Move files around.

smimram · Nov 29, 2024 · 05525b5 · 05525b5
1 parent 2f346f5
commit 05525b5
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -6,8 +6,8 @@ The theory should come up soon.
 
 ## Some examples
 
-- [Curry's axioms for λ-calculus](test/curry.cccatt)
-- [Curien's categorical combinators](test/curien.cccatt)
+- [Curry's axioms for λ-calculus](examples/curry.cccatt)
+- [Curien's categorical combinators](examples/curien.cccatt)
 
 ## Emacs mode
 

diff --git a/examples/Makefile b/examples/Makefile
@@ -0,0 +1,2 @@
+test:
+	@dune runtestg
diff --git a/test/curien.cccatt → examples/curien.cccatt b/test/curien.cccatt → examples/curien.cccatt
@@ -1,5 +1,6 @@
 # Categorical combinators
 # See Curien, 1986
+# https://www.sciencedirect.com/science/article/pii/S001999588680047X
 
 # Generators
 

diff --git a/test/curry-noimplicit.cccatt → examples/curry-noimplicit.cccatt b/test/curry-noimplicit.cccatt → examples/curry-noimplicit.cccatt
diff --git a/test/curry.cccatt → examples/curry.cccatt b/test/curry.cccatt → examples/curry.cccatt
diff --git a/examples/dune b/examples/dune
@@ -0,0 +1,11 @@
+(rule
+ (alias runtest)
+ (deps curry.cccatt curry-noimplicit.cccatt curien.cccatt)
+ (action
+   (progn
+    (run ../src/cccatt.exe curry.cccatt)
+    (run ../src/cccatt.exe curry-noimplicit.cccatt)
+    (run ../src/cccatt.exe curien.cccatt)
+   )
+ )
+)
diff --git a/test/dune b/test/dune
diff --git a/test/Makefile → tests/Makefile b/test/Makefile → tests/Makefile
diff --git a/tests/dune b/tests/dune
@@ -0,0 +1,11 @@
+(rule
+ (alias runtest)
+ (deps test.cccatt implicit.cccatt)
+ (action
+   (progn
+    (run ../src/cccatt.exe test.cccatt)
+    (run ../src/cccatt.exe negative.cccatt)
+    (run ../src/cccatt.exe implicit.cccatt)
+   )
+ )
+)
diff --git a/test/errors/Makefile → tests/errors/Makefile b/test/errors/Makefile → tests/errors/Makefile
diff --git a/test/errors/README.md → tests/errors/README.md b/test/errors/README.md → tests/errors/README.md
diff --git a/test/errors/eq-obj.cccatt → tests/errors/eq-obj.cccatt b/test/errors/eq-obj.cccatt → tests/errors/eq-obj.cccatt
diff --git a/test/errors/hole.cccatt → tests/errors/hole.cccatt b/test/errors/hole.cccatt → tests/errors/hole.cccatt
diff --git a/test/errors/unbound.cccatt → tests/errors/unbound.cccatt b/test/errors/unbound.cccatt → tests/errors/unbound.cccatt
diff --git a/test/implicit.cccatt → tests/implicit.cccatt b/test/implicit.cccatt → tests/implicit.cccatt
diff --git a/test/negative.cccatt → tests/negative.cccatt b/test/negative.cccatt → tests/negative.cccatt
diff --git a/test/test.cccatt → tests/test.cccatt b/test/test.cccatt → tests/test.cccatt
diff --git a/web/dune b/web/dune
@@ -3,10 +3,10 @@
  (modes js)
  (preprocess (pps ppx_blob js_of_ocaml-ppx))
  (preprocessor_deps
-  (file ../test/test.cccatt)
-  (file ../test/implicit.cccatt)
-  (file ../test/curry.cccatt)
-  (file ../test/curien.cccatt)
+  (file ../tests/test.cccatt)
+  (file ../tests/implicit.cccatt)
+  (file ../examples/curry.cccatt)
+  (file ../examples/curien.cccatt)
  )
  (libraries js_of_ocaml cccatt)
 )
diff --git a/web/examples.ml b/web/examples.ml
@@ -1,7 +1,7 @@
-let tests = [%blob "../test/test.cccatt"]
-let implicit = [%blob "../test/implicit.cccatt"]
-let curry = [%blob "../test/curry.cccatt"]
-let curien = [%blob "../test/curien.cccatt"]
+let tests = [%blob "../tests/test.cccatt"]
+let implicit = [%blob "../tests/implicit.cccatt"]
+let curry = [%blob "../examples/curry.cccatt"]
+let curien = [%blob "../examples/curien.cccatt"]
 
 let get = function
   | "tests" -> tests