diff options
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/lux/macro/syntax/common/reader.lux | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/stdlib/source/lux/macro/syntax/common/reader.lux b/stdlib/source/lux/macro/syntax/common/reader.lux index fb4238317..0d172fa88 100644 --- a/stdlib/source/lux/macro/syntax/common/reader.lux +++ b/stdlib/source/lux/macro/syntax/common/reader.lux @@ -26,16 +26,16 @@ quux (foo bar baz))} (Syntax //.Declaration) - (p.either (p.seq s.local-identifier + (p.either (p.and s.local-identifier (parser/wrap (list))) - (s.form (p.seq s.local-identifier + (s.form (p.and s.local-identifier (p.many s.local-identifier))))) ## Annotations (def: #export annotations {#.doc "Reader for the common annotations syntax used by def: statements."} (Syntax //.Annotations) - (s.record (p.some (p.seq s.tag s.any)))) + (s.record (p.some (p.and s.tag s.any)))) ## Definitions (def: check^ @@ -45,22 +45,22 @@ type s.any value s.any] (wrap [(#.Some type) value]))) - (p.seq (parser/wrap #.None) + (p.and (parser/wrap #.None) s.any))) (def: _definition-anns-tag^ (Syntax Name) - (s.tuple (p.seq s.text s.text))) + (s.tuple (p.and s.text s.text))) (def: (_definition-anns^ _) (-> Any (Syntax //.Annotations)) - (p.alt (s.this (' #.Nil)) - (s.form (do p.Monad<Parser> - [_ (s.this (' #.Cons)) - [head tail] (p.seq (s.tuple (p.seq _definition-anns-tag^ s.any)) - (_definition-anns^ []))] - (wrap [head tail]))) - )) + (p.or (s.this (' #.Nil)) + (s.form (do p.Monad<Parser> + [_ (s.this (' #.Cons)) + [head tail] (p.and (s.tuple (p.and _definition-anns-tag^ s.any)) + (_definition-anns^ []))] + (wrap [head tail]))) + )) (def: (flat-list^ _) (-> Any (Syntax (List Code))) @@ -69,7 +69,7 @@ (wrap (list))) (s.form (do p.Monad<Parser> [_ (s.this (' #.Cons)) - [head tail] (s.tuple (p.seq s.any s.any)) + [head tail] (s.tuple (p.and s.any s.any)) tail (s.local (list tail) (flat-list^ []))] (wrap (#.Cons head tail)))))) @@ -142,7 +142,7 @@ (def: #export typed-input {#.doc "Reader for the common typed-argument syntax used by many macros."} (Syntax //.Typed-Input) - (s.record (p.seq s.any s.any))) + (s.record (p.and s.any s.any))) (def: #export type-variables {#.doc "Reader for the common type var/param used by many macros."} |