Skip to content
Permalink
Browse files

Don't mark $_ container with `is dynamic` in 6.d

We already changed the spectests to allow for this change to happen
during the 6.d release preparations.

The moving of `finishpad` is to make sure that we don't create the topic
container descriptor until after the language version is decided;
otherwise, even in 6.c it will be created as non-dynamic and then
re-used after that point in that mode.
  • Loading branch information...
jnthn committed Jan 2, 2019
1 parent 401a354 commit 33f79fefa4dbaab15b125d933772eaa5a0ccefb2
Showing with 3 additions and 3 deletions.
  1. +1 −1 src/Perl6/Grammar.nqp
  2. +2 −2 src/Perl6/World.nqp
@@ -824,9 +824,9 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
$*W.loading_and_symbol_setup($/)
}
<.finishpad>
<.bom>?
<lang-version>
<.finishpad>
<statementlist=.FOREIGN_LANG($*MAIN, 'statementlist', 1)>
<.install_doc_phaser>
@@ -1913,8 +1913,8 @@ class Perl6::World is HLL::World {
'default_value', $WHAT,
'scalar_value', $WHAT,
);
my $desc :=
self.create_container_descriptor($Mu, $name, $WHAT, 1);
my $dynamic := $*W.lang-ver-before('d') || $name ne '$_';
my $desc := self.create_container_descriptor($Mu, $name, $WHAT, $dynamic);

my $cont := self.build_container_and_add_to_sc(%info, $desc);

0 comments on commit 33f79fe

Please sign in to comment.
You can’t perform that action at this time.