Refactoring

diff --git a/ocaml/andrea9.ml b/ocaml/andrea9.ml
index 788cc49dc45792cb0e13ca12fef6ffee177dd3a3..044ad9a9a45d98428a64c9d7f5884002f6557166 100644 (file)
--- a/ocaml/andrea9.ml
+++ b/ocaml/andrea9.ml
@@ -322,9 +322,14 @@ let interactive div conv cmds =
  ) with Done _ -> ()\r
 ;;\r
 \r
+let rec conv_join = function\r
+ | [] -> "@"\r
+ | x::xs -> conv_join xs ^ " ("^ x ^")"\r
+;;\r
+\r
 let _ = exec\r
  "x x"\r
- "@ (x y) (y y) (y x)"\r
+ (conv_join["x y"; "y y"; "y x"])\r
  [ step 0 0; eat ]\r
 ;;\r
 \r
@@ -337,17 +342,6 @@ interactive "x y"
 \r
 auto (problem_of "x (y. x y y)" "x (y. x y x)");;\r
 \r
-let rec conv_join = function\r
- | [] -> "@"\r
- | x::xs -> conv_join xs ^ " ("^ x ^")"\r
-;;\r
-\r
-(* auto (problem_of "x a a a" (conv_join[\r
- "x b a a";\r
- "x a b a";\r
- "x a a b";\r
-]));; *)\r
-\r
 auto (problem_of "x a a a a" (conv_join[\r
  "x b a a a";\r
  "x a b a a";\r
@@ -361,23 +355,6 @@ auto (problem_of "x a a a a (x (x. x x) @ @ (_._.x. x x) x) b b b" (conv_join[
  "x a a a a (_. _. _. _. x. y. x y)";\r
 ]));\r
 \r
-(* let _ = exec\r
- "x y"\r
- [ "x x"; "y z"; "y x" ]\r
- [ step 0 0 0; step 1 0 1; eat 5; ]\r
-;;\r
-\r
-let _ = exec\r
- "a b c"\r
- [ "a b @"; "a @ c"; "a a a" ]\r
- [ step 0 0 0; step 1 1 0; eat 2; ]\r
-;;\r
-\r
-let _ = exec\r
- "a (a b c) (a d e)"\r
- [ "a (a b @) (a @ e)"; "a a a" ]\r
- [ step 0 0 0; step 1 1 0; eat 2]\r
-;; *)\r
 \r
 print_hline();\r
 print_endline "ALL DONE. "\r