Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Reboot and fix viv

  • Loading branch information...
commit 6e4a586d12ef50df8f8a9acec4fac3325643bded 1 parent 8246478
Stefan O'Rear sorear authored

Showing 4 changed files with 13,446 additions and 11,902 deletions. Show diff stats Hide diff stats

  1. +6 6 boot/Cursor.pmc
  2. +13,435 11,895 boot/STD.pmc
  3. +1 0  dist.ini
  4. +4 1 viv
12 boot/Cursor.pmc
@@ -7,7 +7,7 @@ use Encode;
7 7 moose_extends('CursorBase');
8 8 our $ALLROLES = { 'Cursor', 1 };
9 9 our $REGEXES = {
10   - ALL => [ qw// ],
  10 +ALL => [ qw// ],
11 11 };
12 12
13 13
@@ -63,7 +63,7 @@ die 'Required argument s omitted' unless @_;
63 63 my $s = @_ ? shift() : undef;
64 64 $self->deb("sorry $s") if $::DEBUG;
65 65 print STDERR $Cursor::RED, '===', $Cursor::CLEAR, 'SORRY!', $Cursor::RED, '===', $Cursor::CLEAR, "\n"
66   - unless $::IN_SUPPOSE or $::FATALS++;
  66 +unless $::IN_SUPPOSE or $::FATALS++;
67 67 if ($s) {
68 68 my $m = $s;
69 69 $m .= $self->locmess . "\n" unless $m =~ /\n$/;
@@ -92,7 +92,7 @@ my $post = substr($::ORIG, $pos, 40);
92 92 1 while $post =~ s!(\n.*)!!;
93 93 $post = '<EOL>' if $post eq '';
94 94 " at " . $::FILE->{'name'} . " line $line:\n------> " . $Cursor::GREEN . $pre . $Cursor::YELLOW . $::PERL6HERE . $Cursor::RED .
95   - "$post$Cursor::CLEAR";
  95 +"$post$Cursor::CLEAR";
96 96 };
97 97 ## method line
98 98 sub line {
@@ -114,9 +114,9 @@ my @text = split(/^/,$::ORIG);
114 114 for (@text) {
115 115 $line++;
116 116 $::MEMOS[$pos++]->{'L'} = $line
117   - for 1 .. length($_);
  117 +for 1 .. length($_);
118 118 }
119   - ;
  119 +;
120 120 $::MEMOS[$pos++]->{'L'} = $line;
121 121 return $::MEMOS[$p]->{'L'} // 0;
122 122 };
@@ -139,4 +139,4 @@ my $s = "'$stop'";
139 139 $s = '"\'"' if $s eq "'''";
140 140 $self->panic("Unable to parse $name" . $startpos->locmess . "\nCouldn't find final $s; gave up");
141 141 };
142   - 1; };
  142 +1; };
25,330 boot/STD.pmc
13,435 additions, 11,895 deletions not shown
1  dist.ini
... ... @@ -1,5 +1,6 @@
1 1 name = STD
2 2 license = Artistic_2_0
  3 +version = 20101111
3 4
4 5 author = Larry Wall <larry@wall.org>
5 6 author = Stefan O'Rear <stefanor@cox.net>
5 viv
@@ -802,6 +802,9 @@ TEMPLATE
802 802 { package VAST::Concatenation; our @ISA = ('VAST::Base', 'VAST::InfixCall');
803 803 }
804 804
  805 +{ package VAST::Assignment_operator; our @ISA = ('VAST::Base', 'VAST::InfixCall');
  806 +}
  807 +
805 808
806 809 { package VAST::Conditional; our @ISA = 'VAST::Base';
807 810 sub emit_p5 { my $self = shift;
@@ -1251,7 +1254,7 @@ TEMPLATE
1251 1254 RE_bindnamed->new(var => $1, atom =>
1252 1255 $self->{binding}{quantified_atom}->re_ast);
1253 1256 } else {
1254   - RE_var->new(var => $self->{termish}->p5);
  1257 + RE_var->new(var => scalar $self->{variable}->p5);
1255 1258 }
1256 1259 }
1257 1260 }

0 comments on commit 6e4a586

Please sign in to comment.
Something went wrong with that request. Please try again.