Changeset 22174 for src/perl6

Timestamp:

09/06/08 21:10:58 (3 months ago)

Author:

lwall

Message:

[STD] allow 'where' clauses on bare type names (mostly for matching)

Location:

src/perl6

Files:

• Cursor.pmc (modified) (1 diff)
• STD.pm (modified) (4 diffs)

src/perl6/Cursor.pmc

@@ -2422 +2422 @@
         my $base = $ALT // '';
         $base .= ' ' if $base;
+        my %autolexbase = %AUTOLEXED;
         for my $alt (@$alts) {
+            local %AUTOLEXED = %autolexbase;    # alts are independent
             $fakepos = $oldfakepos;
             local $ALT = $base . $alt->{alt};

src/perl6/STD.pm

@@ -2537 +2537 @@
     [
     | '(' <capture>? ')'
-    | <termish>
+    | <?before \S> <termish>
     ]
 }
@@ -2569 +2569 @@
     <longname> { $¢.add_type($<longname>); }
     [ of <fulltypename> ]?
-    where <EXPR>
+    where <termish>
 }
 
@@ -3198 +3198 @@
 
 token args ($istype = 0) {
-    :my $listopy = 0;
+    :my $listopish = 0;
     [
     | '.(' <in: ')', 'semilist', 'argument list'> {*}             #= func args
     | '(' <in: ')', 'semilist', 'argument list'> {*}              #= func args
     | <.unsp> '.'? '(' <in: ')', 'semilist', 'argument list'> {*} #= func args
-    | {} [<?before \s> <!{ $istype }> <.ws> <!infixstopper> <arglist>]? { $listopy = 1 }
-    ]
-
-    [
-    || <?{ $listopy }>
+    | {} <?before \s> <.ws>
+        [
+        || <!{ $istype }> <!infixstopper> <arglist> { $listopish = 1 }
+        || <?{ $istype }> ['where' <.ws> <constraints=termish> <.ws>]*
+        ]
+        
+    ]
+
+    [
+    || <?{ $listopish }>
     || ':' <?before \s> <arglist>    # either switch to listopiness
     || {{ $+prevop = $<O> = {}; }}   # or allow adverbs (XXX needs hoisting?)
@@ -3229 +3234 @@
             {*}                                                 #= packagevar 
         ]?
+        # subset type?
+        <.ws>
+        [ 'where' <.ws> <constraints=termish> <.ws> ]*
         {*}                                                     #= typename