From 35eed84741377236d0c69bc5ceb7a47af09e1e67 Mon Sep 17 00:00:00 2001
From: Scott Richmond <s.richmond@utoronto.ca>
Date: Fri, 26 May 2023 15:24:10 -0400
Subject: [PATCH] Constraint -> guard

---
 src/ludus/interpreter.clj | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/ludus/interpreter.clj b/src/ludus/interpreter.clj
index 2e46db3..1f97e76 100644
--- a/src/ludus/interpreter.clj
+++ b/src/ludus/interpreter.clj
@@ -261,17 +261,17 @@
       (if clause
         (let [clause-data (:data clause)
               pattern (first clause-data)
-              constraint (if (= 3 (count clause-data))
-                           (second clause-data)
-                           nil)
+              guard (if (= 3 (count clause-data))
+                      (second clause-data)
+                      nil)
               body (peek clause-data)
               new-ctx (volatile! {::parent ctx})
               match? (match pattern value new-ctx)
               success (:success match?)
               clause-ctx (:ctx match?)]
           (if success
-            (if constraint 
-              (if (interpret-ast constraint (volatile! clause-ctx))
+            (if guard 
+              (if (interpret-ast guard (volatile! clause-ctx))
                 (do
                   (vswap! new-ctx #(merge % clause-ctx))
                   (interpret-ast body new-ctx))
@@ -350,9 +350,9 @@
         ;(println "With args " args)
         (if clause
           (let [pattern (first clause)
-                constraint (if (= 3 (count clause))
-                             (second clause)
-                             nil)
+                guard (if (= 3 (count clause))
+                        (second clause)
+                        nil)
                 body (peek clause)
                 fn-ctx (volatile! {::parent closed-over})
                 match? (match pattern args fn-ctx)
@@ -362,13 +362,13 @@
             ;(println "Pattern: " pattern)
             ;(println "Body: " body)
             (if success
-              (if constraint 
+              (if guard 
                 (if (do
-                      ;(println "######### Testing constraint")
+                      ;(println "######### Testing guard")
                       ;(println "Context: " clause-ctx)
-                      (interpret-ast constraint vclause))
+                      (interpret-ast guard vclause))
                   (do
-                    ;(println "passed constraint")
+                    ;(println "passed guard")
                     (vswap! fn-ctx #(merge % clause-ctx))
                     (interpret-ast body fn-ctx))
                   (recur (first clauses) (rest clauses)))
@@ -541,17 +541,17 @@
                           clauses (rest clauses)]
                      (if clause
                        (let [pattern (first clause)
-                             constraint (if (= 3 (count clause))
-                                          (second clause)
-                                          nil)
+                             guard (if (= 3 (count clause))
+                                     (second clause)
+                                     nil)
                              body (peek clause)
                              new-ctx (volatile! {::parent ctx})
                              match? (match pattern input new-ctx)
                              success (:success match?)
                              clause-ctx (:ctx match?)]
                          (if success
-                           (if constraint 
-                             (if (interpret-ast constraint (volatile! (assoc clause-ctx ::parent ctx)))
+                           (if guard 
+                             (if (interpret-ast guard (volatile! (assoc clause-ctx ::parent ctx)))
                                (do
                                  (vswap! new-ctx #(merge % clause-ctx))
                                  (interpret-ast body new-ctx))