Changeset 7952

Timestamp:

11/14/05 03:15:26 (3 years ago)

Author:

luqui

svk:copy_cache_prev:

10363

Message:

Added mandatoryWhiteSpace combinator (needs cleanup).
Changed \^{X control char to \cX, as per spec. Also fixed math so that
\cA refers to char 1 rather than 0 (where \c@ refers to 0).
Implemented method-call listop form: $obj.method: arg1, arg2.}

Location:

src/Pugs

Files:

• Lexer.hs (modified) (3 diffs)
• Parser.hs (modified) (1 diff)
• Pretty.hs (modified) (1 diff)

src/Pugs/Lexer.hs

@@ -13 +13 @@
 module Pugs.Lexer (
     wordAlpha, wordAny, isWordAlpha, isWordAny,
-    maybeParens, parens, whiteSpace, lexeme, identifier,
+    maybeParens, parens, whiteSpace, mandatoryWhiteSpace, lexeme, identifier,
     braces, brackets, angles, balanced, balancedDelim, decimal,
 
@@ -69 +69 @@
 whiteSpace :: CharParser st ()
 whiteSpace = P.whiteSpace perl6Lexer
+mandatoryWhiteSpace :: CharParser st ()
+mandatoryWhiteSpace = skipMany1 (oneOf " \t\n")  -- XXX unicode and whatnot
 lexeme     :: CharParser st a -> CharParser st a
 lexeme     = P.lexeme     perl6Lexer
@@ -200 +202 @@
 
 charControl :: GenParser Char st Char
-charControl     = do{ char '^'
+charControl     = do{ char 'c'
                     ; code <- upper
-                    ; return (toEnum (fromEnum code - fromEnum 'A'))
+                    ; return (toEnum (fromEnum code - fromEnum '@'))
                     }
 

src/Pugs/Parser.hs

@@ -1633 +1633 @@
     (invs,args) <- if mustHaveParens
         then parseHasParenParamList
-        else option (Nothing,[]) $ parseParenParamList
+        else do  -- $obj.foo: arg1, arg2    # listop method call
+                 -- we require whitespace after the colon (but not before)
+                 -- so that @list.map:{...} doesn't get interpreted the
+                 -- wrong way.
+            listcolon <- option False $ try $ do { char ':'; mandatoryWhiteSpace; return True }
+            if listcolon
+                then parseNoParenParamList
+                else option (Nothing,[]) $ parseParenParamList
     when (isJust invs) $ fail "Only one invocant allowed"
     return $ \x -> if hasEqual

src/Pugs/Pretty.hs

@@ -191 +191 @@
 quoted '%'  = "\\%"
 quoted '&'  = "\\&"
+quoted '^'  = "\\^"
 quoted x | x < ' ' || x > '~' = "\\d[" ++ show (ord x) ++ "]"
 quoted x = [x]