Changeset 5168 for src/Pugs/Compile.hs

Timestamp:

07/04/05 00:35:11 (3 years ago)

Author:

autrijus

svk:copy_cache_prev:

6965

Message:

* qualified names now dealt with consistently; new and

improved API moved to Pugs.Eval.Var:

isQualified, packageOf, qualify, toPackage, toQualified,

Files:

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

src/Pugs/Compile.hs

@@ -16 +16 @@
 import Pugs.Types
 import Pugs.Eval
+import Pugs.Eval.Var
 import Emit.PIR
 import Text.PrettyPrint
@@ -428 +429 @@
 varText x           = error $ "invalid name: " ++ x
 
-packageOf :: String -> String
-packageOf name = case isQualified name of
-    Just (pkg, _)   -> pkg
-    _               -> "main"
-
-qualify :: String -> String
-qualify name = case isQualified name of
-    Just _  -> name
-    _       -> let (sigil, name') = span (not . isAlphaNum) name
-        in sigil ++ "main::" ++ name'
-
-isQualified :: String -> Maybe (String, String)
-isQualified name | Just (post, pre) <- breakOnGlue "::" (reverse name) =
-    let (sigil, pkg) = span (not . isAlphaNum) preName
-        name'       = possiblyFixOperatorName (sigil ++ postName)
-        preName     = reverse pre
-        postName    = reverse post
-    in Just (pkg, name')
-isQualified _ = Nothing
-
 initTEnv :: Eval TEnv
 initTEnv = do