Generalize a World.DEPRECATED method, and use it

rakudo · May 19, 2015 · 56e4733 · 56e4733
1 parent a6e5e93
commit 56e4733
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -714,15 +714,9 @@ class Perl6::World is HLL::World {
             %*PRAGMAS<soft> := $on;
         }
         elsif $name eq 'MONKEY_TYPING' {
-            my $DEPRECATED := self.find_symbol(['&DEPRECATED']);
-            unless nqp::isnull($DEPRECATED) {
-                $DEPRECATED(
-                  'use MONKEY-TYPING', '2015.04', '2015.09',
-                  :what('use MONKEY_TYPING'),
-                  :file(self.current_file),
-                  :line(HLL::Compiler.lineof($/.orig, $/.from, :cache(1))),
-                );
-            }
+            self.DEPRECATED($/,"'use MONKEY-TYPING'",'2015.04','2015.09',
+              :what("'use MONKEY_TYPING'"),
+            );
             if $arglist { self.throw($/, 'X::Pragma::NoArgs', :$name) }
             %*PRAGMAS<MONKEY-TYPING> := $on;
         }
@@ -735,6 +729,17 @@ class Perl6::World is HLL::World {
         1;
     }
 
+    method DEPRECATED($/,$alternative,$from,$removed,:$what) {
+        my $DEPRECATED := self.find_symbol(['&DEPRECATED']);
+        unless nqp::isnull($DEPRECATED) {
+            $DEPRECATED($alternative,$from,$removed,
+              :$what,
+              :file(self.current_file),
+              :line(HLL::Compiler.lineof($/.orig, $/.from, :cache(1))),
+            );
+        }
+    }
+
     method current_file() {
         my $file := nqp::getlexdyn('$?FILES');
         if nqp::isnull($file) {