Author: Pascal "Pixel" Rigaux

Perl5Parser/Env.hs

@@ -1,6 +1,8 @@
 module Perl5Parser.Env
     ( get_prototype
     , set_prototype
+    , with_new_lexical_block
+    , set_package
     ) where
 
 import Perl5Parser.Types
@@ -24,3 +26,22 @@ set_prototype (fq, f) proto = update_Prototypes update
 
 update_Prototypes :: (Prototypes -> Prototypes) -> Perl5Parser ()
 update_Prototypes f = updateState (\state -> state { prototypes = f (prototypes state) })
+
+update_Env :: (Env -> Env) -> Perl5Parser ()
+update_Env f = updateState (\state -> state { env = f (env state) })
+
+update_Env_lexical :: (Env_lexical -> Env_lexical) -> Perl5Parser ()
+update_Env_lexical f = update_Env (\env -> env { env_lexical = f (env_lexical env) })
+
+set_Env_lexical :: Env_lexical -> Perl5Parser ()
+set_Env_lexical env_lex = update_Env_lexical (\_ -> env_lex)
+
+with_new_lexical_block :: Perl5Parser a -> Perl5Parser a
+with_new_lexical_block p = 
+    do prev_env_lex <- fmap (env_lexical . env) getState
+       v <- p
+       set_Env_lexical prev_env_lex
+       return v
+
+set_package :: String -> Perl5Parser ()
+set_package pkg = update_Env_lexical (\env_lex -> env_lex { current_package = pkg })

Perl5Parser/Lines.hs

@@ -79,7 +79,14 @@ prototype = do char '('
                return (Just proto, [Tokens (Prototype proto : l)])
 
 subattrlist = option [] (toNodes Perl5Parser.Token.p_Attributes)
-package = newNode"package"$ pcons (symbol_node "package") (toNodes Perl5Parser.Token.p_Ident)
+
+package = newNode"package"$ p
+    where p = do l1 <- symbol_node "package"
+                 (fq, i) <- Perl5Parser.Token.p_Ident_raw
+                 let pkg = case fq of LocalIdent -> i ; _ -> fq_canonical fq ++ "::" ++ i
+                 Env.set_package pkg
+                 l2 <- spaces_comments_token
+                 return$ l1 : [Tokens $ Word pkg : l2]
 
 -- | Real conditional expressions
 if_then = newNode"if_then"$ seQ l