Add action opcode and new reduce handler

alextsao1999 · Mar 17, 2022 · 7956180 · 7956180
1 parent e2ea279
commit 7956180
Show file tree

Hide file tree

Showing 11 changed files with 3,972 additions and 5,290 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # tinylr
 a tiny lalr generator inspired by Charles Baker's lalr
 
-generate value_t format ast from grammar
+generate json format ast from grammar
 
 glr parser can handle the shift-reduce conflict and reduce-reduce conflict grammar easily
 

diff --git a/debug.natvis b/debug.natvis
@@ -26,9 +26,9 @@
         </Expand>
     </Type>
     <Type Name="ParserState">
-        <DisplayString Condition="conflict == 0">{{ Index = {index}, Size = {transition_count} }}</DisplayString>
-        <DisplayString Condition="conflict == 1">{{ Index = {index}, Size = {transition_count}, ShiftReduce }}</DisplayString>
-        <DisplayString Condition="conflict == 2">{{ Index = {index}, Size = {transition_count}, ReduceReduce }}</DisplayString>
+        <DisplayString Condition="conflict == 0">{{ Index = {allocated}, Size = {transition_count} }}</DisplayString>
+        <DisplayString Condition="conflict == 1">{{ Index = {allocated}, Size = {transition_count}, ShiftReduce }}</DisplayString>
+        <DisplayString Condition="conflict == 2">{{ Index = {allocated}, Size = {transition_count}, ReduceReduce }}</DisplayString>
 <!--        <DisplayString>{{ Size = {transition_count} }}</DisplayString>-->
         <Expand>
             <ArrayItems>
@@ -89,6 +89,13 @@
             <Item Name="[State]">state</Item>
         </Expand>
     </Type>
+    <Type Name="ReduceAction">
+        <Expand>
+            <Item Name="[Opcode]">((ActionOpcode) opcode)</Item>
+            <Item Name="[Int]">index</Item>
+            <Item Name="[Str]">value</Item>
+        </Expand>
+    </Type>
     <Type Name="alex::RegexRange">
         <Expand>
             <Item Name="[begin]">((char) begin)</Item>

diff --git a/generator.cpp b/generator.cpp