Rename to avoid a conflict.

rakudo · Dec 10, 2012 · 324cb25 · 324cb25
1 parent 53e70fb
commit 324cb25
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Perl6/World.pm b/src/Perl6/World.pm
@@ -2047,11 +2047,11 @@ class Perl6::World is HLL::World {
             }
 
             # Build and throw exception object.
-            %opts<line>     := HLL::Compiler.lineof($c.orig, $c.pos);
-            %opts<modules>  := p6ize_recursive(@*MODULES);
-            %opts<pre>      := @locprepost[0];
-            %opts<post>     := @locprepost[1];
-            %opts<expected> := p6ize_recursive(@expected) if @expected;
+            %opts<line>            := HLL::Compiler.lineof($c.orig, $c.pos);
+            %opts<modules>         := p6ize_recursive(@*MODULES);
+            %opts<pre>             := @locprepost[0];
+            %opts<post>            := @locprepost[1];
+            %opts<highexpect>      := p6ize_recursive(@expected) if @expected;
             %opts<is-compile-time> := 1;
             for %opts -> $p {
                 if nqp::islist($p.value) {

diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -309,7 +309,7 @@ my role X::Comp is Exception {
     has $.is-compile-time = False;
     has $.pre;
     has $.post;
-    has @.expected;
+    has @.highexpect;
     multi method gist(::?CLASS:D:) {
         if $.is-compile-time {
             my $color = %*ENV<RAKUDO_ERROR_COLOR> // $*OS ne 'MSWin32';
@@ -319,9 +319,9 @@ my role X::Comp is Exception {
             my $eject = $*OS eq 'MSWin32' ?? "<HERE>" !! "\x[23CF]";
             my $r = "$red==={$clear}SORRY!$red===$clear\n$.message\nat $.filename():$.line\n------> ";
             $r ~= "$green$.pre$yellow$eject$red$.post$clear" if defined $.pre;
-            if @.expected {
+            if @.highexpect {
                 $r ~= "\n    expecting any of:";
-                for @.expected {
+                for @.highexpect {
                     $r ~= "\n        $_";
                 }
             }