Changeset 6392 for src/Pugs/Lexer.hs

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

Files:

• src/Pugs/Lexer.hs (modified) (2 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)