add precedence to conditionals; add test for conditional associativity

2021-06-18 07:17:21 +02:00
parent b04366fc76
commit f4b4b4f026
4 changed files with 706 additions and 677 deletions
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -798,29 +798,33 @@
      }
    },
    "conditional": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "expression"
-        },
-        {
-          "type": "STRING",
-          "value": "?"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "expression"
-        },
-        {
-          "type": "STRING",
-          "value": ":"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "expression"
-        }
-      ]
+      "type": "PREC_LEFT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "expression"
+          },
+          {
+            "type": "STRING",
+            "value": "?"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "expression"
+          },
+          {
+            "type": "STRING",
+            "value": ":"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        ]
+      }
    },
    "operation": {
      "type": "CHOICE",
@@ -1228,9 +1232,6 @@
    [
      "full_splat"
    ],
-    [
-      "conditional"
-    ],
    [
      "string_lit",
      "quoted_template"
--- a/src/parser.c
+++ b/src/parser.c