Part 5

* Fix shift/reduce conflict
halogenandtoast · Dec 8, 2014 · f5c10a1 · f5c10a1
1 parent 4a4ce7e
commit f5c10a1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ lex.yy.c
 ruby
 parse.tab.c
 parse.tab.h
+parse.output
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 SRC=main.c parse.tab.c lex.yy.c
+
 all: ruby
 
 ruby: ${SRC}
@@ -8,7 +9,7 @@ lex.yy.c: ruby.l
 	flex ruby.l
 
 parse.tab.c: parse.y
-	bison -d parse.y
+	bison -v -d parse.y
 
 clean:
-	rm -rf ruby lex.yy.c parse.tab.c parse.tab.h
+	rm -rf ruby lex.yy.c parse.tab.c parse.tab.h parse.output
diff --git a/parse.y b/parse.y
@@ -4,6 +4,8 @@
   void yyerror(char const *s) { fprintf(stderr, "%s\n", s); }
 %}
 
+%left tPLUS
+
 %token tNUMBER
 %token tPLUS
 %start program