Author: infinoid
Date: Wed Aug 6 20:44:50 2008
New Revision: 30078
Modified:
branches/pdd13pbc/src/pmc/packfile.pmc
branches/pdd13pbc/src/pmc/packfileannotation.pmc
branches/pdd13pbc/src/pmc/packfileannotationkeys.pmc
branches/pdd13pbc/src/pmc/packfileannotations.pmc
branches/pdd13pbc/src/pmc/packfileconstanttable.pmc
branches/pdd13pbc/src/pmc/packfiledirectory.pmc
branches/pdd13pbc/src/pmc/packfilefixupentry.pmc
branches/pdd13pbc/src/pmc/packfilefixuptable.pmc
branches/pdd13pbc/src/pmc/packfilerawsegment.pmc
branches/pdd13pbc/src/pmc/packfilesegment.pmc
Log:
[pdd13] Apply API changes from pdd25cx merge to packfile PMCs.
Modified: branches/pdd13pbc/src/pmc/packfile.pmc
==============================================================================
--- branches/pdd13pbc/src/pmc/packfile.pmc (original)
+++ branches/pdd13pbc/src/pmc/packfile.pmc Wed Aug 6 20:44:50 2008
@@ -93,7 +93,8 @@
const opcode_t *ptr = (const opcode_t*)Parrot_string_cstring(interp,
str);
int length = string_length(interp, str);
if (!PackFile_unpack(interp, pf, ptr, length))
- real_exception(interp, NULL, EXCEPTION_MALFORMED_PACKFILE, "Can't
unpack packfile.");
+ Parrot_ex_throw_from_c_args(interp, NULL,
EXCEPTION_MALFORMED_PACKFILE,
+ "Can't unpack packfile.");
/* Set :main routine */
do_sub_pragmas(interp, pf->cur_cs, PBC_PBC, NULL);
@@ -156,7 +157,7 @@
if (!string_compare(interp, key, CONST_STRING(interp, "uuid_length")))
return pf->header->uuid_size;
- real_exception(interp, NULL, E_KeyError,
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_KEY_NOT_FOUND,
"PackFile: No such integer key \"%s\"",
Parrot_string_cstring(interp, key));
}
@@ -181,7 +182,7 @@
if (!string_compare(interp, key, CONST_STRING(interp, "uuid")))
return string_from_cstring(interp, (char*)pf->header->uuid_data,
pf->header->uuid_size);
- real_exception(interp, NULL, E_KeyError,
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_KEY_NOT_FOUND,
"PackFile: No such string key \"%s\"",
Parrot_string_cstring(interp, key));
}
@@ -257,7 +258,7 @@
pf->header->uuid_type = value;
return;
}
- real_exception(interp, NULL, E_KeyError,
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_KEY_NOT_FOUND,
"PackFile: No such integer key \"%s\"",
Parrot_string_cstring(interp, key));
}
Modified: branches/pdd13pbc/src/pmc/packfileannotation.pmc
==============================================================================
--- branches/pdd13pbc/src/pmc/packfileannotation.pmc (original)
+++ branches/pdd13pbc/src/pmc/packfileannotation.pmc Wed Aug 6 20:44:50 2008
@@ -34,7 +34,7 @@
*/
INTVAL get_offset() {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -48,7 +48,7 @@
*/
void set_offset(INTVAL offset) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -62,7 +62,7 @@
*/
INTVAL get_key_id() {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -76,7 +76,7 @@
*/
void set_key_id(INTVAL offset) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -90,7 +90,7 @@
*/
VTABLE INTVAL get_integer() {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -104,7 +104,7 @@
*/
VTABLE void set_integer(INTVAL offset) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
}
Modified: branches/pdd13pbc/src/pmc/packfileannotationkeys.pmc
==============================================================================
--- branches/pdd13pbc/src/pmc/packfileannotationkeys.pmc (original)
+++ branches/pdd13pbc/src/pmc/packfileannotationkeys.pmc Wed Aug 6
20:44:50 2008
@@ -38,7 +38,7 @@
*/
VTABLE STRING *get_string_keyed_int(INTVAL index) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -52,7 +52,7 @@
*/
VTABLE void set_string_keyed_int(INTVAL index, STRING *value) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -66,7 +66,7 @@
*/
VTABLE INTVAL get_integer_keyed_int(INTVAL index) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -80,7 +80,7 @@
*/
VTABLE void set_integer_keyed_int(INTVAL index, INTVAL value) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
Modified: branches/pdd13pbc/src/pmc/packfileannotations.pmc
==============================================================================
--- branches/pdd13pbc/src/pmc/packfileannotations.pmc (original)
+++ branches/pdd13pbc/src/pmc/packfileannotations.pmc Wed Aug 6 20:44:50 2008
@@ -41,7 +41,7 @@
*/
PMC *get_key_list() {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -55,7 +55,7 @@
*/
VTABLE INTVAL elements() {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -69,7 +69,7 @@
*/
VTABLE PMC *get_pmc_keyed_int(INTVAL index) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -98,7 +98,7 @@
*/
VTABLE void set_pmc_keyed_int(INTVAL index, PMC *annotation) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
Modified: branches/pdd13pbc/src/pmc/packfileconstanttable.pmc
==============================================================================
--- branches/pdd13pbc/src/pmc/packfileconstanttable.pmc (original)
+++ branches/pdd13pbc/src/pmc/packfileconstanttable.pmc Wed Aug 6 20:44:50 2008
@@ -39,7 +39,7 @@
*/
VTABLE INTVAL elements() {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -54,7 +54,7 @@
*/
VTABLE FLOATVAL get_number_keyed_int(INTVAL index) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -69,7 +69,7 @@
*/
VTABLE STRING *get_string_keyed_int(INTVAL index) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -83,7 +83,7 @@
*/
VTABLE PMC *get_pmc_keyed_int(INTVAL index) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -97,7 +97,7 @@
*/
VTABLE void set_number_keyed_int(INTVAL index, FLOATVAL value) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -111,7 +111,7 @@
*/
VTABLE void set_string_keyed_int(INTVAL index, STRING *value) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -125,7 +125,7 @@
*/
VTABLE void set_pmc_keyed_int(INTVAL index, PMC *value) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -153,7 +153,7 @@
*/
INTVAL get_type(INTVAL index) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
Modified: branches/pdd13pbc/src/pmc/packfiledirectory.pmc
==============================================================================
--- branches/pdd13pbc/src/pmc/packfiledirectory.pmc (original)
+++ branches/pdd13pbc/src/pmc/packfiledirectory.pmc Wed Aug 6 20:44:50 2008
@@ -60,7 +60,8 @@
PMC *rv;
int pmc_type;
if(index < 0 || index >= (INTVAL)pfd->num_segments)
- real_exception(interp, NULL, E_IndexError, "PackfileDirectory:
index out of bounds!");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_OUT_OF_BOUNDS,
+ "PackfileDirectory: index out of
bounds!");
pfseg = pfd->segments[index];
switch(pfseg->type) {
case PF_DIR_SEG:
@@ -98,7 +99,8 @@
PackFile_Segment *pfseg;
PMC *rv;
if(index < 0 || index >= (INTVAL)pfd->num_segments)
- real_exception(interp, NULL, E_IndexError, "PackfileDirectory:
index out of bounds!");
+ 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);
}
@@ -114,7 +116,7 @@
*/
VTABLE PMC *get_pmc_keyed_str(STRING *name) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -145,7 +147,7 @@
*/
VTABLE void set_pmc_keyed_str(STRING *name, PMC *segment) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
Modified: branches/pdd13pbc/src/pmc/packfilefixupentry.pmc
==============================================================================
--- branches/pdd13pbc/src/pmc/packfilefixupentry.pmc (original)
+++ branches/pdd13pbc/src/pmc/packfilefixupentry.pmc Wed Aug 6 20:44:50 2008
@@ -33,7 +33,7 @@
*/
VTABLE STRING *get_string() {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
/*
@@ -46,7 +46,7 @@
*/
VTABLE void set_string_native(STRING *value) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -60,7 +60,7 @@
*/
VTABLE INTVAL get_integer() {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -74,7 +74,7 @@
*/
VTABLE void set_integer_native(INTVAL offset) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -88,7 +88,7 @@
*/
INTVAL get_type() {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -102,7 +102,7 @@
*/
void set_type(INTVAL offset) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
}
Modified: branches/pdd13pbc/src/pmc/packfilefixuptable.pmc
==============================================================================
--- branches/pdd13pbc/src/pmc/packfilefixuptable.pmc (original)
+++ branches/pdd13pbc/src/pmc/packfilefixuptable.pmc Wed Aug 6 20:44:50 2008
@@ -39,7 +39,7 @@
*/
VTABLE INTVAL elements() {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -53,7 +53,7 @@
*/
VTABLE PMC *get_pmc_keyed_int(INTVAL index) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -67,7 +67,7 @@
*/
VTABLE void set_pmc_keyed_int(INTVAL index, PMC *value) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
Modified: branches/pdd13pbc/src/pmc/packfilerawsegment.pmc
==============================================================================
--- branches/pdd13pbc/src/pmc/packfilerawsegment.pmc (original)
+++ branches/pdd13pbc/src/pmc/packfilerawsegment.pmc Wed Aug 6 20:44:50 2008
@@ -39,7 +39,7 @@
*/
VTABLE INTVAL elements() {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -53,7 +53,7 @@
*/
VTABLE INTVAL get_integer_keyed_int(INTVAL key) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
@@ -67,7 +67,7 @@
*/
VTABLE void set_integer_keyed_int(INTVAL key, INTVAL value) {
- real_exception(interp, NULL, E_NotImplementedError, "Not implemented
yet.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Not implemented yet.");
}
Modified: branches/pdd13pbc/src/pmc/packfilesegment.pmc
==============================================================================
--- branches/pdd13pbc/src/pmc/packfilesegment.pmc (original)
+++ branches/pdd13pbc/src/pmc/packfilesegment.pmc Wed Aug 6 20:44:50 2008
@@ -79,7 +79,8 @@
*/
METHOD unpack(STRING *data) {
- real_exception(interp, NULL, E_NotImplementedError, "unpack() not
implemented.");
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
+ "unpack() not implemented.");
}
}
