implement C-like comments

feodor · feodor · commit cb3bf775812d · 2014-08-05T20:42:28.000+04:00
diff --git a/expected/jsquery.out b/expected/jsquery.out
@@ -38,13 +38,13 @@ select 'asd(zzz < 13 & x.zxc = "true")'::jsquery;
  "asd"("zzz" < 13 & "x"."zxc" = "true")
 (1 row)
 
-select 'asd(zzz < 13 | #.zxc = "true")'::jsquery;
+select 'asd(zzz < 13 | #.zxc = "true" /* test */)'::jsquery;
                jsquery                
 --------------------------------------
  "asd"("zzz" < 13 | #."zxc" = "true")
 (1 row)
 
-select 'asd(* < 13 & #.zxc = "true")'::jsquery;
+select 'asd(* < 13 & /* ttt */ #.zxc = "true")'::jsquery;
              jsquery              
 ----------------------------------
  "asd"(* < 13 & #."zxc" = "true")
@@ -56,12 +56,17 @@ select '(* < 13 & #.zxc = "true")'::jsquery;
  (* < 13 & #."zxc" = "true")
 (1 row)
 
-select '* < 13 & #.zxc = "true"'::jsquery;
+select '* < 13 & #.zxc/* t2 */ = "true"'::jsquery;
            jsquery           
 -----------------------------
  (* < 13 & #."zxc" = "true")
 (1 row)
 
+select '* < 13 & #.zxc"x" = "true"'::jsquery;
+ERROR:  bad jsquery representation
+LINE 1: select '* < 13 & #.zxc"x" = "true"'::jsquery;
+               ^
+DETAIL:  syntax error, unexpected STRING_P at or near """
 select 'a < 1'::jsquery;
  jsquery 
 ---------
diff --git a/jsquery_scan.l b/jsquery_scan.l
@@ -45,9 +45,10 @@ static void parseUnicode(char *s, int l);
 
 %x xQUOTED
 %x xNONQUOTED
+%x xCOMMENT
 
 special		 [\%\$\.\[\]\(\)\|\&\!\=\<\>\@\#\,\*]
-any			[^\%\$\.\[\]\(\)\|\&\!\=\<\>\@\#\,\* \t\n\r\f\\\"]
+any			[^\%\$\.\[\]\(\)\|\&\!\=\<\>\@\#\,\* \t\n\r\f\\\"\/]
 blank		[ \t\n\r\f]
 unicode     \\u[0-9A-Fa-f]{4}
 
@@ -57,6 +58,8 @@ unicode     \\u[0-9A-Fa-f]{4}
 
 <INITIAL>{blank}+				{ /* ignore */ }
 
+<INITIAL>\/\*					{ BEGIN xCOMMENT; }
+
 <INITIAL>[+-]?[0-9]+(\.[0-9]+)?[eE][+-]?[0-9]+  /* float */  {
 									addstring(true, yytext, yyleng);
 									addchar(false, '\0');
@@ -113,6 +116,15 @@ unicode     \\u[0-9A-Fa-f]{4}
 								}
 
 
+<xNONQUOTED>\/\*				{
+									yylval->str = scanstring;
+									BEGIN xCOMMENT;
+									return checkSpecialVal();
+								}
+
+
+<xNONQUOTED,INITIAL>\/ 			{ addchar(false, '/'); }
+
 <xNONQUOTED>({special}|\")		{
 									yylval->str = scanstring;
 									yyless(0);
@@ -126,9 +138,7 @@ unicode     \\u[0-9A-Fa-f]{4}
 									return checkSpecialVal();
 								}
 
-<xNONQUOTED,xQUOTED>\\[\"\\]	{ 
-									addchar(false, yytext[1]); 
-								}
+<xNONQUOTED,xQUOTED>\\[\"\\]	{ addchar(false, yytext[1]); }
 
 <xNONQUOTED,xQUOTED>\\b 		{ addchar(false, '\b'); }
 
@@ -160,6 +170,14 @@ unicode     \\u[0-9A-Fa-f]{4}
 
 <INITIAL><<EOF>>				{ yyterminate(); }
 
+<xCOMMENT>\*\/					{ BEGIN INITIAL; }
+
+<xCOMMENT>[^\*]+				{ /* ignore */ }
+
+<xCOMMENT>\*					{ /* ignore */ }
+
+<xCOMMENT><<EOF>>				{ yyerror("Unexpected end of comment"); }
+
 %%
 
 void
diff --git a/sql/jsquery.sql b/sql/jsquery.sql
@@ -12,10 +12,11 @@ select 'asd(zzz < 13)'::jsquery;
 select 'asd(zzz < 13 & x = true)'::jsquery;
 select 'asd(zzz < 13 & x = "true")'::jsquery;
 select 'asd(zzz < 13 & x.zxc = "true")'::jsquery;
-select 'asd(zzz < 13 | #.zxc = "true")'::jsquery;
-select 'asd(* < 13 & #.zxc = "true")'::jsquery;
+select 'asd(zzz < 13 | #.zxc = "true" /* test */)'::jsquery;
+select 'asd(* < 13 & /* ttt */ #.zxc = "true")'::jsquery;
 select '(* < 13 & #.zxc = "true")'::jsquery;
-select '* < 13 & #.zxc = "true"'::jsquery;
+select '* < 13 & #.zxc/* t2 */ = "true"'::jsquery;
+select '* < 13 & #.zxc"x" = "true"'::jsquery;
 
 select 'a < 1'::jsquery;
 select 'a < -1'::jsquery;
