shen-ruby 0.12.1 → 0.13.0

data/shen/release/test_programs/mutual.shen

@@ -1,11 +1,11 @@
-(define even? 
-   1 -> false  
-   X -> (odd? (- X 1)))
-
-(define odd?  
-   1 -> true  
-   X -> (even? (- X 1)))
-
-
- 
-
+(define even? 
+   1 -> false  
+   X -> (odd? (- X 1)))
+
+(define odd?  
+   1 -> true  
+   X -> (even? (- X 1)))
+
+
+ 
+

data/shen/release/test_programs/n_queens.shen

@@ -1,45 +1,45 @@
-(define n-queens
-  {number --> (list (list number))}
-  N -> (n-queens-loop N (initialise N)))
-
-(define initialise
-   {number --> (list number)}
-   0 -> []
-   N -> [1 | (initialise (- N 1))])
- 
-(define n-queens-loop
-  {number --> (list number) --> (list (list number))}
-  N Config -> []    where (all_Ns? N Config)
-  N Config -> [Config | (n-queens-loop N (next_n N Config))] 
-                                       where (and (ok_row? Config) (ok_diag? Config))
-  N Config -> (n-queens-loop N (next_n N Config)))
- 
-(define all_Ns?
-  {number --> (list number) --> boolean}
-   _ [] -> true
-  N [N | Ns] -> (all_Ns? N Ns)
-  _ _ -> false)
- 
-(define next_n
-  {number --> (list number) --> (list number)}
-  N [N | Ns] -> [1 | (next_n N Ns)]
-  _ [N | Ns] -> [(+ 1 N) | Ns])
- 
-(define ok_row?
-  {(list number) --> boolean}
-  [] -> true
-  [N | Ns] -> false     where (element? N Ns)
-  [_ | Ns] -> (ok_row? Ns))
- 
-(define ok_diag?
-  {(list number) --> boolean} 
-  [] -> true
-  [N | Ns] -> (and (ok_diag_N? (+ N 1) (- N 1) Ns) 
-                                (ok_diag? Ns)))
- 
-(define ok_diag_N?
-  {number --> number --> (list number) --> boolean}
-  _ _ [] -> true
-  Up Down [Up | _] -> false
-  Up Down [Down | _] -> false
-  Up Down [_ | Ns] -> (ok_diag_N? (+ 1 Up) (- Down 1) Ns)) 
+(define n-queens
+  {number --> (list (list number))}
+  N -> (n-queens-loop N (initialise N)))
+
+(define initialise
+   {number --> (list number)}
+   0 -> []
+   N -> [1 | (initialise (- N 1))])
+ 
+(define n-queens-loop
+  {number --> (list number) --> (list (list number))}
+  N Config -> []    where (all_Ns? N Config)
+  N Config -> [Config | (n-queens-loop N (next_n N Config))] 
+                                       where (and (ok_row? Config) (ok_diag? Config))
+  N Config -> (n-queens-loop N (next_n N Config)))
+ 
+(define all_Ns?
+  {number --> (list number) --> boolean}
+   _ [] -> true
+  N [N | Ns] -> (all_Ns? N Ns)
+  _ _ -> false)
+ 
+(define next_n
+  {number --> (list number) --> (list number)}
+  N [N | Ns] -> [1 | (next_n N Ns)]
+  _ [N | Ns] -> [(+ 1 N) | Ns])
+ 
+(define ok_row?
+  {(list number) --> boolean}
+  [] -> true
+  [N | Ns] -> false     where (element? N Ns)
+  [_ | Ns] -> (ok_row? Ns))
+ 
+(define ok_diag?
+  {(list number) --> boolean} 
+  [] -> true
+  [N | Ns] -> (and (ok_diag_N? (+ N 1) (- N 1) Ns) 
+                                (ok_diag? Ns)))
+ 
+(define ok_diag_N?
+  {number --> number --> (list number) --> boolean}
+  _ _ [] -> true
+  Up Down [Up | _] -> false
+  Up Down [Down | _] -> false
+  Up Down [_ | Ns] -> (ok_diag_N? (+ 1 Up) (- Down 1) Ns)) 

data/shen/release/test_programs/newton_version_1.shen

@@ -1,33 +1,33 @@
-(define newtons-method 
-    N -> (let Guess (/ N 2.0)
-                    (run-newtons-method 
-                           N 
-                           (round-to-2-places (average Guess (/  N Guess)))
-                           Guess)))
-
-(define run-newtons-method  
-   _ Sqrt Sqrt -> Sqrt  
-   N Better_Guess _ 
-   -> (run-newtons-method
-        N
-        (round-to-2-places (average Better_Guess (/  N Better_Guess))) 
-        Better_Guess))
-
-(define round-to-2-places  
-  N -> (/ (round (* 100.0 N)) 100.0)) 
-
-(define average
-  M N -> (/ (+ M N) 2.0))
-
-
-
-
-
-
-
-
-
-
-
- 
-
+(define newtons-method 
+    N -> (let Guess (/ N 2.0)
+                    (run-newtons-method 
+                           N 
+                           (round-to-2-places (average Guess (/  N Guess)))
+                           Guess)))
+
+(define run-newtons-method  
+   _ Sqrt Sqrt -> Sqrt  
+   N Better_Guess _ 
+   -> (run-newtons-method
+        N
+        (round-to-2-places (average Better_Guess (/  N Better_Guess))) 
+        Better_Guess))
+
+(define round-to-2-places  
+  N -> (/ (round (* 100.0 N)) 100.0)) 
+
+(define average
+  M N -> (/ (+ M N) 2.0))
+
+
+
+
+
+
+
+
+
+
+
+ 
+

data/shen/release/test_programs/newton_version_2.shen

@@ -1,24 +1,24 @@
-(define newtons-method 
-   N -> (fix (/. M (specialised-run-newtons-method N M)) (/ N 2.0)))
-
-(define specialised-run-newtons-method  
-   M N -> (round-to-2-places (average N (/ M N)))) 
-
-(define round-to-2-places  
-   M -> (/ (round (* 100.0 M)) 100.0)) 
-
-(define average
-  M N -> (/ (+ M N) 2.0))
-
-
-
-
-
-
-
-
-
-
-
- 
-
+(define newtons-method 
+   N -> (fix (/. M (specialised-run-newtons-method N M)) (/ N 2.0)))
+
+(define specialised-run-newtons-method  
+   M N -> (round-to-2-places (average N (/ M N)))) 
+
+(define round-to-2-places  
+   M -> (/ (round (* 100.0 M)) 100.0)) 
+
+(define average
+  M N -> (/ (+ M N) 2.0))
+
+
+
+
+
+
+
+
+
+
+
+ 
+

data/shen/release/test_programs/parse.prl

@@ -1,14 +1,14 @@
-(defprolog pparse
-  S Grammar <-- (parsing [[s + 0] = [S + 0]] Grammar);) 
-
-(defprolog parsing  
-  [X = X] _ <--;
-  [[X + Y] = [X + Z]] Grammar <-- ! (parsing [Y = Z] Grammar);
-  [[[X + Y] + Z] = W] Grammar <-- ! (parsing [[X + [Y + Z]] = W] Grammar);
-  [W = [[X + Y] + Z]] Grammar <-- ! (parsing [W = [X + [Y + Z]]] Grammar);
-  [[X + Y] = Z] Grammar <-- (member [X = W] Grammar) (parsing [[W + Y] = Z] Grammar);)
-
-(defprolog member
-   X [X | _] <--;
-   X [_ | Y] <-- (member X Y);)
-
+(defprolog pparse
+  S Grammar <-- (parsing [[s + 0] = [S + 0]] Grammar);) 
+
+(defprolog parsing  
+  [X = X] _ <--;
+  [[X + Y] = [X + Z]] Grammar <-- ! (parsing [Y = Z] Grammar);
+  [[[X + Y] + Z] = W] Grammar <-- ! (parsing [[X + [Y + Z]] = W] Grammar);
+  [W = [[X + Y] + Z]] Grammar <-- ! (parsing [W = [X + [Y + Z]]] Grammar);
+  [[X + Y] = Z] Grammar <-- (member [X = W] Grammar) (parsing [[W + Y] = Z] Grammar);)
+
+(defprolog member
+   X [X | _] <--;
+   X [_ | Y] <-- (member X Y);)
+

data/shen/release/test_programs/parser.shen

@@ -1,52 +1,52 @@
-(define parse
-   Sentence -> (let Parse (sent [Sentence []])
-                  (if (parsed? Parse)
-                      (output_parse Parse)
-                      ungrammatical)))
-
-(define parsed?
-  [[] _] -> true
-  _ -> false)
-
-(define output_parse
-  [_ Parse_Rules] -> (reverse Parse_Rules))
-
-(define sent
-   [Input Output] <- (vp (np [Input [[sent --> np vp] | Output]]))
-   _ -> (fail))
-
-(define np
-   [Input Output] <- (n (det [Input [[np --> det n] | Output]]))
-   [Input Output] <- (name [Input [[np --> name] | Output]])
-   _ -> (fail))
-
-(define name
-  [["John" | Input] Output] -> [Input [[name --> "John"] | Output]]
-  [["Bill" | Input] Output] -> [Input [[name --> "Bill"] | Output]]
-   _ -> (fail))
-
- (define det
-  [["the" | Input] Output] -> [Input [[det --> "the"] | Output]]
-  [["a" | Input] Output] -> [Input [[det --> "a"] | Output]]
-  [["that" | Input] Output] -> [Input [[det --> "that"] | Output]]
-  [["this" | Input] Output] -> [Input [[det --> "this"] | Output]]
-  _ -> (fail))
- 
-(define n
-  [["boy" | Input] Output] -> [Input [[n --> "boy"] | Output]]
-  [["girl" | Input] Output] -> [Input [[n --> "girl"] | Output]]
-   _ -> (fail))
-
-(define vp
-   [Input Output] <- (np (vtrans [Input [[vp --> vtrans np] | Output]]))
-   [Input Output] <- (vp [Input [[vp --> vintrans] | Output]])
-   _ -> (fail))
-
-(define vtrans
-  [["kicks" | Input] Output] -> [Input [[vtrans --> "kicks"] | Output]]
-  [["likes" | Input] Output] -> [Input [[vtrans --> "likes"] | Output]]
-   _ -> (fail))
-
-(define vintrans
-  [["jumps" | Input] Output] -> [Input [[vintrans --> "jumps"] | Output]]
+(define parse
+   Sentence -> (let Parse (sent [Sentence []])
+                  (if (parsed? Parse)
+                      (output_parse Parse)
+                      ungrammatical)))
+
+(define parsed?
+  [[] _] -> true
+  _ -> false)
+
+(define output_parse
+  [_ Parse_Rules] -> (reverse Parse_Rules))
+
+(define sent
+   [Input Output] <- (vp (np [Input [[sent --> np vp] | Output]]))
+   _ -> (fail))
+
+(define np
+   [Input Output] <- (n (det [Input [[np --> det n] | Output]]))
+   [Input Output] <- (name [Input [[np --> name] | Output]])
+   _ -> (fail))
+
+(define name
+  [["John" | Input] Output] -> [Input [[name --> "John"] | Output]]
+  [["Bill" | Input] Output] -> [Input [[name --> "Bill"] | Output]]
+   _ -> (fail))
+
+ (define det
+  [["the" | Input] Output] -> [Input [[det --> "the"] | Output]]
+  [["a" | Input] Output] -> [Input [[det --> "a"] | Output]]
+  [["that" | Input] Output] -> [Input [[det --> "that"] | Output]]
+  [["this" | Input] Output] -> [Input [[det --> "this"] | Output]]
+  _ -> (fail))
+ 
+(define n
+  [["boy" | Input] Output] -> [Input [[n --> "boy"] | Output]]
+  [["girl" | Input] Output] -> [Input [[n --> "girl"] | Output]]
+   _ -> (fail))
+
+(define vp
+   [Input Output] <- (np (vtrans [Input [[vp --> vtrans np] | Output]]))
+   [Input Output] <- (vp [Input [[vp --> vintrans] | Output]])
+   _ -> (fail))
+
+(define vtrans
+  [["kicks" | Input] Output] -> [Input [[vtrans --> "kicks"] | Output]]
+  [["likes" | Input] Output] -> [Input [[vtrans --> "likes"] | Output]]
+   _ -> (fail))
+
+(define vintrans
+  [["jumps" | Input] Output] -> [Input [[vintrans --> "jumps"] | Output]]
   _ -> (fail))

data/shen/release/test_programs/powerset.shen

@@ -1,10 +1,10 @@
-(define powerset
-   [] -> [[]]
-   [X | Y] -> (let Powerset (powerset Y)
-                (append (cons-X-to-each-set X Powerset) Powerset)))
-
-(define cons-X-to-each-set  
-    _ [ ] -> [ ]  
-    X [Y | Z] -> [[X | Y] | (cons-X-to-each-set X Z)])
-
-
+(define powerset
+   [] -> [[]]
+   [X | Y] -> (let Powerset (powerset Y)
+                (append (cons-X-to-each-set X Powerset) Powerset)))
+
+(define cons-X-to-each-set  
+    _ [ ] -> [ ]  
+    X [Y | Z] -> [[X | Y] | (cons-X-to-each-set X Z)])
+
+

data/shen/release/test_programs/prime.shen

@@ -1,10 +1,10 @@
-(define prime? 
-  X -> (prime* X (/ X 2) 2))
-
-(define prime*
-  X Max Div -> false	where (integer? (/ X Div))				
-  X Max Div -> true	where (> Div Max)			
-  X Max Div -> (prime* X Max (+ 1 Div)))
-
- 
-
+(define prime? 
+  X -> (prime* X (/ X 2) 2))
+
+(define prime*
+  X Max Div -> false	where (integer? (/ X Div))				
+  X Max Div -> true	where (> Div Max)			
+  X Max Div -> (prime* X Max (+ 1 Div)))
+
+ 
+

data/shen/release/test_programs/prolog.shen

@@ -1,79 +1,79 @@
-(defprolog f
-     a <--;)   
-
-(defprolog g
-  a <-- ! (f b);
-  X <-- (f a);) 
-
-(defprolog mem
-  X [X | _] <--;
-  X [Y | Z] <-- (mem X Z);)  
-
-(defprolog app 
-  [] X X <--;
-  [X | Y] W [X | Z] <-- (app Y W Z);) 
-
-(defprolog rev
-  [] [] <--;
-  [X | Y] Z <-- (rev Y W) (app W [X] Z);) 
- 
-(defprolog enjoys
-  willi X <-- (likes mark X);
-  mark chocolate <--;
-  mark tea <--;) enjoys
- 
-(defprolog fads
-  X <-- (findall Y [enjoys X Y] Friends) (return Friends);) fads
-    
-(defprolog prop
-  A C <-- (proph [[~  C] | A]);) prop
-
-(defprolog proph
-  A <-- (mem [~ P] A) (mem P A) !;
-       A <-- (consistent A) ! (when false);
-       (mode [[P & Q] | A] -) <-- ! (proph [P Q | A]);
-       (mode [[P <=> Q] | A] -) <-- ! (proph [[P => Q] [Q => P] | A]);
-       (mode [[P => Q] | A] -) <-- ! (proph [[[~ P] v Q] | A]);
-       (mode [[~ [P v Q]] | A] -)  <-- ! (proph [[~ P] [~ Q] | A]);
-       (mode [[~ [P & Q]] | A] -) <-- ! (proph [[[~ P] v [~ Q]] | A]);
-       (mode [[~ [P => Q]] | A] -) <-- ! (proph [P [~ Q] | A]);
-       (mode [[~ [P <=> Q]] | A] -) <-- ! (proph [[~ [[P => Q] v [~ [Q => P]]]] | A]);
-       (mode [[P & Q] | A] -) <-- !  (proph [P Q | A]);
-       (mode [[P v Q] | A] -) <-- !  (proph [P | A]) ! (proph [Q | A]);
-       (mode [P | Ps] -) <-- (app Ps [P] Qs) ! (proph Qs);) 
-
-      (defprolog consistent
-         [] <--;
-         [P | Ps] <-- (when (symbol? P)) ! (consistent Ps);
-         [[~ P] | Ps] <-- (when (symbol? P)) ! (consistent Ps);) 
-
-      (defprolog app
-         [] X X <--;
-         (mode [X | Y] -) W [X | Z] <-- (app Y W Z);) 
-
-      (defprolog mem
-         X (mode [X | _] -) <--;
-         X (mode [_ | Y] -) <-- (mem X Y);) 
-
-      (defprolog mapit
-         _  []  [] <--;
-         Pred [X | Y] [W | Z] <-- (call [Pred X W])  (mapit Pred Y Z);) 
-
-       (defprolog consit
-         X [1 X] <--;) 
-
-        (defprolog different
-          X Y <--  (~ [identical X Y]);) 
-
-        (defprolog ~
-          P <-- (call P) ! (when false);
-          _ <--;) 
-
-        (defprolog likes
-           john  X <-- (tall X)  (pretty X);) 
-
-        (defprolog tall
-           mary <--;) 
-
-        (defprolog pretty
+(defprolog f
+     a <--;)   
+
+(defprolog g
+  a <-- ! (f b);
+  X <-- (f a);) 
+
+(defprolog mem
+  X [X | _] <--;
+  X [Y | Z] <-- (mem X Z);)  
+
+(defprolog app 
+  [] X X <--;
+  [X | Y] W [X | Z] <-- (app Y W Z);) 
+
+(defprolog rev
+  [] [] <--;
+  [X | Y] Z <-- (rev Y W) (app W [X] Z);) 
+ 
+(defprolog enjoys
+  willi X <-- (likes mark X);
+  mark chocolate <--;
+  mark tea <--;) enjoys
+ 
+(defprolog fads
+  X <-- (findall Y [enjoys X Y] Friends) (return Friends);) fads
+    
+(defprolog prop
+  A C <-- (proph [[~  C] | A]);) prop
+
+(defprolog proph
+  A <-- (mem [~ P] A) (mem P A) !;
+       A <-- (consistent A) ! (when false);
+       (mode [[P & Q] | A] -) <-- ! (proph [P Q | A]);
+       (mode [[P <=> Q] | A] -) <-- ! (proph [[P => Q] [Q => P] | A]);
+       (mode [[P => Q] | A] -) <-- ! (proph [[[~ P] v Q] | A]);
+       (mode [[~ [P v Q]] | A] -)  <-- ! (proph [[~ P] [~ Q] | A]);
+       (mode [[~ [P & Q]] | A] -) <-- ! (proph [[[~ P] v [~ Q]] | A]);
+       (mode [[~ [P => Q]] | A] -) <-- ! (proph [P [~ Q] | A]);
+       (mode [[~ [P <=> Q]] | A] -) <-- ! (proph [[~ [[P => Q] v [~ [Q => P]]]] | A]);
+       (mode [[P & Q] | A] -) <-- !  (proph [P Q | A]);
+       (mode [[P v Q] | A] -) <-- !  (proph [P | A]) ! (proph [Q | A]);
+       (mode [P | Ps] -) <-- (app Ps [P] Qs) ! (proph Qs);) 
+
+      (defprolog consistent
+         [] <--;
+         [P | Ps] <-- (when (symbol? P)) ! (consistent Ps);
+         [[~ P] | Ps] <-- (when (symbol? P)) ! (consistent Ps);) 
+
+      (defprolog app
+         [] X X <--;
+         (mode [X | Y] -) W [X | Z] <-- (app Y W Z);) 
+
+      (defprolog mem
+         X (mode [X | _] -) <--;
+         X (mode [_ | Y] -) <-- (mem X Y);) 
+
+      (defprolog mapit
+         _  []  [] <--;
+         Pred [X | Y] [W | Z] <-- (call [Pred X W])  (mapit Pred Y Z);) 
+
+       (defprolog consit
+         X [1 X] <--;) 
+
+        (defprolog different
+          X Y <--  (~ [identical X Y]);) 
+
+        (defprolog ~
+          P <-- (call P) ! (when false);
+          _ <--;) 
+
+        (defprolog likes
+           john  X <-- (tall X)  (pretty X);) 
+
+        (defprolog tall
+           mary <--;) 
+
+        (defprolog pretty
            mary <--;)