diff options
Diffstat (limited to 'stdlib/source/lux/data')
| -rw-r--r-- | stdlib/source/lux/data/format/binary.lux | 10 | ||||
| -rw-r--r-- | stdlib/source/lux/data/format/xml.lux | 30 | ||||
| -rw-r--r-- | stdlib/source/lux/data/name.lux (renamed from stdlib/source/lux/data/ident.lux) | 34 | ||||
| -rw-r--r-- | stdlib/source/lux/data/text/format.lux | 4 | ||||
| -rw-r--r-- | stdlib/source/lux/data/text/regex.lux | 28 |
5 files changed, 53 insertions, 53 deletions
diff --git a/stdlib/source/lux/data/format/binary.lux b/stdlib/source/lux/data/format/binary.lux index 27a510b44..add376a44 100644 --- a/stdlib/source/lux/data/format/binary.lux +++ b/stdlib/source/lux/data/format/binary.lux @@ -219,8 +219,8 @@ (..alt ..any (..seq value recur))))) -(def: #export ident - (Format Ident) +(def: #export name + (Format Name) (..seq ..text ..text)) (def: #export type @@ -252,7 +252,7 @@ ## #Apply pair ## #Named - (..seq ..ident type) + (..seq ..name type) ))))) (def: #export cursor @@ -278,9 +278,9 @@ ## #Text ..text ## #Symbol - ..ident + ..name ## #Tag - ..ident + ..name ## #Form sequence ## #Tuple diff --git a/stdlib/source/lux/data/format/xml.lux b/stdlib/source/lux/data/format/xml.lux index 5e92de080..a990e6901 100644 --- a/stdlib/source/lux/data/format/xml.lux +++ b/stdlib/source/lux/data/format/xml.lux @@ -10,17 +10,17 @@ ["." number] ["E" error] ["." product] - ["." ident ("ident/." Equivalence<Ident> Codec<Text,Ident>)] + ["." name ("name/." Equivalence<Name> Codec<Text,Name>)] ["." text ("text/." Equivalence<Text> Monoid<Text>) ["l" lexer]] [collection ["." list ("list/." Monad<List>)] ["d" dictionary]]]]) -(type: #export Tag Ident) -(type: #export Attrs (d.Dictionary Ident Text)) +(type: #export Tag Name) +(type: #export Attrs (d.Dictionary Name Text)) -(def: #export attrs Attrs (d.new ident.Hash<Ident>)) +(def: #export attrs Attrs (d.new name.Hash<Name>)) (type: #export #rec XML (#Text Text) @@ -69,7 +69,7 @@ (wrap ($_ text/compose head tail)))) (def: namespaced-symbol^ - (l.Lexer Ident) + (l.Lexer Name) (do p.Monad<Parser> [first-part xml-identifier ?second-part (<| p.maybe (p.after (l.this ":")) xml-identifier)] @@ -97,7 +97,7 @@ (def: attrs^ (l.Lexer Attrs) - (<| (:: p.Monad<Parser> map (d.from-list ident.Hash<Ident>)) + (<| (:: p.Monad<Parser> map (d.from-list name.Hash<Name>)) p.some (p.seq (spaced^ attr-name^)) (p.after (l.this "=")) @@ -111,9 +111,9 @@ (p.after (l.this "/")) (l.enclosed ["<" ">"]))] (p.assert ($_ text/compose "Close tag does not match open tag.\n" - "Expected: " (ident/encode expected) "\n" - " Actual: " (ident/encode actual) "\n") - (ident/= expected actual)))) + "Expected: " (name/encode expected) "\n" + " Actual: " (name/encode actual) "\n") + (name/= expected actual)))) (def: comment^ (l.Lexer Text) @@ -234,7 +234,7 @@ [(#Node reference/tag reference/attrs reference/children) (#Node sample/tag sample/attrs sample/children)] - (and (ident/= reference/tag sample/tag) + (and (name/= reference/tag sample/tag) (:: (d.Equivalence<Dictionary> text.Equivalence<Text>) = reference/attrs sample/attrs) (n/= (list.size reference/children) (list.size sample/children)) @@ -251,8 +251,8 @@ (exception: #export unexpected-input) (exception: #export unknown-attribute) -(exception: #export (wrong-tag {tag Ident}) - (ident/encode tag)) +(exception: #export (wrong-tag {tag Name}) + (name/encode tag)) (exception: #export (unconsumed-inputs {inputs (List XML)}) (|> inputs @@ -275,7 +275,7 @@ (ex.throw unexpected-input []))))) (def: #export (attr name) - (-> Ident (Reader Text)) + (-> Name (Reader Text)) (function (_ docs) (case docs #.Nil @@ -306,7 +306,7 @@ (#E.Error error))) (def: #export (node tag) - (-> Ident (Reader Any)) + (-> Name (Reader Any)) (function (_ docs) (case docs #.Nil @@ -318,7 +318,7 @@ (ex.throw unexpected-input []) (#Node _tag _attrs _children) - (if (ident/= tag _tag) + (if (name/= tag _tag) (#E.Success [docs []]) (ex.throw wrong-tag tag)))))) diff --git a/stdlib/source/lux/data/ident.lux b/stdlib/source/lux/data/name.lux index 27d45227f..0129bc5cc 100644 --- a/stdlib/source/lux/data/ident.lux +++ b/stdlib/source/lux/data/name.lux @@ -8,46 +8,46 @@ ["." text ("text/." Monoid<Text> Hash<Text>)]]]) ## [Types] -## (type: Ident +## (type: Name ## [Text Text]) ## [Functions] (do-template [<name> <side>] - [(def: #export (<name> [module name]) - (-> Ident Text) + [(def: #export (<name> [module short]) + (-> Name Text) <side>)] [module module] - [name name] + [short short] ) ## [Structures] -(structure: #export _ (Equivalence Ident) +(structure: #export _ (Equivalence Name) (def: (= [xmodule xname] [ymodule yname]) (and (text/= xmodule ymodule) (text/= xname yname)))) -(structure: #export _ (Codec Text Ident) - (def: (encode [module name]) +(structure: #export _ (Codec Text Name) + (def: (encode [module short]) (case module - "" name - _ ($_ text/compose module "." name))) + "" short + _ ($_ text/compose module "." short))) (def: (decode input) (if (text/= "" input) - (#.Left (text/compose "Invalid format for Ident: " input)) + (#.Left (text/compose "Invalid format for Name: " input)) (case (text.split-all-with "." input) - (^ (list name)) - (#.Right ["" name]) + (^ (list short)) + (#.Right ["" short]) - (^ (list module name)) - (#.Right [module name]) + (^ (list module short)) + (#.Right [module short]) _ - (#.Left (text/compose "Invalid format for Ident: " input)))))) + (#.Left (text/compose "Invalid format for Name: " input)))))) -(structure: #export _ (Hash Ident) - (def: eq Equivalence<Ident>) +(structure: #export _ (Hash Name) + (def: eq Equivalence<Name>) (def: (hash [module name]) (n/+ (text/hash module) (text/hash name)))) diff --git a/stdlib/source/lux/data/text/format.lux b/stdlib/source/lux/data/text/format.lux index 7592b7b28..7f4188154 100644 --- a/stdlib/source/lux/data/text/format.lux +++ b/stdlib/source/lux/data/text/format.lux @@ -5,7 +5,7 @@ ["p" parser]] [data ["." bit] - ["." ident] + ["." name] ["." number] ["." text] [format @@ -46,7 +46,7 @@ [%r Rev (:: number.Codec<Text,Rev> encode)] [%f Frac (:: number.Codec<Text,Frac> encode)] [%t Text text.encode] - [%ident Ident (:: ident.Codec<Text,Ident> encode)] + [%name Name (:: name.Codec<Text,Name> encode)] [%code Code code.to-text] [%type Type type.to-text] [%bin Nat (:: number.Binary@Codec<Text,Nat> encode)] diff --git a/stdlib/source/lux/data/text/regex.lux b/stdlib/source/lux/data/text/regex.lux index 34505d157..158eea153 100644 --- a/stdlib/source/lux/data/text/regex.lux +++ b/stdlib/source/lux/data/text/regex.lux @@ -52,31 +52,31 @@ [parts part^] (wrap (text.join-with "" parts)))) -(def: identifier-char^ +(def: name-char^ (l.Lexer Text) (l.none-of "[]{}()s\"#.<>")) -(def: identifier-part^ +(def: name-part^ (l.Lexer Text) (do p.Monad<Parser> [head (refine^ (l.not l.decimal) - identifier-char^) - tail (l.some identifier-char^)] + name-char^) + tail (l.some name-char^)] (wrap (format head tail)))) -(def: (identifier^ current-module) - (-> Text (l.Lexer Ident)) +(def: (name^ current-module) + (-> Text (l.Lexer Name)) ($_ p.either - (p.seq (parser/wrap current-module) (p.after (l.this "..") identifier-part^)) - (p.seq identifier-part^ (p.after (l.this ".") identifier-part^)) - (p.seq (parser/wrap "lux") (p.after (l.this ".") identifier-part^)) - (p.seq (parser/wrap "") identifier-part^))) + (p.seq (parser/wrap current-module) (p.after (l.this "..") name-part^)) + (p.seq name-part^ (p.after (l.this ".") name-part^)) + (p.seq (parser/wrap "lux") (p.after (l.this ".") name-part^)) + (p.seq (parser/wrap "") name-part^))) (def: (re-var^ current-module) (-> Text (l.Lexer Code)) (do p.Monad<Parser> - [ident (l.enclosed ["\\@<" ">"] (identifier^ current-module))] - (wrap (` (: (l.Lexer Text) (~ (code.symbol ident))))))) + [name (l.enclosed ["\\@<" ">"] (name^ current-module))] + (wrap (` (: (l.Lexer Text) (~ (code.symbol name))))))) (def: re-range^ (l.Lexer Code) @@ -194,7 +194,7 @@ (wrap (` ((~! ..copy) (~ (code.symbol ["" (int/encode (.int id))])))))) (do p.Monad<Parser> [_ (l.this "\\k<") - captured-name identifier-part^ + captured-name name-part^ _ (l.this ">")] (wrap (` ((~! ..copy) (~ (code.symbol ["" captured-name])))))))) @@ -384,7 +384,7 @@ (wrap [#Non-Capturing complex])) (do p.Monad<Parser> [_ (l.this "(?<") - captured-name identifier-part^ + captured-name name-part^ _ (l.this ">") [num-captures pattern] (re-alternative^ #1 re-scoped^ current-module) _ (l.this ")")] |