converted namespace and typeref test cases to combined format

25 files changed, 61 insertions, 31 deletions

diff --git a/test/combine.sh b/test/combine.sh
index 2c4739ff..5a454e2a 100755
--- a/test/combine.sh
+++ b/test/combine.sh
@@ -10,16 +10,19 @@ for fn in $@; do
 		if [ -f ${fn%.lm}.args ]; then
 			echo '##### ARGS #####';
 			cat ${fn%.lm}.args
+			rm ${fn%.lm}.args
 		fi
 
 		if [ -f ${fn%.lm}.in ]; then
 			echo '##### IN #####';
 			cat ${fn%.lm}.in
+			rm ${fn%.lm}.in
 		fi
 
 		if [ -f ${fn%.lm}.exp ]; then
 			echo '##### EXP #####';
 			cat ${fn%.lm}.exp
+			rm ${fn%.lm}.exp
 		fi
 
 	) \
diff --git a/test/namespace1.exp b/test/namespace1.exp
deleted file mode 100644
index 54529549..00000000
--- a/test/namespace1.exp
+++ /dev/null
@@ -1,4 +0,0 @@
-a
-  b
-  c
-d
diff --git a/test/namespace1.in b/test/namespace1.in
deleted file mode 100644
index 54529549..00000000
--- a/test/namespace1.in
+++ /dev/null
@@ -1,4 +0,0 @@
-a
-  b
-  c
-d
diff --git a/test/namespace1.lm b/test/namespace1.lm
index 1ef97ee7..eadaba14 100644
--- a/test/namespace1.lm
+++ b/test/namespace1.lm
@@ -1,3 +1,4 @@
+##### LM #####
 namespace n1
 
 	lex
@@ -11,3 +12,13 @@ end
 
 parse P: n1::start[stdin]
 print( P.tree '\n' )
+##### IN #####
+a
+  b
+  c
+d
+##### EXP #####
+a
+  b
+  c
+d
diff --git a/test/typeref1.exp b/test/typeref1.exp
deleted file mode 100644
index 54529549..00000000
--- a/test/typeref1.exp
+++ /dev/null
@@ -1,4 +0,0 @@
-a
-  b
-  c
-d
diff --git a/test/typeref1.in b/test/typeref1.in
deleted file mode 100644
index 54529549..00000000
--- a/test/typeref1.in
+++ /dev/null
@@ -1,4 +0,0 @@
-a
-  b
-  c
-d
diff --git a/test/typeref1.lm b/test/typeref1.lm
index 0f16e74a..44e9b670 100644
--- a/test/typeref1.lm
+++ b/test/typeref1.lm
@@ -1,3 +1,4 @@
+##### LM #####
 namespace n1
 
 	namespace n2
@@ -13,3 +14,13 @@ end
 
 parse P: n1::n2::id*[stdin]
 print( P.tree '\n' )
+##### IN #####
+a
+  b
+  c
+d
+##### EXP #####
+a
+  b
+  c
+d
diff --git a/test/typeref2.exp b/test/typeref2.exp
deleted file mode 100644
index 8b137891..00000000
--- a/test/typeref2.exp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/typeref2.in b/test/typeref2.in
deleted file mode 100644
index e69de29b..00000000
--- a/test/typeref2.in
+++ /dev/null
diff --git a/test/typeref2.lm b/test/typeref2.lm
index 0f16e74a..037822d6 100644
--- a/test/typeref2.lm
+++ b/test/typeref2.lm
@@ -1,3 +1,4 @@
+##### LM #####
 namespace n1
 
 	namespace n2
@@ -13,3 +14,7 @@ end
 
 parse P: n1::n2::id*[stdin]
 print( P.tree '\n' )
+##### IN #####
+
+##### EXP #####
+
diff --git a/test/typeref3.exp b/test/typeref3.exp
deleted file mode 100644
index 54529549..00000000
--- a/test/typeref3.exp
+++ /dev/null
@@ -1,4 +0,0 @@
-a
-  b
-  c
-d
diff --git a/test/typeref3.in b/test/typeref3.in
deleted file mode 100644
index 54529549..00000000
--- a/test/typeref3.in
+++ /dev/null
@@ -1,4 +0,0 @@
-a
-  b
-  c
-d
diff --git a/test/typeref3.lm b/test/typeref3.lm
index 13c1b383..455e9032 100644
--- a/test/typeref3.lm
+++ b/test/typeref3.lm
@@ -1,3 +1,4 @@
+##### LM #####
 namespace n1
 
 	namespace n2
@@ -13,3 +14,13 @@ end
 
 parse P: n1::n2::id+[stdin]
 print( P.tree '\n' )
+##### IN #####
+a
+  b
+  c
+d
+##### EXP #####
+a
+  b
+  c
+d
diff --git a/test/typeref4.exp b/test/typeref4.exp
deleted file mode 100644
index 1f275846..00000000
--- a/test/typeref4.exp
+++ /dev/null
@@ -1 +0,0 @@
-NIL
diff --git a/test/typeref4.in b/test/typeref4.in
deleted file mode 100644
index e69de29b..00000000
--- a/test/typeref4.in
+++ /dev/null
diff --git a/test/typeref4.lm b/test/typeref4.lm
index 13c1b383..1958e48d 100644
--- a/test/typeref4.lm
+++ b/test/typeref4.lm
@@ -1,3 +1,4 @@
+##### LM #####
 namespace n1
 
 	namespace n2
@@ -13,3 +14,7 @@ end
 
 parse P: n1::n2::id+[stdin]
 print( P.tree '\n' )
+##### IN #####
+
+##### EXP #####
+NIL
diff --git a/test/typeref5.exp b/test/typeref5.exp
deleted file mode 100644
index 8b137891..00000000
--- a/test/typeref5.exp
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/typeref5.in b/test/typeref5.in
deleted file mode 100644
index e69de29b..00000000
--- a/test/typeref5.in
+++ /dev/null
diff --git a/test/typeref5.lm b/test/typeref5.lm
index a5fcbe94..9ddb1c46 100644
--- a/test/typeref5.lm
+++ b/test/typeref5.lm
@@ -1,3 +1,4 @@
+##### LM #####
 namespace n1
 
 	namespace n2
@@ -13,3 +14,7 @@ end
 
 parse P: n1::n2::id?[stdin]
 print( P.tree '\n' )
+##### IN #####
+
+##### EXP #####
+
diff --git a/test/typeref6.exp b/test/typeref6.exp
deleted file mode 100644
index 78981922..00000000
--- a/test/typeref6.exp
+++ /dev/null
@@ -1 +0,0 @@
-a
diff --git a/test/typeref6.in b/test/typeref6.in
deleted file mode 100644
index 78981922..00000000
--- a/test/typeref6.in
+++ /dev/null
@@ -1 +0,0 @@
-a
diff --git a/test/typeref6.lm b/test/typeref6.lm
index a5fcbe94..10a1382b 100644
--- a/test/typeref6.lm
+++ b/test/typeref6.lm
@@ -1,3 +1,4 @@
+##### LM #####
 namespace n1
 
 	namespace n2
@@ -13,3 +14,7 @@ end
 
 parse P: n1::n2::id?[stdin]
 print( P.tree '\n' )
+##### IN #####
+a
+##### EXP #####
+a
diff --git a/test/typeref7.exp b/test/typeref7.exp
deleted file mode 100644
index 1f275846..00000000
--- a/test/typeref7.exp
+++ /dev/null
@@ -1 +0,0 @@
-NIL
diff --git a/test/typeref7.in b/test/typeref7.in
deleted file mode 100644
index b2901ea9..00000000
--- a/test/typeref7.in
+++ /dev/null
@@ -1 +0,0 @@
-a b
diff --git a/test/typeref7.lm b/test/typeref7.lm
index a5fcbe94..133745c2 100644
--- a/test/typeref7.lm
+++ b/test/typeref7.lm
@@ -1,3 +1,4 @@
+##### LM #####
 namespace n1
 
 	namespace n2
@@ -13,3 +14,7 @@ end
 
 parse P: n1::n2::id?[stdin]
 print( P.tree '\n' )
+##### IN #####
+a b
+##### EXP #####
+NIL