Changeset 22576

Timestamp:

10/11/08 09:27:34 (6 weeks ago)

Author:

lwall

Message:

[viv] now outputs p6 variables, declarations
[STD] more random hackage for viv and :exists
[STD] now parses declaration initializers as normal assignops

Location:

src/perl6

Files:

• STD.pm (modified) (7 diffs)
• viv (modified) (7 diffs)

src/perl6/STD.pm

@@ -984 +984 @@
     :dba('infix or meta-infix')
     [
-    | <colonpair> { $<fake> = 1; $<sym> = ':'; %<O><prec> = %loose_unary<prec>;  }
+    | <colonpair> {
+            $<fake> = 1;
+            $<sym> = ':';
+            %<O><prec> = %loose_unary<prec>;
+            %<O><assoc> = 'left';
+        }
     | <infix>
        [
@@ -1180 +1185 @@
       #  <?{ $<sigil> eq '@' | '%' }>
         <.unsp>?
-        [
+        $<shape> = [
         | '(' ~ ')' <signature>
         | :dba('shape definition') '[' ~ ']' <semilist>
@@ -1192 +1197 @@
 
     <post_constraint>*
-
-    # XXX generalize to any assignment operator?
-    :dba('variable initializer')
-    [
-    | '=' <.ws> <EXPR( ($<SIGIL> // '') eq '$' ?? item %item_assignment !! item %list_prefix )>
-    | '.=' <.ws> <dottyop>
-    ]?
 }
 
@@ -1204 +1202 @@
     :dba('scoped declarator')
     [
-    | <declarator>
+    | <declarator> { $<SIGIL> = $<declarator><SIGIL> }
     | <regex_declarator>
     | <package_declarator>
     | <fulltypename>+ <multi_declarator>
-    | <multi_declarator>
+    | <multi_declarator> { $<SIGIL> = $<multi_declarator><SIGIL> }
 #    | <?before <[A..Z]> > <name> <.panic("Apparent type name " ~ $<name>.text ~ " is not declared yet")>
     ]
@@ -1214 +1212 @@
 
 
-token scope_declarator:my       { <sym> <scoped> }
-token scope_declarator:our      { <sym> <scoped> }
-token scope_declarator:state    { <sym> <scoped> }
-token scope_declarator:constant { <sym> <scoped> }
-token scope_declarator:has      { <sym> <scoped> }
+token scope_declarator:my       { <sym> <scoped> { $<SIGIL> = $<scoped><SIGIL> } }
+token scope_declarator:our      { <sym> <scoped> { $<SIGIL> = $<scoped><SIGIL> } }
+token scope_declarator:state    { <sym> <scoped> { $<SIGIL> = $<scoped><SIGIL> } }
+token scope_declarator:constant { <sym> <scoped> { $<SIGIL> = $<scoped><SIGIL> } }
+token scope_declarator:has      { <sym> <scoped> { $<SIGIL> = $<scoped><SIGIL> } }
 
 
@@ -1306 +1304 @@
 token declarator {
     [
-    | <variable_declarator>
+    | <variable_declarator> { $<SIGIL> = $<variable_declarator><SIGIL> }
     | '(' ~ ')' <signature> <trait>*
     | <routine_declarator>
@@ -1314 +1312 @@
 }
 
-token multi_declarator:multi { <sym> <.ws> [ <declarator> || <routine_def> ] }
-token multi_declarator:proto { <sym> <.ws> [ <declarator> || <routine_def> ] }
-token multi_declarator:only  { <sym> <.ws> [ <declarator> || <routine_def> ] }
-token multi_declarator:null  { <declarator> }
+token multi_declarator:multi { <sym> <.ws> [ <declarator> { $<SIGIL> = $<declarator><SIGIL> } || <routine_def> ] }
+token multi_declarator:proto { <sym> <.ws> [ <declarator> { $<SIGIL> = $<declarator><SIGIL> } || <routine_def> ] }
+token multi_declarator:only  { <sym> <.ws> [ <declarator> { $<SIGIL> = $<declarator><SIGIL> } || <routine_def> ] }
+token multi_declarator:null  { <declarator> { $<SIGIL> = $<declarator><SIGIL> } }
 
 token routine_declarator:sub       { <sym> <routine_def> }

src/perl6/viv

@@ -14 +14 @@
 my $OPT_pos = 0;
 my $OPT_match = 0;
+my $OPT_log = 0;
 our $ORIG;
 our $POS;
-my %did_ws;
+my @did_ws;
 
 
@@ -33 +34 @@
             $output = 'p6';
             $OPT_pos = 1;
+        }
+        elsif ($switch eq '--log') {
+            $OPT_log = 1;
         }
         elsif ($switch eq '--pos') {
@@ -196 +200 @@
                 }
             }
-            elsif ($arity eq 'CHAIN') {
+            elsif ($self->{sym} eq 'identifier') {
+                $text .= join('', reverse @zyg);
+            }
+            else {
                 $text .= join('', @zyg);
-            }
-            else {
-                $text .= join('', reverse @zyg);
             }
         }
@@ -213 +217 @@
 
     sub ret { my $self = shift;
-        warn ref $self, " returns ", $_[0], "\n";
+        warn ref $self, " returns ", $_[0], "\n" if $OPT_log;
         $_[0];
     }
@@ -255 +259 @@
         my $ws = $self->{WS} // 0;
         my $pos = $self->{POS};
-        if ($ws and not $did_ws{$pos}++) {
+        if ($ws and not $did_ws[$pos]++) {
             substr($ORIG, $pos - $ws, $ws)
         }
@@ -282 +286 @@
     sub emit_p6 { my $self = shift;
         my $text = $self->SUPER::emit_p6(@_);
-        my $finalws = $$POS[-1]{ws};
-        $text .= substr($ORIG, $finalws, -1) if $finalws;
+        if (not @did_ws[@$POS-1]) {
+            my $finalws = $$POS[-1]{ws};
+            $text .= substr($ORIG, $finalws, -1) if $finalws;
+        }
         $self->ret($text);
     }
@@ -357 +363 @@
 }
 
+{ package VAST::scope_declarator; our @ISA = 'VAST::AddSym'; }
 { package VAST::statement_control; our @ISA = 'VAST::AddSym'; }
 { package VAST::version; our @ISA = 'VAST::AddSym'; }
 
+{ package VAST::variable_declarator; our @ISA = 'VAST::Base';
+    sub emit_p6 { my $self = shift;
+        my $text = $self->get_ws;
+        $text .= ($self->get_zyg('variable'))[0];
+        $text .= join '', $self->get_zyg('shape');
+        $text .= join '', $self->get_zyg('trait');
+        $text .= join '', $self->get_zyg('post_constraint');
+        $text;
+    }
+}
+
 if ($0 eq __FILE__) {
     ::MAIN(@ARGV);