Add extra bootstrapping step in src/o.sh where bootstrap_pyacc.py builds flex

diff --git a/.gitignore b/.gitignore
index a8c5e2b..4897b84 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,9 @@ src/config.h
 src/config.h.in~
 src/flex
 src/parse.c.orig
+src/parse.y.xml
 src/scan.c.orig
+src/scan.l.xml
 src/stage1flex
 src/stage1scan.c
 src/stage1scan.c.orig

diff --git a/src/n.sh b/src/n.sh
index b95c072..49554ea 100755 (executable)
--- a/src/n.sh
+++ b/src/n.sh
@@ -2,9 +2,12 @@
 touch scan.l
 make
 ./flex scan.l 2>a
+cp a scan.l.xml
 mv lex.yy.c b
-../../plex2.git/bootstrap_plex.py -o stage1scan.c a
+../../plex2.git/bootstrap_plex.py -o stage1scan.c scan.l.xml
 patch stage1scan.c <stage1scan.c.patch
 make
 ./flex scan.l 2>c
 mv lex.yy.c d
+diff --unified a c
+diff --unified b d

diff --git a/src/o.sh b/src/o.sh
new file mode 100755 (executable)
index 0000000..9b67290
--- /dev/null
+++ b/src/o.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+touch parse.y
+make
+./flex scan.l 2>a
+mv lex.yy.c b
+../../bootstrap_bison.git/src/bison -o /dev/null parse.y 2>parse.y.xml
+../../pyacc2.git/bootstrap_pyacc.py --defines=parse.h -o parse.c parse.y.xml
+patch parse.c <parse.c.patch
+make
+./flex scan.l 2>c
+mv lex.yy.c d
+diff --unified a c
+diff --unified b d