Skip to content

Commit

Permalink
rename SymbolTable to World
Browse files Browse the repository at this point in the history
  • Loading branch information
moritz committed Dec 17, 2011
1 parent d9d3ec3 commit d59a2d3
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions src/Perl6/Grammar.pm
@@ -1,6 +1,6 @@
use NQPP6Regex;
use QRegex;
use Perl6::SymbolTable;
use Perl6::World;
use Perl6::Pod;

grammar Perl6::Grammar is HLL::Grammar {
Expand All @@ -26,8 +26,8 @@ grammar Perl6::Grammar is HLL::Grammar {
# associated with this compilation unit.
my $file := pir::find_caller_lex__ps('$?FILES');
my $*ST := pir::isnull($file) ??
Perl6::SymbolTable.new(:handle(~pir::time__N())) !!
Perl6::SymbolTable.new(:handle(~pir::time__N()), :description($file));
Perl6::World.new(:handle(~pir::time__N())) !!
Perl6::World.new(:handle(~pir::time__N()), :description($file));

# XXX Hack: clear any marks.
pir::set_hll_global__vPsP(['HLL', 'Grammar'], '%!MARKHASH', nqp::null());
Expand Down
2 changes: 1 addition & 1 deletion src/Perl6/SymbolTable.pm → src/Perl6/World.pm
Expand Up @@ -30,7 +30,7 @@ my $SIG_ELEM_NATIVE_STR_VALUE := 8388608;

# This builds upon the SerializationContextBuilder to add the specifics
# needed by Rakudo Perl 6.
class Perl6::SymbolTable is HLL::Compiler::SerializationContextBuilder {
class Perl6::World is HLL::Compiler::SerializationContextBuilder {
# The stack of lexical pads, actually as PAST::Block objects. The
# outermost frame is at the bottom, the latest frame is on top.
has @!BLOCKS;
Expand Down
16 changes: 8 additions & 8 deletions tools/build/Makefile.in
Expand Up @@ -57,8 +57,8 @@ PERL6_PBC = perl6.pbc
PERL6_EXE = perl6$(EXE)
PERL6_ML = src/gen/perl6-moduleloader.pir
PERL6_ML_PBC = blib/Perl6/ModuleLoader.pbc
PERL6_ST = src/gen/perl6-symboltable.pir
PERL6_ST_PBC = blib/Perl6/SymbolTable.pbc
PERL6_W = src/gen/perl6-symboltable.pir
PERL6_W_PBC = blib/Perl6/World.pbc
PERL6_G = src/gen/perl6-grammar.pir
PERL6_G_PBC = blib/Perl6/Grammar.pbc
PERL6_A = src/gen/perl6-actions.pir
Expand Down Expand Up @@ -268,7 +268,7 @@ all: check-versions $(PERL6_EXE) $(SETTING) $(S_SETTING) lib/Test.pir lib/Pod/To
install: all
$(MKPATH) $(DESTDIR)$(NQP_LANG_DIR)/lib/Perl6
$(CP) $(PERL6_ML_PBC) $(DESTDIR)$(NQP_LANG_DIR)/lib/Perl6/ModuleLoader.pbc
$(CP) $(PERL6_ST_PBC) $(DESTDIR)$(NQP_LANG_DIR)/lib/Perl6/SymbolTable.pbc
$(CP) $(PERL6_W_PBC) $(DESTDIR)$(NQP_LANG_DIR)/lib/Perl6/World.pbc
$(CP) $(PERL6_G_PBC) $(DESTDIR)$(NQP_LANG_DIR)/lib/Perl6/Grammar.pbc
$(CP) $(PERL6_A_PBC) $(DESTDIR)$(NQP_LANG_DIR)/lib/Perl6/Actions.pbc
$(CP) $(PERL6_O_PBC) $(DESTDIR)$(NQP_LANG_DIR)/lib/Perl6/Optimizer.pbc
Expand Down Expand Up @@ -313,12 +313,12 @@ $(PERL6_ML_PBC): $(NQP_EXE) $(DYNEXT_DYNPMC) $(DYNEXT_DYNOPS) src/Perl6/ModuleLo
src/Perl6/ModuleLoader.pm
$(PARROT) $(PARROT_ARGS) -o $(PERL6_ML_PBC) $(PERL6_ML)

$(PERL6_ST_PBC): $(NQP_EXE) $(PERL6_ML_PBC) src/Perl6/SymbolTable.pm
$(NQP_EXE) --vmlibs=perl6_group,perl6_ops --target=pir --output=$(PERL6_ST) --encoding=utf8 \
src/Perl6/SymbolTable.pm
$(PARROT) $(PARROT_ARGS) -o $(PERL6_ST_PBC) $(PERL6_ST)
$(PERL6_W_PBC): $(NQP_EXE) $(PERL6_ML_PBC) src/Perl6/World.pm
$(NQP_EXE) --vmlibs=perl6_group,perl6_ops --target=pir --output=$(PERL6_W) --encoding=utf8 \
src/Perl6/World.pm
$(PARROT) $(PARROT_ARGS) -o $(PERL6_W_PBC) $(PERL6_W)

$(PERL6_G_PBC): $(NQP_EXE) $(PERL6_ST_PBC) src/Perl6/Grammar.pm $(PERL6_P_PBC)
$(PERL6_G_PBC): $(NQP_EXE) $(PERL6_W_PBC) src/Perl6/Grammar.pm $(PERL6_P_PBC)
$(NQP_EXE) --target=pir --output=$(PERL6_G) --encoding=utf8 \
src/Perl6/Grammar.pm
$(PARROT) $(PARROT_ARGS) -o $(PERL6_G_PBC) $(PERL6_G)
Expand Down

0 comments on commit d59a2d3

Please sign in to comment.