Changeset 15602 for src/Pugs/Parser

Timestamp:

03/11/07 23:04:37 (21 months ago)

Author:

audreyt

Message:

* Pugs.Parser.Literal: Make pseudoAssignment parametric

instead of hardcoding $$/ as the lhs, so it can be
used elsewhere than "s[]=..." forms.

Files:

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

src/Pugs/Parser/Literal.hs

@@ -597 +597 @@
 substLiteral = do
     (declarator, pseudo) <- choice
-        [ symbol "s"  >> return ("subst", (pseudoAssignment <|>))
+        [ symbol "s"  >> return ("subst", (pseudoAssignment matchResult <|>))
         , do symbol "ss"
              insertIntoPosition ":sigspace(1)"
-             return ("subst", (pseudoAssignment <|>))
+             return ("subst", (pseudoAssignment matchResult <|>))
         , symbol "tr" >> return ("trans", id)
         ]
@@ -625 +625 @@
             flags{ qfProtectedChar = endch' }
     return $ Syn declarator [expr, subst, adverbs]
-
-pseudoAssignment :: RuleParser Exp
-pseudoAssignment = verbatimRule "infix assignment" $ do
+    where
+    matchResult = Syn "${}" [_Var "$/"]
+
+pseudoAssignment :: Exp -> RuleParser Exp
+pseudoAssignment lhs = verbatimRule "infix assignment" $ do
     ahead <- lookAhead (string ".=" <|> ruleInfixAssignment <|> string "=")
     insertIntoPosition "$_ "
@@ -635 +637 @@
         _    -> applyPseudo item
     where
-    matchResult = Syn "${}" [_Var "$/"]
     applyPseudo (Ann ann exp)       = Ann ann (applyPseudo exp)
     applyPseudo (Syn "=" [Var var, exp])
@@ -643 +644 @@
         | last syn == '='
         , var == varTopic
-        = App (_Var ("&infix:" ++ init syn)) Nothing [matchResult, exp]
+        = App (_Var ("&infix:" ++ init syn)) Nothing [lhs, exp]
     applyPseudo x = internalError $ "Unknown pseudo-assignment form:" ++ show x
     fixPseudo (Ann ann exp) = Ann ann (fixPseudo exp)
     fixPseudo (App meth (Just (Var var)) args)
         | var == varTopic
-        = App meth (Just matchResult) args
+        = App meth (Just lhs) args
     fixPseudo x = x