aboutsummaryrefslogtreecommitdiff
path: root/new-luxc/source/luxc/generator/procedure
diff options
context:
space:
mode:
authorEduardo Julian2017-10-18 12:42:46 -0400
committerEduardo Julian2017-10-18 12:42:46 -0400
commit901b09dada43ec6f3b21618800ec7400fda54a0d (patch)
treed62dde3df2ce4fd7d7cd8d0b177f6592f87817cb /new-luxc/source/luxc/generator/procedure
parent14e381de130f0c8d3e333cf0523c6c98b9aa84b1 (diff)
- Updated to the latest changes in stdlib.
Diffstat (limited to 'new-luxc/source/luxc/generator/procedure')
-rw-r--r--new-luxc/source/luxc/generator/procedure/common.jvm.lux16
-rw-r--r--new-luxc/source/luxc/generator/procedure/host.jvm.lux24
2 files changed, 20 insertions, 20 deletions
diff --git a/new-luxc/source/luxc/generator/procedure/common.jvm.lux b/new-luxc/source/luxc/generator/procedure/common.jvm.lux
index e3a46a9ea..48a820663 100644
--- a/new-luxc/source/luxc/generator/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/generator/procedure/common.jvm.lux
@@ -5,9 +5,9 @@
text/format
(coll [list "list/" Functor<List>]
[dict #+ Dict]))
- [macro #+ with-gensyms]
- (macro [code]
- ["s" syntax #+ syntax:])
+ [meta #+ with-gensyms]
+ (meta [code]
+ ["s" syntax #+ syntax:])
[host])
(luxc ["&" base]
(lang ["la" analysis]
@@ -35,10 +35,10 @@
## [Types]
(type: #export Generator
- (-> ls;Synthesis (Lux $;Inst)))
+ (-> ls;Synthesis (Meta $;Inst)))
(type: #export Proc
- (-> Generator (List ls;Synthesis) (Lux $;Inst)))
+ (-> Generator (List ls;Synthesis) (Meta $;Inst)))
(type: #export Bundle
(Dict Text Proc))
@@ -79,7 +79,7 @@
(syntax: (arity: [name s;local-symbol] [arity s;nat])
(with-gensyms [g!proc g!name g!generate g!inputs]
(do @
- [g!input+ (monad;seq @ (list;repeat arity (macro;gensym "input")))]
+ [g!input+ (monad;seq @ (list;repeat arity (meta;gensym "input")))]
(wrap (list (` (def: #export ((~ (code;local-symbol name)) (~ g!proc))
(-> (-> (;;Vector (~ (code;nat arity)) $;Inst) $;Inst)
(-> Text ;;Proc))
@@ -87,7 +87,7 @@
(function [(~ g!generate) (~ g!inputs)]
(case (~ g!inputs)
(^ (list (~@ g!input+)))
- (do macro;Monad<Lux>
+ (do meta;Monad<Meta>
[(~@ (|> g!input+
(list/map (function [g!input]
(list g!input (` ((~ g!generate) (~ g!input))))))
@@ -95,7 +95,7 @@
((~' wrap) ((~ g!proc) [(~@ g!input+)])))
(~' _)
- (macro;fail (wrong-arity (~ g!name) +1 (list;size (~ g!inputs))))))))))))))
+ (meta;fail (wrong-arity (~ g!name) +1 (list;size (~ g!inputs))))))))))))))
(arity: nullary +0)
(arity: unary +1)
diff --git a/new-luxc/source/luxc/generator/procedure/host.jvm.lux b/new-luxc/source/luxc/generator/procedure/host.jvm.lux
index d99694554..f754422c3 100644
--- a/new-luxc/source/luxc/generator/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/generator/procedure/host.jvm.lux
@@ -5,9 +5,9 @@
text/format
(coll [list "list/" Functor<List>]
[dict #+ Dict]))
- [macro #+ with-gensyms]
- (macro [code]
- ["s" syntax #+ syntax:])
+ [meta #+ with-gensyms]
+ (meta [code]
+ ["s" syntax #+ syntax:])
[host])
(luxc ["&" base]
(lang ["la" analysis]
@@ -273,7 +273,7 @@
(-> Text @;Proc)
(case inputs
(^ (list (#ls;Nat level) (#ls;Text class) lengthS))
- (do macro;Monad<Lux>
+ (do meta;Monad<Meta>
[lengthI (generate lengthS)
#let [arrayJT ($t;array level (case class
"boolean" $t;boolean
@@ -297,7 +297,7 @@
(-> Text @;Proc)
(case inputs
(^ (list (#ls;Text class) idxS arrayS))
- (do macro;Monad<Lux>
+ (do meta;Monad<Meta>
[arrayI (generate arrayS)
idxI (generate idxS)
#let [loadI (case class
@@ -323,7 +323,7 @@
(-> Text @;Proc)
(case inputs
(^ (list (#ls;Text class) idxS valueS arrayS))
- (do macro;Monad<Lux>
+ (do meta;Monad<Meta>
[arrayI (generate arrayS)
idxI (generate idxS)
valueI (generate valueS)
@@ -392,7 +392,7 @@
(-> Text @;Proc)
(case inputs
(^ (list (#ls;Text class)))
- (do macro;Monad<Lux>
+ (do meta;Monad<Meta>
[]
(wrap (|>. ($i;string class)
($i;INVOKESTATIC "java.lang.Class" "forName"
@@ -408,7 +408,7 @@
(-> Text @;Proc)
(case inputs
(^ (list (#ls;Text class) objectS))
- (do macro;Monad<Lux>
+ (do meta;Monad<Meta>
[objectI (generate objectS)]
(wrap (|>. objectI
($i;INSTANCEOF class)
@@ -445,7 +445,7 @@
(-> Text @;Proc)
(case inputs
(^ (list (#ls;Text class) (#ls;Text field) (#ls;Text unboxed)))
- (do macro;Monad<Lux>
+ (do meta;Monad<Meta>
[]
(case (dict;get unboxed primitives)
(#;Some primitive)
@@ -472,7 +472,7 @@
(-> Text @;Proc)
(case inputs
(^ (list (#ls;Text class) (#ls;Text field) (#ls;Text unboxed) valueS))
- (do macro;Monad<Lux>
+ (do meta;Monad<Meta>
[valueI (generate valueS)]
(case (dict;get unboxed primitives)
(#;Some primitive)
@@ -504,7 +504,7 @@
(-> Text @;Proc)
(case inputs
(^ (list (#ls;Text class) (#ls;Text field) (#ls;Text unboxed) objectS))
- (do macro;Monad<Lux>
+ (do meta;Monad<Meta>
[objectI (generate objectS)]
(case (dict;get unboxed primitives)
(#;Some primitive)
@@ -535,7 +535,7 @@
(-> Text @;Proc)
(case inputs
(^ (list (#ls;Text class) (#ls;Text field) (#ls;Text unboxed) valueS objectS))
- (do macro;Monad<Lux>
+ (do meta;Monad<Meta>
[valueI (generate valueS)
objectI (generate objectS)]
(case (dict;get unboxed primitives)