compatibility with bison 3.0

feodor · feodor · commit 2328c9ad87a4 · 2014-08-22T16:25:59.000+04:00
diff --git a/jsquery_gram.y b/jsquery_gram.y
@@ -13,8 +13,6 @@
  */
 
 %{
-#define YYPARSE_PARAM result  /* need this to pass a pointer (void *) to yyparse */
-
 #include "postgres.h"
 
 #include "fmgr.h"
@@ -53,8 +51,7 @@ typedef struct string {
 
 /* flex 2.5.4 doesn't bother with a decl for this */
 int jsquery_yylex(YYSTYPE * yylval_param);
-int jsquery_yyparse(void *result);
-void jsquery_yyerror(const char *message);
+void jsquery_yyerror(JsQueryParseItem **result, const char *message);
 
 static JsQueryParseItem*
 makeItemType(int type)
@@ -191,6 +188,7 @@ makeItemList(List *list) {
 %expect 0
 %name-prefix="jsquery_yy"
 %error-verbose
+%parse-param {JsQueryParseItem **result}
 
 %union {
 	string 				str;
@@ -225,8 +223,8 @@ makeItemList(List *list) {
 %%
 
 result: 
-	expr							{ *((JsQueryParseItem**)result) = $1; } 
-	| /* EMPTY */					{ *((JsQueryParseItem**)result) = NULL; }
+	expr							{ *result = $1; } 
+	| /* EMPTY */					{ *result = NULL; }
 	;
 
 array:
diff --git a/jsquery_scan.l b/jsquery_scan.l
@@ -157,13 +157,13 @@ unicode     \\u[0-9A-Fa-f]{4}
 
 <xNONQUOTED,xQUOTED>{unicode}+	{ parseUnicode(yytext, yyleng); }
 
-<xNONQUOTED,xQUOTED>\\u 		{ yyerror("Unicode sequence is invalid"); }
+<xNONQUOTED,xQUOTED>\\u 		{ yyerror(NULL, "Unicode sequence is invalid"); }
 
-<xNONQUOTED,xQUOTED>\\. 		{ yyerror("Escape sequence is invalid"); }
+<xNONQUOTED,xQUOTED>\\. 		{ yyerror(NULL, "Escape sequence is invalid"); }
 
-<xNONQUOTED,xQUOTED>\\ 			{ yyerror("Unexpected end after backslesh"); }
+<xNONQUOTED,xQUOTED>\\ 			{ yyerror(NULL, "Unexpected end after backslesh"); }
 
-<xQUOTED><<EOF>>				{ yyerror("Unexpected end of quoted string"); }
+<xQUOTED><<EOF>>				{ yyerror(NULL, "Unexpected end of quoted string"); }
 
 <xQUOTED>\"						{
 									yylval->str = scanstring;
@@ -186,12 +186,12 @@ unicode     \\u[0-9A-Fa-f]{4}
 
 <xCOMMENT>\*					{ addchar(false, '*'); }
 
-<xCOMMENT><<EOF>>				{ yyerror("Unexpected end of comment"); }
+<xCOMMENT><<EOF>>				{ yyerror(NULL, "Unexpected end of comment"); }
 
 %%
 
 void
-yyerror(const char *message)
+yyerror(JsQueryParseItem **result, const char *message)
 {
 	if (*yytext == YY_END_OF_BUFFER_CHAR)
 	{
@@ -384,7 +384,7 @@ parsejsquery(const char *str, int len) {
 	jsquery_scanner_init(str, len);
 
 	if (jsquery_yyparse((void*)&parseresult) != 0)
-		jsquery_yyerror("bugus input");
+		jsquery_yyerror(NULL, "bugus input");
 
 	jsquery_scanner_finish();
 
