Skip to content

Commit

Permalink
Merging in from trunk.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.parrot.org/parrot/branches/strings@35503 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information
simon committed Jan 13, 2009
1 parent a4c3e10 commit df12eb9
Show file tree
Hide file tree
Showing 267 changed files with 11,642 additions and 13,115 deletions.
22 changes: 14 additions & 8 deletions DEPRECATED.pod
Expand Up @@ -3,7 +3,7 @@
=head1 Deprecation in Parrot

This is a list of currently deprecated features of Parrot. Every deprecation
has an associated RT ticket. Each item indicates the last release it's
has an associated RT or TT ticket. Each item indicates the last release it's
guaranteed to appear in.

When deprecated items are removed, all usage of the feature in the
Expand Down Expand Up @@ -35,17 +35,19 @@ See RT #47011.

=over 4

=item * C<store_global> [post 0.5.0]
=item * C<n_*> math opcode variants [post 0.7.1]

See RT #48016. Replace usage with set_[hll,root]_global variants.
See RT #58410.

=item * C<find_global> [post 0.5.0]
=back

See RT #48018. Replace usage with get_[hll,root]_global variants.
=head1 PMCS

=item * C<n_*> math opcode variants [post 0.7.1]
=over 4

See RT #58410.
=item * Remove VtableCache PMC [post 0.9.0]

See TT #6

=back

Expand All @@ -63,6 +65,8 @@ If you want to override a vtable method/function when building a Class, then
use the method C<add_vtable_override> instead of calling C<add_method> with
one or both of these flags.

See TT #158

=back

=head1 PIR syntax
Expand Down Expand Up @@ -98,6 +102,8 @@ if the arg is a ResizableStringArray
if the arg is a Namespace or Class PMC
The passed in class or the class attatched to the passed in namespace.

See TT #159

=back

=head1 Functions
Expand Down Expand Up @@ -132,7 +138,7 @@ to happen. See RT #60586 and RT #53302.
=item P6protoobject stringification [post 0.9.0]

Stringification of protoobjects will return the full name of the type
and parentheses, per Synopsis 12.
and parentheses, per Synopsis 12. See TT #168

=back

Expand Down
47 changes: 18 additions & 29 deletions MANIFEST
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
# generated by tools/dev/mk_manifest_and_skip.pl Sat Jan 10 02:54:21 2009 UT
# generated by tools/dev/mk_manifest_and_skip.pl Mon Jan 12 21:15:11 2009 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
Expand Down Expand Up @@ -879,6 +879,7 @@ ext/Parrot-Embed/lib/Parrot/PMC.pm []
ext/Parrot-Embed/t/00-load.t []
ext/Parrot-Embed/t/greet.pir []
ext/Parrot-Embed/t/interp.t []
ext/Parrot-Embed/t/languages.t []
ext/Parrot-Embed/t/pipp.t []
ext/Parrot-Embed/tools/check_embed_coverage.pl []
ext/Parrot-Embed/tools/write_typemap.pl []
Expand All @@ -902,7 +903,6 @@ include/parrot/charset.h [main]include
include/parrot/compiler.h [main]include
include/parrot/datatypes.h [main]include
include/parrot/debugger.h [main]include
include/parrot/dod.h [main]include
include/parrot/dynext.h [main]include
include/parrot/embed.h [main]include
include/parrot/encoding.h [main]include
Expand All @@ -912,10 +912,12 @@ include/parrot/exceptions.h [main]include
include/parrot/exec.h [main]include
include/parrot/exit.h [main]include
include/parrot/extend.h [main]include
include/parrot/gc_api.h [main]include
include/parrot/gc_mark_sweep.h [main]include
include/parrot/gc_pools.h [main]include
include/parrot/global.h [main]include
include/parrot/global_setup.h [main]include
include/parrot/hash.h [main]include
include/parrot/headers.h [main]include
include/parrot/hll.h [main]include
include/parrot/imcc.h [main]include
include/parrot/inter_call.h [main]include
Expand Down Expand Up @@ -949,7 +951,6 @@ include/parrot/scheduler.h [main]include
include/parrot/scheduler_private.h [main]include
include/parrot/settings.h [main]include
include/parrot/slice.h [main]include
include/parrot/smallobject.h [main]include
include/parrot/stacks.h [main]include
include/parrot/stat.h [main]include
include/parrot/stm/backend.h [main]include
Expand Down Expand Up @@ -1161,6 +1162,7 @@ languages/abc/t/abc_special_variables [abc]
languages/abc/t/abc_statement [abc]
languages/abc/t/harness [abc]
languages/befunge/Changes [befunge]
languages/befunge/Configure.pl [befunge]
languages/befunge/MAINTAINER [befunge]
languages/befunge/README [befunge]
languages/befunge/befunge.pir [befunge]
Expand Down Expand Up @@ -1545,6 +1547,7 @@ languages/ecmascript/lib/Parrot/Test/JS.pm [ecmascript]
languages/ecmascript/lib/Parrot/Test/JS/PJS.pm [ecmascript]
languages/ecmascript/lib/Parrot/Test/JS/SpiderMonkey.pm [ecmascript]
languages/ecmascript/src/builtin/builtins.pir [ecmascript]
languages/ecmascript/src/classes/Array.pir [ecmascript]
languages/ecmascript/src/classes/Boolean.pir [ecmascript]
languages/ecmascript/src/classes/Completion.pir [ecmascript]
languages/ecmascript/src/classes/List.pir [ecmascript]
Expand Down Expand Up @@ -1588,19 +1591,6 @@ languages/forth/tokenstream.pir [forth]
languages/forth/variablestack.pir [forth]
languages/forth/virtualstack.pir [forth]
languages/forth/words.pir [forth]
languages/hq9plus/MAINTAINER [hq9plus]
languages/hq9plus/README [hq9plus]
languages/hq9plus/config/makefiles/root.in [hq9plus]
languages/hq9plus/hq9plus.pir [hq9plus]
languages/hq9plus/lib/Parrot/Test/Hq9plus.pm [hq9plus]
languages/hq9plus/src/builtins/hello.pir [hq9plus]
languages/hq9plus/src/builtins/nintynine_bottles_of_beer.pir [hq9plus]
languages/hq9plus/src/builtins/plus.pir [hq9plus]
languages/hq9plus/src/builtins/quine.pir [hq9plus]
languages/hq9plus/src/parser/actions.pm [hq9plus]
languages/hq9plus/src/parser/grammar.pg [hq9plus]
languages/hq9plus/t/basic.t [hq9plus]
languages/hq9plus/t/harness [hq9plus]
languages/jako/Curses.jako [jako]
languages/jako/MAINTAINER [jako]
languages/jako/README [jako]
Expand Down Expand Up @@ -2226,7 +2216,6 @@ languages/pheme/MANIFEST [pheme]
languages/pheme/README [pheme]
languages/pheme/TODO [pheme]
languages/pheme/config/makefiles/root.in [pheme]
languages/pheme/lib/PhemeCompiler.pir [pheme]
languages/pheme/lib/PhemeGrammar.pir [pheme]
languages/pheme/lib/PhemeObjects.pir [pheme]
languages/pheme/lib/PhemeSymbols.pir [pheme]
Expand Down Expand Up @@ -2256,9 +2245,8 @@ languages/pipp/README [pipp]
languages/pipp/ROADMAP [pipp]
languages/pipp/Test.php [pipp]
languages/pipp/config/makefiles/root.in [pipp]
languages/pipp/docs/antlr3.pod [pipp]
languages/pipp/docs/extensions.pod [pipp]
languages/pipp/docs/namespaces.pod [pipp]
languages/pipp/docs/internals.pod [pipp]
languages/pipp/docs/pipp.pod [pipp]
languages/pipp/docs/testing.pod [pipp]
languages/pipp/lib/Parrot/Test/Pipp.pm [pipp]
Expand Down Expand Up @@ -2966,18 +2954,19 @@ src/exec_save.h []
src/exec_start.c []
src/exit.c []
src/extend.c []
src/gc/dod.c []
src/gc/gc_gms.c []
src/gc/gc_ims.c []
src/gc/api.c []
src/gc/gc_malloc.c []
src/gc/generational_ms.c []
src/gc/incremental_ms.c []
src/gc/mark_sweep.c []
src/gc/memory.c []
src/gc/pools.c []
src/gc/register.c []
src/gc/res_lea.c []
src/gc/resources.c []
src/gc/smallobject.c []
src/global.c []
src/global_setup.c []
src/hash.c []
src/headers.c []
src/hll.c []
src/inter_call.c []
src/inter_cb.c []
Expand Down Expand Up @@ -3739,11 +3728,11 @@ t/tools/ops2pm/08-sort_ops.t []
t/tools/ops2pm/09-prepare_real_ops.t []
t/tools/ops2pm/10-print_module.t []
t/tools/ops2pm/11-print_h.t []
t/tools/ops2pm/samples/bit_ops.orig []
t/tools/ops2pm/samples/bit_ops.original []
t/tools/ops2pm/samples/bit_ops.second []
t/tools/ops2pm/samples/core_ops.orig []
t/tools/ops2pm/samples/ops_num.orig []
t/tools/ops2pm/samples/pic_ops.orig []
t/tools/ops2pm/samples/core_ops.original []
t/tools/ops2pm/samples/ops_num.original []
t/tools/ops2pm/samples/pic_ops.original []
t/tools/parrot_debugger.t []
t/tools/pbc_merge.t []
t/tools/pmc2c.t []
Expand Down
27 changes: 3 additions & 24 deletions MANIFEST.SKIP
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
# generated by tools/dev/mk_manifest_and_skip.pl Fri Dec 26 11:40:35 2008 UT
# generated by tools/dev/mk_manifest_and_skip.pl Mon Jan 12 21:16:57 2009 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
Expand Down Expand Up @@ -397,6 +397,8 @@
^languages/.*\.tmp/
^languages/Makefile$
^languages/Makefile/
^languages/hq9plus$
^languages/hq9plus/
^languages/languages_smoke\.html$
^languages/languages_smoke\.html/
^languages/test_regex\.pbc$
Expand Down Expand Up @@ -773,23 +775,6 @@
^languages/forth/variablestack\.pbc/
^languages/forth/virtualstack\.pbc$
^languages/forth/virtualstack\.pbc/
# generated from svn:ignore of 'languages/hq9plus/'
^languages/hq9plus/Makefile$
^languages/hq9plus/Makefile/
^languages/hq9plus/hq9plus\.pbc$
^languages/hq9plus/hq9plus\.pbc/
# generated from svn:ignore of 'languages/hq9plus/src/'
^languages/hq9plus/src/gen_actions\.pir$
^languages/hq9plus/src/gen_actions\.pir/
^languages/hq9plus/src/gen_builtins\.pir$
^languages/hq9plus/src/gen_builtins\.pir/
^languages/hq9plus/src/gen_grammar\.pir$
^languages/hq9plus/src/gen_grammar\.pir/
# generated from svn:ignore of 'languages/hq9plus/t/'
^languages/hq9plus/t/.*\.HQ9plus$
^languages/hq9plus/t/.*\.HQ9plus/
^languages/hq9plus/t/.*\.out$
^languages/hq9plus/t/.*\.out/
# generated from svn:ignore of 'languages/jako/'
^languages/jako/.*\.list$
^languages/jako/.*\.list/
Expand Down Expand Up @@ -1112,14 +1097,8 @@
^languages/pheme/Makefile$
^languages/pheme/Makefile/
# generated from svn:ignore of 'languages/pheme/lib/'
^languages/pheme/lib/.*\.pbc$
^languages/pheme/lib/.*\.pbc/
^languages/pheme/lib/ASTGrammar\.pir$
^languages/pheme/lib/ASTGrammar\.pir/
^languages/pheme/lib/OSTGrammar\.pir$
^languages/pheme/lib/OSTGrammar\.pir/
^languages/pheme/lib/PIRGrammar\.pir$
^languages/pheme/lib/PIRGrammar\.pir/
^languages/pheme/lib/pheme_grammar_gen\.pir$
^languages/pheme/lib/pheme_grammar_gen\.pir/
# generated from svn:ignore of 'languages/pipp/'
Expand Down
1 change: 1 addition & 0 deletions PBC_COMPAT
Expand Up @@ -27,6 +27,7 @@

# please insert tab separated entries at the top of the list

3.30 2009.01.10 coke removed find_global_p_s_s and store_global_s_s_p
3.29 2009.01.07 coke removed store_global_p_s_p
3.28 2009.01.07 jonathan changes for bytecode annoations (packfile and ops)
3.27 2008.01.07 coke removed find_global_p_p_s, find_global_p_s, store_global_p_s
Expand Down
2 changes: 1 addition & 1 deletion compilers/imcc/imcc.l
Expand Up @@ -366,7 +366,7 @@ SP [ ]
"null" return PNULL;
"int" return INTV;
"num" return FLOATV;
"new" return NEW;

"pmc" return PMCV;
"string" return STRINGV;
"<<" return SHIFT_LEFT;
Expand Down
27 changes: 4 additions & 23 deletions compilers/imcc/imcc.y
Expand Up @@ -1731,30 +1731,11 @@ assignment:
{ $$ = iINDEXFETCH(interp, IMCC_INFO(interp)->cur_unit, $1, $3, $5); }
| target '[' keylist ']' '=' var
{ $$ = iINDEXSET(interp, IMCC_INFO(interp)->cur_unit, $1, $3, $6); }
| target '=' NEW classname COMMA var
/* Removing this line causes test failures in t/compilers/tge/* for
some reason. Eventualy it should be removed and the normal handling
of ops should be used for all forms of "new". */
| target '=' 'new' classname '[' keylist ']'
{ $$ = iNEW(interp, IMCC_INFO(interp)->cur_unit, $1, $4, $6, 1); }
| target '=' NEW classname '[' keylist ']'
{ $$ = iNEW(interp, IMCC_INFO(interp)->cur_unit, $1, $4, $6, 1); }
| target '=' NEW classname
{ $$ = iNEW(interp, IMCC_INFO(interp)->cur_unit, $1, $4, NULL, 1); }
| target '=' NEW var
{ $$ = MK_I(interp, IMCC_INFO(interp)->cur_unit, "new", 2, $1, $4); }
| target '=' NEW maybe_ns
{ $$ = MK_I(interp, IMCC_INFO(interp)->cur_unit, "new", 2, $1, $4); }
| target '=' NEW maybe_ns COMMA var
{ $$ = MK_I(interp, IMCC_INFO(interp)->cur_unit, "new", 3, $1, $4, $6); }
| target '=' NEW var COMMA var
{ $$ = MK_I(interp, IMCC_INFO(interp)->cur_unit, "new", 3, $1, $4, $6); }
| target '=' NEW var '[' keylist ']'
{ $$ = MK_I(interp, IMCC_INFO(interp)->cur_unit, "new", 3, $1, $4, $6); }
/* NEW is here because it is both PIR and PASM keywords so we
* have to handle the token here (or badly hack the lexer). */
| NEW target COMMA var
{ $$ = MK_I(interp, IMCC_INFO(interp)->cur_unit, "new", 2, $2, $4); }
| NEW target COMMA var COMMA var
{ $$ = MK_I(interp, IMCC_INFO(interp)->cur_unit, "new", 3, $2, $4, $6); }
| NEW target COMMA var '[' keylist ']'
{ $$ = MK_I(interp, IMCC_INFO(interp)->cur_unit, "new", 3, $2, $4, $6); }
/* Subroutine call the short way */
| target '=' sub_call
{
Expand Down

0 comments on commit df12eb9

Please sign in to comment.