moved library files to lib directory

jsiek · Oct 16, 2024 · 1da2e5d · 1da2e5d
1 parent 93bb3ce
commit 1da2e5d
Show file tree

Hide file tree

Showing 29 changed files with 13 additions and 514 deletions.
diff --git a/Base.thm b/Base.thm
diff --git a/Binary.thm b/Binary.thm
diff --git a/FunctionalProgramming.thm b/FunctionalProgramming.thm
diff --git a/List.thm b/List.thm
diff --git a/ListTests.thm b/ListTests.thm
diff --git a/Log.thm b/Log.thm
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 PYTHON = $(shell command -v python3.11)
 
+LIB_DIR = ./lib
 TEST_PASS_DIR = ./test/should-pass
 TEST_ERROR_DIR = ./test/should-error
 
@@ -13,42 +14,42 @@ default: tests tests-lib # check_docs
 check_docs: check_index check_fun check_intro check_ref
 
 tests-should-pass:
-	$(PYTHON) ./deduce.py --recursive-descent $(TEST_PASS_DIR)
-	$(PYTHON) ./deduce.py --lalr $(TEST_PASS_DIR)
+	$(PYTHON) ./deduce.py --recursive-descent $(TEST_PASS_DIR) --dir $(LIB_DIR)
+	$(PYTHON) ./deduce.py --lalr $(TEST_PASS_DIR) --dir $(LIB_DIR)
 
 tests-should-error:
-	$(PYTHON) ./deduce.py --recursive-descent $(TEST_ERROR_DIR) --error
-	$(PYTHON) ./deduce.py --lalr $(TEST_ERROR_DIR) --error
+	$(PYTHON) ./deduce.py --recursive-descent $(TEST_ERROR_DIR) --error --dir $(LIB_DIR)
+	$(PYTHON) ./deduce.py --lalr $(TEST_ERROR_DIR) --error --dir $(LIB_DIR)
 
 
 tests-lib: 
-	$(PYTHON) ./deduce.py . --recursive-descent
+	$(PYTHON) ./deduce.py ./lib --recursive-descent --dir $(LIB_DIR)
 # List parsing needs to be updated in Deduce.lark
 #	$(PYTHON) ./deduce.py . --lalr
 
 tests: tests-should-pass tests-should-error
 
 check_index:
 	/Users/jsiek/Library/Python/3.11/bin/entangled tangle 
-	$(PYTHON) ./deduce.py --recursive-descent index.pf
-	$(PYTHON) ./deduce.py --lalr index.pf
+	$(PYTHON) ./deduce.py --recursive-descent index.pf --dir $(LIB_DIR)
+	$(PYTHON) ./deduce.py --lalr index.pf --dir $(LIB_DIR)
 
 check_fun:
 	/Users/jsiek/Library/Python/3.11/bin/entangled tangle 
-	$(PYTHON) ./deduce.py --recursive-descent FunctionalProgramming.pf
+	$(PYTHON) ./deduce.py --recursive-descent FunctionalProgramming.pf --dir $(LIB_DIR)
 # List parsing needs to be updated in Deduce.lark
 #	$(PYTHON) ./deduce.py --lalr FunctionalProgramming.pf
 
 check_intro:
 	/Users/jsiek/Library/Python/3.11/bin/entangled tangle 
-	$(PYTHON) ./deduce.py --recursive-descent ProofIntro.pf
+	$(PYTHON) ./deduce.py --recursive-descent ProofIntro.pf --dir $(LIB_DIR)
 # List parsing needs to be updated in Deduce.lark
-#	$(PYTHON) ./deduce.py --lalr ProofIntro.pf
+#	$(PYTHON) ./deduce.py --lalr ProofIntro.pf --dir $(LIB_DIR)
 
 check_ref:
 	/Users/jsiek/Library/Python/3.11/bin/entangled tangle 
-	$(PYTHON) ./deduce.py --recursive-descent Reference.pf
-	$(PYTHON) ./deduce.py --lalr Reference.pf
+	$(PYTHON) ./deduce.py --recursive-descent Reference.pf --dir $(LIB_DIR)
+	$(PYTHON) ./deduce.py --lalr Reference.pf --dir $(LIB_DIR)
 
 clean:
 	rm -f index.pf FunctionalProgramming.pf ProofIntro.pf

diff --git a/Maps.thm b/Maps.thm
diff --git a/MultiSet.thm b/MultiSet.thm