Author: bernhard
Date: Mon Feb 25 12:00:43 2008
New Revision: 26059
Removed:
trunk/languages/plumhead/lib/Parrot/Test/Plumhead/Yacc.pm
trunk/languages/plumhead/src/yacc/
Modified:
trunk/MANIFEST
trunk/MANIFEST.SKIP
trunk/languages/plumhead/TODO
trunk/languages/plumhead/config/makefiles/root.in
trunk/languages/plumhead/docs/overview.pod
trunk/languages/plumhead/lib/Parrot/Test/Plumhead.pm
trunk/languages/plumhead/plumhead.pl
trunk/languages/plumhead/src/common/plumhead.pir
trunk/languages/plumhead/t/harness
Log:
[Plumhead]
Remove abandoned variant 'yacc'
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST (original)
+++ trunk/MANIFEST Mon Feb 25 12:00:43 2008
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools\dev\mk_manifest_and_skip.pl Sun Feb 24 19:20:49 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Mon Feb 25 19:58:30 2008 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -1907,7 +1907,6 @@
languages/plumhead/lib/Parrot/Test/Plumhead/PCT.pm [plumhead]
languages/plumhead/lib/Parrot/Test/Plumhead/PHP.pm [plumhead]
languages/plumhead/lib/Parrot/Test/Plumhead/Phc.pm [plumhead]
-languages/plumhead/lib/Parrot/Test/Plumhead/Yacc.pm [plumhead]
languages/plumhead/past_xml.xsd [plumhead]
languages/plumhead/plumhead.pl [plumhead]
languages/plumhead/pmc/phparray.pmc [plumhead]
@@ -1924,11 +1923,6 @@
languages/plumhead/src/pct/PlumheadPAST.tg [plumhead]
languages/plumhead/src/phc/past_xml_to_past_pir.xsl [plumhead]
languages/plumhead/src/phc/phc_xml_to_past_xml.xsl [plumhead]
-languages/plumhead/src/yacc/plumhead.l [plumhead]
-languages/plumhead/src/yacc/plumhead.y [plumhead]
-languages/plumhead/src/yacc/plumhead_lexer.c [plumhead]
-languages/plumhead/src/yacc/plumhead_parser.c [plumhead]
-languages/plumhead/src/yacc/plumhead_parser.h [plumhead]
languages/plumhead/t/arithmetics.t [plumhead]
languages/plumhead/t/array.t [plumhead]
languages/plumhead/t/control_flow.t [plumhead]
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP (original)
+++ trunk/MANIFEST.SKIP Mon Feb 25 12:00:43 2008
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools\dev\mk_manifest_and_skip.pl Sun Feb 24 15:34:53 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Mon Feb 25 19:52:51 2008 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -1050,9 +1050,6 @@
^languages/plumhead/src/pct/PlumheadPAST_gen\.pir/
^languages/plumhead/src/pct/Plumhead_gen\.pir$
^languages/plumhead/src/pct/Plumhead_gen\.pir/
-# generated from svn:ignore of 'languages/plumhead/src/yacc/'
-^languages/plumhead/src/yacc/plumhead_yacc$
-^languages/plumhead/src/yacc/plumhead_yacc/
# generated from svn:ignore of 'languages/plumhead/t/'
^languages/plumhead/t/.*\.out$
^languages/plumhead/t/.*\.out/
Modified: trunk/languages/plumhead/TODO
==============================================================================
--- trunk/languages/plumhead/TODO (original)
+++ trunk/languages/plumhead/TODO Mon Feb 25 12:00:43 2008
@@ -8,6 +8,4 @@
- Support for floating point numbers
- Support for the superglobals _POST and _GET
- Implement var_dump()
-- Subclass OrderedHash for PlumheadArray
-- Add another variant 'yacc'
- distinguish between subs and keywords
Modified: trunk/languages/plumhead/config/makefiles/root.in
==============================================================================
--- trunk/languages/plumhead/config/makefiles/root.in (original)
+++ trunk/languages/plumhead/config/makefiles/root.in Mon Feb 25 12:00:43 2008
@@ -46,7 +46,6 @@
@echo " Current this has nothing to do."
@echo " build-antlr3 Build support for variant 'Plumhead
antlr3'."
@echo " Needs javac and a proper CLASSPATH."
- @echo " build-yacc Build support for variant 'Plumhead yacc'."
@echo ""
@echo "Testing:"
@echo " test: Run the test suite for 'Plumhead pct'."
@@ -55,7 +54,6 @@
@echo " test-phc: Run the test suite for 'Plumhead phc'."
@echo " test-antlr3: Run the test suite for 'Plumhead antlr3'."
@echo " test-pct: Run the test suite for 'Plumhead pct'."
- @echo " test-yacc: Run the test suite for 'Plumhead yacc'."
@echo "Cleaning:"
@echo " clean: Clean up."
@echo " clean-test: Clean up temporary files from testing."
@@ -65,31 +63,25 @@
@echo " help: Print this help message."
@echo ""
@echo "Only for maintainer:"
- @echo " maintain: Maintainance for 'Plumhead antlr3' and
'Plumhead yacc'."
+ @echo " maintain: Maintainance for 'Plumhead antlr3'."
@echo " The other variants need no maintainance."
@echo " maintain-antlr3: Generate Java source files with ANTLR 3."
- @echo " maintain-yacc: Generate C source files with lex and yacc."
- @echo " Depends on 'perl Configure.pl
--maintainer'."
@echo ""
# regenerate the Makefile
Makefile: config/makefiles/root.in
cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages
--languages=plumhead
-maintain: maintain-antlr3 maintain-yacc
+maintain: maintain-antlr3
maintain-antlr3: src/antlr3/Plumhead.g src/antlr3/GenPastPir.g
@echo 'Be sure to set CLASSPATH first, see docs/antlr3.pod'
java org.antlr.Tool src/antlr3/Plumhead.g
java org.antlr.Tool -lib src/antlr3 src/antlr3/GenPastPir.g
-maintain-yacc: src/yacc/plumhead.y src/yacc/plumhead.l
- $(LEX) -o src/yacc/plumhead_lexer.c src/yacc/plumhead.l
- $(YACC) -o src/yacc/plumhead_parser.c -d src/yacc/plumhead.y
-
build: build-pct
-build-all: build-pct build-phc build-antlr3 build-yacc
+build-all: build-pct build-phc build-antlr3
build-common: src/common/plumheadlib.pbc plumhead.pbc
@@ -97,11 +89,6 @@
build-phc: build-common
-build-yacc: build-common src/yacc/plumhead_yacc
-
-src/yacc/plumhead_yacc: src/yacc/plumhead_lexer.c src/yacc/plumhead_parser.c
- $(CC) src/yacc/plumhead_lexer.c src/yacc/plumhead_parser.c -o
src/yacc/plumhead_yacc
-
build-antlr3: build-common
@echo 'Be sure to have set CLASSPATH as laid out in docs/antlr3.pod'
javac src/antlr3/*.java
@@ -152,9 +139,6 @@
test-pct:
- cd .. && $(PERL) -I../lib -I plumhead/lib plumhead/t/harness
--with-pct
-test-yacc:
- - cd .. && $(PERL) -I../lib -I plumhead/lib plumhead/t/harness
--with-yacc
-
clean: clean-common clean-pct clean-antlr3 clean-test clean-pmc
clean-common:
Modified: trunk/languages/plumhead/docs/overview.pod
==============================================================================
--- trunk/languages/plumhead/docs/overview.pod (original)
+++ trunk/languages/plumhead/docs/overview.pod Mon Feb 25 12:00:43 2008
@@ -11,21 +11,21 @@
=head1 Goals
-Provide a side by side comparison of different implementation
-strategies of PHP on Parrot.
+Implement PHP.
+
+Provide a side by side comparison of different parsing and tree transformation
+techniques.
+
+Currently there are three variants:
=over
-=item php - the reference implementation PHP 5.2.0
+=item pct - Parrot compiler toolkit
=item phc - take XML output from phc and munge it with XSLT
=item antlr3 - ANTLR3, converted from languages/bc, started
-=item pct - Parrot compiler toolkit
-
-=item yacc - with lex and yacc, planned
-
=back
=head1 Status
@@ -44,10 +44,6 @@
ANTLR3 generating Java code.
-=item yacc
-
-lex and yacc, or flex and bison
-
=back
=head1 Author
Modified: trunk/languages/plumhead/lib/Parrot/Test/Plumhead.pm
==============================================================================
--- trunk/languages/plumhead/lib/Parrot/Test/Plumhead.pm (original)
+++ trunk/languages/plumhead/lib/Parrot/Test/Plumhead.pm Mon Feb 25
12:00:43 2008
@@ -16,7 +16,6 @@
use Parrot::Test::Plumhead::Phc;
use Parrot::Test::Plumhead::Antlr3;
use Parrot::Test::Plumhead::PCT;
-use Parrot::Test::Plumhead::Yacc;
=head1 NAME
Modified: trunk/languages/plumhead/plumhead.pl
==============================================================================
--- trunk/languages/plumhead/plumhead.pl (original)
+++ trunk/languages/plumhead/plumhead.pl Mon Feb 25 12:00:43 2008
@@ -9,7 +9,7 @@
use strict;
use warnings;
-# possible values are qw( phc antlr3 pct yacc );
+# possible values are qw( phc antlr3 pct );
my $variant = $ENV{PLUMHEAD_VARIANT} || 'pct';
exec './parrot', 'languages/plumhead/plumhead.pbc', "--variant=$variant",
@ARGV;
Modified: trunk/languages/plumhead/src/common/plumhead.pir
==============================================================================
--- trunk/languages/plumhead/src/common/plumhead.pir (original)
+++ trunk/languages/plumhead/src/common/plumhead.pir Mon Feb 25 12:00:43 2008
@@ -10,13 +10,11 @@
./parrot languages/plumhead/plumhead.pbc t.php
- ./parrot languages/plumhead/plumhead.pbc --variant=antlr 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=pct t.php
-
- ./parrot languages/plumhead/plumhead.pbc --variant=yacc t.php
+ ./parrot languages/plumhead/plumhead.pbc --variant=antlr t.php
=head1 DESCRIPTION
@@ -37,10 +35,6 @@
Parse PHP with Java based parser and tree parser, generated from ANTLR3
grammars.
-=head2 Plumhead yacc
-
-Parse PHP with lex and yacc.
-
=head1 SEE ALSO
F<languages/plumhead/docs>
@@ -105,7 +99,6 @@
if variant == 'antlr3' goto VARIANT_ANTLR3
if variant == 'pct' goto VARIANT_PCT
if variant == 'phc' goto VARIANT_PHC
- if variant == 'yacc' goto VARIANT_YACC
VARIANT_PCT:
# look for subs in other namespaces
@@ -154,16 +147,6 @@
if ret goto ERROR
goto EXECUTE_PAST_PIR
-VARIANT_YACC:
- err_msg = 'Creating PAST with lex and yacc'
- # Do it with YACC
- cmd = 'languages/plumhead/src/yacc/plumhead_yacc <'
- concat cmd, php_source_fn
- concat cmd, '> plumhead_past.pir'
- ret = spawnw cmd
- if ret goto ERROR
- goto EXECUTE_PAST_PIR
-
VARIANT_ANTLR3:
err_msg = 'Generating PAST from annotated PHP source failed'
cmd = 'java PlumheadAntlr3 '
Modified: trunk/languages/plumhead/t/harness
==============================================================================
--- trunk/languages/plumhead/t/harness (original)
+++ trunk/languages/plumhead/t/harness Mon Feb 25 12:00:43 2008
@@ -18,8 +18,6 @@
cd languages && perl -I../lib plumhead/t/harness --with-pct
- cd languages && perl -I../lib plumhead/t/harness --with-yacc
-
cd languages && perl -I../lib plumhead/t/harness \
plumhead/t/hello.t
@@ -68,9 +66,6 @@
my $with_pct = ( grep { m/^--with-pct$/ } @ARGV ) ? 1 : 0;
@ARGV = grep { ! m/^--with-pct$/ } @ARGV;
- my $with_yacc = ( grep { m/^--with-yacc$/ } @ARGV ) ? 1 : 0;
- @ARGV = grep { ! m/^--with-yacc$/ } @ARGV;
-
if ( scalar(@ARGV) ) {
# Someone specified tests for me to run.
@files = grep { -f $_ } @ARGV
@@ -100,9 +95,6 @@
elsif ( $with_pct ) {
$ENV{PARROT_PLUMHEAD_TEST_MODULE} = 'Parrot::Test::Plumhead::PCT';
}
- elsif ( $with_yacc ) {
- $ENV{PARROT_PLUMHEAD_TEST_MODULE} = 'Parrot::Test::Plumhead::Yacc';
- }
else {
$ENV{PARROT_PLUMHEAD_TEST_MODULE} = 'Parrot::Test::Plumhead::PCT';
}
