Reducer Changes for Modulo

Adds modulo reductions.
anoma · Oct 9, 2023 · b1ce8e9 · b1ce8e9
1 parent f9b0b89
commit b1ce8e9
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/lambda/lambda.lisp b/src/lambda/lambda.lisp
@@ -391,7 +391,8 @@ nil"))
     (divide #'divide)
     (times #'times)
     (lamb-eq #'lamb-eq)
-    (lamb-lt #'lamb-lt)))
+    (lamb-lt #'lamb-lt)
+    (modulo  #'modulo)))
 
 (defun dispatch-arith (tterm)
   "A dispatch refering the class of an arithmetic term
@@ -402,7 +403,8 @@ to its corresponding operation"
     (divide #'floor)
     (times #'*)
     (lamb-eq #'=)
-    (lamb-lt #'<)))
+    (lamb-lt #'<)
+    (modulo #'mod)))
 
 (defun index-excess (tterm)
   "Checks all indeces occuring in a term which will be substituted.
@@ -438,7 +440,8 @@ beta-substitution of indices which point outside of the app term"
                     divide
                     lamb-eq
                     lamb-lt
-                    pair)
+                    pair
+                    modulo)
                 (funcall (dispatch tterm)
                          (rec n (ltm tterm))
                          (rec n (rtm tterm)))))))
@@ -479,7 +482,8 @@ of term accordingly"
                         divide
                         lamb-eq
                         lamb-lt
-                        pair)
+                        pair
+                        modulo)
                     (funcall (dispatch tterm)
                              (rec n (ltm tterm))
                              (rec n (rtm tterm))))))))
@@ -518,7 +522,8 @@ of the list."
                         divide
                         lamb-eq
                         lamb-lt
-                        pair)
+                        pair
+                        modulo)
                     (funcall (dispatch tterm)
                              (rec (ltm tterm))
                              (rec (rtm tterm))))))))
@@ -572,7 +577,8 @@ listing them"
          divide
          lamb-eq
          lamb-lt
-         pair)
+         pair
+         modulo)
      (funcall (dispatch sub-in)
               (sub ind term-to-replace (ltm sub-in))
               (sub ind term-to-replace (rtm sub-in))))))
@@ -668,7 +674,8 @@ lambda and app terms are  1-argument"
                ((or plus
                     times
                     minus
-                    divide)
+                    divide
+                    modulo)
                 (let ((ltm (ltm tterm))
                       (rtm (rtm tterm)))
                   (if (and (typep ltm 'bit-choice)