Changeset 12176 for src/Pugs/Lexer.hs

Timestamp:

08/12/06 19:55:50 (2 years ago)

Author:

audreyt

Message:

* First cut at proper compile-time role mixin support, based on

discussion on #perl6 about the semantics of "does".

class C {};
class D does C {};
D.isa(C); # False
D.does(C); # True

Composition works, and overriding role methods should work as well,
but concrete class/package names is not yet renamed, and role conflicts
is not yet validated. Still, a step toward the right direction.

Files:

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

src/Pugs/Lexer.hs

@@ -375 +375 @@
     return rv
 
-ruleTrait :: RuleParser String
-ruleTrait = rule "trait" $ do
-    symbol "is" <|> symbol "does"
+ruleTrait :: [String] -> RuleParser (String, String)
+ruleTrait auxs = rule "trait" $ do
+    aux <- choice $ map symbol auxs
     trait <- do
         optional $ string "::" -- XXX Bad Hack
@@ -387 +387 @@
     --             change it all once the proper behaviour is implemented.
     optional $ verbatimParens $ many $ satisfy (/= ')')
-    return trait
+    return (aux, trait)
 
 ruleTraitName :: String -> RuleParser String