Support --javaclass option on selfhost.

jnthn · Apr 15, 2013 · d8d3f2f · d8d3f2f
1 parent 39e3a72
commit d8d3f2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/nqp-src/NQP.pm b/nqp-src/NQP.pm
@@ -3423,6 +3423,7 @@ $nqpcomp.language('nqp');
 $nqpcomp.parsegrammar(NQP::Grammar);
 $nqpcomp.parseactions(NQP::Actions);
 hll-config($nqpcomp.config);
+$nqpcomp.addstage('classname', :after<start>);
 
 # Add extra command line options.
 my @clo := $nqpcomp.commandline_options();
@@ -3434,6 +3435,7 @@ my @clo := $nqpcomp.commandline_options();
 @clo.push('no-regex-lib');
 @clo.push('dynext=s');
 @clo.push('stable-sc');
+@clo.push('javaclass=s');
 
 sub MAIN(*@ARGS) {
     # Enter the compiler.

diff --git a/nqp-src/NQPHLL.pm b/nqp-src/NQPHLL.pm
@@ -910,7 +910,8 @@ class HLL::Backend::JVM {
     }
 
     method jast($qast, *%adverbs) {
-        nqp::getcomp('qast').jast($qast, :classname(nqp::sha1('eval-at-' ~ nqp::time_n())));
+        my $classname := %*COMPILING<%?OPTIONS><javaclass> || nqp::sha1('eval-at-' ~ nqp::time_n());
+        nqp::getcomp('qast').jast($qast, :$classname);
     }
 
     method classfile($jast, *%adverbs) {