Move nfs from test.sh to samples/*.mlc

codedot · codedot · commit aec8ea13fbd9 · 2017-11-04T12:53:44.000+02:00
diff --git a/samples/1021.mlc b/samples/1021.mlc
@@ -1 +1,2 @@
 C10 C2 C1
+# v1: v1
diff --git a/samples/1022i.mlc b/samples/1022i.mlc
@@ -1 +1,2 @@
 C10 C2 C2 I
+# v1: v1
diff --git a/samples/22210i.mlc b/samples/22210i.mlc
@@ -1 +1,2 @@
 C2 C2 C2 C10 I
+# v1: v1
diff --git a/samples/2222101.mlc b/samples/2222101.mlc
@@ -1 +1,2 @@
 C2 C2 C2 C2 C10 C1
+# v1: v1
diff --git a/samples/222210i.mlc b/samples/222210i.mlc
@@ -1 +1,2 @@
 C2 C2 C2 C2 C10 I
+# v1: v1
diff --git a/samples/3222i.mlc b/samples/3222i.mlc
@@ -1 +1,2 @@
 C3 C2 C2 C2 I
+# v1: v1
diff --git a/samples/4222i.mlc b/samples/4222i.mlc
@@ -1 +1,2 @@
 C4 C2 C2 C2 I
+# v1: v1
diff --git a/samples/cfact4.mlc b/samples/cfact4.mlc
@@ -1,3 +1,4 @@
 FACT = n: n (p, q: MULT q (p (SUCC q))) (K C1) C1;
 
 MINUS (C3 C3) (FACT C4)
+# v1, v2: v1 (v1 (v1 v2))
diff --git a/samples/cfact5.mlc b/samples/cfact5.mlc
@@ -1,3 +1,4 @@
 FACT = n: n (p, q: MULT q (p (SUCC q))) (K C1) C1;
 
 MINUS (C3 C5) (FACT C5)
+# v1, v2: v1 (v1 (v1 (v1 (v1 v2))))
diff --git a/samples/counter.mlc b/samples/counter.mlc
@@ -1 +1,2 @@
 (f, x: x f f) (x: (y: y y) (y: y x))
+# v1: v1 (v2: v2 v2) (v3: v3 v3)
diff --git a/samples/w2eta.mlc b/samples/w2eta.mlc
@@ -1 +1,2 @@
 (x: x x) (x, y: (z: z (z y)) (w: x w))
+# v1, v2: v1 (v1 (v1 (v1 v2)))
diff --git a/samples/yfact4.mlc b/samples/yfact4.mlc
@@ -1,3 +1,4 @@
 FACT = Y (self, n: (ZERO n) C1 (MULT n (self (PRED n))));
 
 MINUS (C3 C3) (FACT C4)
+# v1, v2: v1 (v1 (v1 v2))
diff --git a/samples/yfact5.mlc b/samples/yfact5.mlc
@@ -1,3 +1,4 @@
 FACT = Y (self, n: (ZERO n) C1 (MULT n (self (PRED n))));
 
 MINUS (C3 C5) (FACT C5)
+# v1, v2: v1 (v1 (v1 (v1 (v1 v2))))
diff --git a/test.sh b/test.sh
@@ -6,7 +6,7 @@ ERR=`mktemp`
 
 run()
 {
-	node lambda -p -f samples/$1.mlc -a $2 >|$OUT 2>|$ERR
+	node lambda -p -f $1 -a $2 >|$OUT 2>|$ERR
 
 	if [ $? -eq 0 -a "$(cat $OUT)" = "$3" ]; then
 		printf $CELLF "$(sed "$SED" $ERR)"
@@ -18,13 +18,14 @@ run()
 compare()
 {
 	term=$1
-	nf=$2
-	shift 2
+	file=samples/$term.mlc
+	nf="$(sed -n 's/^# *//p' $file)"
+	shift 1
 
 	printf $TERMF $term
 
 	for algo; do
-		run $term $algo "$nf"
+		run $file $algo "$nf"
 	done
 
 	printf "\n"
@@ -33,41 +34,16 @@ compare()
 printf "$TERMF$CELLF$CELLF$CELLF\n" SAMPLE \
 	ABSTRACT CLOSED OPTIMAL
 
-compare counter "v1: v1 (v2: v2 v2) (v3: v3 v3)" \
-	abstract closed optimal
-
-compare w2eta "v1, v2: v1 (v1 (v1 (v1 v2)))" \
-	abstract closed optimal
-
-compare 1021 "v1: v1" \
-	abstract closed optimal
-
-compare 22210i "v1: v1" \
-	abstract closed optimal
-
-compare 3222i "v1: v1" \
-	abstract closed optimal
-
-compare 1022i "v1: v1" \
-	abstract closed optimal
-
-compare 4222i "v1: v1" \
-	abstract closed OPTIMAL
-
-compare 222210i "v1: v1" \
-	abstract closed OPTIMAL
-
-compare 2222101 "v1: v1" \
-	abstract CLOSED OPTIMAL
-
-compare cfact4 "v1, v2: v1 (v1 (v1 v2))" \
-	abstract closed optimal
-
-compare yfact4 "v1, v2: v1 (v1 (v1 v2))" \
-	abstract closed optimal
-
-compare cfact5 "v1, v2: v1 (v1 (v1 (v1 (v1 v2))))" \
-	abstract closed optimal
-
-compare yfact5 "v1, v2: v1 (v1 (v1 (v1 (v1 v2))))" \
-	abstract closed OPTIMAL
+compare counter abstract closed optimal
+compare w2eta   abstract closed optimal
+compare 1021    abstract closed optimal
+compare 22210i  abstract closed optimal
+compare 3222i   abstract closed optimal
+compare 1022i   abstract closed optimal
+compare 4222i   abstract closed OPTIMAL
+compare 222210i abstract closed OPTIMAL
+compare 2222101 abstract CLOSED OPTIMAL
+compare cfact4  abstract closed optimal
+compare yfact4  abstract closed optimal
+compare cfact5  abstract closed optimal
+compare yfact5  abstract closed OPTIMAL

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`FACT = n: n (p, q: MULT q (p (SUCC q))) (K C1) C1;`
`2`	`2`
`3`	`3`	`MINUS (C3 C3) (FACT C4)`
	`4`	`+# v1, v2: v1 (v1 (v1 v2))`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`FACT = n: n (p, q: MULT q (p (SUCC q))) (K C1) C1;`
`2`	`2`
`3`	`3`	`MINUS (C3 C5) (FACT C5)`
	`4`	`+# v1, v2: v1 (v1 (v1 (v1 (v1 v2))))`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`(f, x: x f f) (x: (y: y y) (y: y x))`
	`2`	`+# v1: v1 (v2: v2 v2) (v3: v3 v3)`