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

13 files changed, 78 insertions, 92 deletions

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 $@ $<