The backend is now called by the ragel program; updated the test harness and

the examples makefile.

git-svn-id: http://svn.complang.org/ragel/trunk@319 052ea7fc-9027-0410-9066-f65837a77df0

diff --git a/examples/Makefile b/examples/Makefile
index 7e47386..a392aa8 100644 (file)
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -19,7 +19,6 @@
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
 RAGEL = ../ragel/ragel
-RLCODEGEN = ../rlgen-cd/rlgen-cd
 FLEX = flex
 RE2C = re2c
 CFLAGS = -Wall -g -O3
@@ -46,8 +45,8 @@ distclean clean:
 gotocallret: gotocallret.o
        g++ -g -o gotocallret gotocallret.o 
 
-gotocallret.cpp: gotocallret.rl $(RAGEL) $(RLCODEGEN)
-       $(RAGEL) gotocallret.rl | $(RLCODEGEN) -G2 -o gotocallret.cpp
+gotocallret.cpp: gotocallret.rl
+       $(RAGEL) -G2 -o gotocallret.cpp gotocallret.rl 
 
 gotocallret.o: gotocallret.cpp
        g++ -Wall -g -c -O3 -o $@ $<
@@ -56,26 +55,26 @@ gotocallret.o: gotocallret.cpp
 pullscan: pullscan.o
        gcc -g -o $@ $<
 
-pullscan.c: pullscan.rl $(RAGEL) $(RLCODEGEN)
-       $(RAGEL) pullscan.rl | $(RLCODEGEN) -G2 -o $@
+pullscan.c: pullscan.rl $(RAGEL) 
+       $(RAGEL) -G2 -o $@ pullscan.rl
 
 concurrent: concurrent.o
        g++ -g -o concurrent concurrent.o 
 
-concurrent.cpp: concurrent.rl $(RAGEL) $(RLCODEGEN)
-       $(RAGEL) concurrent.rl | $(RLCODEGEN) -G2 -o concurrent.cpp
+concurrent.cpp: concurrent.rl $(RAGEL)
+       $(RAGEL) -G2 -o concurrent.cpp concurrent.rl
 
 rlscan: rlscan.o
        g++ -g -o rlscan rlscan.o 
 
-rlscan.cpp: rlscan.rl $(RAGEL) $(RLCODEGEN)
-       $(RAGEL) rlscan.rl | $(RLCODEGEN) -G2 -o rlscan.cpp
+rlscan.cpp: rlscan.rl 
+       $(RAGEL) -G2 -o rlscan.cpp rlscan.rl
 
 statechart: statechart.o
        g++ -g -o statechart statechart.o 
 
-statechart.cpp: statechart.rl $(RAGEL) $(RLCODEGEN)
-       $(RAGEL) statechart.rl | $(RLCODEGEN) -G2 -o statechart.cpp
+statechart.cpp: statechart.rl 
+       $(RAGEL) -G2 -o statechart.cpp statechart.rl
 
 statechart.o: statechart.cpp
        g++ -Wall -g -c -O3 -o $@ $<
@@ -83,14 +82,14 @@ statechart.o: statechart.cpp
 params: params.o 
        gcc -g -o params params.o
 
-params.c: params.rl $(RAGEL) $(RLCODEGEN)
-       $(RAGEL) params.rl | $(RLCODEGEN) -G2 -o params.c
+params.c: params.rl
+       $(RAGEL) -G2 -o params.c params.rl
 
 clang: clang.o 
        gcc -g -o clang clang.o
 
-clang.c: clang.rl $(RAGEL) $(RLCODEGEN)
-       $(RAGEL) clang.rl | $(RLCODEGEN) -G2 -o clang.c
+clang.c: clang.rl 
+       $(RAGEL) -G2 -o clang.c clang.rl
 
 optional: lex-cppscan re2c-cppscan
 
@@ -103,8 +102,8 @@ lex-cppscan: lex-cppscan.o
 re2c-cppscan: re2c-cppscan.o
        g++ -g -o $@ $<
        
-cppscan.cpp: cppscan.rl $(RAGEL) $(RLCODEGEN)
-       $(RAGEL) cppscan.rl | $(RLCODEGEN) -G2 -o $@
+cppscan.cpp: cppscan.rl 
+       $(RAGEL) -G2 -o $@ cppscan.rl
 
 lex-cppscan.cpp: cppscan.lex
        $(FLEX) -f -o $@ $<
@@ -118,27 +117,27 @@ example.cpp: example.rec
 format: format.o 
        gcc -g -o format format.o
 
-format.c: format.rl $(RAGEL) $(RLCODEGEN)
-       $(RAGEL) format.rl | $(RLCODEGEN) -G2 -o format.c
+format.c: format.rl
+       $(RAGEL) -G2 -o format.c format.rl
 
 awkemu: awkemu.o
        gcc -g -o awkemu awkemu.o
 
-awkemu.c: awkemu.rl $(RAGEL) $(RLCODEGEN)
-       $(RAGEL) awkemu.rl | $(RLCODEGEN) -G2 -o awkemu.c
+awkemu.c: awkemu.rl
+       $(RAGEL) -G2 -o awkemu.c awkemu.rl
 
 
 mailbox: mailbox.o
        g++ -g -o mailbox mailbox.o 
 
-mailbox.cpp: mailbox.rl $(RAGEL) $(RLCODEGEN)
-       $(RAGEL) mailbox.rl | $(RLCODEGEN) -G2 -o mailbox.cpp
+mailbox.cpp: mailbox.rl
+       $(RAGEL) -G2 -o mailbox.cpp mailbox.rl
 
 atoi: atoi.o
        g++ -g -o atoi atoi.o 
 
-atoi.cpp: atoi.rl $(RAGEL) $(RLCODEGEN)
-       $(RAGEL) atoi.rl | $(RLCODEGEN) -G2 -o atoi.cpp
+atoi.cpp: atoi.rl
+       $(RAGEL) -G2 -o atoi.cpp atoi.rl
 
 atoi.o: atoi.cpp
        g++ -Wall -g -c -O3 -o $@ $<

diff --git a/test/runtests b/test/runtests
index 3fd39d2..6200c28 100755 (executable)
--- a/test/runtests
+++ b/test/runtests
@@ -95,8 +95,8 @@ function test_error
 
 function run_test()
 {
-       echo "$ragel $min_opt $lang_opt $test_case | $codegen $gen_opt -o $code_src"
-       if ! $ragel $min_opt $lang_opt $test_case | $codegen $gen_opt -o $code_src; then
+       echo "$ragel $lang_opt $min_opt $gen_opt -o $code_src $test_case"
+       if ! $ragel $lang_opt $min_opt $gen_opt -o $code_src $test_case; then
                test_error;
        fi