Commit: 7e1613d9838bdb57c0a2349e5e4b7363238a3ecf - cammy (git)

A categorical programming language

Commit MetaInfo

• Revision: 7e1613d9838bdb57c0a2349e5e4b7363238a3ecf (tree)
• Time: 2023-02-16 16:12:46
• Author: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

Add more floating-point operations.

Some NaNs are showing up. I wonder how I should deal with them...

Change Summary

• modified: movelist/cammy.scm

Incremental Difference

--- a/movelist/cammy.scm
+++ b/movelist/cammy.scm
@@ -2,6 +2,8 @@
   (import scheme
           matchable)
 
+  (define (cammy-compile-bin op) (lambda (p) (op (car p) (cdr p))))
+
   (define cammy-compile-aux
     (match-lambda
       ['id (lambda (x) x)]
@@ -17,15 +19,23 @@
         (match-lambda [`(left ,x) (f x)] [`(right ,x) (g x)])]
       ['t (lambda (_) #t)] ['f (lambda (_) #f)]
       ['not not]
+      ['conj (lambda (x) (and (car x) (cdr x)))]
+      ['disj (lambda (x) (or (car x) (cdr x)))]
       ['either (lambda (x) (if x '(left *) '(right *)))]
       ['zero (lambda (_) 0)]
       ['succ (lambda (n) (+ n 1))]
+      ['n-add (cammy-compile-bin +)]
       [`(pr ,f ,g)
         (lambda (x)
           (let loop ((n x) (acc (f '*)))
             (if (= n 0) acc (loop (- n 1) (g acc)))))]
       ['f-zero (lambda (_) 0.0)]
       ['f-one (lambda (_) 1.0)]
+      ['f-negate (lambda (f) (- 0.0 f))]
+      ['f-sin sin] ['f-cos cos]
+      ['f-add (cammy-compile-bin +)]
+      ['f-mul (cammy-compile-bin *)]
+      ['f-lt (cammy-compile-bin <)]
       ))
 
   (define (cammy-compile expr)