diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-15 21:08:18 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-15 21:19:13 -0400 |
| commit | b659d7c33fcacdbbef86557e78f071abf94bead2 (patch) | |
| tree | 102a743dd77a5f6ee7cf4b293e233693b9140fd9 | |
| parent | 1b18d38fc2e82dccc80adebb5fee596d60064f99 (diff) | |
cleanup sqlflex and sqlbison options
Change-Id: I3f01636ef861828fdbe87e4057b6dc293ca63576
| -rw-r--r-- | connectivity/Library_dbtools.mk | 10 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlbison.y | 4 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlflex.l | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 1e063eacd2a9..4228eb9b4b42 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -66,8 +66,6 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ )) endif -#connectivity/source/commontools/RowFunctionParser.cxx disable optimization? - $(eval $(call gb_Library_add_noexception_objects,dbtools,\ connectivity/source/simpledbt/refbase \ )) @@ -76,16 +74,10 @@ $(eval $(call gb_Library_add_grammars,dbtools,\ connectivity/source/parse/sqlbison \ )) -$(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison) : T_YACCFLAGS := -d -l -pSQLyy -bsql - $(eval $(call gb_Library_add_scanners,dbtools,\ -connectivity/source/parse/sqlflex \ + connectivity/source/parse/sqlflex \ )) -$(call gb_LexTarget_get_scanner_target,connectivity/source/parse/sqlflex) : T_LEXFLAGS := -i -8 -PSQLyy -L - - - $(eval $(call gb_Library_add_exception_objects,dbtools,\ connectivity/source/commontools/AutoRetrievingBase \ connectivity/source/commontools/BlobHelper \ diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index 0bb7c316e1a4..017428b3a8aa 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -1,4 +1,8 @@ %token-table +%defines +%no-lines +%define api.prefix SQLyy +%file-prefix "sql" %{ /* * This file is part of the LibreOffice project. diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index d17128ec64a9..1ded0e2d2e74 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -1,3 +1,6 @@ +%option case-insensitive +%option 8bit +%option prefix="SQLyy" %{ // |