Changeset 14640 for src/Pugs/Parser

Timestamp:

11/05/06 18:52:06 (2 years ago)

Author:

audreyt

svk:copy_cache_prev:

41990

Message:

* Pugs.Parser.Operator: Generalize decl+assign hack so we

can deal with "constant=" in a similar way later.

Files:

• src/Pugs/Parser/Operator.hs (modified) (3 diffs)

src/Pugs/Parser/Operator.hs

@@ -390 +390 @@
 makeOp2Assign prec _ con = (`Infix` prec) $ do
     symbol "="
-    return $ \invExp argExp -> stateAssignHack (con "=" [invExp, argExp])
+    return $ \invExp argExp -> declAssignHack (con "=" [invExp, argExp])
 
 -- Rewrite "EXP ~~ .meth" into "?(EXP.meth)"
@@ -403 +403 @@
         _ -> con (sigil ++ name) [x,y]
 
-stateAssignHack :: Exp -> Exp
-stateAssignHack exp@(Syn "=" [lhs, _]) | isStateAssign lhs = 
-    let pad = unsafePerformSTM $! do
-            state_first_run <- newTVar =<< (fmap scalarRef $! newTVar (VInt 0))
-            state_fresh     <- newTVar False
-            return $! mkPad [(cast "$?STATE_START_RUN", [(state_fresh, state_first_run)])] in
-    Syn "block"
-        [ Pad SState pad $!
-            Syn "if"
-                [ App (_Var "&postfix:++") Nothing [_Var "$?STATE_START_RUN"]
-                , lhs
-                , exp
-                ]
-        ]
-    where
-    isStateAssign (Ann (Decl SState) _) = True
-    isStateAssign (Ann _ exp)           = isStateAssign exp
-    isStateAssign _                     = False
-stateAssignHack others = others
+declAssignHack :: Exp -> Exp
+declAssignHack exp@(Syn "=" [lhs, _])
+    | isDecl SState lhs = 
+        let pad = unsafePerformSTM $! do
+                state_first_run <- newTVar =<< (fmap scalarRef $! newTVar (VInt 0))
+                state_fresh     <- newTVar False
+                return $! mkPad [(cast "$?STATE_START_RUN", [(state_fresh, state_first_run)])] in
+        Syn "block"
+            [ Pad SState pad $!
+                Syn "if"
+                    [ App (_Var "&postfix:++") Nothing [_Var "$?STATE_START_RUN"]
+                    , lhs
+                    , exp
+                    ]
+            ]
+    where
+    isDecl s (Ann (Decl d) _)    = s == d
+    isDecl s (Ann _ exp)         = isDecl s exp
+    isDecl _ _                   = False
+declAssignHack others = others
 
 -- Just for the ".=" rewriting
@@ -429 +430 @@
     insertIntoPosition "." -- "$x .= foo" becomes "$x .= .foo"
     return $ \invExp argExp -> case argExp of
-        -- XXX - App meth _ args -> stateAssignHack (con ".=" [invExp, App meth Nothing args])
-        App meth _ args -> stateAssignHack (con "=" [invExp, App meth (Just invExp) args])
+        -- XXX - App meth _ args -> declAssignHack (con ".=" [invExp, App meth Nothing args])
+        App meth _ args -> declAssignHack (con "=" [invExp, App meth (Just invExp) args])
         _               -> Val (VError (VStr "the right-hand-side of .= must be a function application") [])