Change the tokenizer to ignore C-style comments /*...*/ in accordance with

SQL99. (CVS 731)

FossilOrigin-Name: f1534489484afdb835ad8e6f97909fbe76dbe414

diff --git a/manifest b/manifest
index 54e5fbb1087710e25b8d547418628e63eaf40eb8..47c3bc3c1d34417873006f4d936ae67249bed1c8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sfor\sticket\s#142:\sMake\ssure\swe\sget\sthe\scorrect\ssort\sorder\seven\swhen\sthe\ncolumns\sbeing\ssorted\scontain\sNULLs.\s(CVS\s730)
-D 2002-08-26T19:55:08
+C Change\sthe\stokenizer\sto\signore\sC-style\scomments\s/*...*/\sin\saccordance\swith\nSQL99.\s(CVS\s731)
+D 2002-08-27T14:28:30
 F Makefile.in bcb81f40d9a17bd94f59e67157b1e1c54c046c2b
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -48,7 +48,7 @@ F src/test1.c 456cb080db85056be723e770435d9509afc3a83a
 F src/test2.c 279057a854359665b89122070ac1fc472acce1b2
 F src/test3.c b99d5ab68ee672f1fbb00520723b5c21bac35822
 F src/threadtest.c 72bce0a284647314847bbea44616ceb056bfb77f
-F src/tokenize.c 8bd6251e5237c9a16d0bbfb9894925eb129985fa
+F src/tokenize.c 62c98842447effe92eba9622bb2f9a2a8a4b97ad
 F src/trigger.c c90a292a4bef25e478fd5deda6d300319be6a023
 F src/update.c f07e6ed2c517c92871e54d3f5886d1cf56121b11
 F src/util.c c70d5da5357e01b58392faebae3c3620c1d71f14
@@ -147,7 +147,7 @@ F www/speed.tcl a20a792738475b68756ea7a19321600f23d1d803
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 9e341d9c934c2111be6834743f1ce30463b095b6
-R c3833aec2102312b5a02d97350523f61
+P 45847390d007718a4b7a4e9fa445136d013113f8
+R 37afa768fcedc8d2fc0a05d007792ef5
 U drh
-Z 83157ab4770270ac20f0733ba099c807
+Z 451eca83ef39ddfc50a8575792ef9f91

diff --git a/manifest.uuid b/manifest.uuid
index 07ec281392d533261afe97ed8cef87b1480124ce..08b506c0867aab5e44e1bf2c3e1c6907eb563d3c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45847390d007718a4b7a4e9fa445136d013113f8
\ No newline at end of file
+f1534489484afdb835ad8e6f97909fbe76dbe414
\ No newline at end of file

diff --git a/src/tokenize.c b/src/tokenize.c
index 46f6aa86452ae50e58e2d15bb570b62f5c701134..4637f6138a8b41bb1c2bb0577b3aa77f05c130f8 100644 (file)
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -15,7 +15,7 @@
 ** individual tokens and sends those tokens one-by-one over to the
 ** parser for analysis.
 **
-** $Id: tokenize.c,v 1.48 2002/08/24 18:24:56 drh Exp $
+** $Id: tokenize.c,v 1.49 2002/08/27 14:28:30 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -254,8 +254,14 @@ static int sqliteGetToken(const unsigned char *z, int *tokenType){
       return 1;
     }
     case '/': {
-      *tokenType = TK_SLASH;
-      return 1;
+      if( z[1]!='*' || z[2]==0 ){
+        *tokenType = TK_SLASH;
+        return 1;
+      }
+      for(i=3; z[i] && (z[i]!='/' || z[i-1]!='*'); i++){}
+      if( z[i] ) i++;
+      *tokenType = TK_COMMENT;
+      return i;
     }
     case '%': {
       *tokenType = TK_REM;