~ jison lalr parser gets conflicts on optionals of optionals

works around zaach/jison#377
shexjs · Oct 29, 2018 · 0883747 · 0883747
1 parent 73cdad7
commit 0883747
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 JISON?=./node_modules/jison/lib/cli.js
 
 ./lib/ShExJison.js: ./lib/ShExJison.jison
-	$(JISON) $^ -o $@ -p lalr
+	$(JISON) $^ -o $@ -p lr
 
 ./lib/ShapeMapJison.js: ./lib/ShapeMapJison.jison
 	$(JISON) $^ -o $@ -p lalr

diff --git a/browser/shex-browserify.js b/browser/shex-browserify.js
diff --git a/lib/ShExJison.js b/lib/ShExJison.js