From 61296c51e7d15d8df3afad77a00793d2f354c01f Mon Sep 17 00:00:00 2001 From: Dmitry Boulytchev Date: Sun, 16 Feb 2020 00:21:15 +0300 Subject: [PATCH] Massive renaming --- Makefile | 4 ++-- regression/Makefile | 12 ++++++------ regression/{test001.expr => test001.lama} | 0 regression/{test002.expr => test002.lama} | 0 regression/{test003.expr => test003.lama} | 0 regression/{test004.expr => test004.lama} | 0 regression/{test005.expr => test005.lama} | 0 regression/{test006.expr => test006.lama} | 0 regression/{test007.expr => test007.lama} | 0 regression/{test008.expr => test008.lama} | 0 regression/{test009.expr => test009.lama} | 0 regression/{test010.expr => test010.lama} | 0 regression/{test011.expr => test011.lama} | 0 regression/{test012.expr => test012.lama} | 0 regression/{test013.expr => test013.lama} | 0 regression/{test014.expr => test014.lama} | 0 regression/{test015.expr => test015.lama} | 0 regression/{test016.expr => test016.lama} | 0 regression/{test017.expr => test017.lama} | 0 regression/{test018.expr => test018.lama} | 0 regression/{test019.expr => test019.lama} | 0 regression/{test020.expr => test020.lama} | 0 regression/{test021.expr => test021.lama} | 0 regression/{test022.expr => test022.lama} | 0 regression/{test023.expr => test023.lama} | 0 regression/{test024.expr => test024.lama} | 0 regression/{test025.expr => test025.lama} | 0 regression/{test026.expr => test026.lama} | 0 regression/{test027.expr => test027.lama} | 0 regression/{test028.expr => test028.lama} | 0 regression/{test029.expr => test029.lama} | 0 regression/{test030.expr => test030.lama} | 0 regression/{test031.expr => test031.lama} | 0 regression/{test032.expr => test032.lama} | 0 regression/{test033.expr => test033.lama} | 0 regression/{test034.expr => test034.lama} | 0 regression/{test035.expr => test035.lama} | 0 regression/{test036.expr => test036.lama} | 0 regression/{test037.expr => test037.lama} | 0 regression/{test038.expr => test038.lama} | 0 regression/{test039.expr => test039.lama} | 0 regression/{test040.expr => test040.lama} | 0 regression/{test041.expr => test041.lama} | 0 regression/{test042.expr => test042.lama} | 0 regression/{test043.expr => test043.lama} | 0 regression/{test044.expr => test044.lama} | 0 regression/{test045.expr => test045.lama} | 0 regression/{test046.expr => test046.lama} | 0 regression/{test047.expr => test047.lama} | 0 regression/{test048.expr => test048.lama} | 0 regression/{test049.expr => test049.lama} | 0 regression/{test050.expr => test050.lama} | 0 regression/{test051.expr => test051.lama} | 0 regression/{test052.expr => test052.lama} | 0 regression/{test053.expr => test053.lama} | 0 regression/{test054.expr => test054.lama} | 0 regression/{test055.expr => test055.lama} | 0 regression/{test056.expr => test056.lama} | 0 regression/{test057.expr => test057.lama} | 0 regression/{test058.expr => test058.lama} | 0 regression/{test059.expr => test059.lama} | 0 regression/{test060.expr => test060.lama} | 0 regression/{test061.expr => test061.lama} | 0 regression/{test062.expr => test062.lama} | 0 regression/{test063.expr => test063.lama} | 0 regression/{test064.expr => test064.lama} | 0 regression/{test065.expr => test065.lama} | 0 regression/{test066.expr => test066.lama} | 0 regression/{test067.expr => test067.lama} | 0 regression/{test068.expr => test068.lama} | 0 regression/{test069.expr => test069.lama} | 0 regression/{test070.expr => test070.lama} | 0 regression/{test071.expr => test071.lama} | 0 regression/{test072.expr => test072.lama} | 0 regression/{test073.expr => test073.lama} | 0 regression/{test074.expr => test074.lama} | 0 regression/{test075.expr => test075.lama} | 0 regression/{test076.expr => test076.lama} | 0 regression/{test077.expr => test077.lama} | 0 regression/{test078.expr => test078.lama} | 0 regression/{test079.expr => test079.lama} | 0 regression/{test080.expr => test080.lama} | 0 regression/{test081.expr => test081.lama} | 0 regression/{test082.expr => test082.lama} | 0 regression/{test083.expr => test083.lama} | 0 regression/{test084.expr => test084.lama} | 0 regression/{test085.expr => test085.lama} | 0 regression/{test086.expr => test086.lama} | 0 regression/{test087.expr => test087.lama} | 0 regression/{test088.expr => test088.lama} | 0 regression/{test089.expr => test089.lama} | 0 regression/{test090.expr => test090.lama} | 0 regression/{test091.expr => test091.lama} | 0 regression/{test092.expr => test092.lama} | 0 regression/{test093.expr => test093.lama} | 0 regression/{test094.expr => test094.lama} | 0 regression/{test095.expr => test095.lama} | 0 regression/{test096.expr => test096.lama} | 0 regression/{test097.expr => test097.lama} | 0 regression/{test098.expr => test098.lama} | 0 regression/{test099.expr => test099.lama} | 0 regression/{test100.expr => test100.lama} | 0 regression/{test101.expr => test101.lama} | 0 regression/{test102.expr => test102.lama} | 0 regression/{test103.expr => test103.lama} | 0 regression/{test104.expr => test104.lama} | 0 regression/{test105.expr => test105.lama} | 0 regression/{test106.expr => test106.lama} | 0 regression/x86only/{Lib01.expr => Lib01.lama} | 0 regression/x86only/{Lib02.expr => Lib02.lama} | 0 regression/x86only/{Lib03.expr => Lib03.lama} | 0 regression/x86only/Makefile | 14 +++++++------- regression/x86only/{test001.expr => test001.lama} | 0 regression/x86only/{test002.expr => test002.lama} | 0 regression/x86only/{test003.expr => test003.lama} | 0 regression/x86only/{test004.expr => test004.lama} | 0 regression/x86only/{test005.expr => test005.lama} | 0 regression/x86only/{test006.expr => test006.lama} | 0 regression/x86only/{test007.expr => test007.lama} | 0 regression/x86only/{test008.expr => test008.lama} | 0 regression/x86only/{test009.expr => test009.lama} | 0 src/Makefile | 8 ++++---- src/X86.ml | 2 +- stdlib/{Array.expr => Array.lama} | 0 stdlib/{Collection.expr => Collection.lama} | 0 stdlib/{Expr.expr => Expr.lama} | 0 stdlib/{Fun.expr => Fun.lama} | 0 stdlib/{Lazy.expr => Lazy.lama} | 0 stdlib/{List.expr => List.lama} | 0 stdlib/Makefile | 10 +++++----- stdlib/{Matcher.expr => Matcher.lama} | 0 stdlib/{Ostap.expr => Ostap.lama} | 0 stdlib/{Ref.expr => Ref.lama} | 0 stdlib/regression/Makefile | 8 ++++---- stdlib/regression/orig/test17.log | 12 ++++++++++++ stdlib/regression/{test01.expr => test01.lama} | 0 stdlib/regression/{test02.expr => test02.lama} | 0 stdlib/regression/{test03.expr => test03.lama} | 0 stdlib/regression/{test04.expr => test04.lama} | 0 stdlib/regression/{test05.expr => test05.lama} | 0 stdlib/regression/{test06.expr => test06.lama} | 0 stdlib/regression/{test07.expr => test07.lama} | 0 stdlib/regression/{test08.expr => test08.lama} | 0 stdlib/regression/{test09.expr => test09.lama} | 0 stdlib/regression/{test10.expr => test10.lama} | 0 stdlib/regression/{test11.expr => test11.lama} | 0 stdlib/regression/{test12.expr => test12.lama} | 0 stdlib/regression/{test13.expr => test13.lama} | 0 stdlib/regression/{test14.expr => test14.lama} | 0 stdlib/regression/{test15.expr => test15.lama} | 0 stdlib/regression/{test16.expr => test16.lama} | 0 stdlib/regression/test17.lama | 4 ++++ 152 files changed, 45 insertions(+), 29 deletions(-) rename regression/{test001.expr => test001.lama} (100%) rename regression/{test002.expr => test002.lama} (100%) rename regression/{test003.expr => test003.lama} (100%) rename regression/{test004.expr => test004.lama} (100%) rename regression/{test005.expr => test005.lama} (100%) rename regression/{test006.expr => test006.lama} (100%) rename regression/{test007.expr => test007.lama} (100%) rename regression/{test008.expr => test008.lama} (100%) rename regression/{test009.expr => test009.lama} (100%) rename regression/{test010.expr => test010.lama} (100%) rename regression/{test011.expr => test011.lama} (100%) rename regression/{test012.expr => test012.lama} (100%) rename regression/{test013.expr => test013.lama} (100%) rename regression/{test014.expr => test014.lama} (100%) rename regression/{test015.expr => test015.lama} (100%) rename regression/{test016.expr => test016.lama} (100%) rename regression/{test017.expr => test017.lama} (100%) rename regression/{test018.expr => test018.lama} (100%) rename regression/{test019.expr => test019.lama} (100%) rename regression/{test020.expr => test020.lama} (100%) rename regression/{test021.expr => test021.lama} (100%) rename regression/{test022.expr => test022.lama} (100%) rename regression/{test023.expr => test023.lama} (100%) rename regression/{test024.expr => test024.lama} (100%) rename regression/{test025.expr => test025.lama} (100%) rename regression/{test026.expr => test026.lama} (100%) rename regression/{test027.expr => test027.lama} (100%) rename regression/{test028.expr => test028.lama} (100%) rename regression/{test029.expr => test029.lama} (100%) rename regression/{test030.expr => test030.lama} (100%) rename regression/{test031.expr => test031.lama} (100%) rename regression/{test032.expr => test032.lama} (100%) rename regression/{test033.expr => test033.lama} (100%) rename regression/{test034.expr => test034.lama} (100%) rename regression/{test035.expr => test035.lama} (100%) rename regression/{test036.expr => test036.lama} (100%) rename regression/{test037.expr => test037.lama} (100%) rename regression/{test038.expr => test038.lama} (100%) rename regression/{test039.expr => test039.lama} (100%) rename regression/{test040.expr => test040.lama} (100%) rename regression/{test041.expr => test041.lama} (100%) rename regression/{test042.expr => test042.lama} (100%) rename regression/{test043.expr => test043.lama} (100%) rename regression/{test044.expr => test044.lama} (100%) rename regression/{test045.expr => test045.lama} (100%) rename regression/{test046.expr => test046.lama} (100%) rename regression/{test047.expr => test047.lama} (100%) rename regression/{test048.expr => test048.lama} (100%) rename regression/{test049.expr => test049.lama} (100%) rename regression/{test050.expr => test050.lama} (100%) rename regression/{test051.expr => test051.lama} (100%) rename regression/{test052.expr => test052.lama} (100%) rename regression/{test053.expr => test053.lama} (100%) rename regression/{test054.expr => test054.lama} (100%) rename regression/{test055.expr => test055.lama} (100%) rename regression/{test056.expr => test056.lama} (100%) rename regression/{test057.expr => test057.lama} (100%) rename regression/{test058.expr => test058.lama} (100%) rename regression/{test059.expr => test059.lama} (100%) rename regression/{test060.expr => test060.lama} (100%) rename regression/{test061.expr => test061.lama} (100%) rename regression/{test062.expr => test062.lama} (100%) rename regression/{test063.expr => test063.lama} (100%) rename regression/{test064.expr => test064.lama} (100%) rename regression/{test065.expr => test065.lama} (100%) rename regression/{test066.expr => test066.lama} (100%) rename regression/{test067.expr => test067.lama} (100%) rename regression/{test068.expr => test068.lama} (100%) rename regression/{test069.expr => test069.lama} (100%) rename regression/{test070.expr => test070.lama} (100%) rename regression/{test071.expr => test071.lama} (100%) rename regression/{test072.expr => test072.lama} (100%) rename regression/{test073.expr => test073.lama} (100%) rename regression/{test074.expr => test074.lama} (100%) rename regression/{test075.expr => test075.lama} (100%) rename regression/{test076.expr => test076.lama} (100%) rename regression/{test077.expr => test077.lama} (100%) rename regression/{test078.expr => test078.lama} (100%) rename regression/{test079.expr => test079.lama} (100%) rename regression/{test080.expr => test080.lama} (100%) rename regression/{test081.expr => test081.lama} (100%) rename regression/{test082.expr => test082.lama} (100%) rename regression/{test083.expr => test083.lama} (100%) rename regression/{test084.expr => test084.lama} (100%) rename regression/{test085.expr => test085.lama} (100%) rename regression/{test086.expr => test086.lama} (100%) rename regression/{test087.expr => test087.lama} (100%) rename regression/{test088.expr => test088.lama} (100%) rename regression/{test089.expr => test089.lama} (100%) rename regression/{test090.expr => test090.lama} (100%) rename regression/{test091.expr => test091.lama} (100%) rename regression/{test092.expr => test092.lama} (100%) rename regression/{test093.expr => test093.lama} (100%) rename regression/{test094.expr => test094.lama} (100%) rename regression/{test095.expr => test095.lama} (100%) rename regression/{test096.expr => test096.lama} (100%) rename regression/{test097.expr => test097.lama} (100%) rename regression/{test098.expr => test098.lama} (100%) rename regression/{test099.expr => test099.lama} (100%) rename regression/{test100.expr => test100.lama} (100%) rename regression/{test101.expr => test101.lama} (100%) rename regression/{test102.expr => test102.lama} (100%) rename regression/{test103.expr => test103.lama} (100%) rename regression/{test104.expr => test104.lama} (100%) rename regression/{test105.expr => test105.lama} (100%) rename regression/{test106.expr => test106.lama} (100%) rename regression/x86only/{Lib01.expr => Lib01.lama} (100%) rename regression/x86only/{Lib02.expr => Lib02.lama} (100%) rename regression/x86only/{Lib03.expr => Lib03.lama} (100%) rename regression/x86only/{test001.expr => test001.lama} (100%) rename regression/x86only/{test002.expr => test002.lama} (100%) rename regression/x86only/{test003.expr => test003.lama} (100%) rename regression/x86only/{test004.expr => test004.lama} (100%) rename regression/x86only/{test005.expr => test005.lama} (100%) rename regression/x86only/{test006.expr => test006.lama} (100%) rename regression/x86only/{test007.expr => test007.lama} (100%) rename regression/x86only/{test008.expr => test008.lama} (100%) rename regression/x86only/{test009.expr => test009.lama} (100%) rename stdlib/{Array.expr => Array.lama} (100%) rename stdlib/{Collection.expr => Collection.lama} (100%) rename stdlib/{Expr.expr => Expr.lama} (100%) rename stdlib/{Fun.expr => Fun.lama} (100%) rename stdlib/{Lazy.expr => Lazy.lama} (100%) rename stdlib/{List.expr => List.lama} (100%) rename stdlib/{Matcher.expr => Matcher.lama} (100%) rename stdlib/{Ostap.expr => Ostap.lama} (100%) rename stdlib/{Ref.expr => Ref.lama} (100%) create mode 100644 stdlib/regression/orig/test17.log rename stdlib/regression/{test01.expr => test01.lama} (100%) rename stdlib/regression/{test02.expr => test02.lama} (100%) rename stdlib/regression/{test03.expr => test03.lama} (100%) rename stdlib/regression/{test04.expr => test04.lama} (100%) rename stdlib/regression/{test05.expr => test05.lama} (100%) rename stdlib/regression/{test06.expr => test06.lama} (100%) rename stdlib/regression/{test07.expr => test07.lama} (100%) rename stdlib/regression/{test08.expr => test08.lama} (100%) rename stdlib/regression/{test09.expr => test09.lama} (100%) rename stdlib/regression/{test10.expr => test10.lama} (100%) rename stdlib/regression/{test11.expr => test11.lama} (100%) rename stdlib/regression/{test12.expr => test12.lama} (100%) rename stdlib/regression/{test13.expr => test13.lama} (100%) rename stdlib/regression/{test14.expr => test14.lama} (100%) rename stdlib/regression/{test15.expr => test15.lama} (100%) rename stdlib/regression/{test16.expr => test16.lama} (100%) create mode 100644 stdlib/regression/test17.lama diff --git a/Makefile b/Makefile index 2286ef0a3..af782a81b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -EXECUTABLE = src/rc.opt +EXECUTABLE = src/lamac INSTALL ?= install -v MKDIR ?= mkdir SHELL := /bin/bash @@ -10,7 +10,7 @@ all: pushd runtime && make && popd pushd stdlib && make && popd -STD_FILES=$(shell ls stdlib/*.[oi] stdlib/*.expr runtime/runtime.a runtime/Std.i) +STD_FILES=$(shell ls stdlib/*.[oi] stdlib/*.lama runtime/runtime.a runtime/Std.i) #$(info $(STD_FILES)) install: all diff --git a/regression/Makefile b/regression/Makefile index e75798f4f..d1e0fa455 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -1,16 +1,16 @@ -TESTS=$(sort $(basename $(wildcard test*.expr))) +TESTS=$(sort $(basename $(wildcard test*.lama))) -RC=../src/rc.opt +LAMAC=../src/lamac .PHONY: check $(TESTS) check: $(TESTS) -$(TESTS): %: %.expr +$(TESTS): %: %.lama @echo $@ - cat $@.input | $(RC) -i $< > $@.log && diff $@.log orig/$@.log - cat $@.input | $(RC) -s $< > $@.log && diff $@.log orig/$@.log - $(RC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log + cat $@.input | $(LAMAC) -i $< > $@.log && diff $@.log orig/$@.log + cat $@.input | $(LAMAC) -s $< > $@.log && diff $@.log orig/$@.log + $(LAMAC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log clean: $(RM) test*.log *.s *~ $(TESTS) *.i diff --git a/regression/test001.expr b/regression/test001.lama similarity index 100% rename from regression/test001.expr rename to regression/test001.lama diff --git a/regression/test002.expr b/regression/test002.lama similarity index 100% rename from regression/test002.expr rename to regression/test002.lama diff --git a/regression/test003.expr b/regression/test003.lama similarity index 100% rename from regression/test003.expr rename to regression/test003.lama diff --git a/regression/test004.expr b/regression/test004.lama similarity index 100% rename from regression/test004.expr rename to regression/test004.lama diff --git a/regression/test005.expr b/regression/test005.lama similarity index 100% rename from regression/test005.expr rename to regression/test005.lama diff --git a/regression/test006.expr b/regression/test006.lama similarity index 100% rename from regression/test006.expr rename to regression/test006.lama diff --git a/regression/test007.expr b/regression/test007.lama similarity index 100% rename from regression/test007.expr rename to regression/test007.lama diff --git a/regression/test008.expr b/regression/test008.lama similarity index 100% rename from regression/test008.expr rename to regression/test008.lama diff --git a/regression/test009.expr b/regression/test009.lama similarity index 100% rename from regression/test009.expr rename to regression/test009.lama diff --git a/regression/test010.expr b/regression/test010.lama similarity index 100% rename from regression/test010.expr rename to regression/test010.lama diff --git a/regression/test011.expr b/regression/test011.lama similarity index 100% rename from regression/test011.expr rename to regression/test011.lama diff --git a/regression/test012.expr b/regression/test012.lama similarity index 100% rename from regression/test012.expr rename to regression/test012.lama diff --git a/regression/test013.expr b/regression/test013.lama similarity index 100% rename from regression/test013.expr rename to regression/test013.lama diff --git a/regression/test014.expr b/regression/test014.lama similarity index 100% rename from regression/test014.expr rename to regression/test014.lama diff --git a/regression/test015.expr b/regression/test015.lama similarity index 100% rename from regression/test015.expr rename to regression/test015.lama diff --git a/regression/test016.expr b/regression/test016.lama similarity index 100% rename from regression/test016.expr rename to regression/test016.lama diff --git a/regression/test017.expr b/regression/test017.lama similarity index 100% rename from regression/test017.expr rename to regression/test017.lama diff --git a/regression/test018.expr b/regression/test018.lama similarity index 100% rename from regression/test018.expr rename to regression/test018.lama diff --git a/regression/test019.expr b/regression/test019.lama similarity index 100% rename from regression/test019.expr rename to regression/test019.lama diff --git a/regression/test020.expr b/regression/test020.lama similarity index 100% rename from regression/test020.expr rename to regression/test020.lama diff --git a/regression/test021.expr b/regression/test021.lama similarity index 100% rename from regression/test021.expr rename to regression/test021.lama diff --git a/regression/test022.expr b/regression/test022.lama similarity index 100% rename from regression/test022.expr rename to regression/test022.lama diff --git a/regression/test023.expr b/regression/test023.lama similarity index 100% rename from regression/test023.expr rename to regression/test023.lama diff --git a/regression/test024.expr b/regression/test024.lama similarity index 100% rename from regression/test024.expr rename to regression/test024.lama diff --git a/regression/test025.expr b/regression/test025.lama similarity index 100% rename from regression/test025.expr rename to regression/test025.lama diff --git a/regression/test026.expr b/regression/test026.lama similarity index 100% rename from regression/test026.expr rename to regression/test026.lama diff --git a/regression/test027.expr b/regression/test027.lama similarity index 100% rename from regression/test027.expr rename to regression/test027.lama diff --git a/regression/test028.expr b/regression/test028.lama similarity index 100% rename from regression/test028.expr rename to regression/test028.lama diff --git a/regression/test029.expr b/regression/test029.lama similarity index 100% rename from regression/test029.expr rename to regression/test029.lama diff --git a/regression/test030.expr b/regression/test030.lama similarity index 100% rename from regression/test030.expr rename to regression/test030.lama diff --git a/regression/test031.expr b/regression/test031.lama similarity index 100% rename from regression/test031.expr rename to regression/test031.lama diff --git a/regression/test032.expr b/regression/test032.lama similarity index 100% rename from regression/test032.expr rename to regression/test032.lama diff --git a/regression/test033.expr b/regression/test033.lama similarity index 100% rename from regression/test033.expr rename to regression/test033.lama diff --git a/regression/test034.expr b/regression/test034.lama similarity index 100% rename from regression/test034.expr rename to regression/test034.lama diff --git a/regression/test035.expr b/regression/test035.lama similarity index 100% rename from regression/test035.expr rename to regression/test035.lama diff --git a/regression/test036.expr b/regression/test036.lama similarity index 100% rename from regression/test036.expr rename to regression/test036.lama diff --git a/regression/test037.expr b/regression/test037.lama similarity index 100% rename from regression/test037.expr rename to regression/test037.lama diff --git a/regression/test038.expr b/regression/test038.lama similarity index 100% rename from regression/test038.expr rename to regression/test038.lama diff --git a/regression/test039.expr b/regression/test039.lama similarity index 100% rename from regression/test039.expr rename to regression/test039.lama diff --git a/regression/test040.expr b/regression/test040.lama similarity index 100% rename from regression/test040.expr rename to regression/test040.lama diff --git a/regression/test041.expr b/regression/test041.lama similarity index 100% rename from regression/test041.expr rename to regression/test041.lama diff --git a/regression/test042.expr b/regression/test042.lama similarity index 100% rename from regression/test042.expr rename to regression/test042.lama diff --git a/regression/test043.expr b/regression/test043.lama similarity index 100% rename from regression/test043.expr rename to regression/test043.lama diff --git a/regression/test044.expr b/regression/test044.lama similarity index 100% rename from regression/test044.expr rename to regression/test044.lama diff --git a/regression/test045.expr b/regression/test045.lama similarity index 100% rename from regression/test045.expr rename to regression/test045.lama diff --git a/regression/test046.expr b/regression/test046.lama similarity index 100% rename from regression/test046.expr rename to regression/test046.lama diff --git a/regression/test047.expr b/regression/test047.lama similarity index 100% rename from regression/test047.expr rename to regression/test047.lama diff --git a/regression/test048.expr b/regression/test048.lama similarity index 100% rename from regression/test048.expr rename to regression/test048.lama diff --git a/regression/test049.expr b/regression/test049.lama similarity index 100% rename from regression/test049.expr rename to regression/test049.lama diff --git a/regression/test050.expr b/regression/test050.lama similarity index 100% rename from regression/test050.expr rename to regression/test050.lama diff --git a/regression/test051.expr b/regression/test051.lama similarity index 100% rename from regression/test051.expr rename to regression/test051.lama diff --git a/regression/test052.expr b/regression/test052.lama similarity index 100% rename from regression/test052.expr rename to regression/test052.lama diff --git a/regression/test053.expr b/regression/test053.lama similarity index 100% rename from regression/test053.expr rename to regression/test053.lama diff --git a/regression/test054.expr b/regression/test054.lama similarity index 100% rename from regression/test054.expr rename to regression/test054.lama diff --git a/regression/test055.expr b/regression/test055.lama similarity index 100% rename from regression/test055.expr rename to regression/test055.lama diff --git a/regression/test056.expr b/regression/test056.lama similarity index 100% rename from regression/test056.expr rename to regression/test056.lama diff --git a/regression/test057.expr b/regression/test057.lama similarity index 100% rename from regression/test057.expr rename to regression/test057.lama diff --git a/regression/test058.expr b/regression/test058.lama similarity index 100% rename from regression/test058.expr rename to regression/test058.lama diff --git a/regression/test059.expr b/regression/test059.lama similarity index 100% rename from regression/test059.expr rename to regression/test059.lama diff --git a/regression/test060.expr b/regression/test060.lama similarity index 100% rename from regression/test060.expr rename to regression/test060.lama diff --git a/regression/test061.expr b/regression/test061.lama similarity index 100% rename from regression/test061.expr rename to regression/test061.lama diff --git a/regression/test062.expr b/regression/test062.lama similarity index 100% rename from regression/test062.expr rename to regression/test062.lama diff --git a/regression/test063.expr b/regression/test063.lama similarity index 100% rename from regression/test063.expr rename to regression/test063.lama diff --git a/regression/test064.expr b/regression/test064.lama similarity index 100% rename from regression/test064.expr rename to regression/test064.lama diff --git a/regression/test065.expr b/regression/test065.lama similarity index 100% rename from regression/test065.expr rename to regression/test065.lama diff --git a/regression/test066.expr b/regression/test066.lama similarity index 100% rename from regression/test066.expr rename to regression/test066.lama diff --git a/regression/test067.expr b/regression/test067.lama similarity index 100% rename from regression/test067.expr rename to regression/test067.lama diff --git a/regression/test068.expr b/regression/test068.lama similarity index 100% rename from regression/test068.expr rename to regression/test068.lama diff --git a/regression/test069.expr b/regression/test069.lama similarity index 100% rename from regression/test069.expr rename to regression/test069.lama diff --git a/regression/test070.expr b/regression/test070.lama similarity index 100% rename from regression/test070.expr rename to regression/test070.lama diff --git a/regression/test071.expr b/regression/test071.lama similarity index 100% rename from regression/test071.expr rename to regression/test071.lama diff --git a/regression/test072.expr b/regression/test072.lama similarity index 100% rename from regression/test072.expr rename to regression/test072.lama diff --git a/regression/test073.expr b/regression/test073.lama similarity index 100% rename from regression/test073.expr rename to regression/test073.lama diff --git a/regression/test074.expr b/regression/test074.lama similarity index 100% rename from regression/test074.expr rename to regression/test074.lama diff --git a/regression/test075.expr b/regression/test075.lama similarity index 100% rename from regression/test075.expr rename to regression/test075.lama diff --git a/regression/test076.expr b/regression/test076.lama similarity index 100% rename from regression/test076.expr rename to regression/test076.lama diff --git a/regression/test077.expr b/regression/test077.lama similarity index 100% rename from regression/test077.expr rename to regression/test077.lama diff --git a/regression/test078.expr b/regression/test078.lama similarity index 100% rename from regression/test078.expr rename to regression/test078.lama diff --git a/regression/test079.expr b/regression/test079.lama similarity index 100% rename from regression/test079.expr rename to regression/test079.lama diff --git a/regression/test080.expr b/regression/test080.lama similarity index 100% rename from regression/test080.expr rename to regression/test080.lama diff --git a/regression/test081.expr b/regression/test081.lama similarity index 100% rename from regression/test081.expr rename to regression/test081.lama diff --git a/regression/test082.expr b/regression/test082.lama similarity index 100% rename from regression/test082.expr rename to regression/test082.lama diff --git a/regression/test083.expr b/regression/test083.lama similarity index 100% rename from regression/test083.expr rename to regression/test083.lama diff --git a/regression/test084.expr b/regression/test084.lama similarity index 100% rename from regression/test084.expr rename to regression/test084.lama diff --git a/regression/test085.expr b/regression/test085.lama similarity index 100% rename from regression/test085.expr rename to regression/test085.lama diff --git a/regression/test086.expr b/regression/test086.lama similarity index 100% rename from regression/test086.expr rename to regression/test086.lama diff --git a/regression/test087.expr b/regression/test087.lama similarity index 100% rename from regression/test087.expr rename to regression/test087.lama diff --git a/regression/test088.expr b/regression/test088.lama similarity index 100% rename from regression/test088.expr rename to regression/test088.lama diff --git a/regression/test089.expr b/regression/test089.lama similarity index 100% rename from regression/test089.expr rename to regression/test089.lama diff --git a/regression/test090.expr b/regression/test090.lama similarity index 100% rename from regression/test090.expr rename to regression/test090.lama diff --git a/regression/test091.expr b/regression/test091.lama similarity index 100% rename from regression/test091.expr rename to regression/test091.lama diff --git a/regression/test092.expr b/regression/test092.lama similarity index 100% rename from regression/test092.expr rename to regression/test092.lama diff --git a/regression/test093.expr b/regression/test093.lama similarity index 100% rename from regression/test093.expr rename to regression/test093.lama diff --git a/regression/test094.expr b/regression/test094.lama similarity index 100% rename from regression/test094.expr rename to regression/test094.lama diff --git a/regression/test095.expr b/regression/test095.lama similarity index 100% rename from regression/test095.expr rename to regression/test095.lama diff --git a/regression/test096.expr b/regression/test096.lama similarity index 100% rename from regression/test096.expr rename to regression/test096.lama diff --git a/regression/test097.expr b/regression/test097.lama similarity index 100% rename from regression/test097.expr rename to regression/test097.lama diff --git a/regression/test098.expr b/regression/test098.lama similarity index 100% rename from regression/test098.expr rename to regression/test098.lama diff --git a/regression/test099.expr b/regression/test099.lama similarity index 100% rename from regression/test099.expr rename to regression/test099.lama diff --git a/regression/test100.expr b/regression/test100.lama similarity index 100% rename from regression/test100.expr rename to regression/test100.lama diff --git a/regression/test101.expr b/regression/test101.lama similarity index 100% rename from regression/test101.expr rename to regression/test101.lama diff --git a/regression/test102.expr b/regression/test102.lama similarity index 100% rename from regression/test102.expr rename to regression/test102.lama diff --git a/regression/test103.expr b/regression/test103.lama similarity index 100% rename from regression/test103.expr rename to regression/test103.lama diff --git a/regression/test104.expr b/regression/test104.lama similarity index 100% rename from regression/test104.expr rename to regression/test104.lama diff --git a/regression/test105.expr b/regression/test105.lama similarity index 100% rename from regression/test105.expr rename to regression/test105.lama diff --git a/regression/test106.expr b/regression/test106.lama similarity index 100% rename from regression/test106.expr rename to regression/test106.lama diff --git a/regression/x86only/Lib01.expr b/regression/x86only/Lib01.lama similarity index 100% rename from regression/x86only/Lib01.expr rename to regression/x86only/Lib01.lama diff --git a/regression/x86only/Lib02.expr b/regression/x86only/Lib02.lama similarity index 100% rename from regression/x86only/Lib02.expr rename to regression/x86only/Lib02.lama diff --git a/regression/x86only/Lib03.expr b/regression/x86only/Lib03.lama similarity index 100% rename from regression/x86only/Lib03.expr rename to regression/x86only/Lib03.lama diff --git a/regression/x86only/Makefile b/regression/x86only/Makefile index fa96a0e85..65c30a059 100644 --- a/regression/x86only/Makefile +++ b/regression/x86only/Makefile @@ -1,17 +1,17 @@ -TESTS=$(sort $(basename $(wildcard test*.expr))) -LIBS=$(patsubst %.expr,%.o, $(sort $(wildcard Lib*.expr))) +TESTS=$(sort $(basename $(wildcard test*.lama))) +LIBS=$(patsubst %.lama,%.o, $(sort $(wildcard Lib*.lama))) -RC=../../src/rc.opt +LAMAC=../../src/lamac .PHONY: check $(TESTS) check: $(TESTS) -%.o: %.expr - RC_RUNTIME=../../runtime $(RC) -c -I . $< +%.o: %.lama + LAMA=../../runtime $(LAMAC) -c -I . $< -$(TESTS): %: %.expr $(LIBS) - RC_RUNTIME=../../runtime $(RC) -I . $< && cat $@.input | ./$@ > $@.log && diff -u $@.log orig/$@.log +$(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/test001.expr b/regression/x86only/test001.lama similarity index 100% rename from regression/x86only/test001.expr rename to regression/x86only/test001.lama diff --git a/regression/x86only/test002.expr b/regression/x86only/test002.lama similarity index 100% rename from regression/x86only/test002.expr rename to regression/x86only/test002.lama diff --git a/regression/x86only/test003.expr b/regression/x86only/test003.lama similarity index 100% rename from regression/x86only/test003.expr rename to regression/x86only/test003.lama diff --git a/regression/x86only/test004.expr b/regression/x86only/test004.lama similarity index 100% rename from regression/x86only/test004.expr rename to regression/x86only/test004.lama diff --git a/regression/x86only/test005.expr b/regression/x86only/test005.lama similarity index 100% rename from regression/x86only/test005.expr rename to regression/x86only/test005.lama diff --git a/regression/x86only/test006.expr b/regression/x86only/test006.lama similarity index 100% rename from regression/x86only/test006.expr rename to regression/x86only/test006.lama diff --git a/regression/x86only/test007.expr b/regression/x86only/test007.lama similarity index 100% rename from regression/x86only/test007.expr rename to regression/x86only/test007.lama diff --git a/regression/x86only/test008.expr b/regression/x86only/test008.lama similarity index 100% rename from regression/x86only/test008.expr rename to regression/x86only/test008.lama diff --git a/regression/x86only/test009.expr b/regression/x86only/test009.lama similarity index 100% rename from regression/x86only/test009.expr rename to regression/x86only/test009.lama diff --git a/src/Makefile b/src/Makefile index 12d2d0f19..8f4fa34cb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ -TOPFILE = rc +TOPFILE = lamac OCAMLC = ocamlfind c OCAMLOPT = ocamlfind opt OCAMLDEP = ocamlfind dep @@ -8,13 +8,13 @@ PXFLAGS = $(CAMLP5) BFLAGS = -rectypes -g OFLAGS = $(BFLAGS) -all: .depend $(TOPFILE).opt +all: .depend $(TOPFILE) .depend: $(SOURCES) $(OCAMLDEP) $(PXFLAGS) *.ml > .depend -$(TOPFILE).opt: $(SOURCES:.ml=.cmx) - $(OCAMLOPT) -o $(TOPFILE).opt $(OFLAGS) $(LIBS:.cma=.cmxa) -linkpkg -package ostap $(SOURCES:.ml=.cmx) +$(TOPFILE): $(SOURCES:.ml=.cmx) + $(OCAMLOPT) -o $(TOPFILE) $(OFLAGS) $(LIBS:.cma=.cmxa) -linkpkg -package ostap $(SOURCES:.ml=.cmx) $(TOPFILE).byte: $(SOURCES:.ml=.cmo) $(OCAMLC) -o $(TOPFILE).byte $(BFLAGS) $(LIBS) -linkpkg -package ostap $(SOURCES:.ml=.cmo) diff --git a/src/X86.ml b/src/X86.ml index 96f441c26..74e2673d8 100644 --- a/src/X86.ml +++ b/src/X86.ml @@ -690,7 +690,7 @@ let genasm cmd prog = Buffer.contents asm let get_std_path () = - match Sys.getenv_opt "RC_RUNTIME" with + match Sys.getenv_opt "LAMA" with | Some s -> s | None -> "../runtime" diff --git a/stdlib/Array.expr b/stdlib/Array.lama similarity index 100% rename from stdlib/Array.expr rename to stdlib/Array.lama diff --git a/stdlib/Collection.expr b/stdlib/Collection.lama similarity index 100% rename from stdlib/Collection.expr rename to stdlib/Collection.lama diff --git a/stdlib/Expr.expr b/stdlib/Expr.lama similarity index 100% rename from stdlib/Expr.expr rename to stdlib/Expr.lama diff --git a/stdlib/Fun.expr b/stdlib/Fun.lama similarity index 100% rename from stdlib/Fun.expr rename to stdlib/Fun.lama diff --git a/stdlib/Lazy.expr b/stdlib/Lazy.lama similarity index 100% rename from stdlib/Lazy.expr rename to stdlib/Lazy.lama diff --git a/stdlib/List.expr b/stdlib/List.lama similarity index 100% rename from stdlib/List.expr rename to stdlib/List.lama diff --git a/stdlib/Makefile b/stdlib/Makefile index 631207f83..9a595260b 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -1,8 +1,8 @@ SHELL := /bin/bash -FILES=$(wildcard *.expr) -ALL=$(sort $(FILES:.expr=.o)) -RC=../src/rc.opt +FILES=$(wildcard *.lama) +ALL=$(sort $(FILES:.lama=.o)) +LAMAC=../src/lamac all: $(ALL) @@ -16,8 +16,8 @@ Ostap.o: List.o Collection.o Ref.o Fun.o Matcher.o Expr.o: Ostap.o -%.o: %.expr - $(RC) -I . -c $< +%.o: %.lama + $(LAMAC) -I . -c $< clean: rm -Rf *.s *.o *.i *~ diff --git a/stdlib/Matcher.expr b/stdlib/Matcher.lama similarity index 100% rename from stdlib/Matcher.expr rename to stdlib/Matcher.lama diff --git a/stdlib/Ostap.expr b/stdlib/Ostap.lama similarity index 100% rename from stdlib/Ostap.expr rename to stdlib/Ostap.lama diff --git a/stdlib/Ref.expr b/stdlib/Ref.lama similarity index 100% rename from stdlib/Ref.expr rename to stdlib/Ref.lama diff --git a/stdlib/regression/Makefile b/stdlib/regression/Makefile index d76ef6592..a0607bd17 100644 --- a/stdlib/regression/Makefile +++ b/stdlib/regression/Makefile @@ -1,14 +1,14 @@ -TESTS=$(sort $(basename $(wildcard test*.expr))) +TESTS=$(sort $(basename $(wildcard test*.lama))) -RC=../../src/rc.opt +LAMAC=../../src/lamac .PHONY: check $(TESTS) check: $(TESTS) -$(TESTS): %: %.expr +$(TESTS): %: %.lama @echo $@ - RC_RUNTIME=../../runtime $(RC) -I .. -ds -dp $< && ./$@ > $@.log && diff $@.log orig/$@.log + LAMA=../../runtime $(LAMAC) -I .. -ds -dp $< && ./$@ > $@.log && diff $@.log orig/$@.log clean: $(RM) test*.log *.s *~ $(TESTS) *.i diff --git a/stdlib/regression/orig/test17.log b/stdlib/regression/orig/test17.log new file mode 100644 index 000000000..600f469d3 --- /dev/null +++ b/stdlib/regression/orig/test17.log @@ -0,0 +1,12 @@ +Lazy body: 0 +Lazy body: 1 +Lazy body: 2 +Lazy body: 3 +Lazy body: 4 +Lazy body: 5 +Lazy body: 6 +Lazy body: 7 +Lazy body: 8 +Lazy body: 9 +First force: 100 +Second force: 100 diff --git a/stdlib/regression/test01.expr b/stdlib/regression/test01.lama similarity index 100% rename from stdlib/regression/test01.expr rename to stdlib/regression/test01.lama diff --git a/stdlib/regression/test02.expr b/stdlib/regression/test02.lama similarity index 100% rename from stdlib/regression/test02.expr rename to stdlib/regression/test02.lama diff --git a/stdlib/regression/test03.expr b/stdlib/regression/test03.lama similarity index 100% rename from stdlib/regression/test03.expr rename to stdlib/regression/test03.lama diff --git a/stdlib/regression/test04.expr b/stdlib/regression/test04.lama similarity index 100% rename from stdlib/regression/test04.expr rename to stdlib/regression/test04.lama diff --git a/stdlib/regression/test05.expr b/stdlib/regression/test05.lama similarity index 100% rename from stdlib/regression/test05.expr rename to stdlib/regression/test05.lama diff --git a/stdlib/regression/test06.expr b/stdlib/regression/test06.lama similarity index 100% rename from stdlib/regression/test06.expr rename to stdlib/regression/test06.lama diff --git a/stdlib/regression/test07.expr b/stdlib/regression/test07.lama similarity index 100% rename from stdlib/regression/test07.expr rename to stdlib/regression/test07.lama diff --git a/stdlib/regression/test08.expr b/stdlib/regression/test08.lama similarity index 100% rename from stdlib/regression/test08.expr rename to stdlib/regression/test08.lama diff --git a/stdlib/regression/test09.expr b/stdlib/regression/test09.lama similarity index 100% rename from stdlib/regression/test09.expr rename to stdlib/regression/test09.lama diff --git a/stdlib/regression/test10.expr b/stdlib/regression/test10.lama similarity index 100% rename from stdlib/regression/test10.expr rename to stdlib/regression/test10.lama diff --git a/stdlib/regression/test11.expr b/stdlib/regression/test11.lama similarity index 100% rename from stdlib/regression/test11.expr rename to stdlib/regression/test11.lama diff --git a/stdlib/regression/test12.expr b/stdlib/regression/test12.lama similarity index 100% rename from stdlib/regression/test12.expr rename to stdlib/regression/test12.lama diff --git a/stdlib/regression/test13.expr b/stdlib/regression/test13.lama similarity index 100% rename from stdlib/regression/test13.expr rename to stdlib/regression/test13.lama diff --git a/stdlib/regression/test14.expr b/stdlib/regression/test14.lama similarity index 100% rename from stdlib/regression/test14.expr rename to stdlib/regression/test14.lama diff --git a/stdlib/regression/test15.expr b/stdlib/regression/test15.lama similarity index 100% rename from stdlib/regression/test15.expr rename to stdlib/regression/test15.lama diff --git a/stdlib/regression/test16.expr b/stdlib/regression/test16.lama similarity index 100% rename from stdlib/regression/test16.expr rename to stdlib/regression/test16.lama diff --git a/stdlib/regression/test17.lama b/stdlib/regression/test17.lama new file mode 100644 index 000000000..dd475e5d7 --- /dev/null +++ b/stdlib/regression/test17.lama @@ -0,0 +1,4 @@ +local x = lazy (for local i; i := 0, i<10, i := i + 1 do printf ("Lazy body: %d\n", i) od; 100); + +printf ("First force: %d\n", force (x)); +printf ("Second force: %d\n", force (x)) \ No newline at end of file