Index: connectivity/inc/connectivity/sqlparse.hxx =================================================================== RCS file: /cvs/dba/connectivity/inc/connectivity/sqlparse.hxx,v retrieving revision 1.10.10.1.6.1 diff -u -r1.10.10.1.6.1 sqlparse.hxx --- connectivity/inc/connectivity/sqlparse.hxx 27 Sep 2002 10:58:12 -0000 1.10.10.1.6.1 +++ connectivity/inc/connectivity/sqlparse.hxx 8 Feb 2003 15:43:27 -0000 @@ -74,7 +74,7 @@ #ifndef FLEX_SCANNER #ifndef BISON_INCLUDED #define BISON_INCLUDED -#include +#include #endif #endif #endif Index: connectivity/prj/d.lst =================================================================== RCS file: /cvs/dba/connectivity/prj/d.lst,v retrieving revision 1.11.4.1.2.1 diff -u -r1.11.4.1.2.1 d.lst --- connectivity/prj/d.lst 9 Jan 2003 16:12:28 -0000 1.11.4.1.2.1 +++ connectivity/prj/d.lst 8 Feb 2003 15:43:27 -0000 @@ -21,7 +21,7 @@ mkdir: %_DEST%\inc%_EXT%\connectivity\sdbcx hedabu: ..\inc\connectivity\*.hxx %_DEST%\inc%_EXT%\connectivity\*.hxx -hedabu: ..\%__SRC%\inc\connectivity\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx +hedabu: ..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx hedabu: ..\inc\connectivity\sdbcx\*.hxx %_DEST%\inc%_EXT%\connectivity\sdbcx\*.hxx hedabu: ..\version.mk %_DEST%\inc%_EXT%\connectivity\version.mk Index: connectivity/source/parse/makefile.mk =================================================================== RCS file: /cvs/dba/connectivity/source/parse/makefile.mk,v retrieving revision 1.8.20.1 diff -u -r1.8.20.1 makefile.mk --- connectivity/source/parse/makefile.mk 27 Aug 2002 13:10:23 -0000 1.8.20.1 +++ connectivity/source/parse/makefile.mk 8 Feb 2003 15:43:28 -0000 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8.20.1 $ +# $Revision: 1.8.20.1.2.1 $ # -# last change: $Author: vg $ $Date: 2002/08/27 13:10:23 $ +# last change: $Author: armin $ $Date: 2002/10/18 16:14:53 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,12 +67,14 @@ # --- Settings ----------------------------------------------------- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk # --- Files -------------------------------------------------------- +YACCTARGET= $(MISC)$/sqlbison.cxx +YACCFILES= sqlbison.y +YACCFLAGS=-v -d -l -pSQLyy -bsql -o + SLOFILES = \ $(SLO)$/sqlNoException.obj \ $(SLO)$/sqlbison.obj \ @@ -92,16 +94,8 @@ .INCLUDE : target.mk -$(MISC)$/sqlflex.cxx: sqlflex.l +$(MISC)$/%.cxx: %.l +flex -i -8 -PSQLyy -L -o$(MISC)$/sqlflex.cxx sqlflex.l -$(MISC)$/sqlbison.cxx: sqlbison.y - +bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx sqlbison.y - -$(MKDIR) $(OUT)$/inc$/connectivity - +$(COPY) $(MISC)$/sqlbison.cxx.h $(OUT)$/inc$/connectivity$/sqlbison.hxx - -$(SLO)$/sqlbison.obj : $(MISC)$/sqlbison.cxx - -$(SLO)$/sqlflex.obj : $(MISC)$/sqlflex.cxx - -sqliterator.cxx: $(MISC)$/sqlbison.cxx +$(INCCOM)$/sqlbison.hxx : $(YACCTARGET) +$(EXCEPTIONSFILES) : $(INCCOM)$/sqlbison.hxx Index: connectivity/source/parse/sqlbison.y =================================================================== RCS file: /cvs/dba/connectivity/source/parse/sqlbison.y,v retrieving revision 1.34.8.1.2.2.2.1.4.1.2.3 diff -u -r1.34.8.1.2.2.2.1.4.1.2.3 sqlbison.y --- connectivity/source/parse/sqlbison.y 14 Jan 2003 12:14:43 -0000 1.34.8.1.2.2.2.1.4.1.2.3 +++ connectivity/source/parse/sqlbison.y 8 Feb 2003 15:43:29 -0000 @@ -134,21 +134,6 @@ %token SQL_TOKEN_STRING SQL_TOKEN_ACCESS_DATE SQL_TOKEN_INT SQL_TOKEN_REAL_NUM %token SQL_TOKEN_INTNUM SQL_TOKEN_APPROXNUM SQL_TOKEN_NOT SQL_TOKEN_NAME - /* operators */ -%left SQL_TOKEN_NAME -%left SQL_TOKEN_OR -%left SQL_TOKEN_AND - -%left LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */ -%left '+' '-' -%left '*' '/' -%left SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT -%left ')' -%right '=' -%right '.' -%right '(' - - %nonassoc SQL_TOKEN_UMINUS @@ -157,31 +142,31 @@ %token SQL_TOKEN_ALL SQL_TOKEN_ALTER SQL_TOKEN_AMMSC SQL_TOKEN_ANY SQL_TOKEN_AS SQL_TOKEN_ASC SQL_TOKEN_AT SQL_TOKEN_AUTHORIZATION SQL_TOKEN_AVG -%token SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BIT_LENGTH SQL_TOKEN_BOTH SQL_TOKEN_BY +%token SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BOTH SQL_TOKEN_BY -%token SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHAR_LENGTH SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS -%token SQL_TOKEN_CURRENT SQL_TOKEN_CURRENT_DATE SQL_TOKEN_CURRENT_TIME SQL_TOKEN_CURRENT_TIMESTAMP SQL_TOKEN_CURSOR +%token SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS +%token SQL_TOKEN_CURRENT SQL_TOKEN_CURSOR %token SQL_TOKEN_DATE SQL_TOKEN_DAY SQL_TOKEN_DEC SQL_TOKEN_DECIMAL SQL_TOKEN_DECLARE SQL_TOKEN_DEFAULT SQL_TOKEN_DELETE SQL_TOKEN_DESC %token SQL_TOKEN_DISTINCT SQL_TOKEN_DOUBLE SQL_TOKEN_DROP -%token SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_EXTRACT SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL +%token SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL -%token SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_HOUR SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INSERT SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT +%token SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT -%token SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LEFT SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER SQL_TOKEN_MINUTE SQL_TOKEN_MONTH +%token SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER %token SQL_TOKEN_MAX SQL_TOKEN_MIN SQL_TOKEN_NATURAL SQL_TOKEN_NCHAR SQL_TOKEN_NULL SQL_TOKEN_NUMERIC %token SQL_TOKEN_OCTECT_LENGTH SQL_TOKEN_OF SQL_TOKEN_ON SQL_TOKEN_OPTION SQL_TOKEN_ORDER SQL_TOKEN_OUTER -%token SQL_TOKEN_POSITION SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC -%token SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK SQL_TOKEN_RIGHT +%token SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC +%token SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK -%token SQL_TOKEN_SCHEMA SQL_TOKEN_SECOND SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUBSTRING SQL_TOKEN_SUM +%token SQL_TOKEN_SCHEMA SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUM %token SQL_TOKEN_TABLE SQL_TOKEN_TIME SQL_TOKEN_TIMESTAMP SQL_TOKEN_TIMEZONE_HOUR SQL_TOKEN_TIMEZONE_MINUTE SQL_TOKEN_TO SQL_TOKEN_TRAILING SQL_TOKEN_TRANSLATE SQL_TOKEN_TRIM SQL_TOKEN_TRUE SQL_TOKEN_UNION %token SQL_TOKEN_UNIQUE SQL_TOKEN_UNKNOWN SQL_TOKEN_UPDATE SQL_TOKEN_UPPER SQL_TOKEN_USAGE SQL_TOKEN_USER SQL_TOKEN_USING SQL_TOKEN_VALUES SQL_TOKEN_VIEW -%token SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_YEAR SQL_TOKEN_ZONE +%token SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_ZONE /* ODBC KEYWORDS */ %token SQL_TOKEN_CALL SQL_TOKEN_D SQL_TOKEN_FN SQL_TOKEN_T SQL_TOKEN_TS SQL_TOKEN_OJ @@ -204,6 +189,22 @@ %token SQL_TOKEN_LOG10 SQL_TOKEN_MOD SQL_TOKEN_PI SQL_TOKEN_POWER SQL_TOKEN_RADIANS SQL_TOKEN_RAND %token SQL_TOKEN_ROUND SQL_TOKEN_SIGN SQL_TOKEN_SIN SQL_TOKEN_SQRT SQL_TOKEN_TAN SQL_TOKEN_TRUNCATE + + /* operators */ +%left SQL_TOKEN_NAME +%left SQL_TOKEN_OR +%left SQL_TOKEN_AND + +%left LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */ +%left '+' '-' +%left '*' '/' +%left SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT +%left ')' +%right '=' +%right '.' +%right '(' + + %token SQL_TOKEN_INVALIDSYMBOL /*%type sql_single_statement */ @@ -3005,7 +3006,7 @@ } else YYERROR; - } + }; %% Index: connectivity/source/parse/sqlflex.l =================================================================== RCS file: /cvs/dba/connectivity/source/parse/sqlflex.l,v retrieving revision 1.15.12.1 diff -u -r1.15.12.1 sqlflex.l --- connectivity/source/parse/sqlflex.l 27 Sep 2002 11:05:36 -0000 1.15.12.1 +++ connectivity/source/parse/sqlflex.l 8 Feb 2003 15:43:30 -0000 @@ -38,7 +38,7 @@ #define SQLYYDEBUG 1 #endif -#include "connectivity/sqlbison.hxx" +#include "sqlbison.hxx" #endif #ifndef _CONNECTIVITY_SQLSCAN_HXX #include "sqlscan.hxx" Index: connectivity/source/parse/sqlnode.cxx =================================================================== RCS file: /cvs/dba/connectivity/source/parse/sqlnode.cxx,v retrieving revision 1.26.8.2.2.1.6.1 diff -u -r1.26.8.2.2.1.6.1 sqlnode.cxx --- connectivity/source/parse/sqlnode.cxx 27 Sep 2002 11:05:37 -0000 1.26.8.2.2.1.6.1 +++ connectivity/source/parse/sqlnode.cxx 8 Feb 2003 15:43:30 -0000 @@ -69,7 +69,7 @@ #define YYBISON 1 #ifndef BISON_INCLUDED #define BISON_INCLUDED -#include +#include #endif #ifndef _CONNECTIVITY_SQLPARSE_HXX #include