diff options
author | Eduardo Julian | 2018-07-03 22:20:22 -0400 |
---|---|---|
committer | Eduardo Julian | 2018-07-03 22:20:22 -0400 |
commit | f505b42847bd7ba54b14d4b593b883c1bb25501d (patch) | |
tree | eb017a0f3db7d4cd7dee260dd5eb437ad74f327a /stdlib/source/lux/lang | |
parent | 371a407a49ddf0f2fe1d977018fcd0a009c86043 (diff) |
- Re-named "sequence" to "row".
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/lux/lang/compiler/translation.lux | 8 | ||||
-rw-r--r-- | stdlib/source/lux/lang/syntax.lux | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/stdlib/source/lux/lang/compiler/translation.lux b/stdlib/source/lux/lang/compiler/translation.lux index c117bc019..d5a6fb255 100644 --- a/stdlib/source/lux/lang/compiler/translation.lux +++ b/stdlib/source/lux/lang/compiler/translation.lux @@ -6,7 +6,7 @@ [error #+ Error] [text] text/format - (coll [sequence #+ Sequence] + (coll [row #+ Row] (dictionary ["dict" unordered #+ Dict]))) (world [file #+ File])) [//name] @@ -35,7 +35,7 @@ (: (-> code (Error Any)) evaluate!)) -(type: #export (Buffer code) (Sequence [Ident code])) +(type: #export (Buffer code) (Row [Ident code])) (type: #export (Artifacts code) (Dict File (Buffer code))) @@ -117,7 +117,7 @@ with-buffer (-> (Operation (..State anchor code) output) (Operation (..State anchor code) output)) - sequence.empty + row.empty buffer (Buffer code) no-active-buffer] ) @@ -150,7 +150,7 @@ [_ (execute! code)] (function (_ state) (#error.Success [(update@ #buffer - (maybe/map (sequence.add [name code])) + (maybe/map (row.add [name code])) state) []])))) diff --git a/stdlib/source/lux/lang/syntax.lux b/stdlib/source/lux/lang/syntax.lux index 8029b5975..bbbd19232 100644 --- a/stdlib/source/lux/lang/syntax.lux +++ b/stdlib/source/lux/lang/syntax.lux @@ -36,7 +36,7 @@ [text] (text ["l" lexer] format) - (coll [sequence #+ Sequence] + (coll [row #+ Row] (dictionary ["dict" unordered #+ Dict]))))) (type: #export Aliases (Dict Text Text)) @@ -424,14 +424,14 @@ (l.Lexer [Cursor Code])) (do p.Monad<Parser> [_ (l.this <open>) - [where' elems] (loop [elems (: (Sequence Code) - sequence.empty) + [where' elems] (loop [elems (: (Row Code) + row.empty) where where] (p.either (do @ [## Must update the cursor as I ## go along, to keep things accurate. [where' elem] (ast where)] - (recur (sequence.add elem elems) + (recur (row.add elem elems) where')) (do @ [## Must take into account any @@ -440,7 +440,7 @@ where' (left-padding^ where) _ (l.this <close>)] (wrap [(update@ #.column inc where') - (sequence.to-list elems)]))))] + (row.to-list elems)]))))] (wrap [where' [where (<tag> elems)]])))] @@ -463,19 +463,19 @@ (l.Lexer [Cursor Code])) (do p.Monad<Parser> [_ (l.this "{") - [where' elems] (loop [elems (: (Sequence [Code Code]) - sequence.empty) + [where' elems] (loop [elems (: (Row [Code Code]) + row.empty) where where] (p.either (do @ [[where' key] (ast where) [where' val] (ast where')] - (recur (sequence.add [key val] elems) + (recur (row.add [key val] elems) where')) (do @ [where' (left-padding^ where) _ (l.this "}")] (wrap [(update@ #.column inc where') - (sequence.to-list elems)]))))] + (row.to-list elems)]))))] (wrap [where' [where (#.Record elems)]]))) |