moved 'colm' dir to 'src'

71 files changed, 67 insertions, 66 deletions

diff --git a/Makefile.am b/Makefile.am
index 60ebe031..0a852f66 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,7 @@
 # ADT install: $(INSTALL_SUBDIRS)
 # ADT 
 
-SUBDIRS = colm
+SUBDIRS = src
 DIST_SUBDIRS = $(SUBDIRS) aapl test
 
 dist_doc_DATA =  colm.vim
diff --git a/configure.in b/configure.in
index 59bf09f1..948225cc 100644
--- a/configure.in
+++ b/configure.in
@@ -24,7 +24,7 @@ PUBDATE="June 2012"
 AM_INIT_AUTOMAKE([foreign])
 
 AC_SUBST(PUBDATE)
-AC_CONFIG_HEADER([colm/config.h colm/defs.h])
+AC_CONFIG_HEADER([src/config.h src/defs.h])
 
 dnl Choose defaults for the build_parsers and build_manual vars. If the dist
 dnl file is present in the root then default to no, otherwise go for it.
@@ -133,6 +133,6 @@ AC_SUBST(KELBT)
 fi # build_parsers
 
 dnl write output files
-AC_OUTPUT(Makefile colm/Makefile aapl/Makefile test/Makefile)
+AC_OUTPUT(Makefile src/Makefile aapl/Makefile test/Makefile)
 
 echo "configuration of colm complete"
diff --git a/colm/.gitignore b/src/.gitignore
index fe077f2c..c2e96f8e 100644
--- a/colm/.gitignore
+++ b/src/.gitignore
@@ -14,6 +14,7 @@
 /lmparse.cc
 /lmscan.cc
 /config.h.in
+/config.h.in~
 /config.h
 /defs.h
 /version.h
diff --git a/colm/Makefile.am b/src/Makefile.am
index c4a3504a..c4a3504a 100644
--- a/colm/Makefile.am
+++ b/src/Makefile.am
diff --git a/colm/buffer.h b/src/buffer.h
index 9039ad4b..9039ad4b 100644
--- a/colm/buffer.h
+++ b/src/buffer.h
diff --git a/colm/bytecode.c b/src/bytecode.c
index 57d31c78..2cfa598c 100644
--- a/colm/bytecode.c
+++ b/src/bytecode.c
@@ -21,13 +21,13 @@
 
 //#define COLM_LOG
 
-#include <colm/pdarun.h>
-#include <colm/fsmrun.h>
-#include <colm/tree.h>
-#include <colm/bytecode.h>
-#include <colm/pool.h>
-#include <colm/debug.h>
-#include <colm/config.h>
+#include <pdarun.h>
+#include <fsmrun.h>
+#include <tree.h>
+#include <bytecode.h>
+#include <pool.h>
+#include <debug.h>
+#include <config.h>
 
 #include <alloca.h>
 #include <sys/mman.h>
diff --git a/colm/bytecode.h b/src/bytecode.h
index 2151544d..8e626ef1 100644
--- a/colm/bytecode.h
+++ b/src/bytecode.h
@@ -22,8 +22,8 @@
 #ifndef _BYTECODE_H
 #define _BYTECODE_H
 
-#include <colm/pdarun.h>
-#include <colm/tree.h>
+#include <pdarun.h>
+#include <tree.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/colm/closure.cc b/src/closure.cc
index 37b0e259..37b0e259 100644
--- a/colm/closure.cc
+++ b/src/closure.cc
diff --git a/colm/codegen.cc b/src/codegen.cc
index 4403cf8f..4403cf8f 100644
--- a/colm/codegen.cc
+++ b/src/codegen.cc
diff --git a/colm/codevect.c b/src/codevect.c
index a05c7ea4..f8997423 100644
--- a/colm/codevect.c
+++ b/src/codevect.c
@@ -19,8 +19,8 @@
  *  Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include <colm/rtvector.h>
-#include <colm/pdarun.h>
+#include <rtvector.h>
+#include <pdarun.h>
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/colm/colm.h b/src/colm.h
index 4f169254..4f169254 100644
--- a/colm/colm.h
+++ b/src/colm.h
diff --git a/colm/compiler.cc b/src/compiler.cc
index c1e775f2..c1e775f2 100644
--- a/colm/compiler.cc
+++ b/src/compiler.cc
diff --git a/colm/ctinput.cc b/src/ctinput.cc
index b5086268..b5086268 100644
--- a/colm/ctinput.cc
+++ b/src/ctinput.cc
diff --git a/colm/debug.c b/src/debug.c
index 6d9689e0..8efaf510 100644
--- a/colm/debug.c
+++ b/src/debug.c
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-#include <colm/debug.h>
+#include <debug.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/colm/debug.h b/src/debug.h
index 3fd9bb8e..3fd9bb8e 100644
--- a/colm/debug.h
+++ b/src/debug.h
diff --git a/colm/declare.cc b/src/declare.cc
index 167fe050..167fe050 100644
--- a/colm/declare.cc
+++ b/src/declare.cc
diff --git a/colm/defs.h.in b/src/defs.h.in
index 06a3f9df..06a3f9df 100644
--- a/colm/defs.h.in
+++ b/src/defs.h.in
diff --git a/colm/dotgen.cc b/src/dotgen.cc
index e4474958..e4474958 100644
--- a/colm/dotgen.cc
+++ b/src/dotgen.cc
diff --git a/colm/dotgen.h b/src/dotgen.h
index d05a2410..d05a2410 100644
--- a/colm/dotgen.h
+++ b/src/dotgen.h
diff --git a/colm/exports.cc b/src/exports.cc
index f5153330..f5153330 100644
--- a/colm/exports.cc
+++ b/src/exports.cc
diff --git a/colm/fsmap.cc b/src/fsmap.cc
index a4c072b6..a4c072b6 100644
--- a/colm/fsmap.cc
+++ b/src/fsmap.cc
diff --git a/colm/fsmattach.cc b/src/fsmattach.cc
index a58ed9a4..a58ed9a4 100644
--- a/colm/fsmattach.cc
+++ b/src/fsmattach.cc
diff --git a/colm/fsmbase.cc b/src/fsmbase.cc
index 90341039..90341039 100644
--- a/colm/fsmbase.cc
+++ b/src/fsmbase.cc
diff --git a/colm/fsmcodegen.cc b/src/fsmcodegen.cc
index 86302c31..8f3ab597 100644
--- a/colm/fsmcodegen.cc
+++ b/src/fsmcodegen.cc
@@ -1039,20 +1039,20 @@ void FsmCodeGen::writeExec()
 void FsmCodeGen::writeIncludes()
 {
 	out << 
-		"#include <colm/pdarun.h>\n"
-		"#include <colm/fsmrun.h>\n"
-		"#include <colm/debug.h>\n"
-		"#include <colm/bytecode.h>\n"
+		"#include <pdarun.h>\n"
+		"#include <fsmrun.h>\n"
+		"#include <debug.h>\n"
+		"#include <bytecode.h>\n"
+		"#include <config.h>\n"
+		"#include <defs.h>\n"
+		"#include <input.h>\n"
+		"#include <tree.h>\n"
+		"#include <program.h>\n"
+		"#include <colm.h>\n"
 		"#include <stdio.h>\n"
 		"#include <stdlib.h>\n"
 		"#include <string.h>\n"
 		"#include <assert.h>\n"
-		"#include <colm/config.h>\n"
-		"#include <colm/defs.h>\n"
-		"#include <colm/input.h>\n"
-		"#include <colm/tree.h>\n"
-		"#include <colm/program.h>\n"
-		"#include <colm/colm.h>\n"
 		"\n"
 		"\n";
 }
diff --git a/colm/fsmcodegen.h b/src/fsmcodegen.h
index 41cd88ec..41cd88ec 100644
--- a/colm/fsmcodegen.h
+++ b/src/fsmcodegen.h
diff --git a/colm/fsmexec.cc b/src/fsmexec.cc
index f922c7a4..f922c7a4 100644
--- a/colm/fsmexec.cc
+++ b/src/fsmexec.cc
diff --git a/colm/fsmgraph.cc b/src/fsmgraph.cc
index 590d7902..590d7902 100644
--- a/colm/fsmgraph.cc
+++ b/src/fsmgraph.cc
diff --git a/colm/fsmgraph.h b/src/fsmgraph.h
index fca23cc1..fca23cc1 100644
--- a/colm/fsmgraph.h
+++ b/src/fsmgraph.h
diff --git a/colm/fsmmin.cc b/src/fsmmin.cc
index cbb2b99f..cbb2b99f 100644
--- a/colm/fsmmin.cc
+++ b/src/fsmmin.cc
diff --git a/colm/fsmrun.h b/src/fsmrun.h
index 821b3ccf..f92b5e5e 100644
--- a/colm/fsmrun.h
+++ b/src/fsmrun.h
@@ -22,7 +22,7 @@
 #ifndef _FSMRUN2_H
 #define _FSMRUN2_H
 
-#include <colm/input.h>
+#include <input.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/colm/fsmstate.cc b/src/fsmstate.cc
index dae1479b..dae1479b 100644
--- a/colm/fsmstate.cc
+++ b/src/fsmstate.cc
diff --git a/colm/global.h b/src/global.h
index d67c55e4..d67c55e4 100644
--- a/colm/global.h
+++ b/src/global.h
diff --git a/colm/input.c b/src/input.c
index b6c96369..d181b556 100644
--- a/colm/input.c
+++ b/src/input.c
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-#include <colm/input.h>
-#include <colm/fsmrun.h>
-#include <colm/pdarun.h>
-#include <colm/debug.h>
+#include <input.h>
+#include <fsmrun.h>
+#include <pdarun.h>
+#include <debug.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/colm/input.h b/src/input.h
index 882c6b31..882c6b31 100644
--- a/colm/input.h
+++ b/src/input.h
diff --git a/colm/keyops.h b/src/keyops.h
index 1808c6a6..1808c6a6 100644
--- a/colm/keyops.h
+++ b/src/keyops.h
diff --git a/colm/list.c b/src/list.c
index d9180b73..f57109e1 100644
--- a/colm/list.c
+++ b/src/list.c
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-#include <colm/pdarun.h>
+#include <pdarun.h>
 
 void listAddAfter( List *list, ListEl *prev_el, ListEl *new_el )
 {
diff --git a/colm/lmparse.kh b/src/lmparse.kh
index 86b70b6f..86b70b6f 100644
--- a/colm/lmparse.kh
+++ b/src/lmparse.kh
diff --git a/colm/lmparse.kl b/src/lmparse.kl
index 3ead7c98..3ead7c98 100644
--- a/colm/lmparse.kl
+++ b/src/lmparse.kl
diff --git a/colm/lmscan.h b/src/lmscan.h
index 5badaed5..5badaed5 100644
--- a/colm/lmscan.h
+++ b/src/lmscan.h
diff --git a/colm/lmscan.rl b/src/lmscan.rl
index 070a1e66..070a1e66 100644
--- a/colm/lmscan.rl
+++ b/src/lmscan.rl
diff --git a/colm/main.cc b/src/main.cc
index 435bb697..6856da27 100644
--- a/colm/main.cc
+++ b/src/main.cc
@@ -350,7 +350,7 @@ void compileOutputInstalled( const char *argv0 )
 	char command[length];
 	sprintf( command, 
 		"gcc -Wall -Wwrite-strings"
-		" -I" PREFIX "/include"
+		" -I" PREFIX "/include/colm"
 		" -g"
 		" -o %s"
 		" %s"
@@ -375,7 +375,7 @@ void compileOutputInSource( const char *argv0 )
 	char command[length];
 	sprintf( command, 
 		"gcc -Wall -Wwrite-strings"
-		" -I%s.."
+		" -I%s."
 		" -I%s../aapl"
 		" -g"
 		" -o %s"
diff --git a/colm/map.c b/src/map.c
index 4609db58..72f4a18c 100644
--- a/colm/map.c
+++ b/src/map.c
@@ -20,9 +20,9 @@
  */
 
 #include <assert.h>
-#include <colm/pdarun.h>
-#include <colm/map.h>
-#include <colm/pool.h>
+#include <pdarun.h>
+#include <map.h>
+#include <pool.h>
 
 #define true 1
 #define false 0
diff --git a/colm/map.cc b/src/map.cc
index 52dd2697..52dd2697 100644
--- a/colm/map.cc
+++ b/src/map.cc
diff --git a/colm/map.h b/src/map.h
index 993ca86e..acb415b9 100644
--- a/colm/map.h
+++ b/src/map.h
@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-#include <colm/program.h>
+#include <program.h>
 
 typedef struct _MapEl
 {
diff --git a/colm/parsedata.h b/src/parsedata.h
index 79ba08c1..79ba08c1 100644
--- a/colm/parsedata.h
+++ b/src/parsedata.h
diff --git a/colm/parsetree.cc b/src/parsetree.cc
index 084ffbb8..084ffbb8 100644
--- a/colm/parsetree.cc
+++ b/src/parsetree.cc
diff --git a/colm/parsetree.h b/src/parsetree.h
index c3a75df5..c3a75df5 100644
--- a/colm/parsetree.h
+++ b/src/parsetree.h
diff --git a/colm/pcheck.cc b/src/pcheck.cc
index d5401f7d..d5401f7d 100644
--- a/colm/pcheck.cc
+++ b/src/pcheck.cc
diff --git a/colm/pcheck.h b/src/pcheck.h
index 5be60426..5be60426 100644
--- a/colm/pcheck.h
+++ b/src/pcheck.h
diff --git a/colm/pdabuild.cc b/src/pdabuild.cc
index 4bce96ce..4bce96ce 100644
--- a/colm/pdabuild.cc
+++ b/src/pdabuild.cc
diff --git a/colm/pdacodegen.cc b/src/pdacodegen.cc
index 9e3dca47..9e3dca47 100644
--- a/colm/pdacodegen.cc
+++ b/src/pdacodegen.cc
diff --git a/colm/pdacodegen.h b/src/pdacodegen.h
index 8e5e7a3a..8e5e7a3a 100644
--- a/colm/pdacodegen.h
+++ b/src/pdacodegen.h
diff --git a/colm/pdagraph.cc b/src/pdagraph.cc
index 8f17b7a5..8f17b7a5 100644
--- a/colm/pdagraph.cc
+++ b/src/pdagraph.cc
diff --git a/colm/pdagraph.h b/src/pdagraph.h
index dc11b3e1..dc11b3e1 100644
--- a/colm/pdagraph.h
+++ b/src/pdagraph.h
diff --git a/colm/pdarun.c b/src/pdarun.c
index 62ab107e..62ab107e 100644
--- a/colm/pdarun.c
+++ b/src/pdarun.c
diff --git a/colm/pdarun.h b/src/pdarun.h
index 4ab648a6..1bdf651c 100644
--- a/colm/pdarun.h
+++ b/src/pdarun.h
@@ -22,10 +22,10 @@
 #ifndef __COLM_PDARUN_H
 #define __COLM_PDARUN_H
 
-#include <colm/input.h>
-#include <colm/fsmrun.h>
-#include <colm/defs.h>
-#include <colm/tree.h>
+#include <input.h>
+#include <fsmrun.h>
+#include <defs.h>
+#include <tree.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/colm/pool.c b/src/pool.c
index f531338d..e1c3c240 100644
--- a/colm/pool.c
+++ b/src/pool.c
@@ -22,9 +22,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <colm/pdarun.h>
-#include <colm/pool.h>
-#include <colm/debug.h>
+#include <pdarun.h>
+#include <pool.h>
+#include <debug.h>
 
 void initPoolAlloc( PoolAlloc *poolAlloc, int sizeofT )
 {
diff --git a/colm/pool.h b/src/pool.h
index 454a5354..ae647abd 100644
--- a/colm/pool.h
+++ b/src/pool.h
@@ -25,9 +25,9 @@
 /* Allocation, number of items. */
 #define FRESH_BLOCK 8128                    
 
-#include <colm/pdarun.h>
-#include <colm/map.h>
-#include <colm/tree.h>
+#include <pdarun.h>
+#include <map.h>
+#include <tree.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/colm/program.c b/src/program.c
index 50b41fa1..c17b8bb4 100644
--- a/colm/program.c
+++ b/src/program.c
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-#include <colm/pdarun.h>
-#include <colm/fsmrun.h>
-#include <colm/tree.h>
-#include <colm/bytecode.h>
-#include <colm/pool.h>
-#include <colm/debug.h>
-#include <colm/config.h>
+#include <pdarun.h>
+#include <fsmrun.h>
+#include <tree.h>
+#include <bytecode.h>
+#include <pool.h>
+#include <debug.h>
+#include <config.h>
 
 #include <alloca.h>
 #include <sys/mman.h>
diff --git a/colm/program.h b/src/program.h
index b5de90b3..9a50274d 100644
--- a/colm/program.h
+++ b/src/program.h
@@ -22,7 +22,7 @@
 #ifndef __COLM_PROGRAM_H
 #define __COLM_PROGRAM_H
 
-#include <colm/pdarun.h>
+#include <pdarun.h>
 
 typedef struct ColmRuntimeData
 {
diff --git a/colm/redbuild.cc b/src/redbuild.cc
index ae5faf38..ae5faf38 100644
--- a/colm/redbuild.cc
+++ b/src/redbuild.cc
diff --git a/colm/redbuild.h b/src/redbuild.h
index dbbb3e19..dbbb3e19 100644
--- a/colm/redbuild.h
+++ b/src/redbuild.h
diff --git a/colm/redfsm.cc b/src/redfsm.cc
index d3a65b7c..d3a65b7c 100644
--- a/colm/redfsm.cc
+++ b/src/redfsm.cc
diff --git a/colm/redfsm.h b/src/redfsm.h
index 39b98d5f..39b98d5f 100644
--- a/colm/redfsm.h
+++ b/src/redfsm.h
diff --git a/colm/resolve.cc b/src/resolve.cc
index a661e68e..a661e68e 100644
--- a/colm/resolve.cc
+++ b/src/resolve.cc
diff --git a/colm/rtvector.h b/src/rtvector.h
index e03a17f9..e03a17f9 100644
--- a/colm/rtvector.h
+++ b/src/rtvector.h
diff --git a/colm/string.c b/src/string.c
index d670b68c..7508a39a 100644
--- a/colm/string.c
+++ b/src/string.c
@@ -19,9 +19,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-#include <colm/pool.h>
-#include <colm/pdarun.h>
-#include <colm/bytecode.h>
+#include <pool.h>
+#include <pdarun.h>
+#include <bytecode.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/colm/synthesis.cc b/src/synthesis.cc
index 794927ad..794927ad 100644
--- a/colm/synthesis.cc
+++ b/src/synthesis.cc
diff --git a/colm/tree.c b/src/tree.c
index 66e5e025..14f7d81f 100644
--- a/colm/tree.c
+++ b/src/tree.c
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-#include <colm/pdarun.h>
-#include <colm/tree.h>
-#include <colm/pool.h>
-#include <colm/bytecode.h>
-#include <colm/debug.h>
-#include <colm/map.h>
+#include <pdarun.h>
+#include <tree.h>
+#include <pool.h>
+#include <bytecode.h>
+#include <debug.h>
+#include <map.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/colm/tree.h b/src/tree.h
index 4425cfc5..29c0ee74 100644
--- a/colm/tree.h
+++ b/src/tree.h
@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-#include <colm/colm.h>
+#include <colm.h>
 
 typedef unsigned char Code;
 typedef unsigned long Word;
diff --git a/test/runtests.sh b/test/runtests.sh
index 3b141891..39ec642b 100755
--- a/test/runtests.sh
+++ b/test/runtests.sh
@@ -38,7 +38,7 @@ errors=0
 #trap sig_exit SIGINT
 #trap sig_exit SIGQUIT
 
-COLM=../colm/colm
+COLM=../src/colm
 
 [ -d $DATA ] || die "error: data directory not found"