had to make Op a higher-precedence operator

Author: peter

third_party/libpg_query/grammar/grammar.y

@@ -145,8 +145,8 @@
  */
 %nonassoc	UNBOUNDED		/* ideally should have same precedence as IDENT */
 %nonassoc	IDENT GENERATED NULL_P PARTITION RANGE ROWS GROUPS PRECEDING FOLLOWING CUBE ROLLUP ENUM_P
-%left		Op OPERATOR		/* multi-character ops and user-defined operators */
 %left		'+' '-'
+%left		Op OPERATOR		/* multi-character ops and user-defined operators */
 %left		'*' '/' '%' INTEGER_DIVISION
 %left		'^' POWER_OF
 /* Unary Operators */

third_party/libpg_query/grammar/statements/pgq.y

@@ -753,7 +753,7 @@ StickyArrowHead:
             {   /* DDB lexer may concatenate an > with + or * into an "operator" */
                 char *op = $1;
                 if (op[0] ='>' && (op[1] == '+' || op[1] == '*') && op[2] == 0)  {
-                    $$ = (op[1] == '*') ? "->*" : "->+";
+                    $$ = (char*) ((op[1] == '*') ? "->*" : "->+");
                 } else {
                     char msg[128];
                     snprintf(msg, 128, "PGQ does not allow - followed by %s here.", op);
@@ -762,6 +762,7 @@ StickyArrowHead:
             }
     ;
 
+
 StickyDash:
         Op
             {   /* DDB lexer may concatenate an arrow with + or * into an "operator" */
@@ -783,45 +784,44 @@ StickyDash:
 
 /* we allow spaces inside the arrows */
 Arrow:
-        '-'
-            {   $$ = "-"; }
-    |
-        '<' '-'
-            {   $$ = "<-";  }
-    |
-        LAMBDA_ARROW
-            {   $$ = "->"; }
+        '-' StickyArrowHead
+            {   $$ = $2; }
     |
         '-' '>'
             {   $$ = "->"; }
+    |
+        '-'
+            {   $$ = "-"; }
+    |
+        StickyDash
+            {   $$ = $1; }
     |
         '<' LAMBDA_ARROW
             {    $$ = "<->";  }
+    |
+        '<' '-' StickyArrowHead
+            {   $$ = (char*) (($3 == "->*") ? "<->*" : "<->+"); }
     |
         '<' '-' '>'
             {    $$ = "<->";  }
-    |
-        StickyDash
-            {   $$ = $1; }
     |
         '<' StickyDash
             {   char *op = $2;
                 if (op[0] == '<') {
-                    parse_yyerror("PGQ does not allow < followed by < as edge operator");
+                    parser_yyerror("PGQ does not allow < followed by < as edge operator");
                 }
-                $$ = (op[1] == 0)   ? "<-" :
-                     (op[1] == '*') ? "<-*" :
-                     (op[1] == '+') ? "<-+" :
-                     (op[2] == '*') ? "<->*" :
-                     (op[2] == '+') ? "<->+" : "<->";
+                $$ = (char*) ((op[1] == 0)   ? "<-" :
+                              (op[1] == '*') ? "<-*" :
+                              (op[1] == '+') ? "<-+" :
+                              (op[2] == '*') ? "<->*" :
+                              (op[2] == '+') ? "<->+" : "<->");
             }
     |
-        '<' '-' StickyArrowHead
-            {   $$ = ($3 == "->*") ? "<->*" : "<->+"; }
-        ;
+        '<' '-'
+            {   $$ = "<-";  }
     |
-        '-' StickyArrowHead
-            {   $$ = $2 }
+        LAMBDA_ARROW
+            {   $$ = "->"; }
         ;
 
 ArrowLeft: