Changeset 6377

Timestamp:

08/20/05 15:55:47 (3 years ago)

Author:

scook0

svk:copy_cache_prev:

8581

Message:

Phase 1 of my 'use'-parser refactoring:
* Unified the 'lang' parser for JSAN & Perl packages
* JSAN & Perl paths now use similar code to parse the package name

Files:

• src/Pugs/Parser.hs (modified) (5 diffs)

src/Pugs/Parser.hs

@@ -617 +617 @@
     symbol "use"
     tryChoice [ ruleUseVersion >> return emptyExp
-              , ruleUseJSANModule
-              , ruleUsePackage True >> return emptyExp
+              , ruleUsePackage True
               ]
 
@@ -635 +634 @@
 
 {-|
+/This may now be obsolete.../
+
 Match the package-name and import-list part of a @use@ or @no@ declaration.
 
@@ -646 +647 @@
 -}
 ruleUsePackage :: Bool -- ^ @True@ for @use@; @False@ for @no@
-               -> RuleParser ()
+               -> RuleParser Exp
 ruleUsePackage use = rule "use package" $ do
-    lang    <- option "pugs" $ try $ do
+    lang <- ruleUsePackageLang
+    case lang of
+        "jsan" -> if use
+                      then ruleUseJSANModule
+                      else fail "can't 'no' a JSAN module"
+        _      -> ruleUsePerlPackage use lang
+    where
+    ruleUsePackageLang = option "pugs" $ try $ do
         lang <- identifier
         char ':'
         notFollowedBy (char ':')
         return lang
+
+ruleUsePerlPackage :: Bool -> String -> RuleParser Exp
+ruleUsePerlPackage use lang = rule "use perl package" $ do
     names   <- identifier `sepBy1` (try $ string "::")
     _       <- option "" $ ruleVersionPart
@@ -678 +689 @@
             ]
         return ()
-    return ()
+    return emptyExp
 
 {-|
+/This may now be obsolete.../
+
 Match a JSAN module name, preceded by \'@jsan:@\'.  Returns an appropriate
 sub call 'Pugs.AST.Exp' that will load the module using subs defined in
@@ -694 +707 @@
 ruleUseJSANModule :: RuleParser Exp
 ruleUseJSANModule = do
-    string "jsan:"
-    name <- liftM (Val . VStr . concat) $ many1 $ do
-        part <- identifier
-        dot  <- choice [ try $ string ".", string "" ]
-        return $ part ++ dot
+    names <- identifier `sepBy1` (try $ string ".")
+    let name = Val . VStr . concat $ intersperse "." names
     choice
         [ try $ do