Changeset 21952 for src/perl6

Timestamp:

08/19/08 22:07:25 (3 months ago)

Author:

lwall

Message:

[STD] allow use of ::?CLASS in declaration
[STD] reverse use of ident/identifier to make ident the shorter one

Files:

• src/perl6/STD.pm (modified) (18 diffs)

src/perl6/STD.pm

@@ -445 +445 @@
 }
 
-token identifier {
+token ident {
     <.alpha> \w*
 }
@@ -453 +453 @@
 }
 
-token ident {
-    <.identifier> [ <.apostrophe> <.identifier> ]*
+token identifier {
+    <.ident> [ <.apostrophe> <.ident> ]*
 }
 
@@ -462 +462 @@
     ^^ '=' <.unsp>?
     [
-    | 'begin' \h+ <ident> :: .*?
-      "\n=" <.unsp>? 'end' \h+ $<ident> » \N*         {*}         #= tagged
+    | 'begin' \h+ <identifier> :: .*?
+      "\n=" <.unsp>? 'end' \h+ $<identifier> » \N*         {*}         #= tagged
     | 'begin' » :: \h* \n .*?
       "\n=" <.unsp>? 'end' » \N*                      {*}         #= anon
@@ -564 +564 @@
 
 token label {
-    <ident> ':' <?before \s> <.ws>
-
-    [ <?{ $¢.is_type($<ident>.text) }>
+    <identifier> ':' <?before \s> <.ws>
+
+    [ <?{ $¢.is_type($<identifier>.text) }>
       <.panic("You tried to use an existing typename as a label")>
-#      <suppose("You tried to use an existing name $/{'ident'} as a label")>
+#      <suppose("You tried to use an existing name $/{'identifier'} as a label")>
     ]?
 
     # add label as a pseudo type
-    # {{ eval 'COMPILING::{"::$<ident>"} = Label.new($<ident>)' }}  # XXX need statement ref too?
+    # {{ eval 'COMPILING::{"::$<identifier>"} = Label.new($<identifier>)' }}  # XXX need statement ref too?
 
 }
@@ -839 +839 @@
 
 token fatarrow {
-    <key=ident> \h* '=>' :: <.ws> <val=EXPR(item %item_assignment)>
+    <key=identifier> \h* '=>' :: <.ws> <val=EXPR(item %item_assignment)>
 }
 
@@ -848 +848 @@
     ':'
     [
-    | '!' <ident>
-        { $key = $<ident>.text; $value = 0; }
+    | '!' <identifier>
+        { $key = $<identifier>.text; $value = 0; }
         {*}                                                     #= false
-    | <ident>
-        { $key = $<ident>.text; }
+    | <identifier>
+        { $key = $<identifier>.text; }
         [
         || <.unsp>? '.'? <postcircumfix> { $value = $<postcircumfix>; }
@@ -875 +875 @@
     ':'
     [
-    | '!' <ident>
-        { $key = $<ident>.text; $value = 0; }
+    | '!' <identifier>
+        { $key = $<identifier>.text; $value = 0; }
         {*}                                                     #= false
-    | <ident>
-        { $key = $<ident>.text; }
+    | <identifier>
+        { $key = $<identifier>.text; }
         [
         || <.unsp>? '.'? <?before '('> <postcircumfix> { $value = $<postcircumfix>; }
@@ -1550 +1550 @@
 token name {
     [
-    | <ident> <morename>*
+    | <identifier> <morename>*
     | <morename>+
     ]?
@@ -1560 +1560 @@
     <?before '(' | <alpha> >
     [
-    | <ident>
+    | <identifier>
     | '(' :: <in: ')', 'EXPR', 'indirect name'>
     ]
@@ -1602 +1602 @@
 
 token typename {
-    <longname>
-    <?{
+    [
+    | '::?'<identifier>                 # parse ::?CLASS as special case
+    | <longname>
+      <?{
         my $longname = $<longname>.text;
         substr($longname, 0, 2) eq '::' or $¢.is_type($longname)
-    }>
+      }>
+    ]
     # parametric type?
     <.unsp>? [ <?before '['> <postcircumfix> ]?
@@ -2426 +2429 @@
 }
 token trait_auxiliary:will {
-    <sym> <.ws> <ident> <.ws> <block>
+    <sym> <.ws> <identifier> <.ws> <block>
 }
 
@@ -2498 +2501 @@
     ':'
     [
-    | <name=ident> '(' <.ws>
+    | <name=identifier> '(' <.ws>
         [ <named_param> | <param_var> <.ws> ]
         [ ')' || <.panic: "Unable to parse named parameter; couldn't find right parenthesis"> ]
@@ -2509 +2512 @@
     [
         # Is it a longname declaration?
-    || <?{ $<sigil>.text eq '&' }> <?ident> ::
-        <ident=sublongname>
+    || <?{ $<sigil>.text eq '&' }> <?identifier> ::
+        <identifier=sublongname>
 
     ||  # Is it a shaped array or hash declaration?
         <?{ $<sigil>.text eq '@' || $<sigil>.text eq '%' }>
-        <ident>?
+        <identifier>?
         <?before <[ \< \( \[ \{ ]> >
         <postcircumfix>
 
         # ordinary parameter name
-    || <ident>
+    || <identifier>
 
         # bare sigil?
@@ -2609 +2612 @@
 
 token term:sym<::?IDENT> ( --> Term) {
-    $<sym> = [ '::?' <ident> ] »
+    $<sym> = [ '::?' <identifier> ] »
 }
 
@@ -3068 +3071 @@
 #     { <typename> <?spacey> <arglist> { $<sym> = $<typename>.item; } }
 
-# force ident(), ident.(), etc. to be a function call always
-token term:ident ( --> Term )
+# force identifier(), identifier.(), etc. to be a function call always
+token term:identifier ( --> Term )
 {
     :my $i;
-    $i = <ident> <args( $¢.is_type($i.text) )>
+    $i = <identifier> <args( $¢.is_type($i.text) )>
 }
 
@@ -3097 +3100 @@
 
 # names containing :: may or may not be function calls
-# bare ident without parens also handled here if no other rule parses it
+# bare identifier without parens also handled here if no other rule parses it
 token term:name ( --> Term)
 {
@@ -3672 +3675 @@
     }
 
-    token assertion:ident { <ident> [               # is qq right here?
+    token assertion:identifier { <identifier> [               # is qq right here?
                                     | <?before '>' >
                                     | <.ws> <nibbler>
@@ -3738 +3741 @@
 
     token mod_internal:adv {
-        <?before ':' <ident> > [ :lang($¢.cursor_fresh($+LANG)) <quotepair> ] { $/<sym> := «: $<quotepair><key>» }
+        <?before ':' <identifier> > [ :lang($¢.cursor_fresh($+LANG)) <quotepair> ] { $/<sym> := «: $<quotepair><key>» }
     }