Skip to content

Commit

Permalink
Merge kill_array_pmc branch back into trunk.
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.parrot.org/parrot/trunk@43695 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information
@bacek
bacek committed Feb 1, 2010
1 parent 7761b2b commit 4eb8ef8
Show file tree
Hide file tree
Showing 31 changed files with 130 additions and 4,464 deletions.
7 changes: 0 additions & 7 deletions DEPRECATED.pod
View file
Expand Up @@ -101,13 +101,6 @@ bitwise dynops.


L<https://trac.parrot.org/parrot/ticket/1260> L<https://trac.parrot.org/parrot/ticket/1260>


=item Array PMC [eligible in 2.1]

This PMC is old, ill-used and is superseded by other array-like PMCs. Any code
using this PMC should migrate to ResizablePMCArray or something more suitable.

L<https://trac.parrot.org/parrot/ticket/1303>

=item CPointer PMC [eligible in 2.1] =item CPointer PMC [eligible in 2.1]


And all uses in the Parrot calling conventions. And all uses in the Parrot calling conventions.
Expand Down
4 changes: 0 additions & 4 deletions MANIFEST
View file
Expand Up @@ -1039,7 +1039,6 @@ include/parrot/io_unix.h [main]include
include/parrot/io_win32.h [main]include include/parrot/io_win32.h [main]include
include/parrot/key.h [main]include include/parrot/key.h [main]include
include/parrot/library.h [main]include include/parrot/library.h [main]include
include/parrot/list.h [main]include
include/parrot/longopt.h [main]include include/parrot/longopt.h [main]include
include/parrot/memory.h [main]include include/parrot/memory.h [main]include
include/parrot/misc.h [main]include include/parrot/misc.h [main]include
Expand Down Expand Up @@ -1367,7 +1366,6 @@ src/io/win32.c []
src/key.c [] src/key.c []
src/libnci_test.def [] src/libnci_test.def []
src/library.c [] src/library.c []
src/list.c []
src/longopt.c [] src/longopt.c []
src/main.c [] src/main.c []
src/misc.c [] src/misc.c []
Expand Down Expand Up @@ -1399,7 +1397,6 @@ src/pbc_dump.c []
src/pbc_merge.c [] src/pbc_merge.c []
src/pmc.c [] src/pmc.c []
src/pmc/addrregistry.pmc [devel]src src/pmc/addrregistry.pmc [devel]src
src/pmc/array.pmc [devel]src
src/pmc/arrayiterator.pmc [devel]src src/pmc/arrayiterator.pmc [devel]src
src/pmc/bigint.pmc [devel]src src/pmc/bigint.pmc [devel]src
src/pmc/bignum.pmc [devel]src src/pmc/bignum.pmc [devel]src
Expand Down Expand Up @@ -1862,7 +1859,6 @@ t/pharness/04-Usage.t [test]
t/pir/macro.t [test] t/pir/macro.t [test]
t/pir/registernames.t [test] t/pir/registernames.t [test]
t/pmc/addrregistry.t [test] t/pmc/addrregistry.t [test]
t/pmc/array.t [test]
t/pmc/arrayiterator.t [test] t/pmc/arrayiterator.t [test]
t/pmc/bigint.t [test] t/pmc/bigint.t [test]
t/pmc/bignum.t [test] t/pmc/bignum.t [test]
Expand Down
1 change: 1 addition & 0 deletions PBC_COMPAT
View file
Expand Up @@ -27,6 +27,7 @@


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


6.1 2010.01.30 whiteknight remove Array PMC
6.0 2010.01.19 chromatic released 2.0.0 6.0 2010.01.19 chromatic released 2.0.0
5.1 2009.08.06 cotto remove branch_cs opcode 5.1 2009.08.06 cotto remove branch_cs opcode
5.0 2009.07.21 cotto released 1.4.0 5.0 2009.07.21 cotto released 1.4.0
Expand Down
25 changes: 13 additions & 12 deletions compilers/imcc/imclexer.c
View file
Expand Up @@ -3910,11 +3910,12 @@ YY_RULE_SETUP
} }
else { else {
char * const fmt = "local__%s__%s__$"; char * const fmt = "local__%s__%s__$";
const size_t fmtlen = strlen(fmt) - ( 2 * strlen("%s") ); const size_t fmtlen = strlen(fmt) - (2 * strlen("%s"));
const size_t len = strlen(IMCC_INFO(interp)->cur_macro_name) const size_t len = strlen(IMCC_INFO(interp)->cur_macro_name)
+ yyleng + fmtlen; + yyleng + fmtlen;
char * const label = (char *)mem_sys_allocate(len); char * const label = (char *)mem_sys_allocate(len);


/* skip over ".$" prefix with the +2 */
snprintf(label, len, fmt, snprintf(label, len, fmt,
IMCC_INFO(interp)->cur_macro_name, yytext + 2); IMCC_INFO(interp)->cur_macro_name, yytext + 2);


Expand All @@ -3929,49 +3930,49 @@ YY_RULE_SETUP
YY_BREAK YY_BREAK
case 141: case 141:
YY_RULE_SETUP YY_RULE_SETUP
#line 747 "compilers/imcc/imcc.l" #line 748 "compilers/imcc/imcc.l"
/* skip leading ws */; /* skip leading ws */;
YY_BREAK YY_BREAK
case 142: case 142:
YY_RULE_SETUP YY_RULE_SETUP
#line 748 "compilers/imcc/imcc.l" #line 749 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, ' '); DUP_AND_RET(valp, ' ');
YY_BREAK YY_BREAK
case 143: case 143:
YY_RULE_SETUP YY_RULE_SETUP
#line 749 "compilers/imcc/imcc.l" #line 750 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, REG); DUP_AND_RET(valp, REG);
YY_BREAK YY_BREAK
case 144: case 144:
YY_RULE_SETUP YY_RULE_SETUP
#line 750 "compilers/imcc/imcc.l" #line 751 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, REG); DUP_AND_RET(valp, REG);
YY_BREAK YY_BREAK
case 145: case 145:
YY_RULE_SETUP YY_RULE_SETUP
#line 751 "compilers/imcc/imcc.l" #line 752 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, IDENTIFIER); DUP_AND_RET(valp, IDENTIFIER);
YY_BREAK YY_BREAK
case 146: case 146:
YY_RULE_SETUP YY_RULE_SETUP
#line 752 "compilers/imcc/imcc.l" #line 753 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, MACRO); DUP_AND_RET(valp, MACRO);
YY_BREAK YY_BREAK
case 147: case 147:
YY_RULE_SETUP YY_RULE_SETUP
#line 753 "compilers/imcc/imcc.l" #line 754 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, yytext[0]); DUP_AND_RET(valp, yytext[0]);
YY_BREAK YY_BREAK
case YY_STATE_EOF(macro): case YY_STATE_EOF(macro):
#line 754 "compilers/imcc/imcc.l" #line 755 "compilers/imcc/imcc.l"
yyterminate(); yyterminate();
YY_BREAK YY_BREAK
case 148: case 148:
YY_RULE_SETUP YY_RULE_SETUP
#line 756 "compilers/imcc/imcc.l" #line 757 "compilers/imcc/imcc.l"
ECHO; ECHO;
YY_BREAK YY_BREAK
#line 3975 "compilers/imcc/imclexer.c" #line 3976 "compilers/imcc/imclexer.c"
case YY_STATE_EOF(pod): case YY_STATE_EOF(pod):
case YY_STATE_EOF(cmt1): case YY_STATE_EOF(cmt1):
case YY_STATE_EOF(cmt2): case YY_STATE_EOF(cmt2):
Expand Down Expand Up @@ -5173,7 +5174,7 @@ void yyfree (void * ptr , yyscan_t yyscanner)


#define YYTABLES_NAME "yytables" #define YYTABLES_NAME "yytables"


#line 756 "compilers/imcc/imcc.l" #line 757 "compilers/imcc/imcc.l"






Expand Down
4 changes: 0 additions & 4 deletions config/gen/makefiles/root.in
View file
Expand Up @@ -365,7 +365,6 @@ PARROT_H_HEADERS = \
$(INC_DIR)/string.h \ $(INC_DIR)/string.h \
$(INC_DIR)/string_primitives.h \ $(INC_DIR)/string_primitives.h \
$(INC_DIR)/hash.h \ $(INC_DIR)/hash.h \
$(INC_DIR)/list.h \
$(INC_DIR)/pmc_freeze.h \ $(INC_DIR)/pmc_freeze.h \
$(INC_DIR)/vtable.h \ $(INC_DIR)/vtable.h \
$(INC_DIR)/context.h \ $(INC_DIR)/context.h \
Expand Down Expand Up @@ -471,7 +470,6 @@ INTERP_O_FILES = \
src/call/context_accessors$(O) \ src/call/context_accessors$(O) \
src/key$(O) \ src/key$(O) \
src/library$(O) \ src/library$(O) \
src/list$(O) \
src/longopt$(O) \ src/longopt$(O) \
src/misc$(O) \ src/misc$(O) \
src/multidispatch$(O) \ src/multidispatch$(O) \
Expand Down Expand Up @@ -1178,8 +1176,6 @@ src/pmc_freeze$(O) : $(PARROT_H_HEADERS) src/pmc_freeze.str


src/hash$(O) : $(PARROT_H_HEADERS) include/pmc/pmc_key.h src/hash$(O) : $(PARROT_H_HEADERS) include/pmc/pmc_key.h


src/list$(O) : $(PARROT_H_HEADERS)

src/library$(O) : $(PARROT_H_HEADERS) src/library.str \ src/library$(O) : $(PARROT_H_HEADERS) src/library.str \
$(INC_DIR)/dynext.h $(INC_DIR)/dynext.h


Expand Down
1 change: 0 additions & 1 deletion examples/benchmarks/array_access.pir
View file
Expand Up @@ -42,7 +42,6 @@ Inspired by computer language shootout.
arr_size = opt['arr-size'] arr_size = opt['arr-size']
use_default_arr_size: use_default_arr_size:


_bench( 'Array', arr_size )
_bench( 'FixedFloatArray', arr_size ) _bench( 'FixedFloatArray', arr_size )
_bench( 'FixedIntegerArray', arr_size ) _bench( 'FixedIntegerArray', arr_size )
_bench( 'FixedPMCArray', arr_size ) _bench( 'FixedPMCArray', arr_size )
Expand Down

0 comments on commit 4eb8ef8

Please sign in to comment.