*** core.ops.~1.146.~ Tue Jun 4 11:55:32 2002 --- core.ops Tue Jun 4 14:18:31 2002 *************** *** 739,745 **** MAKE_KEY(key, $2, enum_key_int, int_val); ! $1->vtable->set_pmc_keyed(interpreter, $1, &key, $3, NULL); goto NEXT(); } --- 739,745 ---- MAKE_KEY(key, $2, enum_key_int, int_val); ! $1->vtable->set_pmc_keyed(interpreter, $1, NULL, $3, &key); goto NEXT(); } *************** *** 748,754 **** MAKE_KEY(key, $2, enum_key_num, num_val); ! $1->vtable->set_pmc_keyed(interpreter, $1, &key, $3, NULL); goto NEXT(); } --- 748,754 ---- MAKE_KEY(key, $2, enum_key_num, num_val); ! $1->vtable->set_pmc_keyed(interpreter, $1, NULL, $3, &key); goto NEXT(); } *************** *** 757,763 **** MAKE_KEY(key, $2, enum_key_string, struct_val); ! $1->vtable->set_pmc_keyed(interpreter, $1, &key, $3, NULL); goto NEXT(); } --- 757,763 ---- MAKE_KEY(key, $2, enum_key_string, struct_val); ! $1->vtable->set_pmc_keyed(interpreter, $1, NULL, $3, &key); goto NEXT(); } *************** *** 878,885 **** MAKE_KEY(src_key, $2, enum_key_pmc, pmc_val); MAKE_KEY(dest_key, $4, enum_key_pmc, pmc_val); $1->vtable->set_pmc_keyed(interpreter, ! $1, $2 ? &src_key : NULL, $3, $4 ? &dest_key : NULL); goto NEXT(); } --- 878,887 ---- MAKE_KEY(src_key, $2, enum_key_pmc, pmc_val); MAKE_KEY(dest_key, $4, enum_key_pmc, pmc_val); + /* (Can someone independently verify that the keys are the right + way around here) */ $1->vtable->set_pmc_keyed(interpreter, ! $1, $4 ? &dest_key : NULL, $3, $2 ? &src_key : NULL); goto NEXT(); }