Permalink
Browse files

Merge branch 'master' of github.com:parrot/parrot

  • Loading branch information...
2 parents 2dd3f75 + 11483b2 commit 7fae0c78f3ea824bd42cf60bbe7d7b847e84296f @plobsing plobsing committed May 7, 2011
Showing with 11 additions and 11 deletions.
  1. +9 −9 src/hash.c
  2. +2 −2 tools/dev/pbc_to_exe.pir
View
@@ -749,8 +749,8 @@ Parrot_hash_thaw(PARROT_INTERP, ARGMOD(PMC *info))
break;
}
default:
- Parrot_ex_throw_from_c_args(interp, NULL, 1,
- "unimplemented key type");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
+ "unimplemented key type %i", (int)key_type);
break;
}
@@ -774,8 +774,8 @@ Parrot_hash_thaw(PARROT_INTERP, ARGMOD(PMC *info))
break;
}
default:
- Parrot_ex_throw_from_c_args(interp, NULL, 1,
- "unimplemented value type");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
+ "unimplemented value type %i", (int)entry_type);
break;
}
}
@@ -823,8 +823,8 @@ Parrot_hash_freeze(PARROT_INTERP, ARGIN(const Hash *hash), ARGMOD(PMC *info))
VTABLE_push_pmc(interp, info, (PMC *)_bucket->key);
break;
default:
- Parrot_ex_throw_from_c_args(interp, NULL, 1,
- "unimplemented key type");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
+ "unimplemented key type %i", (int)key_type);
break;
}
switch (entry_type) {
@@ -838,8 +838,8 @@ Parrot_hash_freeze(PARROT_INTERP, ARGIN(const Hash *hash), ARGMOD(PMC *info))
VTABLE_push_pmc(interp, info, (PMC *)_bucket->value);
break;
default:
- Parrot_ex_throw_from_c_args(interp, NULL, 1,
- "unimplemented value type");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
+ "unimplemented value type %i", (int)entry_type);
break;
});
}
@@ -1625,7 +1625,7 @@ Parrot_hash_clone_prunable(PARROT_INTERP, ARGIN(const Hash *hash),
default:
valtmp = NULL; /* avoid warning */
- Parrot_ex_throw_from_c_args(interp, NULL, -1,
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
"hash corruption: type = %d\n", hash->entry_type);
};
if (key) {
View
@@ -96,7 +96,7 @@ HEADER
Parrot_set_config_hash(interp) &&
Parrot_api_set_executable_name(interp, argv[0]) &&
Parrot_api_set_runcore(interp, RUNCORE, TRACE))) {
- fprintf(stderr, "PARROT VM: Could not initialize new interpreter");
+ fprintf(stderr, "PARROT VM: Could not initialize new interpreter\n");
show_last_error_and_exit(interp);
}
@@ -107,7 +107,7 @@ HEADER
show_last_error_and_exit(interp);
}
if (!Parrot_api_load_bytecode_bytes(interp, program_code_addr, bytecode_size, &pbc)) {
- fprintf(stderr, "PARROT VM: Could not load bytecode");
+ fprintf(stderr, "PARROT VM: Could not load bytecode\n");
show_last_error_and_exit(interp);
}
if (!Parrot_api_run_bytecode(interp, pbc, argsarray)) {

0 comments on commit 7fae0c7

Please sign in to comment.