Changeset 16436

Timestamp:

05/18/07 22:03:36 (18 months ago)

Author:

audreyt

Message:

* Pugs.Parser: This error is finally a compile-time one, instead

of a runtime one:

Global symbol "$foo" requires explicit package name

As a result, a lot of ext/ code broke -- but they were really
broken already. Fixes welcome!

Files:

• src/Pugs/Parser.hs (modified) (1 diff)

src/Pugs/Parser.hs

@@ -2094 +2094 @@
 
             case Map.lookup var knownVars of
-                Just mpad   -> unless (Just mpad == compPad) $ do
-                    let outerPads        = takeWhile (/= mpad) [ pc | PCompiling pc <- lexPads ]
-                        markPad vars pad = Map.insertWith' Set.union pad (Set.singleton var) vars
-                    -- traceM $ "Adding: " ++ show (var, outerPads)
-                    put state{ s_outerVars = foldl' markPad outerVars outerPads }
-                _           -> put state{ s_freeVars = Set.insert (var, lexPads) freeVars }
-
-            return (makeVar name)
+                Just mpad   -> do
+                    unless (Just mpad == compPad) $ do
+                        let outerPads        = takeWhile (/= mpad) [ pc | PCompiling pc <- lexPads ]
+                            markPad vars pad = Map.insertWith' Set.union pad (Set.singleton var) vars
+                        -- traceM $ "Adding: " ++ show (var, outerPads)
+                        put state{ s_outerVars = foldl' markPad outerVars outerPads }
+                    return (makeVar name)
+                _           -> do
+                    -- If the variable is already defined as global, resolve it as such here.
+                    foundInGlobal <- return $! unsafePerformSTM $! do
+                        globPad <- readMPad (envGlobal env)
+                        return $ isJust (lookupPad (toGlobalVar var) globPad)
+                    when (not foundInGlobal) $ do
+                        pos <- getPosition
+                        when (sourceName pos /= "-e") $ do
+                            fail $ "Global symbol \"" ++ show var ++ "\" requires explicit package name"
+                    return (Var $ toGlobalVar var)
+                    -- put state{ s_freeVars = Set.insert (var, lexPads) freeVars }
 
 ruleVar :: RuleParser Exp