Changeset 6673

Timestamp:

09/03/05 21:49:59 (3 years ago)

Author:

luqui

Message:

r552@feather: fibonaci | 2005-09-03 21:49:38 +0200
The erroneous "sub <foo>" no longer parses. Sub parameters may now be operators,
eg. "sub foo(&infix:<+>) {...}".

Files:

• src/Pugs/Parser.hs (modified) (2 diffs)
• t/subroutines/lexical_subs.t (modified) (2 diffs)

src/Pugs/Parser.hs

@@ -453 +453 @@
 ruleSubName = verbatimRule "subroutine name" $ do
     twigil  <- ruleTwigil
-    fixity  <- option "" $ choice (map (try . string) $ fixities)
-    name    <- ruleQualifiedIdentifier
-                <|> try (between (string "<<") (string ">>")
-                    (many1 (satisfy (/= '>') <|> lookAhead (satisfy (/= '>')))))
-                <|> between (char '<') (char '>') (many1 $ satisfy (/= '>'))
-                <|> between (char '\171') (char '\187') (many1 $ satisfy (/= '\187'))
-    return $ "&" ++ twigil ++ fixity ++ name
+    name    <- ruleOperatorName <|> ruleQualifiedIdentifier
+    return $ "&" ++ twigil ++ name
+
+ruleOperatorName :: RuleParser String
+ruleOperatorName = do
+    fixity <- choice (map (try . string) fixities)
+    name <- try (between (string "<<") (string ">>")
+              (many1 (satisfy (/= '>') <|> lookAhead (satisfy (/= '>')))))
+            <|> between (char '<') (char '>') (many1 $ satisfy (/= '>'))
+            <|> between (char '\171') (char '\187') (many1 $ satisfy (/= '\187'))
+    return $ fixity ++ name
     where
     fixities = words " prefix: postfix: infix: circumfix: coerce: self: term: postcircumfix: rule_modifier: trait_verb: trait_auxiliary: scope_declarator: statement_control: infix_postfix_meta_operator: postfix_prefix_meta_operator: prefix_postfix_meta_operator: infix_circumfix_meta_operator: "
+    
 
 ruleSubParameters :: ParensOption -> RuleParser (Maybe [Param])
@@ -1733 +1738 @@
     -- Valid param names: $foo, @bar, &baz, %grtz, ::baka
     sigil   <- choice [ oneOf "$@%&" >>= return . (:""), string "::" ]
-    twigil  <- ruleTwigil
-    name    <- many1 wordAny
-    return $ sigil ++ twigil ++ name
+    if sigil == "&"
+        then ruleSubName
+        else do twigil <- ruleTwigil
+                name   <- many1 wordAny
+                return $ sigil ++ twigil ++ name
 
 ruleVarName :: RuleParser String

t/subroutines/lexical_subs.t

@@ -4 +4 @@
 use Test;
 
-plan 3;
+plan 5;
 
 sub f() { 
@@ -21 +21 @@
 is(callit({ $^x + 2 }), 3, "lexical subs get precedence over package subs");
 
+sub infix:<@@> ($x, $y) { $x + $y }
 
+sub foo2(&infix:<@@>) {
+    2 @@ 3;
+}
+
+is(2 @@ 3, 5);
+is(foo2({ $^x * $^y }), 6);
 
 # vim: ft=perl6 :