From f92c4dc2f813b40f14d240491daa665942165e7e Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 2 Dec 2017 01:06:34 -0400
Subject: - Adjusted new-luxc to new macro-templating syntax.

---
 new-luxc/source/luxc/lang/synthesis/expression.lux | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'new-luxc/source/luxc/lang/synthesis/expression.lux')

diff --git a/new-luxc/source/luxc/lang/synthesis/expression.lux b/new-luxc/source/luxc/lang/synthesis/expression.lux
index d3fbfcb58..b31a146a1 100644
--- a/new-luxc/source/luxc/lang/synthesis/expression.lux
+++ b/new-luxc/source/luxc/lang/synthesis/expression.lux
@@ -40,7 +40,7 @@
 (def: (function$ arity environment body)
   (-> ls.Arity (List Variable) ls.Synthesis ls.Synthesis)
   (` ("lux function" (~ (code.nat arity))
-      [(~@ (list/map code.int environment))]
+      [(~+ (list/map code.int environment))]
       (~ body))))
 
 (def: (variant$ tag last? valueS)
@@ -53,11 +53,11 @@
 
 (def: (procedure$ name argsS)
   (-> Text (List ls.Synthesis) ls.Synthesis)
-  (` ((~ (code.text name)) (~@ argsS))))
+  (` ((~ (code.text name)) (~+ argsS))))
 
 (def: (call$ funcS argsS)
   (-> ls.Synthesis (List ls.Synthesis) ls.Synthesis)
-  (` ("lux call" (~ funcS) (~@ argsS))))
+  (` ("lux call" (~ funcS) (~+ argsS))))
 
 (def: (synthesize-case arity num-locals synthesize inputA branchesA)
   (-> ls.Arity Nat (-> Nat la.Analysis ls.Synthesis)
@@ -100,14 +100,14 @@
         funcS (synthesize funcA)
         argsS (list/map synthesize argsA)]
     (case funcS
-      (^multi (^code ("lux function" (~ [_ (#.Nat _arity)]) [(~@ _env)] (~ _bodyS)))
+      (^multi (^code ("lux function" (~ [_ (#.Nat _arity)]) [(~+ _env)] (~ _bodyS)))
               (and (n/= _arity (list.size argsS))
                    (not (loopS.contains-self-reference? _bodyS)))
               [(s.run _env (p.some s.int)) (#e.Success _env)])
-      (` ("lux loop" (~ (code.nat (n/inc num-locals))) [(~@ argsS)]
+      (` ("lux loop" (~ (code.nat (n/inc num-locals))) [(~+ argsS)]
           (~ (loopS.adjust _env num-locals _bodyS))))
 
-      (^code ("lux call" (~ funcS') (~@ argsS')))
+      (^code ("lux call" (~ funcS') (~+ argsS')))
       (call$ funcS' (list/compose argsS' argsS))
 
       _
@@ -122,7 +122,7 @@
          expressionA expressionA]
     (case expressionA
       (^code [(~ _left) (~ _right)])
-      (` [(~@ (list/map (recur arity resolver false num-locals)
+      (` [(~+ (list/map (recur arity resolver false num-locals)
                         (la.unfold-tuple expressionA)))])
 
       (^or (^code ("lux sum left" (~ _)))
@@ -143,7 +143,7 @@
       (^code ("lux case" (~ inputA) (~ [_ (#.Record branchesA)])))
       (synthesize-case arity num-locals (recur arity resolver false) inputA branchesA)
 
-      (^multi (^code ("lux function" [(~@ scope)] (~ bodyA)))
+      (^multi (^code ("lux function" [(~+ scope)] (~ bodyA)))
               [(s.run scope (p.some s.int)) (#e.Success raw-env)])
       (let [function-arity (if direct?
                              (n/inc arity)
@@ -186,10 +186,10 @@
           bodyS
           (function$ +1 env (prepare-body function-arity +1 bodyS))))
 
-      (^code ("lux apply" (~@ _)))
+      (^code ("lux apply" (~+ _)))
       (synthesize-apply (recur arity resolver false num-locals) num-locals expressionA)
 
-      (^code ((~ [_ (#.Text name)]) (~@ args)))
+      (^code ((~ [_ (#.Text name)]) (~+ args)))
       (procedure$ name (list/map (recur arity resolver false num-locals) args))
 
       _
-- 
cgit v1.2.3