[svn:parrot] r36230 - in branches/pdd28str_part2: compilers/imcc examples/compilers ext/Parrot-Embed/lib/Parrot include/parrot languages/dotnet/pmc languages/lua/src/pmc languages/perl6/src/ops languages/pipp/src/pmc languages/regex/pmc lib/Parrot/Pmc2c src src/ops src/pmc src/string t/src
allison at svn.parrot.org
allison at svn.parrot.org
Sun Feb 1 06:05:52 UTC 2009
Author: allison
Date: Sun Feb 1 06:05:50 2009
New Revision: 36230
URL: https://trac.parrot.org/parrot/changeset/36230
Log:
[pdd28str] Renaming 'Parrot_str_new_constant'.
Modified:
branches/pdd28str_part2/compilers/imcc/parser_util.c
branches/pdd28str_part2/examples/compilers/japhc.c
branches/pdd28str_part2/ext/Parrot-Embed/lib/Parrot/Embed.xs
branches/pdd28str_part2/include/parrot/string_funcs.h
branches/pdd28str_part2/languages/dotnet/pmc/managedpointer.pmc
branches/pdd28str_part2/languages/lua/src/pmc/lua.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luaany.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luaboolean.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luabytecode.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luafunction.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luanil.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luanumber.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luastring.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luatable.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luathread.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luauserdata.pmc
branches/pdd28str_part2/languages/perl6/src/ops/perl6.ops
branches/pdd28str_part2/languages/pipp/src/pmc/php.pmc
branches/pdd28str_part2/languages/pipp/src/pmc/phparray.pmc
branches/pdd28str_part2/languages/pipp/src/pmc/phpboolean.pmc
branches/pdd28str_part2/languages/pipp/src/pmc/phpfloat.pmc
branches/pdd28str_part2/languages/pipp/src/pmc/phpinteger.pmc
branches/pdd28str_part2/languages/pipp/src/pmc/phpnull.pmc
branches/pdd28str_part2/languages/pipp/src/pmc/phpresource.pmc
branches/pdd28str_part2/languages/pipp/src/pmc/phpstring.pmc
branches/pdd28str_part2/languages/regex/pmc/match.pmc
branches/pdd28str_part2/lib/Parrot/Pmc2c/Attribute.pm
branches/pdd28str_part2/lib/Parrot/Pmc2c/Library.pm
branches/pdd28str_part2/lib/Parrot/Pmc2c/PMCEmitter.pm
branches/pdd28str_part2/src/dynext.c
branches/pdd28str_part2/src/inter_misc.c
branches/pdd28str_part2/src/library.c
branches/pdd28str_part2/src/multidispatch.c
branches/pdd28str_part2/src/ops/core.ops
branches/pdd28str_part2/src/packdump.c
branches/pdd28str_part2/src/pmc/packfiledirectory.pmc
branches/pdd28str_part2/src/pmc/string.pmc
branches/pdd28str_part2/src/pmc/stringhandle.pmc
branches/pdd28str_part2/src/string/api.c
branches/pdd28str_part2/src/string/charset.c
branches/pdd28str_part2/src/string/encoding.c
branches/pdd28str_part2/src/thread.c
branches/pdd28str_part2/src/trace.c
branches/pdd28str_part2/t/src/compiler.t
branches/pdd28str_part2/t/src/extend.t
Modified: branches/pdd28str_part2/compilers/imcc/parser_util.c
==============================================================================
--- branches/pdd28str_part2/compilers/imcc/parser_util.c Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/compilers/imcc/parser_util.c Sun Feb 1 06:05:50 2009 (r36230)
@@ -1041,13 +1041,13 @@
register_compilers(PARROT_INTERP)
{
ASSERT_ARGS(register_compilers)
- Parrot_compreg(interp, const_string(interp, "PASM"), imcc_compile_pasm_ex);
- Parrot_compreg(interp, const_string(interp, "PIR"), imcc_compile_pir_ex);
+ Parrot_compreg(interp, Parrot_str_new_constant(interp, "PASM"), imcc_compile_pasm_ex);
+ Parrot_compreg(interp, Parrot_str_new_constant(interp, "PIR"), imcc_compile_pir_ex);
/* It looks like this isn't used anywhere yet */
/* TODO: return a Eval PMC, instead of a packfile */
/* Parrot_compreg(interp,
- const_string(interp, "FILE"),
+ Parrot_str_new_constant(interp, "FILE"),
imcc_compile_file ); */
}
Modified: branches/pdd28str_part2/examples/compilers/japhc.c
==============================================================================
--- branches/pdd28str_part2/examples/compilers/japhc.c Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/examples/compilers/japhc.c Sun Feb 1 06:05:50 2009 (r36230)
@@ -60,7 +60,7 @@
STRING *cmp;
cdebug((stderr, "japhc_init\n"));
- cmp = const_string(interp, "JaPH_Compiler");
+ cmp = Parrot_str_new_constant(interp, "JaPH_Compiler");
Parrot_compreg(interp, cmp, japh_compiler);
}
Modified: branches/pdd28str_part2/ext/Parrot-Embed/lib/Parrot/Embed.xs
==============================================================================
--- branches/pdd28str_part2/ext/Parrot-Embed/lib/Parrot/Embed.xs Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/ext/Parrot-Embed/lib/Parrot/Embed.xs Sun Feb 1 06:05:50 2009 (r36230)
@@ -125,7 +125,7 @@
}
real_interp = interp->interp;
- p_global = const_string( real_interp, global );
+ p_global = Parrot_str_new_constant( real_interp, global );
if ( items == 3 )
namespace = ST(2);
@@ -134,7 +134,7 @@
if (namespace != &PL_sv_undef )
{
- p_namespace = const_string( real_interp, SvPVX( namespace ) );
+ p_namespace = Parrot_str_new_constant( real_interp, SvPVX( namespace ) );
pmc = Parrot_find_global_s(real_interp, p_namespace, p_global);
}
else
@@ -155,7 +155,7 @@
Parrot_PMC out_pmc;
CODE:
real_interp = interp->interp;
- code_type = const_string( real_interp, "PIR" );
+ code_type = Parrot_str_new_constant( real_interp, "PIR" );
out_pmc = Parrot_compile_string( real_interp, code_type, code, &error );
RETVAL = make_pmc( aTHX_ ST(0), out_pmc );
OUTPUT:
@@ -185,7 +185,7 @@
CODE:
pmc_actual = pmc->pmc;
interp = get_interp( pmc->interp );
- arg_string = const_string( interp, argument );
+ arg_string = Parrot_str_new_constant( interp, argument );
out_pmc = Parrot_call_sub( interp, pmc_actual, signature, arg_string );
RETVAL = make_pmc( aTHX_ pmc->interp, out_pmc );
OUTPUT:
Modified: branches/pdd28str_part2/include/parrot/string_funcs.h
==============================================================================
--- branches/pdd28str_part2/include/parrot/string_funcs.h Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/include/parrot/string_funcs.h Sun Feb 1 06:05:50 2009 (r36230)
@@ -29,7 +29,7 @@
PARROT_EXPORT
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
-STRING * const_string(PARROT_INTERP, ARGIN(const char *buffer))
+STRING * Parrot_str_new_constant(PARROT_INTERP, ARGIN(const char *buffer))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -557,7 +557,7 @@
__attribute__nonnull__(2)
FUNC_MODIFIES(*tc);
-#define ASSERT_ARGS_const_string __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_str_new_constant __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(buffer)
#define ASSERT_ARGS_Parrot_str_new_COW __attribute__unused__ int _ASSERT_ARGS_CHECK = \
Modified: branches/pdd28str_part2/languages/dotnet/pmc/managedpointer.pmc
==============================================================================
--- branches/pdd28str_part2/languages/dotnet/pmc/managedpointer.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/dotnet/pmc/managedpointer.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -445,7 +445,7 @@
PMC* get_attr(INTVAL idx)
{
PMC *ref;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "load_pmc"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "load_pmc"),
"->P", &ref);
if (ref)
return VTABLE_get_attr(INTERP, ref, idx);
@@ -456,7 +456,7 @@
PMC* get_attr_str(STRING* idx)
{
PMC *ref;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "load_pmc"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "load_pmc"),
"->P", &ref);
if (ref)
return VTABLE_get_attr_str(INTERP, ref, idx);
@@ -467,7 +467,7 @@
void set_attr(INTVAL idx, PMC *value)
{
PMC *ref;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "load_pmc"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "load_pmc"),
"->P", &ref);
if (ref)
VTABLE_set_attr(INTERP, ref, idx, value);
@@ -476,7 +476,7 @@
void set_attr_str(STRING *idx, PMC *value)
{
PMC *ref;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "load_pmc"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "load_pmc"),
"->P", &ref);
if (ref)
VTABLE_set_attr_str(INTERP, ref, idx, value);
Modified: branches/pdd28str_part2/languages/lua/src/pmc/lua.pmc
==============================================================================
--- branches/pdd28str_part2/languages/lua/src/pmc/lua.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/lua/src/pmc/lua.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -45,19 +45,19 @@
if (pass) {
dynpmc_LuaBoolean = pmc_type(INTERP,
- const_string(INTERP, "LuaBoolean"));
+ Parrot_str_new_constant(INTERP, "LuaBoolean"));
dynpmc_LuaFunction = pmc_type(INTERP,
- const_string(INTERP, "LuaFunction"));
+ Parrot_str_new_constant(INTERP, "LuaFunction"));
dynpmc_LuaNil = pmc_type(INTERP,
- const_string(INTERP, "LuaNil"));
+ Parrot_str_new_constant(INTERP, "LuaNil"));
dynpmc_LuaNumber = pmc_type(INTERP,
- const_string(INTERP, "LuaNumber"));
+ Parrot_str_new_constant(INTERP, "LuaNumber"));
dynpmc_LuaString = pmc_type(INTERP,
- const_string(INTERP, "LuaString"));
+ Parrot_str_new_constant(INTERP, "LuaString"));
dynpmc_LuaTable = pmc_type(INTERP,
- const_string(INTERP, "LuaTable"));
+ Parrot_str_new_constant(INTERP, "LuaTable"));
dynpmc_LuaUserdata = pmc_type(INTERP,
- const_string(INTERP, "LuaUserdata"));
+ Parrot_str_new_constant(INTERP, "LuaUserdata"));
}
}
Modified: branches/pdd28str_part2/languages/lua/src/pmc/luaany.pmc
==============================================================================
--- branches/pdd28str_part2/languages/lua/src/pmc/luaany.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/lua/src/pmc/luaany.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -59,8 +59,8 @@
if (dynpmc_LuaString == type) {
meta = Parrot_find_global_s(interp,
- const_string(interp, "string"),
- const_string(interp, "mt_string"));
+ Parrot_str_new_constant(interp, "string"),
+ Parrot_str_new_constant(interp, "mt_string"));
}
if (dynpmc_LuaFunction != type) {
@@ -74,7 +74,7 @@
if (meta) {
PMC *method;
PMC *key = pmc_new(interp, dynpmc_LuaString);
- VTABLE_set_string_native(interp, key, const_string(interp, name));
+ VTABLE_set_string_native(interp, key, Parrot_str_new_constant(interp, name));
method = VTABLE_get_pmc_keyed(interp, meta, key);
Modified: branches/pdd28str_part2/languages/lua/src/pmc/luaboolean.pmc
==============================================================================
--- branches/pdd28str_part2/languages/lua/src/pmc/luaboolean.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/lua/src/pmc/luaboolean.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -77,7 +77,7 @@
*/
VTABLE STRING* name() {
- return const_string(INTERP, "boolean");
+ return Parrot_str_new_constant(INTERP, "boolean");
}
/*
@@ -119,9 +119,9 @@
*/
VTABLE STRING* get_string() {
if (PMC_int_val(SELF))
- return const_string(INTERP, "true");
+ return Parrot_str_new_constant(INTERP, "true");
else
- return const_string(INTERP, "false");
+ return Parrot_str_new_constant(INTERP, "false");
}
Modified: branches/pdd28str_part2/languages/lua/src/pmc/luabytecode.pmc
==============================================================================
--- branches/pdd28str_part2/languages/lua/src/pmc/luabytecode.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/lua/src/pmc/luabytecode.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -137,7 +137,7 @@
static PMC* _load_bool(Interp *interp)
{
PMC* ret = pmc_new(interp, pmc_type(interp,
- const_string(interp, "Boolean")));
+ Parrot_str_new_constant(interp, "Boolean")));
VTABLE_set_integer_native(interp, ret, _get_byte());
return ret;
}
@@ -145,7 +145,7 @@
static PMC* _load_byte(Interp *interp)
{
PMC* ret = pmc_new(interp, pmc_type(interp,
- const_string(interp, "Integer")));
+ Parrot_str_new_constant(interp, "Integer")));
VTABLE_set_integer_native(interp, ret, _get_byte());
return ret;
}
@@ -153,7 +153,7 @@
static PMC* _load_integer(Interp *interp)
{
PMC* ret = pmc_new(interp, pmc_type(interp,
- const_string(interp, "Integer")));
+ Parrot_str_new_constant(interp, "Integer")));
VTABLE_set_integer_native(interp, ret, _get_integer());
return ret;
}
@@ -161,7 +161,7 @@
static PMC* _load_string(Interp *interp)
{
PMC* ret = pmc_new(interp, pmc_type(interp,
- const_string(interp, "String")));
+ Parrot_str_new_constant(interp, "String")));
VTABLE_set_string_native(interp, ret, _get_string(interp));
return ret;
}
@@ -178,21 +178,21 @@
#if 1
fp -= 8;
VTABLE_set_attr_str(interp, script,
- const_string(interp, "version"), _load_byte(interp));
+ Parrot_str_new_constant(interp, "version"), _load_byte(interp));
VTABLE_set_attr_str(interp, script,
- const_string(interp, "format"), _load_byte(interp));
+ Parrot_str_new_constant(interp, "format"), _load_byte(interp));
VTABLE_set_attr_str(interp, script,
- const_string(interp, "endian"), _load_byte(interp));
+ Parrot_str_new_constant(interp, "endian"), _load_byte(interp));
VTABLE_set_attr_str(interp, script,
- const_string(interp, "sizeof_int"), _load_byte(interp));
+ Parrot_str_new_constant(interp, "sizeof_int"), _load_byte(interp));
VTABLE_set_attr_str(interp, script,
- const_string(interp, "sizeof_size_t"), _load_byte(interp));
+ Parrot_str_new_constant(interp, "sizeof_size_t"), _load_byte(interp));
VTABLE_set_attr_str(interp, script,
- const_string(interp, "sizeof_opcode"), _load_byte(interp));
+ Parrot_str_new_constant(interp, "sizeof_opcode"), _load_byte(interp));
VTABLE_set_attr_str(interp, script,
- const_string(interp, "sizeof_number"), _load_byte(interp));
+ Parrot_str_new_constant(interp, "sizeof_number"), _load_byte(interp));
VTABLE_set_attr_str(interp, script,
- const_string(interp, "integral"), _load_byte(interp));
+ Parrot_str_new_constant(interp, "integral"), _load_byte(interp));
#endif
}
@@ -284,9 +284,9 @@
PMC* local = _new_lua(interp, "Local");
VTABLE_set_string_native(interp, local, _get_string(interp));
VTABLE_set_attr_str(interp, local,
- const_string(interp, "startpc"), _load_integer(interp));
+ Parrot_str_new_constant(interp, "startpc"), _load_integer(interp));
VTABLE_set_attr_str(interp, local,
- const_string(interp, "endpc"), _load_integer(interp));
+ Parrot_str_new_constant(interp, "endpc"), _load_integer(interp));
VTABLE_set_pmc_keyed_int(interp, ret, i, local);
}
@@ -314,31 +314,31 @@
PMC * ret = _new_lua(interp, "Function");
VTABLE_set_attr_str(interp, ret,
- const_string(interp, "source"), _load_string(interp));
+ Parrot_str_new_constant(interp, "source"), _load_string(interp));
VTABLE_set_attr_str(interp, ret,
- const_string(interp, "linedefined"), _load_integer(interp));
+ Parrot_str_new_constant(interp, "linedefined"), _load_integer(interp));
VTABLE_set_attr_str(interp, ret,
- const_string(interp, "lastlinedefined"), _load_integer(interp));
+ Parrot_str_new_constant(interp, "lastlinedefined"), _load_integer(interp));
VTABLE_set_attr_str(interp, ret,
- const_string(interp, "nups"), _load_byte(interp));
+ Parrot_str_new_constant(interp, "nups"), _load_byte(interp));
VTABLE_set_attr_str(interp, ret,
- const_string(interp, "numparams"), _load_byte(interp));
+ Parrot_str_new_constant(interp, "numparams"), _load_byte(interp));
VTABLE_set_attr_str(interp, ret,
- const_string(interp, "is_vararg"), _load_byte(interp));
+ Parrot_str_new_constant(interp, "is_vararg"), _load_byte(interp));
VTABLE_set_attr_str(interp, ret,
- const_string(interp, "maxstacksize"), _load_byte(interp));
+ Parrot_str_new_constant(interp, "maxstacksize"), _load_byte(interp));
VTABLE_set_attr_str(interp, ret,
- const_string(interp, "code"), _load_instruction_list(interp));
+ Parrot_str_new_constant(interp, "code"), _load_instruction_list(interp));
VTABLE_set_attr_str(interp, ret,
- const_string(interp, "k"), _load_constant_list(interp));
+ Parrot_str_new_constant(interp, "k"), _load_constant_list(interp));
VTABLE_set_attr_str(interp, ret,
- const_string(interp, "p"), _load_prototype_list(interp));
+ Parrot_str_new_constant(interp, "p"), _load_prototype_list(interp));
VTABLE_set_attr_str(interp, ret,
- const_string(interp, "lineinfo"), _load_line_list(interp));
+ Parrot_str_new_constant(interp, "lineinfo"), _load_line_list(interp));
VTABLE_set_attr_str(interp, ret,
- const_string(interp, "locvars"), _load_local_list(interp));
+ Parrot_str_new_constant(interp, "locvars"), _load_local_list(interp));
VTABLE_set_attr_str(interp, ret,
- const_string(interp, "upvalues"), _load_upvalue_list(interp));
+ Parrot_str_new_constant(interp, "upvalues"), _load_upvalue_list(interp));
return ret;
}
@@ -384,7 +384,7 @@
_init(INTERP, luabytecode);
_load_header(INTERP, script);
VTABLE_set_attr_str(INTERP, script,
- const_string(INTERP, "top"), _load_function(INTERP));
+ Parrot_str_new_constant(INTERP, "top"), _load_function(INTERP));
RETURN(PMC *script);
}
Modified: branches/pdd28str_part2/languages/lua/src/pmc/luafunction.pmc
==============================================================================
--- branches/pdd28str_part2/languages/lua/src/pmc/luafunction.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/lua/src/pmc/luafunction.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -41,7 +41,7 @@
*/
VTABLE void init_pmc(PMC *sub) {
- if (VTABLE_isa(INTERP, sub, const_string(INTERP, "Sub"))) {
+ if (VTABLE_isa(INTERP, sub, Parrot_str_new_constant(INTERP, "Sub"))) {
PMC_struct_val(SELF) = mem_allocate_zeroed_typed(Parrot_sub);
PMC_pmc_val(SELF) = NULL;
PMC_metadata(SELF) = NULL;
@@ -79,7 +79,7 @@
*/
VTABLE STRING* name() {
- return const_string(INTERP, "function");
+ return Parrot_str_new_constant(INTERP, "function");
}
/*
Modified: branches/pdd28str_part2/languages/lua/src/pmc/luanil.pmc
==============================================================================
--- branches/pdd28str_part2/languages/lua/src/pmc/luanil.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/lua/src/pmc/luanil.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -69,7 +69,7 @@
*/
VTABLE STRING* name() {
- return const_string(INTERP, "nil");
+ return Parrot_str_new_constant(INTERP, "nil");
}
/*
@@ -97,7 +97,7 @@
*/
VTABLE STRING* get_string() {
- return const_string(INTERP, "nil");
+ return Parrot_str_new_constant(INTERP, "nil");
}
/*
Modified: branches/pdd28str_part2/languages/lua/src/pmc/luanumber.pmc
==============================================================================
--- branches/pdd28str_part2/languages/lua/src/pmc/luanumber.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/lua/src/pmc/luanumber.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -83,7 +83,7 @@
*/
VTABLE STRING* name() {
- return const_string(INTERP, "number");
+ return Parrot_str_new_constant(INTERP, "number");
}
/*
@@ -263,7 +263,7 @@
MULTI PMC *add(LuaString value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, value, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, value, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -304,7 +304,7 @@
MULTI void i_add(LuaString value) {
PMC *n;
- Parrot_PCCINVOKE(interp, value, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, value, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -349,7 +349,7 @@
MULTI PMC *subtract(LuaString value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, value, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, value, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -391,7 +391,7 @@
MULTI void i_subtract(LuaString value) {
PMC *n;
- Parrot_PCCINVOKE(interp, value, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, value, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -433,7 +433,7 @@
MULTI PMC *multiply(LuaString value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, value, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, value, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -473,7 +473,7 @@
MULTI void i_multiply(LuaString value) {
PMC *n;
- Parrot_PCCINVOKE(interp, value, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, value, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -515,7 +515,7 @@
MULTI PMC *divide(LuaString value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, value, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, value, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -556,7 +556,7 @@
MULTI void i_divide(LuaString value) {
PMC *n;
- Parrot_PCCINVOKE(interp, value, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, value, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -601,7 +601,7 @@
MULTI PMC *modulus(LuaString value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, value, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, value, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -643,7 +643,7 @@
MULTI void i_modulus(LuaString value) {
PMC *n;
- Parrot_PCCINVOKE(interp, value, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, value, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -685,7 +685,7 @@
MULTI PMC *pow(LuaString value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, value, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, value, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -726,7 +726,7 @@
MULTI void i_pow(LuaString value) {
PMC *n;
- Parrot_PCCINVOKE(interp, value, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, value, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -1079,7 +1079,7 @@
default: p = "bad fpclassify";
}
VTABLE_set_string_native(INTERP, retval,
- const_string(INTERP, p));
+ Parrot_str_new_constant(INTERP, p));
RETURN(PMC *retval);
}
Modified: branches/pdd28str_part2/languages/lua/src/pmc/luastring.pmc
==============================================================================
--- branches/pdd28str_part2/languages/lua/src/pmc/luastring.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/lua/src/pmc/luastring.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -120,7 +120,7 @@
*/
VTABLE STRING* name() {
- return const_string(INTERP, "string");
+ return Parrot_str_new_constant(INTERP, "string");
}
/*
@@ -160,7 +160,7 @@
/* Only allow constant PMCs to embed constant strings */
if (PObj_constant_TEST(SELF) && !PObj_constant_TEST(value)) {
const char *copy = string_to_cstring(INTERP, value);
- value = const_string(INTERP, copy);
+ value = Parrot_str_new_constant(INTERP, copy);
}
PMC_str_val(SELF) = value;
@@ -189,7 +189,7 @@
*/
VTABLE PMC* neg(PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -208,7 +208,7 @@
*/
VTABLE void i_neg() {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -277,7 +277,7 @@
*/
MULTI PMC* add(LuaNumber value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -289,7 +289,7 @@
MULTI PMC* add(LuaString value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -323,7 +323,7 @@
*/
MULTI void i_add(LuaNumber value) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -336,7 +336,7 @@
MULTI void i_add(LuaString value) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -371,7 +371,7 @@
*/
MULTI PMC* subtract(LuaNumber value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -383,7 +383,7 @@
MULTI PMC* subtract(LuaString value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -417,7 +417,7 @@
*/
MULTI void i_subtract(LuaNumber value) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -430,7 +430,7 @@
MULTI void i_subtract(LuaString value) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -466,7 +466,7 @@
*/
MULTI PMC* multiply(LuaNumber value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -478,7 +478,7 @@
MULTI PMC* multiply(LuaString value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -512,7 +512,7 @@
*/
MULTI void i_multiply(LuaNumber value) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -525,7 +525,7 @@
MULTI void i_multiply(LuaString value) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -560,7 +560,7 @@
*/
MULTI PMC* divide(LuaNumber value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -572,7 +572,7 @@
MULTI PMC* divide(LuaString value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -607,7 +607,7 @@
*/
MULTI void i_divide(LuaNumber value) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -620,7 +620,7 @@
MULTI void i_divide(LuaString value) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -655,7 +655,7 @@
*/
MULTI PMC* modulus(LuaNumber value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -667,7 +667,7 @@
MULTI PMC* modulus(LuaString value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -702,7 +702,7 @@
*/
MULTI void i_modulus(LuaNumber value) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -715,7 +715,7 @@
MULTI void i_modulus(LuaString value) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -750,7 +750,7 @@
*/
MULTI PMC* pow(LuaNumber value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -762,7 +762,7 @@
MULTI PMC* pow(LuaString value, PMC *dest) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -797,7 +797,7 @@
*/
MULTI void i_pow(LuaNumber value) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -810,7 +810,7 @@
MULTI void i_pow(LuaString value) {
PMC *n;
- Parrot_PCCINVOKE(interp, SELF, const_string(interp, "tonumber"),
+ Parrot_PCCINVOKE(interp, SELF, Parrot_str_new_constant(interp, "tonumber"),
"->P", &n);
if (PMC_type(n) == dynpmc_LuaNumber)
@@ -973,8 +973,8 @@
*/
METHOD PMC* get_metatable() {
PMC *retval = Parrot_find_global_s(INTERP,
- const_string(INTERP, "string"),
- const_string(INTERP, "mt_string"));
+ Parrot_str_new_constant(INTERP, "string"),
+ Parrot_str_new_constant(INTERP, "mt_string"));
if (!retval)
retval = pmc_new(INTERP, dynpmc_LuaNil);
Modified: branches/pdd28str_part2/languages/lua/src/pmc/luatable.pmc
==============================================================================
--- branches/pdd28str_part2/languages/lua/src/pmc/luatable.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/lua/src/pmc/luatable.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -343,10 +343,10 @@
if (mode) {
mark_key = string_str_index(interp, mode,
- const_string(interp, "k"), 0) < 0;
+ Parrot_str_new_constant(interp, "k"), 0) < 0;
mark_val = string_str_index(interp, mode,
- const_string(interp, "v"), 0) < 0;
+ Parrot_str_new_constant(interp, "v"), 0) < 0;
}
for (i = 0; i < t->size; i++) {
@@ -402,11 +402,11 @@
#if 0
PMC *key = pmc_new(INTERP, dynpmc_LuaString);
VTABLE_set_string_native(INTERP, key,
- const_string(INTERP, "__mode"));
+ Parrot_str_new_constant(INTERP, "__mode"));
m = lua_get(INTERP, PMC_hash(meta), key);
#else
m = lua_getstr(INTERP, PMC_hash(meta),
- const_string(INTERP, "__mode"));
+ Parrot_str_new_constant(INTERP, "__mode"));
#endif
if (m && *m)
mode = PMC_str_val(*m);
@@ -445,7 +445,7 @@
*/
VTABLE STRING* name() {
- return const_string(INTERP, "table");
+ return Parrot_str_new_constant(INTERP, "table");
}
/*
Modified: branches/pdd28str_part2/languages/lua/src/pmc/luathread.pmc
==============================================================================
--- branches/pdd28str_part2/languages/lua/src/pmc/luathread.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/lua/src/pmc/luathread.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -68,7 +68,7 @@
*/
VTABLE void init_pmc(PMC *sub) {
PMC *classobj = Parrot_oo_get_class_str(INTERP,
- const_string(INTERP, "Parrot::Coroutine"));
+ Parrot_str_new_constant(INTERP, "Parrot::Coroutine"));
PMC *init_args;
if (PMC_IS_NULL(classobj))
@@ -77,7 +77,7 @@
init_args = pmc_new(INTERP, enum_class_Hash);
VTABLE_set_pmc_keyed_str(INTERP, init_args,
- const_string(INTERP, "initial_sub"), sub);
+ Parrot_str_new_constant(INTERP, "initial_sub"), sub);
PMC_pmc_val(SELF) = VTABLE_instantiate(INTERP, classobj, init_args);
PMC_metadata(SELF) = getcurrenv(INTERP);
PObj_custom_mark_SET(SELF);
@@ -109,7 +109,7 @@
*/
VTABLE STRING* name() {
- return const_string(INTERP, "thread");
+ return Parrot_str_new_constant(INTERP, "thread");
}
/*
Modified: branches/pdd28str_part2/languages/lua/src/pmc/luauserdata.pmc
==============================================================================
--- branches/pdd28str_part2/languages/lua/src/pmc/luauserdata.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/lua/src/pmc/luauserdata.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -139,7 +139,7 @@
*/
VTABLE STRING* name() {
- return const_string(INTERP, "userdata");
+ return Parrot_str_new_constant(INTERP, "userdata");
}
/*
Modified: branches/pdd28str_part2/languages/perl6/src/ops/perl6.ops
==============================================================================
--- branches/pdd28str_part2/languages/perl6/src/ops/perl6.ops Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/perl6/src/ops/perl6.ops Sun Feb 1 06:05:50 2009 (r36230)
@@ -14,7 +14,7 @@
* to re-bless it into. While we're at it, count the number of attributes
* the current class has that the parent class does not. */
PMC *current_class = VTABLE_get_class(interp, $1);
- PMC *parent_list = VTABLE_inspect_str(interp, $2, const_string(interp, "all_parents"));
+ PMC *parent_list = VTABLE_inspect_str(interp, $2, Parrot_str_new_constant(interp, "all_parents"));
int num_parents = VTABLE_elements(interp, parent_list);
int in_parents = 0;
int new_attribs = 0;
@@ -27,7 +27,7 @@
}
else {
new_attribs += VTABLE_elements(interp, VTABLE_inspect_str(interp,
- test_class, const_string(interp, "attributes")));
+ test_class, Parrot_str_new_constant(interp, "attributes")));
}
}
if (!in_parents)
@@ -36,7 +36,7 @@
/* Make sure we're operating on the real value, not a ObjectRef. */
value = $1;
- while (VTABLE_isa(interp, value, const_string(interp, "ObjectRef")))
+ while (VTABLE_isa(interp, value, Parrot_str_new_constant(interp, "ObjectRef")))
value = VTABLE_get_pmc(interp, value);
/* Check what we're trying to bless into is a standard Parrot class. */
Modified: branches/pdd28str_part2/languages/pipp/src/pmc/php.pmc
==============================================================================
--- branches/pdd28str_part2/languages/pipp/src/pmc/php.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/pipp/src/pmc/php.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -43,17 +43,17 @@
if (pass) {
dynpmc_PhpArray = pmc_type(INTERP,
- const_string(INTERP, "PhpArray"));
+ Parrot_str_new_constant(INTERP, "PhpArray"));
dynpmc_PhpBoolean = pmc_type(INTERP,
- const_string(INTERP, "PhpBoolean"));
+ Parrot_str_new_constant(INTERP, "PhpBoolean"));
dynpmc_PhpFloat = pmc_type(INTERP,
- const_string(INTERP, "PhpFloat"));
+ Parrot_str_new_constant(INTERP, "PhpFloat"));
dynpmc_PhpInteger = pmc_type(INTERP,
- const_string(INTERP, "PhpInteger"));
+ Parrot_str_new_constant(INTERP, "PhpInteger"));
dynpmc_PhpString = pmc_type(INTERP,
- const_string(INTERP, "PhpString"));
+ Parrot_str_new_constant(INTERP, "PhpString"));
dynpmc_PhpNull = pmc_type(INTERP,
- const_string(INTERP, "PhpNull"));
+ Parrot_str_new_constant(INTERP, "PhpNull"));
}
}
Modified: branches/pdd28str_part2/languages/pipp/src/pmc/phparray.pmc
==============================================================================
--- branches/pdd28str_part2/languages/pipp/src/pmc/phparray.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/pipp/src/pmc/phparray.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -1260,7 +1260,7 @@
*/
VTABLE STRING* name() {
- return const_string(INTERP, "array");
+ return Parrot_str_new_constant(INTERP, "array");
}
/*
@@ -1273,7 +1273,7 @@
*/
VTABLE STRING* get_string() {
- return const_string(INTERP, "Array");
+ return Parrot_str_new_constant(INTERP, "Array");
}
/*
Modified: branches/pdd28str_part2/languages/pipp/src/pmc/phpboolean.pmc
==============================================================================
--- branches/pdd28str_part2/languages/pipp/src/pmc/phpboolean.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/pipp/src/pmc/phpboolean.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -38,7 +38,7 @@
*/
STRING* name() {
- return const_string(INTERP, "boolean");
+ return Parrot_str_new_constant(INTERP, "boolean");
}
/*
@@ -52,9 +52,9 @@
*/
STRING* get_string() {
if (PMC_int_val(SELF))
- return const_string(INTERP, "1");
+ return Parrot_str_new_constant(INTERP, "1");
else
- return const_string(INTERP, "");
+ return Parrot_str_new_constant(INTERP, "");
}
Modified: branches/pdd28str_part2/languages/pipp/src/pmc/phpfloat.pmc
==============================================================================
--- branches/pdd28str_part2/languages/pipp/src/pmc/phpfloat.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/pipp/src/pmc/phpfloat.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -37,7 +37,7 @@
*/
STRING* name() {
- return const_string(INTERP, "double");
+ return Parrot_str_new_constant(INTERP, "double");
}
/*
Modified: branches/pdd28str_part2/languages/pipp/src/pmc/phpinteger.pmc
==============================================================================
--- branches/pdd28str_part2/languages/pipp/src/pmc/phpinteger.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/pipp/src/pmc/phpinteger.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -35,7 +35,7 @@
*/
STRING* name() {
- return const_string(INTERP, "integer");
+ return Parrot_str_new_constant(INTERP, "integer");
}
/*
Modified: branches/pdd28str_part2/languages/pipp/src/pmc/phpnull.pmc
==============================================================================
--- branches/pdd28str_part2/languages/pipp/src/pmc/phpnull.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/pipp/src/pmc/phpnull.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -34,7 +34,7 @@
*/
STRING* name() {
- return const_string(INTERP, "NULL");
+ return Parrot_str_new_constant(INTERP, "NULL");
}
VTABLE void set_integer_native(INTVAL value) {
Modified: branches/pdd28str_part2/languages/pipp/src/pmc/phpresource.pmc
==============================================================================
--- branches/pdd28str_part2/languages/pipp/src/pmc/phpresource.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/pipp/src/pmc/phpresource.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -88,7 +88,7 @@
*/
STRING* name() {
- return const_string(INTERP, "resource");
+ return Parrot_str_new_constant(INTERP, "resource");
}
/*
Modified: branches/pdd28str_part2/languages/pipp/src/pmc/phpstring.pmc
==============================================================================
--- branches/pdd28str_part2/languages/pipp/src/pmc/phpstring.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/pipp/src/pmc/phpstring.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -37,7 +37,7 @@
*/
STRING* name() {
- return const_string(INTERP, "string");
+ return Parrot_str_new_constant(INTERP, "string");
}
/*
Modified: branches/pdd28str_part2/languages/regex/pmc/match.pmc
==============================================================================
--- branches/pdd28str_part2/languages/regex/pmc/match.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/languages/regex/pmc/match.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -38,7 +38,7 @@
static STRING* match_range(Interp* interp, PMC* self, PMC* range)
{
- STRING* input_key = const_string(interp, "!INPUT");
+ STRING* input_key = Parrot_str_new_constant(interp, "!INPUT");
Hash* hash = (Hash*) PMC_struct_val(self);
HashBucket *b;
STRING* input;
@@ -210,7 +210,7 @@
*/
INTVAL get_bool() {
- STRING* input_key = const_string(interp, "!RESULT");
+ STRING* input_key = Parrot_str_new_constant(interp, "!RESULT");
Hash* hash = (Hash*) PMC_struct_val(SELF);
HashBucket *b;
Modified: branches/pdd28str_part2/lib/Parrot/Pmc2c/Attribute.pm
==============================================================================
--- branches/pdd28str_part2/lib/Parrot/Pmc2c/Attribute.pm Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/lib/Parrot/Pmc2c/Attribute.pm Sun Feb 1 06:05:50 2009 (r36230)
@@ -110,28 +110,28 @@
if ($attrtype eq "INTVAL") {
$decl .= <<"EOA";
PMC *attr_value = VTABLE_get_attr_str(interp, \\
- pmc, const_string(interp, "$attrname")); \\
+ pmc, Parrot_str_new_constant(interp, "$attrname")); \\
(dest) = VTABLE_get_integer(interp, attr_value); \\
EOA
}
elsif ($attrtype eq "FLOATVAL") {
$decl .= <<"EOA";
PMC *attr_value = VTABLE_get_attr_str(interp, \\
- pmc, const_string(interp, "$attrname")); \\
+ pmc, Parrot_str_new_constant(interp, "$attrname")); \\
(dest) = VTABLE_get_number(interp, attr_value); \\
EOA
}
elsif ($attrtype =~ "STRING") {
$decl .= <<"EOA";
PMC *attr_value = VTABLE_get_attr_str(interp, \\
- pmc, const_string(interp, "$attrname")); \\
+ pmc, Parrot_str_new_constant(interp, "$attrname")); \\
(dest) = VTABLE_get_string(interp, attr_value); \\
EOA
}
elsif ($attrtype =~ /PMC/) {
$decl .= <<"EOA";
(dest) = VTABLE_get_attr_str(interp, \\
- pmc, const_string(interp, "$attrname")); \\
+ pmc, Parrot_str_new_constant(interp, "$attrname")); \\
EOA
}
@@ -159,7 +159,7 @@
PMC *attr_value = pmc_new(interp, enum_class_Integer); \\
VTABLE_set_integer_native(interp, attr_value, value); \\
VTABLE_set_attr_str(interp, pmc, \\
- const_string(interp, "$attrname"), attr_value); \\
+ Parrot_str_new_constant(interp, "$attrname"), attr_value); \\
EOA
}
elsif ($attrtype eq "FLOATVAL") {
@@ -167,7 +167,7 @@
PMC *attr_value = pmc_new(interp, enum_class_Float); \\
VTABLE_set_number_native(interp, attr_value, value); \\
VTABLE_set_attr_str(interp, pmc, \\
- const_string(interp, "$attrname"), attr_value); \\
+ Parrot_str_new_constant(interp, "$attrname"), attr_value); \\
EOA
}
elsif ($attrtype =~ "STRING") {
@@ -175,13 +175,13 @@
PMC *attr_value = pmc_new(interp, enum_class_String); \\
VTABLE_set_string_native(interp, attr_value, value); \\
VTABLE_set_attr_str(interp, pmc, \\
- const_string(interp, "$attrname"), attr_value); \\
+ Parrot_str_new_constant(interp, "$attrname"), attr_value); \\
EOA
}
elsif ($attrtype =~ /PMC/) {
$decl .= <<"EOA";
VTABLE_set_attr_str(interp, pmc, \\
- const_string(interp, "$attrname"), value); \\
+ Parrot_str_new_constant(interp, "$attrname"), value); \\
EOA
}
Modified: branches/pdd28str_part2/lib/Parrot/Pmc2c/Library.pm
==============================================================================
--- branches/pdd28str_part2/lib/Parrot/Pmc2c/Library.pm Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/lib/Parrot/Pmc2c/Library.pm Sun Feb 1 06:05:50 2009 (r36230)
@@ -77,8 +77,8 @@
$cout .= <<"EOC";
#define PARROT_IN_EXTENSION
-#define CONST_STRING(i, s) const_string(i, s)
-#define CONST_STRING_GEN(i, s) const_string(i, s)
+#define CONST_STRING(i, s) Parrot_str_new_constant(i, s)
+#define CONST_STRING_GEN(i, s) Parrot_str_new_constant(i, s)
#include "parrot/parrot.h"
#include "parrot/extend.h"
#include "parrot/dynext.h"
Modified: branches/pdd28str_part2/lib/Parrot/Pmc2c/PMCEmitter.pm
==============================================================================
--- branches/pdd28str_part2/lib/Parrot/Pmc2c/PMCEmitter.pm Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/lib/Parrot/Pmc2c/PMCEmitter.pm Sun Feb 1 06:05:50 2009 (r36230)
@@ -69,8 +69,8 @@
$c->emit( dont_edit( $self->filename ) );
if ($self->is_dynamic) {
$c->emit("#define PARROT_IN_EXTENSION\n");
- $c->emit("#define CONST_STRING(i, s) const_string((i), s)\n");
- $c->emit("#define CONST_STRING_GEN(i, s) const_string((i), s)\n");
+ $c->emit("#define CONST_STRING(i, s) Parrot_str_new_constant((i), s)\n");
+ $c->emit("#define CONST_STRING_GEN(i, s) Parrot_str_new_constant((i), s)\n");
}
$self->gen_includes;
Modified: branches/pdd28str_part2/src/dynext.c
==============================================================================
--- branches/pdd28str_part2/src/dynext.c Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/dynext.c Sun Feb 1 06:05:50 2009 (r36230)
@@ -140,7 +140,7 @@
ARGIN(STRING *name))
{
ASSERT_ARGS(set_cstring_prop)
- STRING * const key = const_string(interp, what);
+ STRING * const key = Parrot_str_new_constant(interp, what);
PMC * const prop = constant_pmc_new(interp, enum_class_String);
VTABLE_set_string_native(interp, prop, name);
Modified: branches/pdd28str_part2/src/inter_misc.c
==============================================================================
--- branches/pdd28str_part2/src/inter_misc.c Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/inter_misc.c Sun Feb 1 06:05:50 2009 (r36230)
@@ -107,7 +107,7 @@
Parrot_mark_method_writes(PARROT_INTERP, int type, ARGIN(const char *name))
{
ASSERT_ARGS(Parrot_mark_method_writes)
- STRING *const str_name = const_string(interp, name);
+ STRING *const str_name = Parrot_str_new_constant(interp, name);
PMC *const pmc_true = pmc_new(interp, enum_class_Integer);
PMC *const method = VTABLE_get_pmc_keyed_str(
interp, interp->vtables[type]->_namespace, str_name);
@@ -481,7 +481,7 @@
ASSERT_ARGS(sysinfo_s)
switch (info_wanted) {
case PARROT_OS:
- return const_string(interp, BUILD_OS_NAME);
+ return Parrot_str_new_constant(interp, BUILD_OS_NAME);
case PARROT_OS_VERSION:
#ifdef PARROT_HAS_HEADER_SYSUTSNAME
{
Modified: branches/pdd28str_part2/src/library.c
==============================================================================
--- branches/pdd28str_part2/src/library.c Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/library.c Sun Feb 1 06:05:50 2009 (r36230)
@@ -228,11 +228,11 @@
VTABLE_set_pmc_keyed_int(interp, lib_paths,
PARROT_LIB_DYN_EXTS, paths);
/* no CONST_STRING here - the c2str.pl preprocessor needs "real strs" */
- entry = const_string(interp, PARROT_LOAD_EXT);
+ entry = Parrot_str_new_constant(interp, PARROT_LOAD_EXT);
VTABLE_push_string(interp, paths, entry);
/* OS/X has .dylib and .bundle */
if (!STREQ(PARROT_LOAD_EXT, PARROT_SHARE_EXT)) {
- entry = const_string(interp, PARROT_SHARE_EXT);
+ entry = Parrot_str_new_constant(interp, PARROT_SHARE_EXT);
VTABLE_push_string(interp, paths, entry);
}
Modified: branches/pdd28str_part2/src/multidispatch.c
==============================================================================
--- branches/pdd28str_part2/src/multidispatch.c Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/multidispatch.c Sun Feb 1 06:05:50 2009 (r36230)
@@ -304,7 +304,7 @@
PMC *type_tuple = PMCNULL;
PMC *returns = PMCNULL;
PMC *call_object = pmc_new(interp, enum_class_CallSignature);
- STRING *string_sig = const_string(interp, sig);
+ STRING *string_sig = Parrot_str_new_constant(interp, sig);
const INTVAL sig_len = string_length(interp, string_sig);
INTVAL in_return_sig = 0;
INTVAL i;
@@ -434,7 +434,7 @@
if (PMC_IS_NULL(sub)) {
sub = Parrot_mmd_find_multi_from_sig_obj(interp,
- const_string(interp, name), sig_object);
+ Parrot_str_new_constant(interp, name), sig_object);
if (!PMC_IS_NULL(sub))
Parrot_mmd_cache_store_by_types(interp, interp->op_mmd_cache, name,
@@ -1441,9 +1441,9 @@
{
ASSERT_ARGS(Parrot_mmd_add_multi_from_c_args)
STRING *comma = CONST_STRING(interp, ",");
- STRING *sub_name_str = const_string(interp, sub_name);
- STRING *long_sig_str = const_string(interp, long_sig);
- STRING *short_sig_str = const_string(interp, short_sig);
+ STRING *sub_name_str = Parrot_str_new_constant(interp, sub_name);
+ STRING *long_sig_str = Parrot_str_new_constant(interp, long_sig);
+ STRING *short_sig_str = Parrot_str_new_constant(interp, short_sig);
PMC *type_list = string_split(interp, comma, long_sig_str);
STRING *ns_name = VTABLE_get_string_keyed_int(interp, type_list, 0);
Modified: branches/pdd28str_part2/src/ops/core.ops
==============================================================================
--- branches/pdd28str_part2/src/ops/core.ops Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/ops/core.ops Sun Feb 1 06:05:50 2009 (r36230)
@@ -849,7 +849,7 @@
* current context appropriately.
*/
Parrot_context_ref(interp, CONTEXT(interp));
- VTABLE_set_attr_str(interp, $1, const_string(interp, "resume"), resume);
+ VTABLE_set_attr_str(interp, $1, Parrot_str_new_constant(interp, "resume"), resume);
dest = Parrot_ex_throw_from_op(interp, $1, ret);
goto ADDRESS(dest);
}
@@ -878,7 +878,7 @@
CONTROL_ERROR, $1);
VTABLE_set_attr_str(interp, exception,
- const_string(interp, "resume"), resume);
+ Parrot_str_new_constant(interp, "resume"), resume);
dest = Parrot_ex_throw_from_op(interp, exception, ret);
goto ADDRESS(dest);
}
@@ -893,7 +893,7 @@
Parrot_ex_build_exception(interp, EXCEPT_error, CONTROL_ERROR, msg);
VTABLE_set_attr_str(interp, exception,
- const_string(interp, "resume"), resume);
+ Parrot_str_new_constant(interp, "resume"), resume);
dest = Parrot_ex_throw_from_op(interp, exception, ret);
goto ADDRESS(dest);
}
@@ -919,7 +919,7 @@
PMC *exception = Parrot_ex_build_exception(interp, EXCEPT_exit,
$1, NULL);
VTABLE_set_attr_str(interp, exception,
- const_string(interp, "resume"), resume);
+ Parrot_str_new_constant(interp, "resume"), resume);
dest = Parrot_ex_throw_from_op(interp, exception, ret);
goto ADDRESS(dest);
}
Modified: branches/pdd28str_part2/src/packdump.c
==============================================================================
--- branches/pdd28str_part2/src/packdump.c Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/packdump.c Sun Feb 1 06:05:50 2009 (r36230)
@@ -261,7 +261,7 @@
{
PMC * const pmc = self->u.key;
Parrot_sub *sub;
- STRING * const null = const_string(interp, "(null)");
+ STRING * const null = Parrot_str_new_constant(interp, "(null)");
STRING *namespace_description;
pobj_flag_dump(interp, (long)PObj_get_FLAGS(pmc));
Modified: branches/pdd28str_part2/src/pmc/packfiledirectory.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/packfiledirectory.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/pmc/packfiledirectory.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -102,7 +102,7 @@
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_OUT_OF_BOUNDS,
"PackfileDirectory: index out of bounds!");
pfseg = pfd->segments[index];
- return const_string(interp, pfseg->name);
+ return Parrot_str_new_constant(interp, pfseg->name);
}
@@ -121,7 +121,7 @@
for (i = 0; i < total; i++) {
PackFile_Segment *pfseg;
pfseg = pfd->segments[i];
- if (!string_compare(interp, name, const_string(interp, pfseg->name)))
+ if (!string_compare(interp, name, Parrot_str_new_constant(interp, pfseg->name)))
return VTABLE_get_pmc_keyed_int(interp, SELF, i);
}
/* the specified segment name wasn't found. */
Modified: branches/pdd28str_part2/src/pmc/string.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/string.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/pmc/string.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -219,7 +219,7 @@
/* Only allow constant PMCs to embed constant strings */
if (PObj_constant_TEST(SELF) && !PObj_constant_TEST(value)) {
const char *copy = string_to_cstring(INTERP, value);
- value = const_string(INTERP, copy);
+ value = Parrot_str_new_constant(INTERP, copy);
}
PMC_str_val(SELF) = value;
}
Modified: branches/pdd28str_part2/src/pmc/stringhandle.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/stringhandle.pmc Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/pmc/stringhandle.pmc Sun Feb 1 06:05:50 2009 (r36230)
@@ -183,7 +183,7 @@
/* Set a default mode of read-only. */
GET_ATTR_mode(INTERP, SELF, open_mode);
if (STRING_IS_NULL(open_mode)) {
- open_mode = const_string(INTERP, "r");
+ open_mode = Parrot_str_new_constant(INTERP, "r");
SET_ATTR_mode(INTERP, SELF, open_mode);
}
@@ -339,10 +339,10 @@
STRING *encoding;
GET_ATTR_encoding(INTERP, SELF, encoding);
if (!STRING_IS_NULL(encoding) &&
- string_equal(INTERP, encoding, const_string(INTERP, "utf8")) == 0)
+ string_equal(INTERP, encoding, Parrot_str_new_constant(INTERP, "utf8")) == 0)
string_result = string_make(INTERP, "", 0, "unicode", 0);
else
- string_result = const_string(INTERP, "");
+ string_result = Parrot_str_new_constant(INTERP, "");
}
else
string_result = string_copy(INTERP, string_result);
@@ -426,9 +426,9 @@
METHOD buffer_type(STRING *new_type :optional, INTVAL got_type :opt_flag) {
INTVAL flags;
- STRING *nobuffer_string = const_string(INTERP, "unbuffered");
- STRING *linebuffer_string = const_string(INTERP, "line-buffered");
- STRING *fullbuffer_string = const_string(INTERP, "full-buffered");
+ STRING *nobuffer_string = Parrot_str_new_constant(INTERP, "unbuffered");
+ STRING *linebuffer_string = Parrot_str_new_constant(INTERP, "line-buffered");
+ STRING *fullbuffer_string = Parrot_str_new_constant(INTERP, "full-buffered");
GET_ATTR_flags(INTERP, SELF, flags);
Modified: branches/pdd28str_part2/src/string/api.c
==============================================================================
--- branches/pdd28str_part2/src/string/api.c Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/string/api.c Sun Feb 1 06:05:50 2009 (r36230)
@@ -660,7 +660,7 @@
/*
-=item C<STRING * const_string>
+=item C<STRING * Parrot_str_new_constant>
Creates and returns a constant Parrot string.
@@ -672,9 +672,9 @@
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
STRING *
-const_string(PARROT_INTERP, ARGIN(const char *buffer))
+Parrot_str_new_constant(PARROT_INTERP, ARGIN(const char *buffer))
{
- ASSERT_ARGS(const_string)
+ ASSERT_ARGS(Parrot_str_new_constant)
DECL_CONST_CAST;
STRING *s;
Hash * const cstring_cache = (Hash *)interp->const_cstring_hash;
Modified: branches/pdd28str_part2/src/string/charset.c
==============================================================================
--- branches/pdd28str_part2/src/string/charset.c Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/string/charset.c Sun Feb 1 06:05:50 2009 (r36230)
@@ -340,7 +340,7 @@
(n + 1) * sizeof (One_charset));
all_charsets->n_charsets++;
all_charsets->set[n].charset = charset;
- all_charsets->set[n].name = const_string(interp, charsetname);
+ all_charsets->set[n].name = Parrot_str_new_constant(interp, charsetname);
all_charsets->set[n].n_converters = 0;
return 1;
Modified: branches/pdd28str_part2/src/string/encoding.c
==============================================================================
--- branches/pdd28str_part2/src/string/encoding.c Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/string/encoding.c Sun Feb 1 06:05:50 2009 (r36230)
@@ -338,7 +338,7 @@
(n + 1) * sizeof (One_encoding));
all_encodings->n_encodings++;
all_encodings->enc[n].encoding = encoding;
- all_encodings->enc[n].name = const_string(interp, encodingname);
+ all_encodings->enc[n].name = Parrot_str_new_constant(interp, encodingname);
return 1;
}
Modified: branches/pdd28str_part2/src/thread.c
==============================================================================
--- branches/pdd28str_part2/src/thread.c Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/thread.c Sun Feb 1 06:05:50 2009 (r36230)
@@ -514,7 +514,7 @@
interp->thread_data->tid,
VTABLE_get_string(interp, exception),
VTABLE_get_integer_keyed_str(interp, exception,
- const_string(interp, "type"))); */
+ Parrot_str_new_constant(interp, "type"))); */
ret_val = PMCNULL;
}
Modified: branches/pdd28str_part2/src/trace.c
==============================================================================
--- branches/pdd28str_part2/src/trace.c Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/src/trace.c Sun Feb 1 06:05:50 2009 (r36230)
@@ -389,7 +389,7 @@
goto done;
if (len < ARGS_COLUMN) {
STRING * const fill = Parrot_str_repeat(debugger,
- const_string(debugger, " "),
+ Parrot_str_new_constant(debugger, " "),
ARGS_COLUMN);
Parrot_io_putps(debugger, Parrot_io_STDERR(debugger), fill);
}
Modified: branches/pdd28str_part2/t/src/compiler.t
==============================================================================
--- branches/pdd28str_part2/t/src/compiler.t Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/t/src/compiler.t Sun Feb 1 06:05:50 2009 (r36230)
@@ -44,7 +44,7 @@
PMC *compreg = Parrot_PMC_get_pmc_keyed_int(interp,
interp->iglobals,
IGLOBALS_COMPREG_HASH);
- STRING *pir = const_string(interp, "PIR");
+ STRING *pir = Parrot_str_new_constant(interp, "PIR");
PMC *comp = Parrot_PMC_get_pmc_keyed_str(interp, compreg, pir);
if (PMC_IS_NULL(comp) || !Parrot_PMC_defined(interp, comp)) {
@@ -64,7 +64,7 @@
dod_register_pmc(interp, prog);
/* locate function to run */
- smain = const_string(interp, "main");
+ smain = Parrot_str_new_constant(interp, "main");
entry = Parrot_find_global_cur(interp, smain);
/* location of the entry */
@@ -131,7 +131,7 @@
dod_register_pmc(interp, prog);
/* locate function to run */
- smain = const_string(interp, "main");
+ smain = Parrot_str_new_constant(interp, "main");
entry = Parrot_find_global_cur(interp, smain);
/* location of the entry */
@@ -159,7 +159,7 @@
PMC *compreg = Parrot_PMC_get_pmc_keyed_int(interp,
interp->iglobals,
IGLOBALS_COMPREG_HASH);
- STRING *pir = const_string(interp, "PIR");
+ STRING *pir = Parrot_str_new_constant(interp, "PIR");
PMC *comp = Parrot_PMC_get_pmc_keyed_str(interp, compreg, pir);
if (PMC_IS_NULL(comp) || !Parrot_PMC_defined(interp, comp)) {
@@ -224,7 +224,7 @@
dod_register_pmc(interp, prog);
/* locate function to run */
- smain = const_string(interp, "main");
+ smain = Parrot_str_new_constant(interp, "main");
entry = Parrot_find_global_cur(interp, smain);
/* location of the entry */
@@ -252,7 +252,7 @@
PMC *compreg = Parrot_PMC_get_pmc_keyed_int(interp,
interp->iglobals,
IGLOBALS_COMPREG_HASH);
- STRING *pir = const_string(interp, "PIR");
+ STRING *pir = Parrot_str_new_constant(interp, "PIR");
PMC *comp = Parrot_PMC_get_pmc_keyed_str(interp, compreg, pir);
if (PMC_IS_NULL(comp) || !Parrot_PMC_defined(interp, comp)) {
@@ -317,7 +317,7 @@
dod_register_pmc(interp, prog);
/* locate function to run */
- smain = const_string(interp, "main");
+ smain = Parrot_str_new_constant(interp, "main");
entry = Parrot_find_global_cur(interp, smain);
/* location of the entry */
@@ -344,7 +344,7 @@
PMC *compreg = Parrot_PMC_get_pmc_keyed_int(interp,
interp->iglobals,
IGLOBALS_COMPREG_HASH);
- STRING *pir = const_string(interp, "PIR");
+ STRING *pir = Parrot_str_new_constant(interp, "PIR");
PMC *comp = Parrot_PMC_get_pmc_keyed_str(interp, compreg, pir);
if (PMC_IS_NULL(comp) || !Parrot_PMC_defined(interp, comp)) {
@@ -409,7 +409,7 @@
dod_register_pmc(interp, prog);
/* locate function to run */
- smain = const_string(interp, "main");
+ smain = Parrot_str_new_constant(interp, "main");
entry = Parrot_find_global_cur(interp, smain);
/* location of the entry */
@@ -435,7 +435,7 @@
PMC *compreg = Parrot_PMC_get_pmc_keyed_int(interp,
interp->iglobals,
IGLOBALS_COMPREG_HASH);
- STRING *pir = const_string(interp, "PIR");
+ STRING *pir = Parrot_str_new_constant(interp, "PIR");
PMC *comp = Parrot_PMC_get_pmc_keyed_str(interp, compreg, pir);
if (PMC_IS_NULL(comp) || !Parrot_PMC_defined(interp, comp)) {
Modified: branches/pdd28str_part2/t/src/extend.t
==============================================================================
--- branches/pdd28str_part2/t/src/extend.t Sun Feb 1 05:56:02 2009 (r36229)
+++ branches/pdd28str_part2/t/src/extend.t Sun Feb 1 06:05:50 2009 (r36230)
@@ -441,7 +441,7 @@
the_test(PARROT_INTERP, opcode_t *cur_op, opcode_t *start)
{
PackFile *pf = Parrot_readbc(interp, "$temp_pbc");
- STRING *name = const_string(interp, "_sub1");
+ STRING *name = Parrot_str_new_constant(interp, "_sub1");
PMC *sub, *arg;
Parrot_loadbc(interp, pf);
@@ -452,7 +452,7 @@
/* win32 seems to buffer stderr ? */
Parrot_io_flush(interp, Parrot_io_STDERR(interp));
- name = const_string(interp, "_sub2");
+ name = Parrot_str_new_constant(interp, "_sub2");
sub = Parrot_find_global_cur(interp, name);
arg = pmc_new(interp, enum_class_String);
@@ -515,7 +515,7 @@
the_test(PARROT_INTERP, opcode_t *cur_op, opcode_t *start)
{
PackFile *pf = Parrot_readbc(interp, "$temp_pbc");
- STRING *name = const_string(interp, "_sub1");
+ STRING *name = Parrot_str_new_constant(interp, "_sub1");
PMC *sub;
Parrot_runloop jump_point;
@@ -646,7 +646,7 @@
packfile = PackFile_new_dummy(interp, "dummy");
- code_type = const_string( interp, "PIR" );
+ code_type = Parrot_str_new_constant( interp, "PIR" );
retval = Parrot_compile_string( interp, code_type, code, &error );
if (!retval) {
@@ -654,7 +654,7 @@
return 1;
}
- foo_name = const_string( interp, "foo" );
+ foo_name = Parrot_str_new_constant( interp, "foo" );
sub = Parrot_find_global_cur( interp, foo_name );
retval = (PMC *) Parrot_call_sub( interp, sub, "V", "" );
@@ -687,7 +687,7 @@
pf = Parrot_readbc( interp, "$temp_pbc" );
Parrot_loadbc( interp, pf );
- sub = Parrot_find_global_cur( interp, const_string( interp, "add" ) );
+ sub = Parrot_find_global_cur( interp, Parrot_str_new_constant( interp, "add" ) );
result = Parrot_call_sub( interp, sub, "III", 100, 200 );
printf( "Result is %d.\\n", result );
More information about the parrot-commits
mailing list