MonetDB: Jun2010 - Get this to compile again on Windows.

[Sjoerd Mullender]

Changeset: ca44e0299890 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca44e0299890
Modified Files:
        sql/src/server/sql_parser.mx
        sql/src/server/sql_scan.mx
Branch: Jun2010
Log Message:

Get this to compile again on Windows.

We got the error:
sql\NT\src\server\sql_parser.tab.h(351): error #47: incompatible redefinition 
of macro "TEXT" (declared at line 395 of "C:\Program Files\\Microsoft 
SDKs\Windows\v6.0A\include\winnt.h")
  #define TEXT 281


diffs (44 lines):

diff -r 4c7ff2ce775d -r ca44e0299890 sql/src/server/sql_parser.mx
--- a/sql/src/server/sql_parser.mx      Wed Jul 07 13:39:44 2010 +0200
+++ b/sql/src/server/sql_parser.mx      Wed Jul 07 14:12:50 2010 +0200
@@ -642,7 +642,7 @@
        IDENT aTYPE ALIAS AGGR RANK sqlINT HEXADECIMAL INTNUM APPROXNUM 
        USING 
        ALL ANY SOME GLOBAL CAST CONVERT
-       CHARACTER VARYING LARGE OBJECT VARCHAR CLOB TEXT BINARY sqlBLOB
+       CHARACTER VARYING LARGE OBJECT VARCHAR CLOB sqlTEXT BINARY sqlBLOB
        sqlDECIMAL sqlFLOAT
        TINYINT SMALLINT BIGINT sqlINTEGER
        sqlDOUBLE sqlREAL PRECISION PARTIAL SIMPLE ACTION CASCADE RESTRICT
@@ -4538,7 +4538,7 @@
 
 clob:
        CLOB                            { $$ = $1; }
- |     TEXT                            { $$ = $1; }
+ |     sqlTEXT                         { $$ = $1; }
  |     CHARACTER LARGE OBJECT          { $$ = $1; }
 ;
 blob:
@@ -4602,7 +4602,7 @@
 |  SQL_EXPLAIN { $$ = sa_strdup(SA, "explain"); }
 |  SQL_DEBUG   { $$ = sa_strdup(SA, "debug"); }
 |  SQL_TRACE   { $$ = sa_strdup(SA, "trace"); }
-|  TEXT        { $$ = sa_strdup(SA, "text"); }
+|  sqlTEXT             { $$ = sa_strdup(SA, "text"); }
 |  AUTO_COMMIT { $$ = sa_strdup(SA, "auto_commit"); }
 /* SQL/XML non reserved words */
 |  STRIP       { $$ = sa_strdup(SA, "strip"); }
diff -r 4c7ff2ce775d -r ca44e0299890 sql/src/server/sql_scan.mx
--- a/sql/src/server/sql_scan.mx        Wed Jul 07 13:39:44 2010 +0200
+++ b/sql/src/server/sql_scan.mx        Wed Jul 07 14:12:50 2010 +0200
@@ -119,8 +119,8 @@
        keywords_insert("OBJECT", OBJECT);
        keywords_insert("CLOB", CLOB);
        keywords_insert("BLOB", sqlBLOB);
-       keywords_insert("TEXT", TEXT);
-       keywords_insert("TINYTEXT", TEXT);
+       keywords_insert("TEXT", sqlTEXT);
+       keywords_insert("TINYTEXT", sqlTEXT);
        keywords_insert("STRING", CLOB);        /* ? */
        keywords_insert("CHECK", CHECK);
        keywords_insert("CONSTRAINT", CONSTRAINT);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list