Author: paultcochrane
Date: Fri Jul 6 09:01:29 2007
New Revision: 19646
Modified:
trunk/src/pmc/class.pmc
Log:
[src] Found an issue associated with building parrot with icc. When
tools/build/c2str.pl creates the relevant set of #define statements for
CONST_STRING it uses the line number where the CONST_STRING() macro appears
within the source file. However, if the macro appears in a function
definition, and the function arguments span more than one line, and the
CONST_STRING() macro appears on the following line (say), then icc
calculates the line number to use, and hence doesn't agree with what was
generated by c2str.pl. This commit puts the relevant function calls all on
the one line so that icc is able to build parrot.
Modified: trunk/src/pmc/class.pmc
==============================================================================
--- trunk/src/pmc/class.pmc (original)
+++ trunk/src/pmc/class.pmc Fri Jul 6 09:01:29 2007
@@ -480,8 +480,7 @@
}
else {
PMC *naming_hash = pmc_new(interp, enum_class_Hash);
- VTABLE_set_pmc_keyed_str(interp, naming_hash,
- CONST_STRING(interp, "name"), name);
+ VTABLE_set_pmc_keyed_str(interp, naming_hash, CONST_STRING(interp,
"name"), name);
child_class = pmc_new_init(interp, enum_class_Class,
naming_hash);
}
@@ -606,12 +605,10 @@
string_to_cstring(interp, name));
/* Set name and type. */
- VTABLE_set_string_keyed_str(interp, new_attribute,
- CONST_STRING(interp, "name"), name);
+ VTABLE_set_string_keyed_str(interp, new_attribute,
CONST_STRING(interp, "name"), name);
if (!PMC_IS_NULL(type))
- VTABLE_set_pmc_keyed_str(interp, new_attribute,
- CONST_STRING(interp, "type"), type);
+ VTABLE_set_pmc_keyed_str(interp, new_attribute,
CONST_STRING(interp, "type"), type);
/* Enter the attribute in the attributes array. */
VTABLE_set_pmc_keyed_str(interp, _class->attrib_metadata, name,
@@ -930,8 +927,7 @@
* init_class_from_hash - saves some code duplication. */
PMC *naming_hash = pmc_new(interp, enum_class_Hash);
- VTABLE_set_string_keyed_str(interp, naming_hash,
- CONST_STRING(interp, "name"), name);
+ VTABLE_set_string_keyed_str(interp, naming_hash,
CONST_STRING(interp, "name"), name);
init_class_from_hash(interp, SELF, naming_hash);
}
