shen-ruby 0.10.0 → 0.11.0

data/shen/release/test_programs/README.shen

@@ -1,53 +1,53 @@
-\* 
-
-This is the test harness for Shen.  Assuming your port to Blub is in the directory Platforms/Blub; do the
-following.
-
-(cd "../../Test Programs")
-(load "README.shen")
-(load "tests.shen")
-
-  *\
-
-(package test-harness [report reset ok passed failed]
-
-(define reset
-  -> (set *passed* (set *failed* 0)))
-
-(defmacro exec-macro
-  [exec Name Expr Prediction] -> [trap-error [let (protect Output) [output "~%~A: ~R = ~S" Name (rcons Expr) Prediction]
-                                                  (protect Result) [time Expr]
-                                                  [if [= (protect Result) Prediction] [passed] [failed (protect Result)]]] 
-                                                      [/. (protect E) [err (protect E)]]])
-                                              
-(define rcons
-  [X | Y] -> [cons (rcons X) (rcons Y)] 
-  X -> X)                                             
-                                              
-(define passed
-  -> (do (trap-error (set *passed* (+ 1 (value *passed*))) (/. E (set *passed* 1)))
-          (print passed)))
-          
-(define failed
-  Result -> (let Fail+ (trap-error (set *failed* (+ 1 (value *failed*))) (/. E (set *failed* 1)))
-                 ShowResult (output "~S returned~%" Result)
-                 (if (y-or-n? "failed; continue?") ok (error "kill"))))  
-
-(define err
-  E -> (error "")  where (= (error-to-string E) "kill")
-  E -> (do (trap-error (set *failed* (+ 1 (value *failed*))) (/. E (set *failed* 1)))
-           (output "~%failed with error ~A~%" (error-to-string E))))
-
-(defmacro report-results-macro
-  [report Name | Tests] -> (let NewTests (create-tests Name Tests)
-                                         [do | NewTests]))
-                                         
-(define create-tests
-  Name [] -> [[results] ok]  
-  Name [Test Prediction | Tests] -> [[exec Name Test Prediction] | (create-tests Name Tests)])                 
-                                         
-(define results
-  -> (let Passed (trap-error (value *passed*) (/. E 0))
-          Failed (trap-error (value *failed*) (/. E 0))
-          Percent (* (/ Passed (+ Passed Failed)) 100)
+\* 
+
+This is the test harness for Shen.  Assuming your port to Blub is in the directory Platforms/Blub; do the
+following.
+
+(cd "../../Test Programs")
+(load "README.shen")
+(load "tests.shen")
+
+  *\
+
+(package test-harness [report reset ok passed failed]
+
+(define reset
+  -> (set *passed* (set *failed* 0)))
+
+(defmacro exec-macro
+  [exec Name Expr Prediction] -> [trap-error [let (protect Output) [output "~%~A: ~R = ~S" Name (rcons Expr) Prediction]
+                                                  (protect Result) [time Expr]
+                                                  [if [= (protect Result) Prediction] [passed] [failed (protect Result)]]] 
+                                                      [/. (protect E) [err (protect E)]]])
+                                              
+(define rcons
+  [X | Y] -> [cons (rcons X) (rcons Y)] 
+  X -> X)                                             
+                                              
+(define passed
+  -> (do (trap-error (set *passed* (+ 1 (value *passed*))) (/. E (set *passed* 1)))
+          (print passed)))
+          
+(define failed
+  Result -> (let Fail+ (trap-error (set *failed* (+ 1 (value *failed*))) (/. E (set *failed* 1)))
+                 ShowResult (output "~S returned~%" Result)
+                 (if (y-or-n? "failed; continue?") ok (error "kill"))))  
+
+(define err
+  E -> (error "")  where (= (error-to-string E) "kill")
+  E -> (do (trap-error (set *failed* (+ 1 (value *failed*))) (/. E (set *failed* 1)))
+           (output "~%failed with error ~A~%" (error-to-string E))))
+
+(defmacro report-results-macro
+  [report Name | Tests] -> (let NewTests (create-tests Name Tests)
+                                         [do | NewTests]))
+                                         
+(define create-tests
+  Name [] -> [[results] ok]  
+  Name [Test Prediction | Tests] -> [[exec Name Test Prediction] | (create-tests Name Tests)])                 
+                                         
+(define results
+  -> (let Passed (trap-error (value *passed*) (/. E 0))
+          Failed (trap-error (value *failed*) (/. E 0))
+          Percent (* (/ Passed (+ Passed Failed)) 100)
           (output "~%passed ... ~A~%failed ...~A~%pass rate ...~A%~%~%" Passed Failed Percent)))     )

data/shen/release/test_programs/TinyLispFunctions.txt

@@ -1,16 +1,16 @@
-(defun plus (x y)
-  (lispif (equal x 0) 
-           y
-           (plus (prec x) (succ y))))
-
-(defun member (x y)
-   (lispif (equal y (empty!)) 
-           (empty!)
-           (lispif (equal x (car y)) 
-                   y
-                   (member x (cdr y)))))
-
-(defun join (x y)
-   (lispif (equal x (empty!))
-            y
+(defun plus (x y)
+  (lispif (equal x 0) 
+           y
+           (plus (prec x) (succ y))))
+
+(defun member (x y)
+   (lispif (equal y (empty!)) 
+           (empty!)
+           (lispif (equal x (car y)) 
+                   y
+                   (member x (cdr y)))))
+
+(defun join (x y)
+   (lispif (equal x (empty!))
+            y
             (lispcons (car x) (join (cdr x) y))))

data/shen/release/test_programs/TinyTypes.shen

@@ -1,55 +1,55 @@
-(specialise defun)
-(specialise lambda')
-
-(datatype tiny_lisp_type_theory
-
-  let Lambda (mk_lambda Xs Body)
-  F : A >> Lambda : A;
-  __________________
-  (defun F Xs Body) : A;
-
-  let X* (gensym &&x)
-  let Y* (subst X* X Y)
-  X* : A >> Y* : B;
-  _____________________
-  (lambda' (X) Y) : (A --> B);
-
-  F : (A --> B); X : A;
-  ________________
-  (F X) : B;
-
-  ____________________________
-  lispif : (bool --> (A --> (A --> A)));
-
-  ________________________
-  equal : (A --> (A --> bool));
-
-  ___________________________
-  lispcons : (A --> ((list A) --> (list A)));
-
-  ______________
-  car : ((list A) --> A);
-
-  _______________
-  cdr : ((list A) --> (list A));
-
-  if (element? F [succ prec])
-  ____________________
-  F : (number --> number);
-
-  ___________
-  (tee!) : bool;
-
-  ____________
-  (empty!) : (list A);
-
-  ________
-  (empty!) : bool;
-
-  if (symbol? X)
-  ____________
-  (quote X) : symbol;)
-
-(define mk_lambda
-   [X] Body -> [lambda' [X] Body]
-   [X | Y] Body -> [lambda' [X] (mk_lambda Y Body)])
+(specialise defun)
+(specialise lambda')
+
+(datatype tiny_lisp_type_theory
+
+  let Lambda (mk_lambda Xs Body)
+  F : A >> Lambda : A;
+  __________________
+  (defun F Xs Body) : A;
+
+  let X* (gensym &&x)
+  let Y* (subst X* X Y)
+  X* : A >> Y* : B;
+  _____________________
+  (lambda' (X) Y) : (A --> B);
+
+  F : (A --> B); X : A;
+  ________________
+  (F X) : B;
+
+  ____________________________
+  lispif : (bool --> (A --> (A --> A)));
+
+  ________________________
+  equal : (A --> (A --> bool));
+
+  ___________________________
+  lispcons : (A --> ((list A) --> (list A)));
+
+  ______________
+  car : ((list A) --> A);
+
+  _______________
+  cdr : ((list A) --> (list A));
+
+  if (element? F [succ prec])
+  ____________________
+  F : (number --> number);
+
+  ___________
+  (tee!) : bool;
+
+  ____________
+  (empty!) : (list A);
+
+  ________
+  (empty!) : bool;
+
+  if (symbol? X)
+  ____________
+  (quote X) : symbol;)
+
+(define mk_lambda
+   [X] Body -> [lambda' [X] Body]
+   [X | Y] Body -> [lambda' [X] (mk_lambda Y Body)])

data/shen/release/test_programs/binary.shen

@@ -1,24 +1,24 @@
-(datatype binary
-
-if (element? X [0 1])
-_____________
-X : zero-or-one;
-
-X : zero-or-one;
-________________
-[X] : binary;
-
-X : zero-or-one; Y : binary;
-____________________________
-[X | Y] : binary;
-
-X : zero-or-one, [Y | Z] : binary >> P;
-________________________________________
-[X Y | Z] : binary >> P;)
-
-(define complement
-   {binary --> binary}
-   [0] -> [1] 
-   [1] -> [0]      
-   [1 N | X] -> [0 | (complement [N | X])] 
-   [0 N | X] -> [1 | (complement [N | X])]) 
+(datatype binary
+
+if (element? X [0 1])
+_____________
+X : zero-or-one;
+
+X : zero-or-one;
+________________
+[X] : binary;
+
+X : zero-or-one; Y : binary;
+____________________________
+[X | Y] : binary;
+
+X : zero-or-one, [Y | Z] : binary >> P;
+________________________________________
+[X Y | Z] : binary >> P;)
+
+(define complement
+   {binary --> binary}
+   [0] -> [1] 
+   [1] -> [0]      
+   [1 N | X] -> [0 | (complement [N | X])] 
+   [0 N | X] -> [1 | (complement [N | X])]) 

data/shen/release/test_programs/bubble_version_1.shen

@@ -1,28 +1,28 @@
-(define bubble-sort 
-  \* bubble again if you need to *\  
-  X -> (bubble-again-perhaps (bubble X) X))
-
-(define bubble 
-  [] -> []  
-  [X] -> [X]  
-  [X Y | Z] -> [Y | (bubble [X | Z])]   where    (> Y X)
-  [X Y | Z] -> [X | (bubble [Y | Z])])
-
-(define bubble-again-perhaps  
-   \* no change as a result of bubbling - then the job is done *\  
-   X X -> X  
-  \* else bubble again *\  
-   X _ -> (bubble-sort X))
-
-
-
-
-
-
-
-
-
-
-
- 
-
+(define bubble-sort 
+  \* bubble again if you need to *\  
+  X -> (bubble-again-perhaps (bubble X) X))
+
+(define bubble 
+  [] -> []  
+  [X] -> [X]  
+  [X Y | Z] -> [Y | (bubble [X | Z])]   where    (> Y X)
+  [X Y | Z] -> [X | (bubble [Y | Z])])
+
+(define bubble-again-perhaps  
+   \* no change as a result of bubbling - then the job is done *\  
+   X X -> X  
+  \* else bubble again *\  
+   X _ -> (bubble-sort X))
+
+
+
+
+
+
+
+
+
+
+
+ 
+

data/shen/release/test_programs/bubble_version_2.shen

@@ -1,22 +1,22 @@
-(define bubble-sort 
-  X -> (fix bubble X)) 
-
-(define bubble 
-  [] -> []  
-  [X] -> [X]  
-  [X Y | Z] -> [Y | (bubble [X | Z])]   where    (> Y X)
-  [X Y | Z] -> [X | (bubble [Y | Z])])
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
+(define bubble-sort 
+  X -> (fix bubble X)) 
+
+(define bubble 
+  [] -> []  
+  [X] -> [X]  
+  [X Y | Z] -> [Y | (bubble [X | Z])]   where    (> Y X)
+  [X Y | Z] -> [X | (bubble [Y | Z])])
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+

data/shen/release/test_programs/calculator.shen

@@ -1,21 +1,21 @@
-(datatype arith-expr
-
-    X : number;
-    ====================
-    [num X] : arith-expr; 
-
-    if (element? Op [+ - * /])
-    X : arith-expr; Y : arith-expr;
-    ===============================
-    [X Op Y] : arith-expr;)
-
-(define do-calculation
-  {arith-expr --> number}
-  [X + Y] -> (+ (do-calculation X) (do-calculation Y))
-  [X - Y] -> (- (do-calculation X) (do-calculation Y))
-  [X * Y] -> (* (do-calculation X) (do-calculation Y))
-  [X / Y] -> (/ (do-calculation X) (do-calculation Y))
-  [num X] -> X)
-
-
-
+(datatype arith-expr
+
+    X : number;
+    ====================
+    [num X] : arith-expr; 
+
+    if (element? Op [+ - * /])
+    X : arith-expr; Y : arith-expr;
+    ===============================
+    [X Op Y] : arith-expr;)
+
+(define do-calculation
+  {arith-expr --> number}
+  [X + Y] -> (+ (do-calculation X) (do-calculation Y))
+  [X - Y] -> (- (do-calculation X) (do-calculation Y))
+  [X * Y] -> (* (do-calculation X) (do-calculation Y))
+  [X / Y] -> (/ (do-calculation X) (do-calculation Y))
+  [num X] -> X)
+
+
+

data/shen/release/test_programs/cartprod.shen

@@ -1,23 +1,23 @@
-(define cartesian-product 
-   [ ] _ -> [ ]  
-   [X | Y] Z -> (append (all-pairs-using-X X Z) (cartesian-product Y Z)))
-
-(define all-pairs-using-X 
-   _ [ ] -> [ ] 
-   X [Y | Z] -> [[X Y] | (all-pairs-using-X X Z)]) 
-   
-
-   
-    
-      
-    
-      
-
-
-
-
-
-
-
- 
-
+(define cartesian-product 
+   [ ] _ -> [ ]  
+   [X | Y] Z -> (append (all-pairs-using-X X Z) (cartesian-product Y Z)))
+
+(define all-pairs-using-X 
+   _ [ ] -> [ ] 
+   X [Y | Z] -> [[X Y] | (all-pairs-using-X X Z)]) 
+   
+
+   
+    
+      
+    
+      
+
+
+
+
+
+
+
+ 
+