move PRE/POST error message logic to the error class; trim condition …

…text
rakudo · Mar 18, 2012 · 924712d · 924712d
1 parent d1505ae
commit 924712d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/Perl6/World.pm b/src/Perl6/World.pm
@@ -1254,10 +1254,8 @@ class Perl6::World is HLL::World {
                 PAST::Var.new( :name($sym), :scope('lexical_6model') ));
         }
         elsif $phaser eq 'PRE' || $phaser eq 'POST' {
-            my $what := self.add_string_constant(
-                $phaser eq 'PRE' ?? 'Precondition' !! 'Postcondition'
-            );
-            $what.named('what');
+            my $what := self.add_string_constant($phaser);
+            $what.named('phaser');
             my $condition := self.add_string_constant(~$/<blorst>);
             $condition.named('condition');
 

diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -498,12 +498,13 @@ my class X::Package::Stubbed does X::Comp {
 }
 
 my class X::Phaser::PrePost is Exception {
-    has $.what = 'Precondition';
+    has $.phaser = 'PRE';
     has $.condition;
     method message {
+        my $what = $.phaser eq 'PRE' ?? 'Precondition' !! 'Postcondition';
         $.condition.defined
-            ?? "$.what '$.condition' failed"
-            !! "$.what failed";
+            ?? "$what '$.condition.trim()' failed"
+            !! "$what failed";
     }
 }