diff options
author | Adrian Thurston <thurston@colm.net> | 2020-01-09 17:23:58 +0200 |
---|---|---|
committer | Adrian Thurston <thurston@colm.net> | 2020-01-09 17:47:18 +0200 |
commit | 02e94c41cb049ba3e083234737685191057e24d0 (patch) | |
tree | 24102e9b1287098ba21ea73ac977409a93469559 | |
parent | 4525ffd0ab1dff0e49b84cf1c6baa9ed4b3dda35 (diff) | |
download | colm-02e94c41cb049ba3e083234737685191057e24d0.tar.gz |
colm: modified calling convention for colm wrapper
Changed the calling convention for colm-wrap (formerly colm-pack) so that we
can substitute the colm program, once packing is implemented there. Makes the
new wrapper args compatible with the existing args for the colm binary.
refs #85
-rw-r--r-- | colm/.gitignore | 2 | ||||
-rw-r--r-- | colm/Makefile.am | 44 | ||||
-rw-r--r-- | colm/colm-pack.sh | 58 | ||||
-rw-r--r-- | colm/colm-wrap.sh | 78 | ||||
-rw-r--r-- | colm/main.cc | 19 | ||||
-rw-r--r-- | ragel/Makefile.am | 10 | ||||
-rw-r--r-- | ragel/host-asm/Makefile.am | 14 | ||||
-rw-r--r-- | ragel/host-c/Makefile.am | 13 | ||||
-rw-r--r-- | ragel/host-crack/Makefile.am | 13 | ||||
-rw-r--r-- | ragel/host-csharp/Makefile.am | 13 | ||||
-rw-r--r-- | ragel/host-d/Makefile.am | 13 | ||||
-rw-r--r-- | ragel/host-go/Makefile.am | 13 | ||||
-rw-r--r-- | ragel/host-java/Makefile.am | 13 | ||||
-rw-r--r-- | ragel/host-js/Makefile.am | 13 | ||||
-rw-r--r-- | ragel/host-julia/Makefile.am | 13 | ||||
-rw-r--r-- | ragel/host-ocaml/Makefile.am | 16 | ||||
-rw-r--r-- | ragel/host-ruby/Makefile.am | 13 | ||||
-rw-r--r-- | ragel/host-rust/Makefile.am | 13 |
18 files changed, 194 insertions, 177 deletions
diff --git a/colm/.gitignore b/colm/.gitignore index 9846cac8..4538dcbd 100644 --- a/colm/.gitignore +++ b/colm/.gitignore @@ -35,4 +35,4 @@ /output /log -/colm-pack +/colm-wrap diff --git a/colm/Makefile.am b/colm/Makefile.am index 2b10991a..5a53f040 100644 --- a/colm/Makefile.am +++ b/colm/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/aapl AUTOMAKE_OPTIONS = subdir-objects bin_PROGRAMS = colm -bin_SCRIPTS = colm-pack +bin_SCRIPTS = colm-wrap RUNTIME_SRC = \ map.c pdarun.c list.c input.c stream.c debug.c \ @@ -106,19 +106,19 @@ bootstrap0_LDADD = libprog.a libcolm.la # the colm syntax/semantics that is implemented in colm itself. # -gen/bootstrap1.pack: colm-pack bootstrap0$(EXEEXT) +gen/bootstrap1.pack: colm-wrap bootstrap0$(EXEEXT) mkdir -p gen - $(builddir)/colm-pack bootstrap0 -p $@ \ - -c -o gen/parse1.c -e gen/if1.h -x gen/if1.cc + $(builddir)/colm-wrap -w bootstrap0 -o $@ \ + -c -p gen/parse1.c -e gen/if1.h -x gen/if1.cc no-input gen/parse1.c: gen/bootstrap1.pack - $(builddir)/colm-pack unpack -o $@ $< + $(builddir)/colm-wrap -o $@ $< gen/if1.h: gen/bootstrap1.pack - $(builddir)/colm-pack unpack -o $@ $< + $(builddir)/colm-wrap -o $@ $< gen/if1.cc: gen/bootstrap1.pack - $(builddir)/colm-pack unpack -o $@ $< + $(builddir)/colm-wrap -o $@ $< # Listing if1.h in BUILT_SOURCES isn't sufficient because it depends on the # building of bootstrap0. Automake wants to put all built sources into a list @@ -141,19 +141,19 @@ bootstrap1_LDADD = libprog.a libcolm.la # and thus generates the sources used in the colm binary. # -gen/bootstrap2.pack: colm-pack bootstrap1$(EXEEXT) colm.lm +gen/bootstrap2.pack: colm-wrap bootstrap1$(EXEEXT) colm.lm mkdir -p gen - $(builddir)/colm-pack bootstrap1 -p $@ \ - -c -o gen/parse2.c -e gen/if2.h -x gen/if2.cc colm.lm + $(builddir)/colm-wrap -w bootstrap1 -o $@ \ + -c -p gen/parse2.c -e gen/if2.h -x gen/if2.cc colm.lm gen/parse2.c: gen/bootstrap2.pack - $(builddir)/colm-pack unpack -o $@ $< + $(builddir)/colm-wrap -o $@ $< gen/if2.h: gen/bootstrap2.pack - $(builddir)/colm-pack unpack -o $@ $< + $(builddir)/colm-wrap -o $@ $< gen/if2.cc: gen/bootstrap2.pack - $(builddir)/colm-pack unpack -o $@ $< + $(builddir)/colm-wrap -o $@ $< BUILT_SOURCES += gen/parse2.c gen/if2.h gen/if2.cc loadboot2.cc: gen/if2.h @@ -166,19 +166,19 @@ bootstrap2_LDADD = libprog.a libcolm.la endif -gen/bootstrap3.pack: colm-pack $(BUILD_PARSE_3_WITH) prog.lm colm.lm +gen/bootstrap3.pack: colm-wrap $(BUILD_PARSE_3_WITH) prog.lm colm.lm mkdir -p gen - $(builddir)/colm-pack $(BUILD_PARSE_3_WITH) -p $@ \ - -c -o gen/parse3.c -e gen/if3.h -x gen/if3.cc prog.lm + $(builddir)/colm-wrap -w $(BUILD_PARSE_3_WITH) -o $@ \ + -c -p gen/parse3.c -e gen/if3.h -x gen/if3.cc prog.lm gen/parse3.c: gen/bootstrap3.pack - $(builddir)/colm-pack unpack -o $@ $< + $(builddir)/colm-wrap -o $@ $< gen/if3.h: gen/bootstrap3.pack - $(builddir)/colm-pack unpack -o $@ $< + $(builddir)/colm-wrap -o $@ $< gen/if3.cc: gen/bootstrap3.pack - $(builddir)/colm-pack unpack -o $@ $< + $(builddir)/colm-wrap -o $@ $< BUILT_SOURCES += gen/parse3.c gen/if3.h gen/if3.cc loadcolm.cc: gen/if3.h @@ -200,8 +200,8 @@ version.h: Makefile config.h: ../src/config.h cp ../src/config.h ./ -CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = prog.lm colm.lm loadfinal.cc colm-pack.sh +CLEANFILES = $(BUILT_SOURCES) gen/bootstrap1.pack gen/bootstrap2.pack gen/bootstrap3.pack +EXTRA_DIST = prog.lm colm.lm loadfinal.cc colm-wrap.sh -colm-pack: colm-pack.sh +colm-wrap: colm-wrap.sh @$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST) diff --git a/colm/colm-pack.sh b/colm/colm-pack.sh deleted file mode 100644 index ce0ea902..00000000 --- a/colm/colm-pack.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -# - -# This wrapper around the colm program (and bootstrap programs) allows us to -# stick to one output per run of the program. It packs up the multiple colm -# output files into one file. We can extract them one at a time afterwards. - -CMD=$1; -shift 1 - -ARGS="" -while getopts "p:o:e:x:RcD:I:L:vdlirS:M:vHh?-:sVa:m:b:E:" opt; do - # For the unpack case. - if [ "$opt" = 'o' ]; then - output=$OPTARG - fi - - # For the colm wrapper case. - case "$opt" in - p) - # Pack file name - pack_file=$OPTARG - ;; - [oexm]) - ARGS="$ARGS -$opt $OPTARG.pack" - PACKS="$PACKS $OPTARG.pack" - ;; - [DILSMambE-]) ARGS="$ARGS -$opt $OPTARG" ;; - [RcvdlirvHhsV]) ARGS="$ARGS -$opt" ;; - ?) - exit 1; - ;; - esac -done - -# Shift over the args. -shift $((OPTIND - 1)); - -if [ $CMD = "unpack" ]; then - tar -xmf "$@" $output - EXIT_STATUS=$? -else - if [ "`basename $0`" != "$0" ] && [ -x "`dirname $0`/$CMD" ]; then - COLM="`dirname $0`/$CMD" - else - COLM=@prefix@/bin/$CMD - fi - - $COLM $ARGS "$@" - EXIT_STATUS=$? - if [ $EXIT_STATUS = 0 ]; then - tar --transform 's/.pack$//' -cf "$pack_file" $PACKS - fi - rm -f $PACKS -fi - -exit $EXIT_STATUS - diff --git a/colm/colm-wrap.sh b/colm/colm-wrap.sh new file mode 100644 index 00000000..a255f4bb --- /dev/null +++ b/colm/colm-wrap.sh @@ -0,0 +1,78 @@ +#!/bin/bash +# + +# This wrapper around the colm program (and bootstrap programs) allows us to +# limit ourselves to one output file per makefile rule. It packs up multiple +# colm output files into one pack file, which is used as an intermediate file. +# We can extract the individual files from the pack one at a time, in separate +# rules. +# +# Ultimately this functionality should be rolled into the colm program itself. +# Until that is complete, this wrapper exists. +# + +unset CMD +unset ARGS +unset OUTPUT +unset PACKS + +while getopts "w:p:o:e:x:RcD:I:L:vdlirS:M:vHh?-:sVa:m:b:E:" opt; do + + # For the colm wrapper case. + case "$opt" in + w) + # Which command to wrap. + CMD=$OPTARG + ;; + o) + # Pack file name. For wrapping. + OUTPUT=$OPTARG + ;; + [pexm]) + ARGS="$ARGS -$opt $OPTARG.pack" + PACKS="$PACKS $OPTARG.pack" + ;; + [DILSMambE-]) ARGS="$ARGS -$opt $OPTARG" ;; + [RcvdlirvHhsV]) ARGS="$ARGS -$opt" ;; + ?) + exit 1; + ;; + esac +done + +# Shift over the args. +shift $((OPTIND - 1)); + +INPUT="$1" +if [ -z "$INPUT" ]; then + echo colm-wrap: no input file given >&2 + exit 1 +fi + +if [ -z "$OUTPUT" ]; then + echo colm-wrap: no output file given >&2 + exit 1 +fi + +# Default command to colm. +if [ "${INPUT%.pack}" != "$INPUT" ]; then + tar -xmf "$INPUT" "$OUTPUT" + EXIT_STATUS=$? +else + CMD=${CMD:=colm} + if [ "`basename $0`" != "$0" ] && [ -x "`dirname $0`/$CMD" ]; then + COLM="`dirname $0`/$CMD" + else + COLM=@prefix@/bin/$CMD + fi + + $COLM $ARGS "$INPUT" + EXIT_STATUS=$? + if [ $EXIT_STATUS = 0 ]; then + tar --transform 's/.pack$//' -cf "$OUTPUT" $PACKS + fi + rm -f $PACKS +fi + +exit $EXIT_STATUS + diff --git a/colm/main.cc b/colm/main.cc index 2febd774..1663ae14 100644 --- a/colm/main.cc +++ b/colm/main.cc @@ -90,6 +90,7 @@ bool run = false; bool addUniqueEmptyProductions = false; bool gblLibrary = false; long gblActiveRealm = 0; +bool outputSpecifiedWithDashP = false; ArgsVector includePaths; ArgsVector libraryPaths; @@ -187,8 +188,10 @@ void usage() "general:\n" " -h, -H, -?, --help print this usage and exit\n" " -v --version print version information and exit\n" -" -b <file> write binary to <file>\n" -" -o <file> write object to <file>\n" +" -b <ident> use <ident> as name of C object encapulaing the program\n" +" -o <file> if -c given, write C parse object to <file>,\n" +" otherwise write binary to <file>\n" +" -p <file> write C parse object to <file>\n" " -e <file> write C++ export header to <file>\n" " -x <file> write C++ export code to <file>\n" " -m <file> write C++ commit code to <file>\n" @@ -554,7 +557,7 @@ bool inSourceTree( const char *argv0, char *&location ) void processArgs( int argc, const char **argv ) { - ParamCheck pc( "cD:e:x:I:L:vdliro:S:M:vHh?-:sVa:m:b:E:", argc, argv ); + ParamCheck pc( "p:cD:e:x:I:L:vdliro:S:M:vHh?-:sVa:m:b:E:", argc, argv ); while ( pc.check() ) { switch ( pc.state ) { @@ -582,6 +585,9 @@ void processArgs( int argc, const char **argv ) case 'r': run = true; break; + case 'p': + outputSpecifiedWithDashP = true; + /* fallthrough */ case 'o': /* Output. */ if ( *pc.parameterArg == 0 ) @@ -726,7 +732,7 @@ int main(int argc, const char **argv) if ( verbose ) gblActiveRealm = 0xffffffff; - + /* Bail on above errors. */ if ( gblErrorCount > 0 ) exit(1); @@ -751,6 +757,11 @@ int main(int argc, const char **argv) } #endif + if ( !gblLibrary && outputSpecifiedWithDashP ) { + error() << "-p option must be used with -c" << endl; + } + + /* Bail on above errors. */ if ( gblErrorCount > 0 ) exit(1); diff --git a/ragel/Makefile.am b/ragel/Makefile.am index 81dc02d2..f247fba2 100644 --- a/ragel/Makefile.am +++ b/ragel/Makefile.am @@ -2,10 +2,10 @@ SUBDIRS = . host-ruby host-asm host-julia host-ocaml host-c \ host-d host-csharp host-go host-java host-rust host-crack host-js COLM_BIN = ../colm/colm -COLM_PACK = ../colm/colm-pack +COLM_WRAP = ../colm/colm-wrap COLM_LA = ../colm/libcolm.la COLM_LIBDEP = $(COLM_LA) -COLM_BINDEP = $(COLM_BIN) $(COLM_PACK) +COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP) KELBT = @KELBT@ RAGEL = @RAGEL@ @@ -129,13 +129,13 @@ RAGEL_LM = \ rlreduce.lm parse.pack: $(RAGEL_LM) $(COLM_BINDEP) - $(COLM_PACK) colm -p parse.pack -c -b rlparseC -o parse.c -m rlreduce.cc $< + $(COLM_WRAP) -c -b rlparseC -o $@ -p parse.c -m rlreduce.cc $< rlreduce.cc: parse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< parse.c: parse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< if WITH_RAGEL_KELBT diff --git a/ragel/host-asm/Makefile.am b/ragel/host-asm/Makefile.am index fa5c3ede..3a2ac07d 100644 --- a/ragel/host-asm/Makefile.am +++ b/ragel/host-asm/Makefile.am @@ -1,8 +1,8 @@ COLM_BIN = ../../colm/colm -COLM_PACK = ../../colm/colm-pack +COLM_WRAP = ../../colm/colm-wrap COLM_LA = ../../colm/libcolm.la COLM_LIBDEP = $(COLM_LA) -COLM_BINDEP = $(COLM_BIN) $(COLM_PACK) +COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP) bin_PROGRAMS = ragel-asm @@ -20,11 +20,11 @@ BUILT_SOURCES = rlparse.c rlreduce.cc EXTRA_DIST = rlparse.lm rlparse.pack: rlparse.lm $(COLM_BINDEP) - $(COLM_PACK) colm -p rlparse.pack \ - -I.. -c -b rlparseAsm -o rlparse.c -m rlreduce.cc $< + $(COLM_WRAP) -c -I .. -b rlparseAsm -o $@ -p rlparse.c -m rlreduce.cc $< + +rlparse.c: rlparse.pack + $(COLM_WRAP) -o $@ $< rlreduce.cc: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< -rlparse.c: rlparse.pack - $(COLM_PACK) unpack -o $@ $< diff --git a/ragel/host-c/Makefile.am b/ragel/host-c/Makefile.am index b59c1e5d..680a09fe 100644 --- a/ragel/host-c/Makefile.am +++ b/ragel/host-c/Makefile.am @@ -1,8 +1,8 @@ COLM_BIN = ../../colm/colm -COLM_PACK = ../../colm/colm-pack +COLM_WRAP = ../../colm/colm-wrap COLM_LA = ../../colm/libcolm.la COLM_LIBDEP = $(COLM_LA) -COLM_BINDEP = $(COLM_BIN) $(COLM_PACK) +COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP) bin_PROGRAMS = ragel-c @@ -20,14 +20,13 @@ BUILT_SOURCES = rlparse.c rlreduce.cc EXTRA_DIST = rlparse.lm rlhc.lm rlparse.pack: rlparse.lm $(COLM_BINDEP) - $(COLM_PACK) colm -p rlparse.pack \ - -I.. -c -b rlparseC -o rlparse.c -m rlreduce.cc $< + $(COLM_WRAP) -c -I .. -b rlparseC -o $@ -p rlparse.c -m rlreduce.cc $< rlparse.c: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlreduce.cc: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlhc.c: rlhc.lm ../ril.lm $(COLM_BINDEP) - $(COLM_BIN) -I.. -c -b rlhcC -o $@ $< + $(COLM_BIN) -c -I .. -b rlhcC -o $@ $< diff --git a/ragel/host-crack/Makefile.am b/ragel/host-crack/Makefile.am index a7768847..676c7f25 100644 --- a/ragel/host-crack/Makefile.am +++ b/ragel/host-crack/Makefile.am @@ -1,8 +1,8 @@ COLM_BIN = ../../colm/colm -COLM_PACK = ../../colm/colm-pack +COLM_WRAP = ../../colm/colm-wrap COLM_LA = ../../colm/libcolm.la COLM_LIBDEP = $(COLM_LA) -COLM_BINDEP = $(COLM_BIN) $(COLM_PACK) +COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP) bin_PROGRAMS = ragel-crack @@ -20,14 +20,13 @@ BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c EXTRA_DIST = rlparse.lm rlhc.lm rlparse.pack: rlparse.lm $(COLM_BINDEP) - $(COLM_PACK) colm -p rlparse.pack \ - -I.. -c -b rlparseCrack -o rlparse.c -m rlreduce.cc $< + $(COLM_WRAP) -c -I .. -b rlparseCrack -o $@ -p rlparse.c -m rlreduce.cc $< rlparse.c: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlreduce.cc: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlhc.c: rlhc.lm ../ril.lm $(COLM_BINDEP) - $(COLM_BIN) -I.. -c -b rlhcCrack -o $@ $< + $(COLM_BIN) -c -I .. -b rlhcCrack -o $@ $< diff --git a/ragel/host-csharp/Makefile.am b/ragel/host-csharp/Makefile.am index 98e5dc75..e4f4fd71 100644 --- a/ragel/host-csharp/Makefile.am +++ b/ragel/host-csharp/Makefile.am @@ -1,8 +1,8 @@ COLM_BIN = ../../colm/colm -COLM_PACK = ../../colm/colm-pack +COLM_WRAP = ../../colm/colm-wrap COLM_LA = ../../colm/libcolm.la COLM_LIBDEP = $(COLM_LA) -COLM_BINDEP = $(COLM_BIN) $(COLM_PACK) +COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP) bin_PROGRAMS = ragel-csharp @@ -20,14 +20,13 @@ BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c EXTRA_DIST = rlparse.lm rlhc.lm rlparse.pack: rlparse.lm $(COLM_BINDEP) - $(COLM_PACK) colm -p rlparse.pack \ - -I.. -c -b rlparseCSharp -o rlparse.c -m rlreduce.cc $< + $(COLM_WRAP) -c -I .. -b rlparseCSharp -o $@ -p rlparse.c -m rlreduce.cc $< rlparse.c: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlreduce.cc: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlhc.c: rlhc.lm ../ril.lm $(COLM_BINDEP) - $(COLM_BIN) -I.. -c -b rlhcCSharp -o $@ $< + $(COLM_BIN) -c -I .. -b rlhcCSharp -o $@ $< diff --git a/ragel/host-d/Makefile.am b/ragel/host-d/Makefile.am index ba8c7f62..aae8d6fe 100644 --- a/ragel/host-d/Makefile.am +++ b/ragel/host-d/Makefile.am @@ -1,8 +1,8 @@ COLM_BIN = ../../colm/colm -COLM_PACK = ../../colm/colm-pack +COLM_WRAP = ../../colm/colm-wrap COLM_LA = ../../colm/libcolm.la COLM_LIBDEP = $(COLM_LA) -COLM_BINDEP = $(COLM_BIN) $(COLM_PACK) +COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP) bin_PROGRAMS = ragel-d @@ -20,14 +20,13 @@ BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c EXTRA_DIST = rlparse.lm rlhc.lm rlparse.pack: rlparse.lm $(COLM_BINDEP) - $(COLM_PACK) colm -p rlparse.pack \ - -I.. -c -b rlparseD -o rlparse.c -m rlreduce.cc $< + $(COLM_WRAP) -c -I .. -b rlparseD -o $@ -p rlparse.c -m rlreduce.cc $< rlparse.c: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlreduce.cc: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlhc.c: rlhc.lm ../ril.lm $(COLM_BINDEP) - $(COLM_BIN) -I.. -c -b rlhcD -o $@ $< + $(COLM_BIN) -c -I .. -b rlhcD -o $@ $< diff --git a/ragel/host-go/Makefile.am b/ragel/host-go/Makefile.am index ebb8eca3..e775096d 100644 --- a/ragel/host-go/Makefile.am +++ b/ragel/host-go/Makefile.am @@ -1,8 +1,8 @@ COLM_BIN = ../../colm/colm -COLM_PACK = ../../colm/colm-pack +COLM_WRAP = ../../colm/colm-wrap COLM_LA = ../../colm/libcolm.la COLM_LIBDEP = $(COLM_LA) -COLM_BINDEP = $(COLM_BIN) $(COLM_PACK) +COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP) bin_PROGRAMS = ragel-go @@ -22,14 +22,13 @@ BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c EXTRA_DIST = rlparse.lm rlhc.lm out-go.lm rlparse.pack: rlparse.lm $(COLM_BINDEP) - $(COLM_PACK) colm -p rlparse.pack \ - -I.. -c -b rlparseGo -o rlparse.c -m rlreduce.cc $< + $(COLM_WRAP) -c -I .. -b rlparseGo -o $@ -p rlparse.c -m rlreduce.cc $< rlparse.c: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlreduce.cc: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlhc.c: rlhc.lm ../ril.lm $(COLM_BINDEP) - $(COLM_BIN) -I.. -c -b rlhcGo -o $@ $< + $(COLM_BIN) -c -I .. -b rlhcGo -o $@ $< diff --git a/ragel/host-java/Makefile.am b/ragel/host-java/Makefile.am index ff703228..44521de1 100644 --- a/ragel/host-java/Makefile.am +++ b/ragel/host-java/Makefile.am @@ -1,8 +1,8 @@ COLM_BIN = ../../colm/colm -COLM_PACK = ../../colm/colm-pack +COLM_WRAP = ../../colm/colm-wrap COLM_LA = ../../colm/libcolm.la COLM_LIBDEP = $(COLM_LA) -COLM_BINDEP = $(COLM_BIN) $(COLM_PACK) +COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP) bin_PROGRAMS = ragel-java @@ -20,14 +20,13 @@ BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c EXTRA_DIST = rlparse.lm rlhc.lm rlparse.pack: rlparse.lm $(COLM_BINDEP) - $(COLM_PACK) colm -p rlparse.pack \ - -I.. -c -b rlparseJava -o rlparse.c -m rlreduce.cc $< + $(COLM_WRAP) -c -I .. -b rlparseJava -o $@ -p rlparse.c -m rlreduce.cc $< rlparse.c: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlreduce.cc: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlhc.c: rlhc.lm ../ril.lm $(COLM_BINDEP) - $(COLM_BIN) -I.. -c -b rlhcJava -o $@ $< + $(COLM_BIN) -c -I .. -b rlhcJava -o $@ $< diff --git a/ragel/host-js/Makefile.am b/ragel/host-js/Makefile.am index e2923534..db08d249 100644 --- a/ragel/host-js/Makefile.am +++ b/ragel/host-js/Makefile.am @@ -1,8 +1,8 @@ COLM_BIN = ../../colm/colm -COLM_PACK = ../../colm/colm-pack +COLM_WRAP = ../../colm/colm-wrap COLM_LA = ../../colm/libcolm.la COLM_LIBDEP = $(COLM_LA) -COLM_BINDEP = $(COLM_BIN) $(COLM_PACK) +COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP) bin_PROGRAMS = ragel-js @@ -20,14 +20,13 @@ BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c EXTRA_DIST = rlparse.lm rlhc.lm rlparse.pack: rlparse.lm $(COLM_BINDEP) - $(COLM_PACK) colm -p rlparse.pack \ - -I.. -c -b rlparseJs -o rlparse.c -m rlreduce.cc $< + $(COLM_WRAP) -c -I .. -b rlparseJs -o $@ -p rlparse.c -m rlreduce.cc $< rlparse.c: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlreduce.cc: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlhc.c: rlhc.lm ../ril.lm $(COLM_BINDEP) - $(COLM_BIN) -I.. -c -b rlhcJs -o $@ $< + $(COLM_BIN) -c -I .. -b rlhcJs -o $@ $< diff --git a/ragel/host-julia/Makefile.am b/ragel/host-julia/Makefile.am index e24a69a0..f7f193b8 100644 --- a/ragel/host-julia/Makefile.am +++ b/ragel/host-julia/Makefile.am @@ -1,8 +1,8 @@ COLM_BIN = ../../colm/colm -COLM_PACK = ../../colm/colm-pack +COLM_WRAP = ../../colm/colm-wrap COLM_LA = ../../colm/libcolm.la COLM_LIBDEP = $(COLM_LA) -COLM_BINDEP = $(COLM_BIN) $(COLM_PACK) +COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP) bin_PROGRAMS = ragel-julia @@ -20,14 +20,13 @@ BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c EXTRA_DIST = rlparse.lm rlhc.lm rlparse.pack: rlparse.lm $(COLM_BINDEP) - $(COLM_PACK) colm -p rlparse.pack \ - -I.. -c -b rlparseJulia -o rlparse.c -m rlreduce.cc $< + $(COLM_WRAP) -c -I .. -b rlparseJulia -o $@ -p rlparse.c -m rlreduce.cc $< rlparse.c: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlreduce.cc: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlhc.c: rlhc.lm ../ril.lm $(COLM_BINDEP) - $(COLM_BIN) -I.. -c -b rlhcJulia -o $@ $< + $(COLM_BIN) -c -I .. -b rlhcJulia -o $@ $< diff --git a/ragel/host-ocaml/Makefile.am b/ragel/host-ocaml/Makefile.am index d9b425b1..1e268bce 100644 --- a/ragel/host-ocaml/Makefile.am +++ b/ragel/host-ocaml/Makefile.am @@ -1,8 +1,8 @@ COLM_BIN = ../../colm/colm -COLM_PACK = ../../colm/colm-pack +COLM_WRAP = ../../colm/colm-wrap COLM_LA = ../../colm/libcolm.la COLM_LIBDEP = $(COLM_LA) -COLM_BINDEP = $(COLM_BIN) $(COLM_PACK) +COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP) bin_PROGRAMS = ragel-ocaml @@ -20,19 +20,15 @@ BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c EXTRA_DIST = rlparse.lm rlhc.lm rlparse.pack: rlparse.lm $(COLM_BINDEP) - $(COLM_PACK) colm -p rlparse.pack \ - -I.. -c -b rlparseOCaml -o rlparse.c -m rlreduce.cc $< + $(COLM_WRAP) -c -I .. -b rlparseOCaml -o $@ -p rlparse.c -m rlreduce.cc $< rlparse.c: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlreduce.cc: rlparse.pack - $(COLM_PACK) unpack -o $@ $< - -rlhc$(EXEEXT): rlhc.lm - $(COLM_BIN) -I.. -o $@ $< + $(COLM_WRAP) -o $@ $< rlhc.c: rlhc.lm ../ril.lm $(COLM_BINDEP) - $(COLM_BIN) -I.. -c -b rlhcOCaml -o $@ $< + $(COLM_BIN) -c -I .. -b rlhcOCaml -o $@ $< diff --git a/ragel/host-ruby/Makefile.am b/ragel/host-ruby/Makefile.am index 8d0c57a1..60423939 100644 --- a/ragel/host-ruby/Makefile.am +++ b/ragel/host-ruby/Makefile.am @@ -1,8 +1,8 @@ COLM_BIN = ../../colm/colm -COLM_PACK = ../../colm/colm-pack +COLM_WRAP = ../../colm/colm-wrap COLM_LA = ../../colm/libcolm.la COLM_LIBDEP = $(COLM_LA) -COLM_BINDEP = $(COLM_BIN) $(COLM_PACK) +COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP) bin_PROGRAMS = ragel-ruby @@ -20,14 +20,13 @@ BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c EXTRA_DIST = rlparse.lm rlhc.lm rlparse.pack: rlparse.lm $(COLM_BINDEP) - $(COLM_PACK) colm -p rlparse.pack \ - -I.. -c -b rlparseRuby -o rlparse.c -m rlreduce.cc $< + $(COLM_WRAP) -c -I .. -b rlparseRuby -o $@ -p rlparse.c -m rlreduce.cc $< rlparse.c: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlreduce.cc: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlhc.c: rlhc.lm ../ril.lm $(COLM_BINDEP) - $(COLM_BIN) -I.. -c -b rlhcRuby -o $@ $< + $(COLM_BIN) -c -I .. -b rlhcRuby -o $@ $< diff --git a/ragel/host-rust/Makefile.am b/ragel/host-rust/Makefile.am index 2ff77b90..4282cddc 100644 --- a/ragel/host-rust/Makefile.am +++ b/ragel/host-rust/Makefile.am @@ -1,8 +1,8 @@ COLM_BIN = ../../colm/colm -COLM_PACK = ../../colm/colm-pack +COLM_WRAP = ../../colm/colm-wrap COLM_LA = ../../colm/libcolm.la COLM_LIBDEP = $(COLM_LA) -COLM_BINDEP = $(COLM_BIN) $(COLM_PACK) +COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP) bin_PROGRAMS = ragel-rust @@ -20,14 +20,13 @@ BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c EXTRA_DIST = rlparse.lm rlhc.lm rlparse.pack: rlparse.lm $(COLM_BINDEP) - $(COLM_PACK) colm -p rlparse.pack \ - -I.. -c -b rlparseRust -o rlparse.c -m rlreduce.cc $< + $(COLM_WRAP) -c -I .. -b rlparseRust -o $@ -p rlparse.c -m rlreduce.cc $< rlparse.c: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlreduce.cc: rlparse.pack - $(COLM_PACK) unpack -o $@ $< + $(COLM_WRAP) -o $@ $< rlhc.c: rlhc.lm ../ril.lm $(COLM_BINDEP) - $(COLM_BIN) -I.. -c -b rlhcRust -o $@ $< + $(COLM_BIN) -c -I .. -b rlhcRust -o $@ $< |