Changeset 7943 for src/Pugs/Lexer.hs

Timestamp:

11/13/05 04:54:04 (3 years ago)

Author:

luqui

Message:

Fixed '$foo'.perl (wasn't properly escaping the $).
In the process, I blessed and implemented "\d[123]".

Files:

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

src/Pugs/Lexer.hs

@@ -61 +61 @@
 maybeParens :: CharParser st a -> CharParser st a
 maybeParens p = choice [ parens p, p ]
+maybeBrackets :: CharParser st a -> CharParser st a
+maybeBrackets p = choice [ brackets p, p ]
 
 parens     :: CharParser st a -> CharParser st a
@@ -204 +206 @@
 charNum :: GenParser Char st Char                    
 charNum         = do{ code <- decimal 
-                              <|> do{ char 'o'; number 8 octDigit }
-                              <|> do{ char 'x'; number 16 hexDigit }
-                              <|> do{ char 'd'; number 10 digit }
+                              <|> do{ char 'o'; maybeBrackets $ number 8 octDigit }
+                              <|> do{ char 'x'; maybeBrackets $ number 16 hexDigit }
+                              <|> do{ char 'd'; maybeBrackets $ number 10 digit }
                     ; return (toEnum (fromInteger code))
                     }