diff options
| author | Eduardo Julian | 2017-03-24 17:09:57 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2017-03-24 17:09:57 -0400 |
| commit | f6cb4f22329a4c60821fbd03749667adc703b19b (patch) | |
| tree | f6d6aaf39167f0fa4ecdd14d191ea70ece28a2bc /stdlib | |
| parent | a33a0b4767ce510438a62a0108585c36b44df3aa (diff) | |
- Renamed "end" to "end!".
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/source/lux/macro/syntax.lux | 4 | ||||
| -rw-r--r-- | stdlib/source/lux/math/simple.lux | 10 | ||||
| -rw-r--r-- | stdlib/source/lux/type/auto.lux | 4 | ||||
| -rw-r--r-- | stdlib/test/test/lux/macro/syntax.lux | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/stdlib/source/lux/macro/syntax.lux b/stdlib/source/lux/macro/syntax.lux index d77fba6b1..4b8339b8e 100644 --- a/stdlib/source/lux/macro/syntax.lux +++ b/stdlib/source/lux/macro/syntax.lux @@ -274,7 +274,7 @@ output output ))) -(def: #export end +(def: #export end! {#;doc "Ensures there are no more inputs."} (Syntax Unit) (lambda [tokens] @@ -488,7 +488,7 @@ (: (Syntax (Lux (List AST))) (do Monad<Syntax> [(~@ (join-pairs vars+parsers)) - (~ g!end) end] + (~ g!end) end!] ((~' wrap) (do Monad<Lux> [] (~ body)))))) diff --git a/stdlib/source/lux/math/simple.lux b/stdlib/source/lux/math/simple.lux index f1ef2359b..aaffaa967 100644 --- a/stdlib/source/lux/math/simple.lux +++ b/stdlib/source/lux/math/simple.lux @@ -45,7 +45,7 @@ [(syntax: #export (<name> [args ($_ s;alt (s;seq (s;alt s;symbol s;any) (s;some s;any)) - s;end)]) + s;end!)]) ## {#;doc (doc (= (<name> +1 +2) ## (<nat-op> +1 +2)) ## (= (<name> 1 2) @@ -109,7 +109,7 @@ [(syntax: #export (<name> [args ($_ s;alt (s;seq (s;alt s;symbol s;any) (s;some s;any)) - s;end)]) + s;end!)]) ## {#;doc (doc (= (<name> +1 +2) ## (<nat-op> +1 +2)) ## (= (<name> 1 2) @@ -173,7 +173,7 @@ [(syntax: #export (<name> [args ($_ s;alt (s;seq (s;alt s;symbol s;any) (s;some s;any)) - s;end)]) + s;end!)]) ## {#;doc (doc (= (<name> +1 +2) ## (<nat-op> +1 +2)) ## (= (<name> 1 2) @@ -218,7 +218,7 @@ [(syntax: #export (<name> [args ($_ s;alt s;symbol s;any - s;end)]) + s;end!)]) ## {#;doc (doc (= (<name> +1 +2) ## (<nat-op> +1 +2)) ## (= (<name> 1 2) @@ -263,7 +263,7 @@ [(syntax: #export (<name> [args ($_ s;alt s;symbol s;any - s;end)]) + s;end!)]) ## {#;doc (doc (= (<name> +1 +2) ## (<nat-op> +1 +2)) ## (= (<name> 1 2) diff --git a/stdlib/source/lux/type/auto.lux b/stdlib/source/lux/type/auto.lux index edf1153b7..fa658ffb8 100644 --- a/stdlib/source/lux/type/auto.lux +++ b/stdlib/source/lux/type/auto.lux @@ -318,8 +318,8 @@ (` ((~ (ast;symbol constructor)) (~@ (List/map instance$ dependencies)))))) (syntax: #export (::: [member s;symbol] - [args (s;alt (s;seq (s;some s;symbol) s;end) - (s;seq (s;some s;any) s;end))]) + [args (s;alt (s;seq (s;some s;symbol) s;end!) + (s;seq (s;some s;any) s;end!))]) {#;doc (doc "Automatic structure selection (for type-class style polymorphism)." "This feature layers type-class style polymorphism on top of Lux's signatures and structures." "When calling a polymorphic function, or using a polymorphic constant," diff --git a/stdlib/test/test/lux/macro/syntax.lux b/stdlib/test/test/lux/macro/syntax.lux index 340f8d2aa..fe5b48993 100644 --- a/stdlib/test/test/lux/macro/syntax.lux +++ b/stdlib/test/test/lux/macro/syntax.lux @@ -202,9 +202,9 @@ (assert "Can ensure the end has been reached." (and (match [] (s;run (list) - s;end)) + s;end!)) (fails? (s;run (list (ast;bool true)) - s;end)))) + s;end!)))) (assert "Can apply a parser N times." (and (match (list 123 456 789) |