aboutsummaryrefslogtreecommitdiff
path: root/stdlib/test
diff options
context:
space:
mode:
authorEduardo Julian2017-11-15 23:22:30 -0400
committerEduardo Julian2017-11-15 23:22:30 -0400
commit190b512a822fefbb9c66271feb189cc6ccebaf85 (patch)
tree6d317f54649be741c67e03c71a8b6006b83f00ec /stdlib/test
parentf11c10f72d003555d76c9803954e2bd8b347362d (diff)
- Re-named "lux/meta" to to "lux/macro".
Diffstat (limited to 'stdlib/test')
-rw-r--r--stdlib/test/test/lux.lux4
-rw-r--r--stdlib/test/test/lux/control/parser.lux6
-rw-r--r--stdlib/test/test/lux/data/format/json.lux46
-rw-r--r--stdlib/test/test/lux/data/text/regex.lux6
-rw-r--r--stdlib/test/test/lux/lang/syntax.lux2
-rw-r--r--stdlib/test/test/lux/macro/code.lux (renamed from stdlib/test/test/lux/meta/code.lux)2
-rw-r--r--stdlib/test/test/lux/macro/poly/eq.lux (renamed from stdlib/test/test/lux/meta/poly/eq.lux)6
-rw-r--r--stdlib/test/test/lux/macro/poly/functor.lux (renamed from stdlib/test/test/lux/meta/poly/functor.lux)6
-rw-r--r--stdlib/test/test/lux/macro/syntax.lux (renamed from stdlib/test/test/lux/meta/syntax.lux)6
-rw-r--r--stdlib/test/tests.lux10
10 files changed, 47 insertions, 47 deletions
diff --git a/stdlib/test/test/lux.lux b/stdlib/test/test/lux.lux
index 4c0d1513f..22190bd93 100644
--- a/stdlib/test/test/lux.lux
+++ b/stdlib/test/test/lux.lux
@@ -8,8 +8,8 @@
(data [maybe]
[text "text/" Eq<Text>]
text/format)
- [meta]
- (meta ["s" syntax #+ syntax:])))
+ [macro]
+ (macro ["s" syntax #+ syntax:])))
(context: "Value identity."
(<| (times +100)
diff --git a/stdlib/test/test/lux/control/parser.lux b/stdlib/test/test/lux/control/parser.lux
index 3a2483f6b..0f6b4a4b1 100644
--- a/stdlib/test/test/lux/control/parser.lux
+++ b/stdlib/test/test/lux/control/parser.lux
@@ -12,9 +12,9 @@
[ident]
["E" error])
["r" math/random]
- [meta]
- (meta [code]
- ["s" syntax #+ syntax:]))
+ [macro]
+ (macro [code]
+ ["s" syntax #+ syntax:]))
lux/test)
## [Utils]
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index ab18e047f..167e80555 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/test/test/lux/data/format/json.lux
@@ -16,12 +16,12 @@
(coll [sequence #+ sequence]
["d" dict]
[list]))
- [meta #+ with-gensyms]
- (meta [code]
- [syntax #+ syntax:]
- [poly #+ derived:]
- [poly/eq]
- [poly/json])
+ [macro #+ with-gensyms]
+ (macro [code]
+ [syntax #+ syntax:]
+ [poly #+ derived:]
+ [poly/eq]
+ [poly/json])
(type [unit])
["r" math/random]
(time ["ti" instant]
@@ -144,23 +144,23 @@
_
false))]
(and ## (:: bool;Eq<Bool> = (get@ #bool recL) (get@ #bool recR))
- ## (f.= (get@ #frac recL) (get@ #frac recR))
- ## (:: text;Eq<Text> = (get@ #text recL) (get@ #text recR))
- ## (:: (maybe;Eq<Maybe> number;Eq<Frac>) = (get@ #maybe recL) (get@ #maybe recR))
- ## (:: (list;Eq<List> number;Eq<Frac>) = (get@ #list recL) (get@ #list recR))
- ## (variant/= (get@ #variant recL) (get@ #variant recR))
- ## (let [[tL0 tL1 tL2] (get@ #tuple recL)
- ## [tR0 tR1 tR2] (get@ #tuple recR)]
- ## (and (:: bool;Eq<Bool> = tL0 tR0)
- ## (f.= tL1 tR1)
- ## (:: text;Eq<Text> = tL2 tR2)))
- ## (:: (d;Eq<Dict> number;Eq<Frac>) = (get@ #dict recL) (get@ #dict recR))
- ## (:: Eq<Recursive> = (get@ #recursive recL) (get@ #recursive recR))
- (:: ti;Eq<Instant> = (get@ #instant recL) (get@ #instant recR))
- (:: tdu;Eq<Duration> = (get@ #duration recL) (get@ #duration recR))
- (:: tda;Eq<Date> = (get@ #date recL) (get@ #date recR))
- (:: unit;Eq<Unit> = (get@ #grams recL) (get@ #grams recR))
- ))))
+ ## (f.= (get@ #frac recL) (get@ #frac recR))
+ ## (:: text;Eq<Text> = (get@ #text recL) (get@ #text recR))
+ ## (:: (maybe;Eq<Maybe> number;Eq<Frac>) = (get@ #maybe recL) (get@ #maybe recR))
+ ## (:: (list;Eq<List> number;Eq<Frac>) = (get@ #list recL) (get@ #list recR))
+ ## (variant/= (get@ #variant recL) (get@ #variant recR))
+ ## (let [[tL0 tL1 tL2] (get@ #tuple recL)
+ ## [tR0 tR1 tR2] (get@ #tuple recR)]
+ ## (and (:: bool;Eq<Bool> = tL0 tR0)
+ ## (f.= tL1 tR1)
+ ## (:: text;Eq<Text> = tL2 tR2)))
+ ## (:: (d;Eq<Dict> number;Eq<Frac>) = (get@ #dict recL) (get@ #dict recR))
+ ## (:: Eq<Recursive> = (get@ #recursive recL) (get@ #recursive recR))
+ (:: ti;Eq<Instant> = (get@ #instant recL) (get@ #instant recR))
+ (:: tdu;Eq<Duration> = (get@ #duration recL) (get@ #duration recR))
+ (:: tda;Eq<Date> = (get@ #date recL) (get@ #date recR))
+ (:: unit;Eq<Unit> = (get@ #grams recL) (get@ #grams recR))
+ ))))
(context: "Polytypism"
(<| (times +100)
diff --git a/stdlib/test/test/lux/data/text/regex.lux b/stdlib/test/test/lux/data/text/regex.lux
index ee34db931..34d752d5a 100644
--- a/stdlib/test/test/lux/data/text/regex.lux
+++ b/stdlib/test/test/lux/data/text/regex.lux
@@ -9,9 +9,9 @@
text/format
(text [lexer]
["&" regex]))
- [meta]
- (meta [code]
- ["s" syntax #+ syntax:])
+ [macro]
+ (macro [code]
+ ["s" syntax #+ syntax:])
["r" math/random])
lux/test)
diff --git a/stdlib/test/test/lux/lang/syntax.lux b/stdlib/test/test/lux/lang/syntax.lux
index 4db181cae..154e18a91 100644
--- a/stdlib/test/test/lux/lang/syntax.lux
+++ b/stdlib/test/test/lux/lang/syntax.lux
@@ -9,7 +9,7 @@
["l" lexer])
(coll [list]))
["r" math/random "r/" Monad<Random>]
- (meta [code])
+ (macro [code])
(lang ["&" syntax])
test))
diff --git a/stdlib/test/test/lux/meta/code.lux b/stdlib/test/test/lux/macro/code.lux
index 7c3706f13..64bdf5f1c 100644
--- a/stdlib/test/test/lux/meta/code.lux
+++ b/stdlib/test/test/lux/macro/code.lux
@@ -6,7 +6,7 @@
text/format
[number])
["r" math/random]
- (meta ["&" code]))
+ (macro ["&" code]))
lux/test)
(context: "Code"
diff --git a/stdlib/test/test/lux/meta/poly/eq.lux b/stdlib/test/test/lux/macro/poly/eq.lux
index c0644a7fa..e1d7604e7 100644
--- a/stdlib/test/test/lux/meta/poly/eq.lux
+++ b/stdlib/test/test/lux/macro/poly/eq.lux
@@ -10,9 +10,9 @@
[maybe]
(coll [list]))
["r" math/random]
- [meta]
- (meta [poly #+ derived:]
- ["&" poly/eq]))
+ [macro]
+ (macro [poly #+ derived:]
+ ["&" poly/eq]))
lux/test)
## [Utils]
diff --git a/stdlib/test/test/lux/meta/poly/functor.lux b/stdlib/test/test/lux/macro/poly/functor.lux
index 8ece07447..45e54bae7 100644
--- a/stdlib/test/test/lux/meta/poly/functor.lux
+++ b/stdlib/test/test/lux/macro/poly/functor.lux
@@ -11,9 +11,9 @@
[text]
[identity])
["r" math/random]
- [meta]
- (meta [poly #+ derived:]
- ["&" poly/functor]))
+ [macro]
+ (macro [poly #+ derived:]
+ ["&" poly/functor]))
lux/test)
## [Utils]
diff --git a/stdlib/test/test/lux/meta/syntax.lux b/stdlib/test/test/lux/macro/syntax.lux
index 511c56e68..b159bf999 100644
--- a/stdlib/test/test/lux/meta/syntax.lux
+++ b/stdlib/test/test/lux/macro/syntax.lux
@@ -11,9 +11,9 @@
[ident]
["E" error])
["r" math/random]
- [meta]
- (meta [code]
- ["s" syntax #+ syntax: Syntax]))
+ [macro]
+ (macro [code]
+ ["s" syntax #+ syntax: Syntax]))
lux/test)
## [Utils]
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index 34f6ef8b0..3f02bf694 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -62,10 +62,10 @@
(math ["_;" random]
(logic ["_;" continuous]
["_;" fuzzy]))
- (meta ["_;" code]
- ["_;" syntax]
- (poly ["poly_;" eq]
- ["poly_;" functor]))
+ (macro ["_;" code]
+ ["_;" syntax]
+ (poly ["poly_;" eq]
+ ["poly_;" functor]))
(type ["_;" implicit]
["_;" object])
(lang ["lang_;" syntax]
@@ -88,7 +88,7 @@
[css])
(coll (tree ["tree_;" parser])))
(math [random])
- [meta]
+ [macro]
(type [unit])
[world/env])
)