|
|
Author: bernhard
Date: Mon Jun 30 05:29:22 2008
New Revision: 28851
Modified:
branches/libs4php/languages/plumhead/config/makefiles/root.in
branches/libs4php/languages/plumhead/src/common/plumhead.pir
Log:
[Plumhead]
Merge some more changes from 'trunk' to 'libs4php'.
Modified: branches/libs4php/languages/plumhead/config/makefiles/root.in
==============================================================================
--- branches/libs4php/languages/plumhead/config/makefiles/root.in
(original)
+++ branches/libs4php/languages/plumhead/config/makefiles/root.in Mon Jun
30 05:29:22 2008
@@ -6,15 +6,14 @@
# Set up directories
BUILD_DIR = @build_dir@
-TGE_DIR = $(BUILD_DIR)/compilers/tge
LIBRARY_DIR = $(BUILD_DIR)/runtime/parrot/library
PMCDIR = src/pmc
PARROT_DYNEXT = @build_dir@/runtime/parrot/dynext
# Set up commands
PARROT = $(BUILD_DIR)/parrot@exe@
-PERL = @perl@
-RM_F = @rm_f@
+PERL = @perl@
+RM_F = @rm_f@
RECONFIGURE = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
PMCBUILD = $(PERL) @build_dir@/tools/build/dynpmc.pl
NQP = $(BUILD_DIR)/compilers/nqp/nqp.pbc
@@ -173,22 +172,17 @@
src/common/php_ctype.pbc: src/common/php_ctype.pir src/common/php_MACRO.pir
$(PARROT) -o src/common/php_ctype.pbc src/common/php_ctype.pir
-src/pct/Plumhead_gen.pir: $(LIBRARY_DIR)/PGE/Perl6Grammar.pir
src/pct/Plumhead.pg
+src/pct/gen_grammar.pir: $(LIBRARY_DIR)/PGE/Perl6Grammar.pir src/pct/grammar.pg
$(PARROT) $(LIBRARY_DIR)/PGE/Perl6Grammar.pir \
- --output=src/pct/Plumhead_gen.pir src/pct/Plumhead.pg
-
-src/pct/PlumheadPAST_gen.pir: src/pct/PlumheadPAST.tg
- $(PARROT) $(TGE_DIR)/tgc.pir \
- --output=src/pct/PlumheadPAST_gen.pir src/pct/PlumheadPAST.tg
+ --output=src/pct/gen_grammar.pir src/pct/grammar.pg
src/pct/gen_actions.pir: $(NQP) $(PCT) src/pct/actions.pm
$(PARROT) $(NQP) --output=src/pct/gen_actions.pir \
- --target=pir src/pct/actions.pm
+ --target=pir src/pct/actions.pm
plumhead.pbc: \
src/common/plumhead.pir \
- src/pct/Plumhead_gen.pir \
- src/pct/PlumheadPAST_gen.pir \
+ src/pct/gen_grammar.pir \
src/pct/gen_actions.pir
$(PARROT) -o plumhead.pbc src/common/plumhead.pir
@@ -222,15 +216,17 @@
clean: clean-common clean-pct clean-antlr3 clean-test
clean-common: clean-pmc
- $(RM_F) src/common/plumheadlib.pbc plumhead.pbc
+ $(RM_F) \
+ src/common/plumheadlib.pbc \
+ src/common/*.pbc \
+ plumhead.pbc
clean-pmc:
- $(RM_F) "$(PMCDIR)/*dump" "$(PMCDIR)/*\.c" "$(PMCDIR)/pmc_*h"
"$(PMCDIR)/php_group.h" "$(PMCDIR)/*$(O)" "$(PMCDIR)/*$(LOAD_EXT)"
+ $(RM_F) "$(PMCDIR)/*dump" "$(PMCDIR)/*.c" "$(PMCDIR)/pmc_*h"
"$(PMCDIR)/php_group.h" "$(PMCDIR)/*$(O)" "$(PMCDIR)/*$(LOAD_EXT)"
clean-pct:
$(RM_F) \
- src/pct/Plumhead_gen.pir \
- src/pct/PlumheadPAST_gen.pir \
+ src/pct/gen_grammar.pir \
src/pct/gen_actions.pir
clean-antlr3:
Modified: branches/libs4php/languages/plumhead/src/common/plumhead.pir
==============================================================================
--- branches/libs4php/languages/plumhead/src/common/plumhead.pir
(original)
+++ branches/libs4php/languages/plumhead/src/common/plumhead.pir Mon Jun
30 05:29:22 2008
@@ -10,13 +10,13 @@
./parrot languages/plumhead/plumhead.pbc t.php
- ./parrot languages/plumhead/plumhead.pbc --variant=pct t.php
+ ./parrot languages/plumhead/plumhead.pbc --variant=pct t.php
- ./parrot languages/plumhead/plumhead.pbc --variant=phc t.php
+ ./parrot languages/plumhead/plumhead.pbc --variant=phc t.php
./parrot languages/plumhead/plumhead.pbc --variant=antlr t.php
- ./parrot languages/plumhead/plumhead.pbc --run-nqp t.nqp
+ ./parrot languages/plumhead/plumhead.pbc --run-nqp t.nqp
=head1 DESCRIPTION
@@ -133,23 +133,12 @@
variant = opt['variant']
if variant == 'antlr3' goto VARIANT_ANTLR3
if variant == 'pct' goto VARIANT_PCT
- if variant == 'pct-with-nqp-actions' goto VARIANT_PCT_WITH_NQP_ACTIONS
if variant == 'phc' goto VARIANT_PHC
$I0 = defined opt['run-nqp']
- unless $I0 goto VARIANT_PCT
- .return run_nqp( source_fn, target )
+ if $I0 goto RUN_NQP
VARIANT_PCT:
# use the Parrot Compiler Toolkit by default
- err_msg = 'Compiling and executing with pct failed'
- .local pmc plumhead_compiler
- plumhead_compiler = compreg 'Plumhead'
-
- .return plumhead_compiler.'evalfiles'( source_fn, 'target' => target )
-
-VARIANT_PCT_WITH_NQP_ACTIONS:
- # use the Parrot Compiler Toolkit by default
- err_msg = 'Compiling and executing with pct failed'
.local pmc plumhead_compiler
plumhead_compiler = compreg 'PlumheadWithNqpActions'
@@ -188,6 +177,11 @@
.return run_nqp( 'plumhead_antlr_past.nqp', target )
+RUN_NQP:
+
+ .return run_nqp( source_fn, target )
+
+
ERROR:
printerr err_msg
printerr "\n"
@@ -199,7 +193,6 @@
#os."rm"('plumhead_phc_past.nqp')
#os."rm"('plumhead_antlr_past.nqp')
-FINISH:
exit ret
.end
@@ -293,9 +286,7 @@
.namespace [ 'Plumhead::Grammar' ]
-.include 'src/pct/Plumhead_gen.pir'
-
-.include 'src/pct/PlumheadPAST_gen.pir'
+.include 'src/pct/gen_grammar.pir'
.include 'src/pct/gen_actions.pir'
|
|