Author: pmichaud
Date: Mon Mar 31 08:58:36 2008
New Revision: 26664
Removed:
trunk/compilers/pge/PGE/P6Regex.pir
trunk/compilers/pge/pgc.pir
trunk/examples/pge/all.pir
trunk/runtime/parrot/library/PGE/P6Grammar.pir
trunk/t/compilers/pge/p6regex/
Modified:
trunk/DEPRECATED.pod
trunk/MANIFEST
trunk/MANIFEST.SKIP
trunk/NEWS
trunk/compilers/pge/PGE.pir
trunk/config/gen/makefiles/past-pm.in
trunk/config/gen/makefiles/pge.in
trunk/config/gen/makefiles/root.in
trunk/t/compilers/pge/06-grammar.t
trunk/t/compilers/pge/perl6regex/context.t
trunk/t/compilers/pge/pge_text.t
trunk/tools/install/smoke.pl
Log:
[pge]:
* Remove deprecated P6Regex, P6Grammar, and pgc.pir from trunk.
* Resolves RT#48028 and RT#48026.
* Updated NEWS, DEPRECATED.pod
Modified: trunk/DEPRECATED.pod
==============================================================================
--- trunk/DEPRECATED.pod (original)
+++ trunk/DEPRECATED.pod Mon Mar 31 08:58:36 2008
@@ -149,19 +149,6 @@
=over 4
-=item * pgc.pir [post 0.5.0]
-
-See RT #48026. The pgc.pir compiler for P6 grammars (pre-2007 regex syntax)
-is deprecated. Switch to using the new PGE::Perl6Grammar.pir compiler instead,
-and the Perl6Regex syntax.
-
-=item * PGE::P6Regex [post 0.5.0]
-
-See RT #48028. In early 2007 there were a number of changes made to the Perl
-6 regular expression syntax (as given by Synopsis 5). The new syntax is
-implemented via the PGE::Perl6Regex compiler, and the PGE::P6Regex compiler
-is now deprecated in favor of the new syntax.
-
=item * compilers/PAST-pm [post 0.5.1]
See RT #48030. The compiler tools in compilers/PAST-pm/ and
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST (original)
+++ trunk/MANIFEST Mon Mar 31 08:58:36 2008
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Mar 31 14:48:48 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Mon Mar 31 15:37:26 2008 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -141,14 +141,12 @@
compilers/pge/PGE/Match.pir []
compilers/pge/PGE/OPTable.pir []
compilers/pge/PGE/P5Regex.pir []
-compilers/pge/PGE/P6Regex.pir []
compilers/pge/PGE/Perl6Regex.pir []
compilers/pge/PGE/Regex.pir []
compilers/pge/PGE/builtins.pg []
compilers/pge/README.pod []
compilers/pge/STATUS []
compilers/pge/demo.pir []
-compilers/pge/pgc.pir []
compilers/pirc/README.pod []
compilers/pirc/doc/design.pod []
compilers/pirc/heredoc/hdocprep.c []
@@ -674,7 +672,6 @@
examples/past/four_plus_one.pir [main]doc
examples/pge/README [main]doc
examples/pge/TAP_grammar.pg [main]doc
-examples/pge/all.pir [main]doc
examples/pge/benchmarks/ambs1/Makefile [main]doc
examples/pge/benchmarks/ambs1/ambs1.pg [main]doc
examples/pge/benchmarks/ambs1/main.pir [main]doc
@@ -2577,7 +2574,6 @@
runtime/parrot/library/PGE/Dumper.pir [library]
runtime/parrot/library/PGE/Glob.pir [library]
runtime/parrot/library/PGE/Hs.pir [library]
-runtime/parrot/library/PGE/P6Grammar.pir [library]
runtime/parrot/library/PGE/Perl6Grammar.pir [library]
runtime/parrot/library/PGE/Text.pir [library]
runtime/parrot/library/PGE/Util.pir [library]
@@ -2977,19 +2973,6 @@
t/compilers/pge/06-grammar.t []
t/compilers/pge/p5regex/p5rx.t []
t/compilers/pge/p5regex/re_tests []
-t/compilers/pge/p6regex/01-regex.t []
-t/compilers/pge/p6regex/builtins.t []
-t/compilers/pge/p6regex/closure.t []
-t/compilers/pge/p6regex/context.t []
-t/compilers/pge/p6regex/rx_backtrack []
-t/compilers/pge/p6regex/rx_captures []
-t/compilers/pge/p6regex/rx_charclass []
-t/compilers/pge/p6regex/rx_lookarounds []
-t/compilers/pge/p6regex/rx_metachars []
-t/compilers/pge/p6regex/rx_modifiers []
-t/compilers/pge/p6regex/rx_subrules []
-t/compilers/pge/p6regex/subrules.t []
-t/compilers/pge/p6regex/syntax_errors.t []
t/compilers/pge/perl6regex/01-regex.t []
t/compilers/pge/perl6regex/context.t []
t/compilers/pge/perl6regex/rx_backtrack []
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP (original)
+++ trunk/MANIFEST.SKIP Mon Mar 31 08:58:36 2008
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Mar 31 14:48:48 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Mon Mar 31 15:03:15 2008 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -1713,11 +1713,6 @@
# generated from svn:ignore of 't/compilers/pge/p5regex/'
^t/compilers/pge/p5regex/.*\.pir$
^t/compilers/pge/p5regex/.*\.pir/
-# generated from svn:ignore of 't/compilers/pge/p6regex/'
-^t/compilers/pge/p6regex/.*\.pasm$
-^t/compilers/pge/p6regex/.*\.pasm/
-^t/compilers/pge/p6regex/.*\.pir$
-^t/compilers/pge/p6regex/.*\.pir/
# generated from svn:ignore of 't/compilers/pge/perl6regex/'
^t/compilers/pge/perl6regex/.*\.pbc$
^t/compilers/pge/perl6regex/.*\.pbc/
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Mon Mar 31 08:58:36 2008
@@ -3,6 +3,8 @@
New in 0.6.1
- Languages
+ Reimplemented HQ9+ with PCT
+- Compilers
+ + Removed P6Regex, pgc, P6Grammar from PGE
New in 0.6.0
- Specification
Modified: trunk/compilers/pge/PGE.pir
==============================================================================
--- trunk/compilers/pge/PGE.pir (original)
+++ trunk/compilers/pge/PGE.pir Mon Mar 31 08:58:36 2008
@@ -17,7 +17,6 @@
.include "compilers/pge/PGE/Regex.pir"
.include "compilers/pge/PGE/Exp.pir"
.include "compilers/pge/PGE/Perl6Regex.pir"
-.include "compilers/pge/PGE/P6Regex.pir"
.include "compilers/pge/PGE/P5Regex.pir"
.include "compilers/pge/PGE/builtins_gen.pir"
Modified: trunk/config/gen/makefiles/past-pm.in
==============================================================================
--- trunk/config/gen/makefiles/past-pm.in (original)
+++ trunk/config/gen/makefiles/past-pm.in Mon Mar 31 08:58:36 2008
@@ -56,20 +56,20 @@
@echo " help: Print this help message."
@echo ""
-test: all NoneParser.pir NoneGrammar.pir
- cd $(TOOL_DIR); prove -r t/compilers/past-pm
-
+#test: all NoneParser.pir NoneGrammar.pir
+# cd $(TOOL_DIR); prove -r t/compilers/past-pm
+#
# NoneParser and NoneGrammar are external modules for some of
# the tests. They will be moved into the test file later.
-NoneParser.pir: $(TEST_DIR)/NoneParser.pg
- $(PARROT) $(PGE_DIR)/pgc.pir \
- --output=$(TEST_DIR)/NoneParser.pir \
- $(TEST_DIR)/NoneParser.pg
-
-NoneGrammar.pir: $(TEST_DIR)/NoneGrammar.tg
- $(PARROT) $(TGE_DIR)/tgc.pir \
- --output=$(TEST_DIR)/NoneGrammar.pir \
- $(TEST_DIR)/NoneGrammar.tg
+#NoneParser.pir: $(TEST_DIR)/NoneParser.pg
+# $(PARROT) $(PGE_DIR)/pgc.pir \
+# --output=$(TEST_DIR)/NoneParser.pir \
+# $(TEST_DIR)/NoneParser.pg
+#
+#NoneGrammar.pir: $(TEST_DIR)/NoneGrammar.tg
+# $(PARROT) $(TGE_DIR)/tgc.pir \
+# --output=$(TEST_DIR)/NoneGrammar.pir \
+# $(TEST_DIR)/NoneGrammar.tg
testclean:
$(RM_F) $(TEST_DIR)/*.pir \
Modified: trunk/config/gen/makefiles/pge.in
==============================================================================
--- trunk/config/gen/makefiles/pge.in (original)
+++ trunk/config/gen/makefiles/pge.in Mon Mar 31 08:58:36 2008
@@ -18,12 +18,10 @@
PGE/Exp.pir \
PGE/Match.pir \
PGE/Regex.pir \
- PGE/P6Regex.pir \
PGE/Perl6Regex.pir \
PGE/OPTable.pir \
PGE/P5Regex.pir \
PGE/builtins.pg \
- pgc.pir \
$(PARROT_LIBRARY)/PGE.pbc: PGE.pbc
$(CP) PGE.pbc $(PARROT_LIBRARY)
@@ -62,10 +60,10 @@
testclean:
$(RM_F) "../../t/compilers/pge/*.pir" \
"../../t/compilers/pge/p5regex/*.pir" \
- "../../t/compilers/pge/p6regex/*.pir"
+ "../../t/compilers/pge/perl6regex/*.pir"
$(RM_F) "../../t/compilers/pge/*.pbc" \
"../../t/compilers/pge/p5regex/*.pbc" \
- "../../t/compilers/pge/p6regex/*.pbc"
+ "../../t/compilers/pge/perl6regex/*.pbc"
clean: testclean
$(RM_F) \
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in (original)
+++ trunk/config/gen/makefiles/root.in Mon Mar 31 08:58:36 2008
@@ -285,7 +285,6 @@
$(LIBRARY_DIR)/Parrot/HLLCompiler.pbc \
$(LIBRARY_DIR)/PGE/Dumper.pbc \
$(LIBRARY_DIR)/PGE/Glob.pbc \
- $(LIBRARY_DIR)/PGE/P6Grammar.pbc \
$(LIBRARY_DIR)/PGE/Perl6Grammar.pbc \
$(LIBRARY_DIR)/PGE/Text.pbc \
$(LIBRARY_DIR)/PGE/Util.pbc \
Modified: trunk/t/compilers/pge/06-grammar.t
==============================================================================
--- trunk/t/compilers/pge/06-grammar.t (original)
+++ trunk/t/compilers/pge/06-grammar.t Mon Mar 31 08:58:36 2008
@@ -177,7 +177,7 @@
do_match:
load_bytecode 'PGE.pbc'
- load_bytecode 'compilers/pge/pgc.pir'
+ load_bytecode 'PGE/Perl6Grammar.pbc'
match = parser(expr)
result = match
Modified: trunk/t/compilers/pge/perl6regex/context.t
==============================================================================
--- trunk/t/compilers/pge/perl6regex/context.t (original)
+++ trunk/t/compilers/pge/perl6regex/context.t Mon Mar 31 08:58:36 2008
@@ -11,7 +11,7 @@
=head1 NAME
-t/p6regex/context.t - PGE return value tests
+t/compilers/pge/perl6regex/context.t - PGE return value tests
=head1 DESCRIPTION
@@ -20,7 +20,7 @@
=head1 SYNOPSIS
- % prove t/p6regex/context.t
+ % prove t/compilers/pge/perl6regex/context.t
=cut
Modified: trunk/t/compilers/pge/pge_text.t
==============================================================================
--- trunk/t/compilers/pge/pge_text.t (original)
+++ trunk/t/compilers/pge/pge_text.t Mon Mar 31 08:58:36 2008
@@ -19,7 +19,7 @@
=head1 SYNOPSIS
- % prove t/p6regex/text_brk.t
+ % prove t/compilers/pge/text_brk.t
=cut
Modified: trunk/tools/install/smoke.pl
==============================================================================
--- trunk/tools/install/smoke.pl (original)
+++ trunk/tools/install/smoke.pl Mon Mar 31 08:58:36 2008
@@ -58,7 +58,7 @@
or die "Can't open $filename ($!).\n";
print $FH "token TOP { \\s* }\n";
close $FH;
-$out = `$parrot lib/parrot/library/PGE/P6Grammar.pir $filename`;
+$out = `$parrot lib/parrot/library/PGE/Perl6Grammar.pir $filename`;
ok($out =~ /^\n## <::TOP>/, "check PGE");
unlink($filename);
