Changeset 3250

Timestamp:

05/15/05 12:23:34 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

4802

Message:

* Post-term code/method invocation in interpolated strings no longer

eat trailing whitespace.

Files:

• src/Pugs/Parser.hs (modified) (4 diffs)

src/Pugs/Parser.hs

@@ -1056 +1056 @@
     hasEqual    <- option False $ do { char '='; whiteSpace; return True }
     name        <- do { str <- ruleSubName; return $ colon str }
-    (invs,args) <- parens $ parseNoParenParamList False
+    (invs,args) <- between (symbol "(") (char ')') $ do
+        parseNoParenParamList False
     -- XXX we just append the adverbial block onto the end of the arg list
     -- it really goes into the *& slot if there is one. -lp
@@ -1065 +1066 @@
 ruleArraySubscript :: RuleParser (Exp -> Exp)
 ruleArraySubscript = tryVerbatimRule "array subscript" $ do
-    symbol "["
-    p <- option id $ do exp <- ruleExpression; return $ \x -> Syn "[]" [x, exp]
-    char ']'
-    return p
+    between (symbol "[") (char ']') $ option id $ do
+        exp <- ruleExpression; return $ \x -> Syn "[]" [x, exp]
 
 ruleHashSubscript :: RuleParser (Exp -> Exp)
@@ -1076 +1075 @@
 ruleHashSubscriptBraces :: RuleParser (Exp -> Exp)
 ruleHashSubscriptBraces = do
-    symbol "{"
-    p <- option id $ do exp <- ruleExpression; return $ \x -> Syn "{}" [x, exp]
-    char '}'
-    return p
+    between (symbol "{") (char '}') $ option id $ do
+        exp <- ruleExpression; return $ \x -> Syn "{}" [x, exp]
 
 ruleHashSubscriptQW :: RuleParser (Exp -> Exp)
@@ -1087 +1084 @@
 
 ruleCodeSubscript :: RuleParser (Exp -> Exp)
-ruleCodeSubscript = tryRule "code subscript" $ do
+ruleCodeSubscript = tryVerbatimRule "code subscript" $ do
     (invs,args) <- parens $ parseParamList
     return $ \x -> App x invs args