-xbt_error_t
-gras_cbps_v_pop (gras_cbps_t ps,
- const char *name,
- gras_datadesc_type_t *ddt,
- void **res) {
- xbt_dynar_t varstack,frame;
- gras_cbps_elm_t var = NULL;
- void *data = NULL;
- xbt_error_t errcode;
-
- DEBUG1("pop(%s)",name);
- /* FIXME: Error handling */
- errcode = xbt_dict_get(ps->space, name, (void **)&varstack);
- if (errcode == mismatch_error) {
- RAISE1(mismatch_error,"Asked to pop the non-existant %s",
- name);
- }
- xbt_dynar_pop(varstack, &var);
-
- if (!xbt_dynar_length(varstack)) {
- DEBUG1("Last incarnation of %s poped. Kill it",name);
- xbt_dict_remove(ps->space, name);
- xbt_dynar_free(&varstack);
- }
-
- if (ddt)
- *ddt = var->type;
- data = var->data;
-
- xbt_free(var);
-
- xbt_dynar_pop(ps->frames, &frame);
- {
- int l = xbt_dynar_length(frame);
-
- while (l--) {
- char *_name = NULL;
-
- _name = xbt_dynar_get_as(frame, l, char*);
- if (!strcmp(name, _name)) {
- xbt_dynar_remove_at(frame, l, &_name);
- xbt_free(_name);
- break;
- }
- }
- }
- xbt_dynar_push(ps->frames, &frame);
-
- *res = data;
- return no_error;
+void
+gras_cbps_v_pop (gras_cbps_t ps,
+ const char *name,
+ gras_datadesc_type_t *ddt,
+ void **res) {
+ xbt_dynar_t varstack,frame;
+ gras_cbps_elm_t var = NULL;
+ void *data = NULL;
+ xbt_ex_t e;
+
+ DEBUG1("pop(%s)",name);
+ TRY {
+ varstack = xbt_dict_get(ps->space, name);
+ } CATCH(e) {
+ if (e.category != mismatch_error)
+ RETHROW;
+
+ xbt_ex_free(e);
+ THROW1(not_found_error,1,"Asked to pop the non-existant %s", name);
+ }
+ xbt_dynar_pop(varstack, &var);
+
+ if (!xbt_dynar_length(varstack)) {
+ DEBUG1("Last incarnation of %s poped. Kill it",name);
+ xbt_dict_remove(ps->space, name);
+ xbt_dynar_free(&varstack);
+ }
+
+ if (ddt)
+ *ddt = var->type;
+ data = var->data;
+
+ free(var);
+
+ xbt_dynar_pop(ps->frames, &frame);
+ {
+ int l = xbt_dynar_length(frame);
+
+ while (l--) {
+ char *_name = NULL;
+
+ _name = xbt_dynar_get_as(frame, l, char*);
+ if (!strcmp(name, _name)) {
+ xbt_dynar_remove_at(frame, l, &_name);
+ free(_name);
+ break;
+ }
+ }
+ }
+ xbt_dynar_push(ps->frames, &frame);
+
+ *res = data;