Changeset 10103 for src/Pugs/Lexer.hs

Timestamp:

04/28/06 07:01:21 (3 years ago)

Author:

audreyt

Message:

* Lexer/Parser: drop all mention of tryRule and tryChoice;

next step is to take out all the unneccessary explicit "try".

Files:

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

src/Pugs/Lexer.hs

@@ -217 +217 @@
     
     stringList :: Int -> RuleParser [Exp]
-    stringList i = tryChoice
+    stringList i = choice
         [ do
             parse <- interpolator
@@ -315 +315 @@
 
 rule :: String -> RuleParser a -> RuleParser a
-rule name action = (<?> name) $ lexeme $ action
+rule name = (<?> name) . lexeme
 
 verbatimRule :: String -> RuleParser a -> RuleParser a
-verbatimRule name action = (<?> name) $ action
+verbatimRule name = (<?> name)
 
 literalRule :: String -> RuleParser a -> RuleParser a
-literalRule name action = (<?> name) $ postSpace $ action
+literalRule name = (<?> name) . postSpace
 
 tryRule :: String -> RuleParser a -> RuleParser a
-tryRule name action = (<?> name) $ lexeme $ action
+tryRule name = (<?> name) . lexeme . try
 
 tryVerbatimRule :: String -> RuleParser a -> RuleParser a
-tryVerbatimRule name action = (<?> name) $ action
+tryVerbatimRule name = (<?> name)
 
 ruleScope :: RuleParser Scope
-ruleScope = tryRule "scope" $ do
+ruleScope = rule "scope" $ do
     scope <- ruleScopeName
     return $ readScope scope
@@ -397 +397 @@
 tryChoice :: [RuleParser a] -- ^ List of candidate parsers
           -> RuleParser a
-tryChoice = choice
+tryChoice = choice . map try
 
 {-|