Changeset 2336

Timestamp:

04/25/05 21:14:16 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

3850

Message:

* print (4)+4 now prints 8, because the whitespace is no

longer tolerated.

Location:

src/Pugs

Files:

• Lexer.hs (modified) (1 diff)
• Parser.hs (modified) (2 diffs)

src/Pugs/Lexer.hs

@@ -67 +67 @@
 balancedDelim = P.balancedDelim perl6Lexer
 decimal    = P.decimal perl6Lexer
+verbatimIdentifier = (<?> "identifier") $ do
+    c  <- identStart perl6Def
+    cs <- many (identLetter perl6Def)
+    return (c:cs)
 
 ruleWhiteSpaceLine = do

src/Pugs/Parser.hs

@@ -240 +240 @@
     return $ "&" ++ star ++ prefix ++ (c:cs)
 
-ruleSubName = rule "subroutine name" $ do
+ruleSubName = verbatimRule "subroutine name" $ do
     star    <- option "" $ string "*"
     fixity  <- option "" $ choice (map (try . string) $ words fixities)
-    names   <- identifier `sepBy1` (try $ string "::")
+    names   <- verbatimIdentifier `sepBy1` (try $ string "::")
     return $ "&" ++ star ++ fixity ++ concat (intersperse "::" names)
     where
@@ -796 +796 @@
     return $ \x -> Syn "()" [x, Syn "invs" invs, Syn "args" args]
 
-parseApply = lexeme $ do
-    name            <- ruleSubName
-    option ' ' $ char '.'
-    (invs,args)   <- parseParamList
+parseApply = tryRule "apply" $ do
+    name    <- ruleSubName
+    hasDot  <- option False $ try $ do { whiteSpace; char '.'; return True }
+    (invs, args) <- if hasDot
+        then parseNoParenParamList
+        else parseParenParamList <|> do { whiteSpace; parseNoParenParamList }
     return $ App name invs args