← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/ecl/intrepid

« back to all changes in this revision

Viewing changes to src/c/error.d

  • Committer: Bazaar Package Importer
  • Author(s): Peter Van Eynde
  • Date: 2006-06-21 09:21:21 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060621092121-txz1f21lj0wh0f67
Tags: 0.9h-20060617-1
* New upstream version
* Updated standards version without real changes. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/c/error.d
70
70
        cl_va_start(args, narg, narg, 0);
71
71
        funcall(4, @'si::universal-error-handler',
72
72
                Cnil,                    /*  not correctable  */
73
 
                make_constant_string(s),         /*  condition text  */
 
73
                make_constant_base_string(s),    /*  condition text  */
74
74
                cl_grab_rest_args(args));
75
75
}
76
76
 
81
81
        cl_va_start(args, narg, narg, 0);
82
82
        return funcall(4, @'si::universal-error-handler',
83
83
                       Ct,                      /*  correctable  */
84
 
                       make_constant_string(err),       /*  continue-format-string  */
 
84
                       make_constant_base_string(err),  /*  continue-format-string  */
85
85
                       cl_grab_rest_args(args));
86
86
}
87
87
 
97
97
        si_signal_simple_error(4, 
98
98
                               @'program-error', /* condition name */
99
99
                               Cnil, /* not correctable */
100
 
                               make_constant_string(s), /* format control */
 
100
                               make_constant_base_string(s), /* format control */
101
101
                               cl_grab_rest_args(args)); /* format args */
102
102
}
103
103
 
109
109
        si_signal_simple_error(4,
110
110
                               @'control-error', /* condition name */
111
111
                               Cnil, /* not correctable */
112
 
                               make_constant_string(s), /* format control */
 
112
                               make_constant_base_string(s), /* format control */
113
113
                               cl_grab_rest_args(args)); /* format args */
114
114
}
115
115
 
121
121
        si_signal_simple_error(6,
122
122
                               @'reader-error', /* condition name */
123
123
                               Cnil, /* not correctable */
124
 
                               make_constant_string(s), /* format control */
 
124
                               make_constant_base_string(s), /* format control */
125
125
                               cl_grab_rest_args(args), /* format args */
126
126
                               @':stream', stream);
127
127
}
208
208
FEinvalid_function_name(cl_object fname)
209
209
{
210
210
        cl_error(9, @'simple-type-error', @':format-control',
211
 
                 make_constant_string("Not a valid function name ~D"),
 
211
                 make_constant_base_string("Not a valid function name ~D"),
212
212
                 @':format-arguments', cl_list(1, fname),
213
213
                 @':expected-type', cl_list(2, @'satisfies', @'si::valid-function-name-p'),
214
214
                 @':datum', fname);
257
257
        cl_va_start(args, narg, narg, 0);
258
258
        rest = cl_grab_rest_args(args);
259
259
 
260
 
        FEerror("~?~%Explanation: ~A.", 3, make_constant_string(msg), rest,
261
 
                make_constant_string(strerror(errno)));
 
260
        FEerror("~?~%Explanation: ~A.", 3, make_constant_base_string(msg), rest,
 
261
                make_constant_base_string(strerror(errno)));
262
262
}
263
263
 
264
264
#if defined(mingw32) || defined(_MSC_VER)
274
274
 
275
275
        if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_ALLOCATE_BUFFER,
276
276
                          0, GetLastError(), 0, (void*)&win_msg, 0, NULL) == 0)
277
 
                win_msg_obj = make_simple_string("[Unable to get error message]");
 
277
                win_msg_obj = make_simple_base_string("[Unable to get error message]");
278
278
        else {
279
 
                win_msg_obj = make_string_copy(win_msg);
 
279
                win_msg_obj = make_base_string_copy(win_msg);
280
280
                LocalFree(win_msg);
281
281
        }
282
282
 
283
 
        FEerror("~?~%Explanation: ~A.", 3, make_constant_string(msg), rest,
 
283
        FEerror("~?~%Explanation: ~A.", 3, make_constant_base_string(msg), rest,
284
284
                win_msg_obj);
285
285
}
286
286
#endif