Changeset 7949 for src/Pugs/Lexer.hs

Timestamp:

11/13/05 17:31:09 (3 years ago)

Author:

autrijus

svk:copy_cache_prev:

10363

Message:

* luqui's \d[] patch eats the trailing space after the bracket;

change "brackets" to "verbatimBrackets" to solve this.

* moreover, fix the old bug of "&foo() &bar()" eating the

whitespace inbetween, due to the same cause.

* test for both in t/syntax/interpolation/strings.t

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 ]
+
+maybeVerbatimBrackets :: CharParser st a -> CharParser st a
+maybeVerbatimBrackets p = choice [ verbatimBrackets p, p ]
 
 parens     :: CharParser st a -> CharParser st a
@@ -205 +206 @@
 
 charNum :: GenParser Char st Char                    
-charNum         = do{ code <- decimal 
-                              <|> 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))
-                    }
+charNum = do
+    code <- choice
+        [ decimal 
+        , based 'o'  8 octDigit
+        , based 'x' 16 hexDigit
+        , based 'd' 10 digit
+        ]
+    return . toEnum $ fromInteger code
+    where
+    based ch num p = do
+        char ch
+        let p' = number num p
+        choice [ verbatimBrackets p', p' ]
 
 number :: Integer -> GenParser tok st Char -> GenParser tok st Integer