Changeset 12266 for src/Pugs/Lexer.hs

Timestamp:

08/15/06 19:05:38 (2 years ago)

Author:

audreyt

Message:

* "\0" is made legal again, though "\00" "\01" etc are all still failures.

Files:

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

src/Pugs/Lexer.hs

@@ -263 +263 @@
 -- | Backslashed non-alphanumerics (except for @\^@) translate into themselves.
 escapeCode      :: RuleParser String
-escapeCode      = ch charEsc <|> charNum <|> ch charAscii <|> ch charControl <|> ch anyChar
+escapeCode      = charNum <|> ch charEsc <|> ch charAscii <|> ch charControl <|> ch anyChar
                 <?> "escape code"
     where
@@ -278 +278 @@
 charNum = do
     codes <- choice
-        [ many1 digit >>= \ds -> do
-            error ("Error: \\" ++ ds ++ " is ambiguous: write as decimal \\d" ++ ds ++ " or octal \\o" ++ ds ++ " instead") -- $ return [read ds]
+        [ many1 digit >>= \ds -> case ds of
+            "0" -> return [0]
+            _   -> error ("Error: Invalid escape sequence \\" ++ ds ++ "; write as decimal \\d" ++ ds ++ " or octal \\o" ++ ds ++ " instead") -- $ return [read ds]
         , based 'o'  8 octDigit
         , based 'x' 16 hexDigit