Changeset 7949

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/Parser.hs (modified) (1 diff)
• t/syntax/interpolation/strings.t (modified) (3 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

src/Pugs/Parser.hs

@@ -1660 +1660 @@
 ruleCodeSubscript :: RuleParser (Exp -> Exp)
 ruleCodeSubscript = tryVerbatimRule "code subscript" $ do
-    (invs,args) <- parens $ parseParamList
+    (invs, args) <- verbatimParens parseParamList
     -- FAILED PARSER PATCH
     --(invs, args) <- parseHasParenParamList -- XXX doesn't handle trailing 

t/syntax/interpolation/strings.t

@@ -12 +12 @@
 =cut
 
-plan 25;
+plan 26;
 
 my $world = "World";
@@ -28 +28 @@
 is("Wont you take me to &func()", 'Wont you take me to func-y town', 'closure interpolation');
 is("2 + 2 = { 2+2 }", '2 + 2 = 4', 'double quoted closure interpolation works');
-is("&func() is where I live", 'func-y town is where I live', "make sure function interpolation doesn't eat all trailing whitespace", :todo<bug>);
+is("&func() is where I live", 'func-y town is where I live', "make sure function interpolation doesn't eat all trailing whitespace");
 
 # L<S02/Names and Variables /except when interpolating/>
@@ -59 +59 @@
 is(qb"$world \\\"\n\t", "\$world \\\"\n\t", "only interpolate backslash");
 is('$world \qq[@list[]] %hash{}', '$world 1 2 %hash{}', "interpolate quoting constructs in ''");
+
+is(" \d[111] \d[107] ", ' o k ', "\\d[] respects whitespaces around it")