aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/lux/data
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib/source/lux/data')
-rw-r--r--stdlib/source/lux/data/coll/ordered/dict.lux6
-rw-r--r--stdlib/source/lux/data/coll/ordered/set.lux6
-rw-r--r--stdlib/source/lux/data/coll/sequence.lux6
-rw-r--r--stdlib/source/lux/data/coll/stream.lux4
-rw-r--r--stdlib/source/lux/data/coll/tree/rose.lux6
-rw-r--r--stdlib/source/lux/data/coll/tree/zipper.lux6
-rw-r--r--stdlib/source/lux/data/format/json.lux10
-rw-r--r--stdlib/source/lux/data/lazy.lux6
-rw-r--r--stdlib/source/lux/data/number/complex.lux6
-rw-r--r--stdlib/source/lux/data/number/ratio.lux6
-rw-r--r--stdlib/source/lux/data/text/format.lux6
-rw-r--r--stdlib/source/lux/data/text/lexer.lux2
-rw-r--r--stdlib/source/lux/data/text/regex.lux14
13 files changed, 42 insertions, 42 deletions
diff --git a/stdlib/source/lux/data/coll/ordered/dict.lux b/stdlib/source/lux/data/coll/ordered/dict.lux
index 1151a018b..24b6b7c3b 100644
--- a/stdlib/source/lux/data/coll/ordered/dict.lux
+++ b/stdlib/source/lux/data/coll/ordered/dict.lux
@@ -6,9 +6,9 @@
(data (coll [list "L/" Monad<List> Monoid<List> Fold<List>])
["p" product]
[maybe])
- [meta]
- (meta [code]
- ["s" syntax #+ syntax: Syntax])))
+ [macro]
+ (macro [code]
+ ["s" syntax #+ syntax: Syntax])))
(def: error-message Text "Invariant violation")
diff --git a/stdlib/source/lux/data/coll/ordered/set.lux b/stdlib/source/lux/data/coll/ordered/set.lux
index 90026feab..376624033 100644
--- a/stdlib/source/lux/data/coll/ordered/set.lux
+++ b/stdlib/source/lux/data/coll/ordered/set.lux
@@ -7,9 +7,9 @@
(ordered ["d" dict]))
["p" product]
["M" maybe #+ Functor<Maybe>])
- [meta]
- (meta [code]
- ["s" syntax #+ syntax: Syntax])))
+ [macro]
+ (macro [code]
+ ["s" syntax #+ syntax: Syntax])))
(type: #export (Set a)
(d;Dict a a))
diff --git a/stdlib/source/lux/data/coll/sequence.lux b/stdlib/source/lux/data/coll/sequence.lux
index c76735d3c..f85558c5e 100644
--- a/stdlib/source/lux/data/coll/sequence.lux
+++ b/stdlib/source/lux/data/coll/sequence.lux
@@ -12,9 +12,9 @@
[array "array/" Functor<Array> Fold<Array>])
[bit]
[product])
- [meta #+ with-gensyms]
- (meta [code]
- ["s" syntax #+ syntax: Syntax])
+ [macro #+ with-gensyms]
+ (macro [code]
+ ["s" syntax #+ syntax: Syntax])
))
## [Utils]
diff --git a/stdlib/source/lux/data/coll/stream.lux b/stdlib/source/lux/data/coll/stream.lux
index 61e3b3e6c..43ed0087c 100644
--- a/stdlib/source/lux/data/coll/stream.lux
+++ b/stdlib/source/lux/data/coll/stream.lux
@@ -5,8 +5,8 @@
comonad
[cont #+ pending Cont]
["p" parser])
- [meta #+ with-gensyms]
- (meta ["s" syntax #+ syntax: Syntax])
+ [macro #+ with-gensyms]
+ (macro ["s" syntax #+ syntax: Syntax])
(data (coll [list "List/" Monad<List>])
bool)))
diff --git a/stdlib/source/lux/data/coll/tree/rose.lux b/stdlib/source/lux/data/coll/tree/rose.lux
index b07f1ed84..546982dba 100644
--- a/stdlib/source/lux/data/coll/tree/rose.lux
+++ b/stdlib/source/lux/data/coll/tree/rose.lux
@@ -6,9 +6,9 @@
["p" parser]
fold)
(data (coll [list "L/" Monad<List> Fold<List>]))
- [meta]
- (meta [code]
- ["s" syntax #+ syntax: Syntax])))
+ [macro]
+ (macro [code]
+ ["s" syntax #+ syntax: Syntax])))
## [Types]
(type: #export (Tree a)
diff --git a/stdlib/source/lux/data/coll/tree/zipper.lux b/stdlib/source/lux/data/coll/tree/zipper.lux
index ddab9d121..c8f9a9059 100644
--- a/stdlib/source/lux/data/coll/tree/zipper.lux
+++ b/stdlib/source/lux/data/coll/tree/zipper.lux
@@ -6,9 +6,9 @@
(tree [rose #+ Tree "T/" Functor<Tree>])
[stack #+ Stack])
[maybe "M/" Monad<Maybe>])
- [meta]
- (meta [code]
- ["s" syntax #+ syntax: Syntax])))
+ [macro]
+ (macro [code]
+ ["s" syntax #+ syntax: Syntax])))
## Adapted from the clojure.zip namespace in the Clojure standard library.
diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux
index ddc2b48cf..029d8dde7 100644
--- a/stdlib/source/lux/data/format/json.lux
+++ b/stdlib/source/lux/data/format/json.lux
@@ -17,10 +17,10 @@
(coll [list "list/" Fold<List> Monad<List>]
[sequence #+ Sequence sequence "sequence/" Monad<Sequence>]
[dict #+ Dict]))
- [meta #+ Monad<Meta> with-gensyms]
- (meta ["s" syntax #+ syntax:]
- [code]
- [poly #+ poly:])
+ [macro #+ Monad<Meta> with-gensyms]
+ (macro ["s" syntax #+ syntax:]
+ [code]
+ [poly #+ poly:])
(lang [type])
))
@@ -86,7 +86,7 @@
(wrap (` [(~ (code;text key-name)) (~ (wrapper value))]))
_
- (meta;fail "Wrong syntax for JSON object.")))
+ (macro;fail "Wrong syntax for JSON object.")))
pairs)]
(wrap (list (` (: JSON (#Object (dict;from-list text;Hash<Text> (list (~@ pairs')))))))))
diff --git a/stdlib/source/lux/data/lazy.lux b/stdlib/source/lux/data/lazy.lux
index 547418d51..e344c6a0a 100644
--- a/stdlib/source/lux/data/lazy.lux
+++ b/stdlib/source/lux/data/lazy.lux
@@ -5,8 +5,8 @@
["A" applicative]
monad)
(concurrency ["a" atom])
- [meta]
- (meta ["s" syntax #+ syntax:])
+ [macro]
+ (macro ["s" syntax #+ syntax:])
(type opaque)))
(opaque: #export (Lazy a)
@@ -31,7 +31,7 @@
(syntax: #export (freeze expr)
(do @
- [g!_ (meta;gensym "_")]
+ [g!_ (macro;gensym "_")]
(wrap (list (` (freeze' (function [(~ g!_)] (~ expr))))))))
(struct: #export _ (F;Functor Lazy)
diff --git a/stdlib/source/lux/data/number/complex.lux b/stdlib/source/lux/data/number/complex.lux
index 870474890..7fc8af1dd 100644
--- a/stdlib/source/lux/data/number/complex.lux
+++ b/stdlib/source/lux/data/number/complex.lux
@@ -12,9 +12,9 @@
["E" error]
[maybe]
(coll [list "L/" Monad<List>]))
- [meta]
- (meta [code]
- ["s" syntax #+ syntax: Syntax])))
+ [macro]
+ (macro [code]
+ ["s" syntax #+ syntax: Syntax])))
(type: #export Complex
{#real Frac
diff --git a/stdlib/source/lux/data/number/ratio.lux b/stdlib/source/lux/data/number/ratio.lux
index d14e5e1f1..f3f9a1196 100644
--- a/stdlib/source/lux/data/number/ratio.lux
+++ b/stdlib/source/lux/data/number/ratio.lux
@@ -13,9 +13,9 @@
["E" error]
[product]
[maybe])
- [meta]
- (meta [code]
- ["s" syntax #+ syntax: Syntax])))
+ [macro]
+ (macro [code]
+ ["s" syntax #+ syntax: Syntax])))
(type: #export Ratio
{#numerator Nat
diff --git a/stdlib/source/lux/data/text/format.lux b/stdlib/source/lux/data/text/format.lux
index 7fdd9f552..9f8d2b25f 100644
--- a/stdlib/source/lux/data/text/format.lux
+++ b/stdlib/source/lux/data/text/format.lux
@@ -12,9 +12,9 @@
(time [instant]
[duration]
[date])
- [meta]
- (meta [code]
- ["s" syntax #+ syntax: Syntax])
+ [macro]
+ (macro [code]
+ ["s" syntax #+ syntax: Syntax])
(lang [type])))
## [Syntax]
diff --git a/stdlib/source/lux/data/text/lexer.lux b/stdlib/source/lux/data/text/lexer.lux
index 9ae2bdd8f..5fc638354 100644
--- a/stdlib/source/lux/data/text/lexer.lux
+++ b/stdlib/source/lux/data/text/lexer.lux
@@ -7,7 +7,7 @@
[maybe]
["E" error]
(coll [list]))
- (meta [code])))
+ (macro [code])))
(type: Offset Nat)
diff --git a/stdlib/source/lux/data/text/regex.lux b/stdlib/source/lux/data/text/regex.lux
index bcefa4331..07e2a6ea4 100644
--- a/stdlib/source/lux/data/text/regex.lux
+++ b/stdlib/source/lux/data/text/regex.lux
@@ -10,9 +10,9 @@
["E" error]
[maybe]
(coll [list "L/" Fold<List> Monad<List>]))
- [meta #- run]
- (meta [code]
- ["s" syntax #+ syntax:])))
+ [macro #- run]
+ (macro [code]
+ ["s" syntax #+ syntax:])))
## [Utils]
(def: regex-char^
@@ -458,13 +458,13 @@
(regex "a(.)(.)|b(.)(.)")
)}
(do @
- [current-module meta;current-module-name]
+ [current-module macro;current-module-name]
(case (|> (regex^ current-module)
(p;before l;end)
(l;run pattern))
(#E;Error error)
- (meta;fail (format "Error while parsing regular-expression:\n"
- error))
+ (macro;fail (format "Error while parsing regular-expression:\n"
+ error))
(#E;Success regex)
(wrap (list regex))
@@ -485,7 +485,7 @@
_
do-something-else))}
(do @
- [g!temp (meta;gensym "temp")]
+ [g!temp (macro;gensym "temp")]
(wrap (list& (` (^multi (~ g!temp)
[(l;run (~ g!temp) (regex (~ (code;text pattern))))
(#E;Success (~ (maybe;default g!temp