Changeset 7317

Timestamp:

10/05/05 20:17:28 (3 years ago)

Author:

autrijus

Message:

* gaal reported the block parsing fix is still buggy, so now

I made sure that adverbial blocks parse differently from
nonadverbial ones:

pugs> :d f{x}.z
App &f (: App &z (Syn "sub" {sub {...}}: ))

pugs> :d f:{x}.z
App &z (App &f (: Syn "sub" {sub {...}}): )

Files:

• src/Pugs/Parser.hs (modified) (1 diff)

src/Pugs/Parser.hs

@@ -1723 +1723 @@
 parseNoParenParamList :: RuleParser (Maybe Exp, [Exp])
 parseNoParenParamList = do
-    formal <- formalSegment argBlockish `sepEndBy` sep
+    formal <- (<|> return []) $ do
+        x <- formalSegment dotForbidden
+        (<|> return [x]) $ do
+            sep
+            xs <- formalSegment dotAllowed `sepEndBy` sep
+            return (x:xs)
     processFormals formal
     where
     sep = symbol ":"
-    formalSegment args = do
-        rv <- option Nothing (fmap Just $ tryChoice args)
+    formalSegment dot = do
+        rv <- option Nothing (fmap Just $ tryChoice (argBlockish dot))
         case rv of
             Nothing           -> return []
             Just (exp, trail) -> do
-                rest <- option [] $ do { trail; formalSegment args }
+                rest <- option [] $ do { trail; formalSegment dot }
                 return (exp ++ rest)
-    argBlockish =
-        [ argBlockWith ruleBlockLiteral
-        , argBlockWith pairOrBlockAdverb
+    argBlockish dot =
+        [ argBlockWith ruleBlockLiteral dot
+        , argBlockWith pairOrBlockAdverb dot
         , argVanilla
         ]
-    argBlockWith p = do
-        x <- p
-        lookAhead (satisfy (not . (`elem` ".,")))
+    argBlockWith rule pred = do
+        x <- rule
+        lookAhead $ satisfy pred
         return ([x], return "")
+    dotAllowed = (/= '.')
+    dotForbidden = (not . (`elem` ".,"))
     argVanilla = do
         x <- parseTightOp