aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/lux/data/text
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/source/lux/data/text
parentf11c10f72d003555d76c9803954e2bd8b347362d (diff)
- Re-named "lux/meta" to to "lux/macro".
Diffstat (limited to 'stdlib/source/lux/data/text')
-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
3 files changed, 11 insertions, 11 deletions
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