Skip to content

Commit

Permalink
ops2c Emitter was failing for ops with a fullname longer than 30 char…
Browse files Browse the repository at this point in the history 
…acters.

Fix that.  Add 6model.ops to the build.  make bootstrap-ops.  Now the build
is failing
  • Loading branch information
@Whiteknight
Whiteknight authored and Reini Urban committed Mar 17, 2014
1 parent e45cb1e commit 115e14e
Show file tree
Hide file tree
Showing 16 changed files with 321 additions and 133 deletions.
1 change: 1 addition & 0 deletions compilers/opsc/ops2c.nqp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ sub MAIN() {
src/ops/io.ops
src/ops/math.ops
src/ops/object.ops
src/ops/6model.ops
src/ops/pmc.ops
src/ops/set.ops
src/ops/string.ops
Expand Down
8 changes: 3 additions & 5 deletions compilers/opsc/src/Ops/Emitter.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,8 @@ method emit_opsenum_h_body($fh) {
my $max_op_num := 0;
for self.ops_file.ops -> $op {
if !self.ops_file<core> || !self.ops_file.oplib.op_skip_table.exists( $op.full_name ) {
my $space := pir::repeat__SsI(' ', 30 - pir::length__Is($op.full_name));
$fh.print(" enum_ops_" ~ $op.full_name ~ $space ~ "=");
$space := pir::repeat__SsI(' ', 5 - pir::length__Is(~$max_op_num));
$fh.print($space ~ $max_op_num ~ ",\n");
$fh.print(" enum_ops_" ~ $op.full_name ~ " =");
$fh.print(" " ~ $max_op_num ~ ",\n");
$max_op_num++;
}
}
Expand Down Expand Up @@ -197,7 +195,7 @@ method _emit_c_op_enum_header_part($fh) {
$sb.append_format(" PARROT_OP_%0%1 %2 /* %3 */\n",
$op.full_name,
($op.code == $last_op_code ?? ' ' !! ','),
pir::repeat__SsI(' ', 30 - pir::length__Is($op.full_name)),
" ",
$op.code);
}
$fh.print(q|
Expand Down
2 changes: 1 addition & 1 deletion docs/book/draft/ch07_dynpmcs.pod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ using a macro with the same name as the PMC, but all upper-case:

Parrot_Foo_Attributes * attrs = PARROT_FOO(SELF);
attrs->bar = 7; /* it's an INTVAL */
attrs->baz = pmc_new( ... ) /* it's a PMC */
attrs->baz = Parrot_pmc_new( ... ) /* it's a PMC */

Notice how the type name of the attributes structure is C<Parrot_>,
followed by the name of the PMC with the same capitalization as is used
Expand Down
2 changes: 1 addition & 1 deletion examples/compilers/japhc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ japh_compiler(PARROT_INTERP, const char *program)
/*
* create sub PMC
*/
sub = pmc_new(interp, enum_class_Eval);
sub = Parrot_pmc_new(interp, enum_class_Eval);
PMC_get_sub(interp, sub, sub_data);
sub_data->seg = cur_cs;
sub_data->address = cur_cs->base.data;
Expand Down
2 changes: 2 additions & 0 deletions include/parrot/6model/repr/P6opaque.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,6 @@ typedef struct {
/* Initializes the P6opaque REPR. */
REPROps * P6opaque_initialize(PARROT_INTERP);

PMC *index_mapping_and_flat_list(PARROT_INTERP, PMC *WHAT, P6opaqueREPRData *repr_data);

#endif
198 changes: 198 additions & 0 deletions include/parrot/oplib/core_ops.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,204 @@ op_lib_t *PARROT_CORE_OPLIB_INIT(PARROT_INTERP, long init);
opcode_t * Parrot_inspect_p_pc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_inspect_p_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_inspect_p_pc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_get_knowhow_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_get_knowhow_attribute_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_get_how_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_get_how_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_get_what_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_get_what_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_get_who_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_get_who_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_who_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_who_pc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_who_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_who_pc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_type_object_for_p_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_type_object_for_p_pc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_type_object_for_p_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_type_object_for_p_pc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_instance_of_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_instance_of_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_clone_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_clone_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_defined_i_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_defined_i_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_int_i_p_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_int_i_pc_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_int_i_p_pc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_int_i_pc_pc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_int_i_p_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_int_i_pc_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_int_i_p_pc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_int_i_pc_pc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_num_n_p_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_num_n_pc_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_num_n_p_pc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_num_n_pc_pc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_num_n_p_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_num_n_pc_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_num_n_p_pc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_num_n_pc_pc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_str_s_p_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_str_s_pc_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_str_s_p_pc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_str_s_pc_pc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_str_s_p_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_str_s_pc_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_str_s_p_pc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_attr_str_s_pc_pc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_p_p_s_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_pc_p_s_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_p_pc_s_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_pc_pc_s_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_p_p_sc_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_pc_p_sc_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_p_pc_sc_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_pc_pc_sc_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_p_p_s_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_pc_p_s_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_p_pc_s_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_pc_pc_s_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_p_p_sc_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_pc_p_sc_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_p_pc_sc_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_int_pc_pc_sc_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_p_p_s_n(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_pc_p_s_n(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_p_pc_s_n(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_pc_pc_s_n(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_p_p_sc_n(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_pc_p_sc_n(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_p_pc_sc_n(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_pc_pc_sc_n(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_p_p_s_nc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_pc_p_s_nc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_p_pc_s_nc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_pc_pc_s_nc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_p_p_sc_nc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_pc_p_sc_nc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_p_pc_sc_nc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_num_pc_pc_sc_nc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_p_p_s_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_pc_p_s_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_p_pc_s_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_pc_pc_s_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_p_p_sc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_pc_p_sc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_p_pc_sc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_pc_pc_sc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_p_p_s_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_pc_p_s_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_p_pc_s_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_pc_pc_s_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_p_p_sc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_pc_p_sc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_p_pc_sc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_bind_attr_str_pc_pc_sc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_is_attr_initialized_i_p_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_is_attr_initialized_i_pc_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_is_attr_initialized_i_p_pc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_is_attr_initialized_i_pc_pc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_is_attr_initialized_i_p_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_is_attr_initialized_i_pc_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_is_attr_initialized_i_p_pc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_is_attr_initialized_i_pc_pc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_change_type_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_change_type_pc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_change_type_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_change_type_pc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_type_check_i_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_type_check_i_pc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_type_check_i_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_type_check_i_pc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_publish_type_check_cache_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_publish_type_check_cache_pc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_publish_type_check_cache_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_publish_type_check_cache_pc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_publish_method_cache_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_publish_method_cache_pc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_publish_method_cache_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_publish_method_cache_pc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_unbox_str_s_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_unbox_str_s_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_unbox_int_i_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_unbox_int_i_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_unbox_num_n_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_unbox_num_n_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_box_str_p_s_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_box_str_p_sc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_box_str_p_s_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_box_str_p_sc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_box_int_p_i_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_box_int_p_ic_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_box_int_p_i_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_box_int_p_ic_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_box_num_p_n_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_box_num_p_nc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_box_num_p_n_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_box_num_p_nc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stable_set_type_check_mode_p_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stable_set_type_check_mode_pc_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stable_set_type_check_mode_p_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stable_set_type_check_mode_pc_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stable_publish_vtable_mapping_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stable_publish_vtable_mapping_pc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stable_publish_vtable_mapping_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stable_publish_vtable_mapping_pc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stable_publish_vtable_handler_mapping_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stable_publish_vtable_handler_mapping_pc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stable_publish_vtable_handler_mapping_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stable_publish_vtable_handler_mapping_pc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_get_sc_object_p_s_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_get_sc_object_p_sc_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_get_sc_object_p_s_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_get_sc_object_p_sc_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_get_sc_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_get_sc_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_create_sc_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_create_sc_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_set_sc_object_s_i_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_set_sc_object_sc_i_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_set_sc_object_s_ic_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_set_sc_object_sc_ic_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_set_sc_object_s_i_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_set_sc_object_sc_i_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_set_sc_object_s_ic_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_set_sc_object_sc_ic_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_set_sc_for_object_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_set_sc_for_object_pc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_set_sc_for_object_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_set_sc_for_object_pc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_get_sc_for_object_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_get_sc_for_object_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_get_package_through_who_p_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_get_package_through_who_p_pc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_get_package_through_who_p_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_get_package_through_who_p_pc_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_is_invokable_i_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_is_invokable_i_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_primitive_type_spec_i_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_repr_get_primitive_type_spec_i_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_is_container_i_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_is_container_i_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_decontainerize_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_nqp_decontainerize_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_p_p_s_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_pc_p_s_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_p_pc_s_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_pc_pc_s_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_p_p_sc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_pc_p_sc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_p_pc_sc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_pc_pc_sc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_p_p_s_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_pc_p_s_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_p_pc_s_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_pc_pc_s_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_p_p_sc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_pc_p_sc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_p_pc_sc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_container_spec_pc_pc_sc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_new_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_new_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_new_p_s_p(opcode_t *, PARROT_INTERP);
Expand Down
6 changes: 3 additions & 3 deletions src/6model/knowhow_bootstrapper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ new_type(PARROT_INTERP, PMC *nci)
PARROT_GC_WRITE_BARRIER(interp, HOW);

/* Set .WHO to an empty hash. */
STABLE(type_object)->WHO = pmc_new(interp, enum_class_Hash);
STABLE(type_object)->WHO = Parrot_pmc_new(interp, enum_class_Hash);
PARROT_GC_WRITE_BARRIER(interp, STABLE_PMC(type_object));

/* Put it into capture to act as return value. */
Expand Down Expand Up @@ -203,7 +203,7 @@ parents(PARROT_INTERP, PMC *nci)
{
PMC * unused;
PMC *capture = Parrot_pcc_get_signature(interp, CURRENT_CONTEXT(interp));
PMC *empty = pmc_new(interp, enum_class_FixedPMCArray);
PMC *empty = Parrot_pmc_new(interp, enum_class_FixedPMCArray);
unused = Parrot_pcc_build_call_from_c_args(interp, capture, "P", empty);
}

Expand Down Expand Up @@ -236,7 +236,7 @@ mro(PARROT_INTERP, PMC *nci)
PMC * unused;
PMC *capture = Parrot_pcc_get_signature(interp, CURRENT_CONTEXT(interp));
PMC *obj = VTABLE_get_pmc_keyed_int(interp, capture, 1);
PMC *mro = pmc_new(interp, enum_class_ResizablePMCArray);
PMC *mro = Parrot_pmc_new(interp, enum_class_ResizablePMCArray);
VTABLE_push_pmc(interp, mro, STABLE(obj)->WHAT);
unused = Parrot_pcc_build_call_from_c_args(interp, capture, "P", mro);
}
Expand Down
2 changes: 1 addition & 1 deletion src/6model/repr_registry.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void
REPR_initialize_registry(PARROT_INTERP)
{
/* Allocate name to ID map, and anchor it with the GC. */
repr_name_to_id_map = pmc_new(interp, enum_class_Hash);
repr_name_to_id_map = Parrot_pmc_new(interp, enum_class_Hash);
Parrot_pmc_gc_register(interp, repr_name_to_id_map);

/* Add all representations. */
Expand Down
2 changes: 1 addition & 1 deletion src/6model/reprs/HashAttrStore.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ instance_of(PARROT_INTERP, PMC *WHAT)
interp,
sizeof (HashAttrStoreInstance));
obj->common.stable = STABLE_PMC(WHAT);
obj->store = pmc_new(interp, enum_class_Hash);
obj->store = Parrot_pmc_new(interp, enum_class_Hash);

return wrap_object(interp, obj);
}
Expand Down
4 changes: 2 additions & 2 deletions src/6model/reprs/KnowHOWREPR.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ instance_of(PARROT_INTERP, PMC *WHAT)
{
KnowHOWREPRInstance *obj = mem_allocate_zeroed_typed(KnowHOWREPRInstance);
obj->common.stable = STABLE_PMC(WHAT);
obj->methods = pmc_new(interp, enum_class_Hash);
obj->attributes = pmc_new(interp, enum_class_ResizablePMCArray);
obj->methods = Parrot_pmc_new(interp, enum_class_Hash);
obj->attributes = Parrot_pmc_new(interp, enum_class_ResizablePMCArray);
return wrap_object(interp, obj);
}

Expand Down
Loading

0 comments on commit 115e14e

Please sign in to comment.