change: use save/loadModule

Author: eldesh

Makefile.polyml

@@ -7,28 +7,29 @@ SRC := $(wildcard src/main/*)
 TEST_SRC := $(wildcard src/test/*)
 BASIS_TEST_SRC := $(wildcard ./basis/test/*)
 
-TARGET := libsmlunit.poly
 TEST := smlunit-test-poly smlunit-basis-test-poly
+TARGET := libsmlunit.poly
 
 all: $(TARGET)
 
 
 $(TARGET): $(SRC)
 	echo "" | $(POLYML) $(POLYMLFLAGS) \
 		--eval 'PolyML.make "src/main"' \
-		--eval 'PolyML.SaveState.saveState "$@"'
+		--use export.sml \
+		--eval 'PolyML.SaveState.saveModule ("$(TARGET)", SMLUnit)'
 
 
 smlunit-test-poly.o: $(TARGET) $(TEST_SRC)
 	echo "" | $(POLYML) $(POLYMLFLAGS) \
-		--eval 'PolyML.SaveState.loadState "$<"' \
+		--eval 'PolyML.loadModule "./$(TARGET)"' \
 		--eval 'PolyML.make "src/test"' \
 		--eval 'PolyML.export ("$(@:.o=)", TestMain.test)'
 
 
 smlunit-basis-test-poly.o: $(TARGET) $(BASIS_TEST_SRC)
 	echo "" | $(POLYML) $(POLYMLFLAGS) \
-		--eval 'PolyML.SaveState.loadState "$<"' \
+		--eval 'PolyML.loadModule "./$(TARGET)"' \
 		--eval 'PolyML.make "basis/test"' \
 		--eval 'PolyML.export ("$(@:.o=)", TestMain.test)'
 
@@ -45,7 +46,7 @@ test: $(TEST)
 
 .PHONY: clean
 clean:
-	$(RM) $(TARGET)
-	$(RM) $(TEST)
-	$(RM) $(TEST:=.o)
+	-$(RM) $(TARGET)
+	-$(RM) $(TEST)
+	-$(RM) $(TEST:=.o)
 

export.sml

@@ -0,0 +1,7 @@
+val SMLUnit =
+  {
+    sigs = ["SMLUNIT", "ASSERT", "TEST", "TESTRUNNER"],
+    structs = ["SMLUnit"],
+    functors = [],
+    onStartup = NONE
+  }

readme.md

@@ -101,11 +101,11 @@ foo_test.sml
 
 ### PolyML
 
-`loadState "libsmlunit.poly"` for other project.
+`PolyML.loadModule "/path/to/libsmlunit.poly"` for other project.
 
 ```sh
 $ poly
-> PolyML.SaveState.loadState "/path/to/libsmlunit.poly";
+> PolyML.loadModule "/path/to/libsmlunit.poly";
 val it = (): unit
 >
 ```