Changeset 21929 for src/Pugs/Lexer.hs

Timestamp:

08/18/08 08:49:33 (3 months ago)

Author:

audreyt

Message:

* Pugs.Lexer: Restore "\c[CHARACTER NAME]" support.

Add support for "\c[CHARNAME1, CHARNAME2]".
Restore support for control character escapes such as "\cL".
(However, "\c1" is now interpreted as chr(1), not "q" as in perl5.)

Files:

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

src/Pugs/Lexer.hs

@@ -273 +273 @@
 -- | Backslashed non-alphanumerics (except for @\^@) translate into themselves.
 escapeCode      :: RuleParser String
-escapeCode      = charNum <|> ch charEsc <|> ch charAscii <|> ch charControl <|> ch anyChar
+escapeCode      = charNum <|> ch charEsc <|> ch charAscii <|> charControl <|> ch anyChar
                 <?> "escape code"
     where
     ch = fmap (:[])
 
-charControl :: RuleParser Char
+charControl :: RuleParser String
 charControl = do
     char 'c'
-    code <- upper <|> oneOf "@["
+    code <- upper <|> oneOf "@[" <|> digit
     case code of
         '[' -> do
-            charName <- many (satisfy (/= ']'))
+            charNames <- many1 (noneOf ",]") `sepBy1` many1 ruleComma
             char ']'
-            case nameToCode charName of
-                Just c  -> return (chr c)
-                _       -> error $ "Invalid unicode character name: " ++ charName
-        _   -> return (toEnum (fromEnum code - fromEnum '@'))
+            forM charNames $ \charName -> do
+                if all isDigit charName
+                    then return $ chr (read charName)
+                    else case nameToCode charName of
+                        Just c  -> return (chr c)
+                        _       -> fail $ "Invalid unicode character name: " ++ charName
+        _ | isDigit code -> do
+            cs <- many digit
+            return [chr $ read (code:cs)]
+        _   -> return [toEnum (fromEnum code - fromEnum '@')]
 
 -- This is currently the only escape that can return multiples.
@@ -302 +308 @@
         , based 'o'  8 octDigit
         , based 'x' 16 hexDigit
-        , based 'c' 10 digit
+--        , based 'c' 10 digit
         ]
     return $ map (toEnum . fromInteger) codes