diff --git a/Makefile b/Makefile index cc6a50790..e9ea331aa 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,6 @@ uninstall: regression: make clean check -C regression - make clean check -C regression/x86only make clean check -C stdlib/regression clean: diff --git a/regression/Makefile b/regression/Makefile index 8acc95159..0f824f097 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -16,4 +16,3 @@ clean: $(RM) test*.log *.s *~ $(TESTS) *.i $(MAKE) clean -C expressions $(MAKE) clean -C deep-expressions - $(MAKE) clean -C x86only diff --git a/regression/x86only/Lib01.lama b/regression/x86only/Lib01.lama deleted file mode 100644 index ae58f32a9..000000000 --- a/regression/x86only/Lib01.lama +++ /dev/null @@ -1,5 +0,0 @@ -public fun from_test005 (s) { - printf ("called with %s\n", s) -} - -printf ("Init Lib01...\n") diff --git a/regression/x86only/Lib02.lama b/regression/x86only/Lib02.lama deleted file mode 100644 index 257464934..000000000 --- a/regression/x86only/Lib02.lama +++ /dev/null @@ -1,3 +0,0 @@ -import Lib01; - -printf ("Init Lib02...\n") \ No newline at end of file diff --git a/regression/x86only/Lib03.lama b/regression/x86only/Lib03.lama deleted file mode 100644 index 7de599a39..000000000 --- a/regression/x86only/Lib03.lama +++ /dev/null @@ -1,4 +0,0 @@ -import Lib01; -import Lib02; - -printf ("Init Lib03...\n") \ No newline at end of file diff --git a/regression/x86only/Makefile b/regression/x86only/Makefile deleted file mode 100644 index 65c30a059..000000000 --- a/regression/x86only/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -TESTS=$(sort $(basename $(wildcard test*.lama))) -LIBS=$(patsubst %.lama,%.o, $(sort $(wildcard Lib*.lama))) - -LAMAC=../../src/lamac - -.PHONY: check $(TESTS) - -check: $(TESTS) - -%.o: %.lama - LAMA=../../runtime $(LAMAC) -c -I . $< - -$(TESTS): %: %.lama $(LIBS) - LAMA=../../runtime $(LAMAC) -I . $< && cat $@.input | ./$@ > $@.log && diff -u $@.log orig/$@.log - -clean: - rm -f test*.log *.i *.o *.s *~ $(TESTS) diff --git a/regression/x86only/orig/test005.log b/regression/x86only/orig/test005.log deleted file mode 100644 index b820707a2..000000000 --- a/regression/x86only/orig/test005.log +++ /dev/null @@ -1,2 +0,0 @@ -Init Lib01... -called with that one diff --git a/regression/x86only/orig/test008.log b/regression/x86only/orig/test008.log deleted file mode 100644 index 6559c220b..000000000 --- a/regression/x86only/orig/test008.log +++ /dev/null @@ -1,4 +0,0 @@ -Init Lib01... -Init Lib02... -Init Lib03... -main dish. diff --git a/regression/x86only/test001.input b/regression/x86only/test001.input deleted file mode 100644 index 8b1378917..000000000 --- a/regression/x86only/test001.input +++ /dev/null @@ -1 +0,0 @@ - diff --git a/regression/x86only/test002.input b/regression/x86only/test002.input deleted file mode 100644 index 573541ac9..000000000 --- a/regression/x86only/test002.input +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/regression/x86only/test003.input b/regression/x86only/test003.input deleted file mode 100644 index 573541ac9..000000000 --- a/regression/x86only/test003.input +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/regression/x86only/test004.input b/regression/x86only/test004.input deleted file mode 100644 index 573541ac9..000000000 --- a/regression/x86only/test004.input +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/regression/x86only/test005.input b/regression/x86only/test005.input deleted file mode 100644 index 573541ac9..000000000 --- a/regression/x86only/test005.input +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/regression/x86only/test005.lama b/regression/x86only/test005.lama deleted file mode 100644 index b3738162c..000000000 --- a/regression/x86only/test005.lama +++ /dev/null @@ -1,3 +0,0 @@ -import Lib01; - -from_test005 ("that one") \ No newline at end of file diff --git a/regression/x86only/test006.input b/regression/x86only/test006.input deleted file mode 100644 index 573541ac9..000000000 --- a/regression/x86only/test006.input +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/regression/x86only/test007.input b/regression/x86only/test007.input deleted file mode 100644 index 573541ac9..000000000 --- a/regression/x86only/test007.input +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/regression/x86only/test008.input b/regression/x86only/test008.input deleted file mode 100644 index 573541ac9..000000000 --- a/regression/x86only/test008.input +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/regression/x86only/test008.lama b/regression/x86only/test008.lama deleted file mode 100644 index 114ba56d2..000000000 --- a/regression/x86only/test008.lama +++ /dev/null @@ -1,4 +0,0 @@ -import Lib03; -import Lib02; - -printf ("main dish.\n") \ No newline at end of file diff --git a/regression/x86only/test009.input b/regression/x86only/test009.input deleted file mode 100644 index 573541ac9..000000000 --- a/regression/x86only/test009.input +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/regression/x86only/vgcore.3910 b/regression/x86only/vgcore.3910 deleted file mode 100644 index 81220a5b3..000000000 Binary files a/regression/x86only/vgcore.3910 and /dev/null differ diff --git a/runtime/runtime.c b/runtime/runtime.c index 852b76751..a10acd1b9 100644 --- a/runtime/runtime.c +++ b/runtime/runtime.c @@ -723,6 +723,10 @@ extern int Lhash (void *p) { extern int Lcompare (void *p, void *q) { # define COMPARE_AND_RETURN(x,y) do if (x != y) return BOX(x - y); while (0) + if (q == 0 || p == 0) { + failure ("NULL pointer in Lcompare\n"); + } + if (p == q) return BOX(0); if (UNBOXED(p)) { diff --git a/src/version.ml b/src/version.ml index 893e6e89d..95b3a817c 100644 --- a/src/version.ml +++ b/src/version.ml @@ -1 +1 @@ -let version = "Version 1.00, c084e57b2, Sun Mar 15 12:41:31 2020 +0300" +let version = "Version 1.00, e4b34a3ec, Sat Mar 21 13:05:14 2020 +0300" diff --git a/stdlib/regression/orig/test07.log b/stdlib/regression/orig/test07.log index 3eabcf1be..983d47528 100644 --- a/stdlib/regression/orig/test07.log +++ b/stdlib/regression/orig/test07.log @@ -1,6 +1,6 @@ HashTab internal structure: MNode (-624426958, {[{1, 2, 3}, 100]}, 0, 0, 0) HashTab internal structure: MNode (-624426958, {[{1, 2, 3}, 200], [{1, 2, 3}, 100]}, 0, 0, 0) -Searching: Some (100) +Searching: Some (200) Searching: Some (200) Replaced: Some (800) -Restored: Some (100) +Restored: Some (200) diff --git a/stdlib/regression/orig/test12.log b/stdlib/regression/orig/test12.log index 765e45780..ec9e9230c 100644 --- a/stdlib/regression/orig/test12.log +++ b/stdlib/regression/orig/test12.log @@ -1 +1 @@ -Succ (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul ("a", "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a")) +Succ (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul ("a", "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a")) diff --git a/regression/x86only/orig/test001.log b/stdlib/regression/orig/test20.log similarity index 100% rename from regression/x86only/orig/test001.log rename to stdlib/regression/orig/test20.log diff --git a/regression/x86only/orig/test002.log b/stdlib/regression/orig/test21.log similarity index 100% rename from regression/x86only/orig/test002.log rename to stdlib/regression/orig/test21.log diff --git a/regression/x86only/orig/test003.log b/stdlib/regression/orig/test22.log similarity index 100% rename from regression/x86only/orig/test003.log rename to stdlib/regression/orig/test22.log diff --git a/regression/x86only/orig/test004.log b/stdlib/regression/orig/test23.log similarity index 100% rename from regression/x86only/orig/test004.log rename to stdlib/regression/orig/test23.log diff --git a/regression/x86only/orig/test006.log b/stdlib/regression/orig/test24.log similarity index 100% rename from regression/x86only/orig/test006.log rename to stdlib/regression/orig/test24.log diff --git a/regression/x86only/orig/test007.log b/stdlib/regression/orig/test25.log similarity index 100% rename from regression/x86only/orig/test007.log rename to stdlib/regression/orig/test25.log diff --git a/regression/x86only/orig/test009.log b/stdlib/regression/orig/test26.log similarity index 59% rename from regression/x86only/orig/test009.log rename to stdlib/regression/orig/test26.log index fb1ed734e..84b318eed 100644 --- a/regression/x86only/orig/test009.log +++ b/stdlib/regression/orig/test26.log @@ -1,2 +1,2 @@ Number of commands-line arguments: 1 - arg [0 ] = "./test009" + arg [0 ] = "./test26" diff --git a/stdlib/regression/test12.lama b/stdlib/regression/test12.lama index 9e9afaccd..e739ed76b 100644 --- a/stdlib/regression/test12.lama +++ b/stdlib/regression/test12.lama @@ -16,4 +16,4 @@ local a = token ("a"), exp = expr ({[Left, {add, sub}], [Left, {mul, div}]}, a) (id), i; -printf ("%s\n", parseString (exp |> bypass (eof), gen (10)).string) +printf ("%s\n", parseString (exp |> bypass (eof), gen (5)).string) diff --git a/regression/x86only/test001.lama b/stdlib/regression/test20.lama similarity index 100% rename from regression/x86only/test001.lama rename to stdlib/regression/test20.lama diff --git a/regression/x86only/test002.lama b/stdlib/regression/test21.lama similarity index 100% rename from regression/x86only/test002.lama rename to stdlib/regression/test21.lama diff --git a/regression/x86only/test003.lama b/stdlib/regression/test22.lama similarity index 100% rename from regression/x86only/test003.lama rename to stdlib/regression/test22.lama diff --git a/regression/x86only/test004.lama b/stdlib/regression/test23.lama similarity index 100% rename from regression/x86only/test004.lama rename to stdlib/regression/test23.lama diff --git a/regression/x86only/test006.lama b/stdlib/regression/test24.lama similarity index 100% rename from regression/x86only/test006.lama rename to stdlib/regression/test24.lama diff --git a/regression/x86only/test007.lama b/stdlib/regression/test25.lama similarity index 100% rename from regression/x86only/test007.lama rename to stdlib/regression/test25.lama diff --git a/regression/x86only/test009.lama b/stdlib/regression/test26.lama similarity index 100% rename from regression/x86only/test009.lama rename to stdlib/regression/test26.lama