Handle java deprecation message properly

rakudo · May 21, 2015 · 498ce69 · 498ce69
1 parent 65aaeec
commit 498ce69
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Perl6/ModuleLoader.nqp b/src/Perl6/ModuleLoader.nqp
@@ -90,7 +90,7 @@ class Perl6::ModuleLoader does Perl6::ModuleLoaderVMConfig {
                         }
                     }
                     if %opts<from> eq 'java' {
-                        $*W.DEPRECATED($/,':from<Java>','2015.01','2015.09',:what(':from<java>'));
+                        $*W.DEPRECATED($/,':from<Java>','2015.01','2015.09',:what(':from<java>'), :$line, :$file);
                         return %language_module_loaders<Java>.load_module($module_name,
                             %opts, |@GLOBALish, :$line, :$file);
                     }

diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -732,13 +732,13 @@ class Perl6::World is HLL::World {
         1;
     }
 
-    method DEPRECATED($/,$alternative,$from,$removed,:$what) {
+    method DEPRECATED($/,$alternative,$from,$removed,:$what,:$line,:$file) {
         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))),
+              :file($file // self.current_file),
+              :line($line // HLL::Compiler.lineof($/.orig, $/.from, :cache(1))),
             );
         }
     }