Outsourced the syntax for labelled type definitions to macros.

2 files changed, 13 insertions, 10 deletions

diff --git a/lux-r/source/luxc/lang/synthesis/variable.lux b/lux-r/source/luxc/lang/synthesis/variable.lux
index 920c99057..fe599dfc7 100644
--- a/lux-r/source/luxc/lang/synthesis/variable.lux
+++ b/lux-r/source/luxc/lang/synthesis/variable.lux
@@ -14,7 +14,7 @@
     (list (.int register))
 
     (^or (#ls.SeqP pre post) (#ls.AltP pre post))
-    (list/compose (bound-vars pre) (bound-vars post))
+    (list/composite (bound-vars pre) (bound-vars post))
     
     _
     (list)))
@@ -29,7 +29,7 @@
     (path-bodies post)
 
     (#ls.AltP pre post)
-    (list/compose (path-bodies pre) (path-bodies post))
+    (list/composite (path-bodies pre) (path-bodies post))
     
     _
     (list)))
@@ -39,9 +39,12 @@
   (and (variableL.local? var)
        (n/> arity (.nat var))))
 
-(type: Tracker (s.Set Variable))
+(type: Tracker
+  (s.Set Variable))
 
-(def: init-tracker Tracker (s.new number.Hash<Int>))
+(def: init-tracker
+  Tracker
+  (s.new number.Hash<Int>))
 
 (def: (unused-vars current-arity bound exprS)
   (-> ls.Arity (List Variable) ls.Synthesis (List Variable))
diff --git a/lux-ruby/source/program.lux b/lux-ruby/source/program.lux
index f66262971..50253a545 100644
--- a/lux-ruby/source/program.lux
+++ b/lux-ruby/source/program.lux
@@ -137,12 +137,12 @@
   )
 
 (syntax: (method_inputs [input_classes (<code>.tuple (<>.some <code>.any))])
-  (monad.map meta.monad
-             (function (_ class)
-               (do meta.monad
-                 [var (macro.identifier "input")]
-                 (wrap (code.record (list [var class])))))
-             input_classes))
+  (monad.each meta.monad
+              (function (_ class)
+                (do meta.monad
+                  [var (macro.identifier "input")]
+                  (wrap (code.record (list [var class])))))
+              input_classes))
 
 (import: org/jruby/runtime/JavaSites$CheckedSites)
 (import: org/jruby/runtime/builtin/Variable)