Changeset 6392

Timestamp:

08/21/05 12:05:16 (3 years ago)

Author:

scook0

svk:copy_cache_prev:

8581

Message:

* Merge some more parser redundancy
* Oops, ruleDelimitedIdentifier shouldn't use lexeme identifiers
* ruleDelimitedIdentifier now matches leading delimiters

Location:

src/Pugs

Files:

• Lexer.hs (modified) (2 diffs)
• Parser.hs (modified) (5 diffs)

src/Pugs/Lexer.hs

@@ -16 +16 @@
     braces, brackets, angles, balanced, balancedDelim, decimal,
 
-    ruleQualifiedIdentifier, ruleWhiteSpaceLine,
+    ruleDelimitedIdentifier, ruleQualifiedIdentifier, ruleWhiteSpaceLine,
 
     symbol, interpolatingStringLiteral, escapeCode,
@@ -83 +83 @@
 decimal    = P.decimal    perl6Lexer
 
+{-|
+Match one or more identifiers, separated internally by the given delimiter
+(with an optional leading delimiter).
+
+Returns a list of the identifiers matched, discarding the delimiters.  You
+can always recreate them using \"@concat $ intersperse delim@\" if you want,
+or else use 'ruleQualifiedIdentifier'.
+-}
+ruleDelimitedIdentifier :: String -- ^ Delimiter (e.g. \'@::@\')
+                        -> GenParser Char st [String]
+ruleDelimitedIdentifier delim = verbatimRule "delimited identifier" $ do
+    option "" (try $ string delim) -- leading delimiter
+    ruleVerbatimIdentifier `sepBy1` (try $ string delim)
+
 ruleQualifiedIdentifier :: GenParser Char st String
 ruleQualifiedIdentifier = verbatimRule "qualified identifier" $ do
-    chunks  <- ruleVerbatimIdentifier `sepBy1` (try $ string "::")
+    chunks <- ruleDelimitedIdentifier "::"
     return $ concat (intersperse "::" chunks)
 

src/Pugs/Parser.hs

@@ -545 +545 @@
     scope       <- ruleScope
     typename    <- choice
-        [ do { name <- ruleQualifiedIdentifier ; whiteSpace ; return name }
+        [ lexeme ruleQualifiedIdentifier
         , return ""
         ]  -- Type
@@ -661 +661 @@
         
 {-|
-Match one or more identifiers, separated internally by the given delimiter.
-
-Returns a list of the identifiers matched, discarding the delimiters.  You
-can always recreate them using \"@concat $ intersperse delim@\" if you want.
-
-If you want to match leading or trailing delimiters, you'll have to do that
-yourself.
--}
-ruleDelimitedIdentifier :: String -- ^ Delimiter (e.g. \'@::@\')
-                        -> RuleParser [String]
-ruleDelimitedIdentifier delim = 
-    (<?> "delimited identifier") $ identifier `sepBy1` (try $ string delim)
-
-{-|
 Match the package-name and import-list part of a (non-JSAN) @use@ or @no@
 declaration, then perform the actual import.
@@ -753 +739 @@
 ruleAuthorPart = do -- author - XXX
     char '-'
+    -- this will break if you specify an author AND an imports list
     str <- many1 (satisfy (/= ';'))
     return ('-':str)
@@ -776 +763 @@
 ruleRequireDeclaration = tryRule "require declaration" $ do
     symbol "require"
-    names <- identifier `sepBy1` (try $ string "::")
-    _ <- option "" $ do -- version - XXX
-        char '-'
-        many1 (choice [ digit, char '.' ])
+    names <- ruleDelimitedIdentifier "::"
+    _     <- option "" $ ruleVersionPart
+    _     <- option "" $ ruleAuthorPart
     return $ App (Var "&require") Nothing [Val . VStr $ concat (intersperse "/" names) ++ ".pm"]
 
@@ -1655 +1641 @@
     twigil  <- ruleTwigil
     -- doesn't handle names /beginning/ with "::"
-    names   <- ruleDelimitedIdentifier "::"
-    return $ (sigil:twigil) ++ concat (intersperse "::" names)
+    name    <- ruleQualifiedIdentifier
+    return $ (sigil:twigil) ++ name
 
 ruleTwigil :: RuleParser String