Changeset 15611 for src/Pugs/AST.hs

Timestamp:

03/12/07 00:07:31 (21 months ago)

Author:

audreyt

Message:

* "our $x" now reuses pad entry for package and lexical vars:

module Main;
our $x;
$x := 123; # also rebinds $Main::x

Files:

• src/Pugs/AST.hs (modified) (2 diffs)

src/Pugs/AST.hs

@@ -14 +14 @@
 module Pugs.AST (
     evalExp, readCodesFromRef,
-    genMultiSym, genSym, genSymScoped,
+    genMultiSym, genSym, genSymScoped, genPadEntryScoped, mkPadMutator,
     strRangeInf, strRange, strInc,
     mergeStmts, isEmptyParams,
@@ -150 +150 @@
 isStaticScope _       = False
 
--- XXX - SConstant support
-genSymScoped :: MonadSTM m => Scope -> Var -> VRef -> m PadMutator
-genSymScoped scope var ref
+genPadEntryScoped :: MonadSTM m => Scope -> VRef -> m PadEntry
+genPadEntryScoped scope ref
     | SConstant <- scope = do
-        return (makeEntry $ EntryConstant typ ref)
+        return (EntryConstant typ ref)
     | isStaticScope scope = do
         tvar    <- liftSTM $ newTVar ref
-        return (makeEntry $ EntryStatic typ ref tvar)
+        return (EntryStatic typ ref tvar)
     | otherwise = do
         tvar    <- liftSTM $ newTVar ref
         fresh   <- liftSTM $ newTVar True
-        return (makeEntry $ EntryLexical typ ref tvar fresh)
+        return (EntryLexical typ ref tvar fresh)
     where
     typ = refType ref
-    makeEntry entry
-        | SCodeMulti <- v_sigil var = \(MkPad map) -> MkPad (Map.insertWith (mergePadEntry var) var entry map)
-        | otherwise                 = \(MkPad map) -> MkPad (Map.insert var entry map)
+
+genSymScoped :: MonadSTM m => Scope -> Var -> VRef -> m PadMutator
+genSymScoped scope var ref = do
+    entry <- genPadEntryScoped scope ref
+    return (mkPadMutator var entry)
+
+mkPadMutator :: Var -> PadEntry -> PadMutator
+mkPadMutator var entry
+    | SCodeMulti <- v_sigil var = \(MkPad map) -> MkPad (Map.insertWith (mergePadEntry var) var entry map)
+    | otherwise                 = \(MkPad map) -> MkPad (Map.insert var entry map)
 
 {-|