- Modified the compiler so parser syntax tokens are stored in the same format as lux data-structures, to ease communication between the compiler & macros.

1 files changed, 4 insertions, 6 deletions

diff --git a/source/lux.lux b/source/lux.lux
index b400e0da8..76ea2dc4c 100644
--- a/source/lux.lux
+++ b/source/lux.lux
@@ -333,9 +333,7 @@
                              init
                              args)))))
 
-(def complement (. not))
-
-(def (constant x)
+(def (const x)
   (lambda [_] x))
 
 (def (int> x y)
@@ -574,15 +572,15 @@
   (let [output (case' tokens
                       (#Cons [tag (#Cons [func (#Cons [record #Nil])])])
                       (` (let [_record_ (~ record)]
-                           (set@' (~ tag) _record_ ((~ func) (get@' (~ tag) _record_)))))
+                           (set@' (~ tag) ((~ func) (get@' (~ tag) _record_)) _record_)))
 
                       (#Cons [tag (#Cons [func #Nil])])
                       (` (lambda [record]
-                           (` (set@' (~ tag) record ((~ func) (get@' (~ tag) record))))))
+                           (` (set@' (~ tag) ((~ func) (get@' (~ tag) record)) record))))
 
                       (#Cons [tag #Nil])
                       (` (lambda [func record]
-                           (set@' (~ tag) record (func (get@' (~ tag) record))))))]
+                           (set@' (~ tag) (func (get@' (~ tag) record)) record))))]
     (return (list output))))
 
 (def (show-int int)