Changeset 16417

Timestamp:

05/18/07 00:18:48 (18 months ago)

Author:

audreyt

Message:

* Pugs.Parser.*: More cleanups; fake a compPad so CHECK blocks

still thinks they are running in compile time, even though
nothing really is under compilation.

Location:

src/Pugs/Parser

Files:

• Program.hs (modified) (2 diffs)
• Types.hs (modified) (4 diffs)
• Util.hs (modified) (3 diffs)

src/Pugs/Parser/Program.hs

@@ -174 +174 @@
         block{ bi_body = mergeStmts emptyExp $ bi_body block }
 
+    -- We are still in the compile time.
+    modify $ \s -> s{ s_env = (s_env s){ envCompPad = Just (error "no comp pad") } }
+
+    -- Force a reclose-pad evaluation here by way of unsafeEvalExp.
+    main'@(Val (VCode vc)) <- unsafeEvalExp $ Syn "" [unwrap main]
+
     -- S04: CHECK {...}*      at compile time, ALAP
     --  $_() for @*CHECK
@@ -190 +196 @@
     possiblyExit rv
 
-    -- Force a reclose-pad evaluation here by way of unsafeEvalExp.
-    main'@(Val (VCode vc)) <- unsafeEvalExp $ Syn "" [unwrap main]
-
     env' <- getRuleEnv
     return $ env'
-        { envBody       = App (Syn "block" [main']) Nothing (replicate (length $ subParams vc) (_Var "$*_")) -- _Var "@*ARGS"]
+        { envBody       = App (Syn "block" [main']) Nothing (replicate (length $ subParams vc) (_Var "$_")) -- _Var "@*ARGS"]
         , envPackage    = envPackage env
         , envCompPad    = Nothing

src/Pugs/Parser/Types.hs

@@ -4 +4 @@
     RuleParser, RuleState(..), CharClass(..),
     DynParsers(..), ParensOption(..), FormalsOption(..), BracketLevel(..), OuterLevel,
-    CodeMutator, BlockInfo(..), emptyBlockInfo,
+    BlockInfo(..), emptyBlockInfo,
 
     RuleOperator, RuleOperatorTable,
@@ -28 +28 @@
 data BlockInfo = MkBlockInfo
     { bi_pad    :: !Pad
-    , bi_traits :: !CodeMutator
+    , bi_traits :: !(TraitBlocks -> TraitBlocks)
     , bi_body   :: !Exp
     }
@@ -140 +140 @@
     { s_env           :: Env
     , s_parseProgram  :: (Env -> FilePath -> String -> Env)
-    , s_dynParsers    :: DynParsers     -- ^ Cache for dynamically-generated
-                                        --     parsers
-    , s_bracketLevel  :: !BracketLevel  -- ^ The kind of "bracket" we are in
-                                        --     part and has to suppress {..} literals
---  , s_char          :: Char           -- ^ What the previous character contains
---  , s_name          :: !ID            -- ^ Capture name
---  , s_pos           :: !Int           -- ^ Capture position
-    , s_wsLine        :: !Line          -- ^ Last whitespace position
-    , s_wsColumn      :: !Column        -- ^ Last whitespace position
---  , s_blockPads     :: Map Scope Pad  -- ^ Hoisted pad for this block
-    , s_outerVars     :: Map Var (TVar Pad) -- ^ OUTER symbols we remembers, and the scope it associates with
-                                       
+    , s_dynParsers    :: DynParsers         -- ^ Cache for dynamically-generated
+                                            --     parsers
+    , s_bracketLevel  :: !BracketLevel      -- ^ The kind of "bracket" we are in
+                                            --     part and has to suppress {..} literals
+--  , s_char          :: Char               -- ^ What the previous character contains
+--  , s_name          :: !ID                -- ^ Capture name
+--  , s_pos           :: !Int               -- ^ Capture position
+    , s_wsLine        :: !Line              -- ^ Last whitespace position
+    , s_wsColumn      :: !Column            -- ^ Last whitespace position
+--  , s_blockPads     :: Map Scope Pad      -- ^ Hoisted pad for this block
+    , s_knownVars     :: !(Map Var MPad)        -- ^ Map from variables to its associated scope
+    , s_outerVars     :: !(Map MPad (Set Var))  -- ^ Map from scopes to vars that must not be declared in it
+    , s_freeVars      :: !(Set (Var, LexPads))  -- ^ Set of free vars and the mpadlist to check with
+    , s_protoPad      :: !Pad                   -- ^ Pad that's part of all scopes; used in param init
     , s_closureTraits :: [TraitBlocks -> TraitBlocks]
                                        -- ^ Closure traits: head is this block, tail is all outer blocks
     }
-
-type CodeMutator = VCode -> VCode
 
 data BracketLevel
@@ -250 +250 @@
 addBlockPad :: Pad -> RuleParser ()
 addBlockPad pad = do
-    -- First we check that our pad does not contain shadows OUTER symbols.
+    -- To add a Pad to the COMPILING block, we do two things:
+    -- First, we check that our pad does not contain shadowed OUTER symbols.
+    -- XXX TODO: it should be fine for two identical padEntry to shadow each other,
+    --     as is the case with { our multi f () {}; { &f(); our multi f ($x) {} } }.
     state <- get
     let myVars          = padKeys pad

src/Pugs/Parser/Util.hs

@@ -24 +24 @@
     state   <- get
 
-    compPad <- return $! unsafePerformSTM $! newTVar emptyPad
+    -- XXX - Perhaps clone the protopad right here, for $_ etc?
+    compPad <- newMPad (s_protoPad state)
+
     -- traceM $ "Gen:" ++ show compPad
     let env     = s_env state
-        lexPads = (pad:envLexPads env)
+        lexPads = (PCompiling compPad:envLexPads env)
 
     put state
@@ -57 +59 @@
         , s_closureTraits = outerTraits
         , s_knownVars     = outerKnownVars
-        , s_outerVars     = Map.filter (/= compPad) (s_outerVars state')
+        , s_outerVars     = outerOuterVars
+        , s_protoPad      = emptyPad
         }
 
@@ -67 +70 @@
             let newEntry = entry{ pe_proto = proto }
             return (newEntry `seq` (var, newEntry))
-        newPad <- listToPad (length entries `seq` entries)
+        let newPad = listToPad (length entries `seq` entries)
         writeMPad compPad newPad
         return newPad