Changeset 10060 for src/Pugs/Lexer.hs

Timestamp:

04/23/06 18:38:04 (3 years ago)

Author:

audreyt

Message:

* Switch Pugs.Parser to Commit-by-default "ratchet" parser.

* Caveat: This is currently broken:

if %h{'x'} {...}

because our whitespace rule is backwards. I'll fix soon.

For now, use this workaround:

if %h.{'x'} {...}

(the "correct" fix is for "lexeme" to not swallow post-term
whitespace; rather, let operators swalloe pre-term whitespace
if they choose to do so. takers welcome :))

Files:

• src/Pugs/Lexer.hs (modified) (2 diffs)

src/Pugs/Lexer.hs

@@ -276 +276 @@
 
 tryRule :: String -> GenParser Char st a -> GenParser Char st a
-tryRule name action = (<?> name) $ lexeme $ try action
+tryRule name action = (<?> name) $ lexeme $ action
 
 tryVerbatimRule :: String -> GenParser tok st a -> GenParser tok st a
-tryVerbatimRule name action = (<?> name) $ try action
+tryVerbatimRule name action = (<?> name) $ action
 
 ruleScope :: RuleParser Scope
@@ -349 +349 @@
 tryChoice :: [GenParser tok st a] -- ^ List of candidate parsers
           -> GenParser tok st a
-tryChoice = choice . map try
+tryChoice = choice
 
 {-|