mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-14 15:40:19 +02:00
* backtrace.c, debug.c, eval.c, eval.h, gsubr.c, procprop.h,
read.c, srcprop.c, srcprop.h (scm_i_filename, scm_i_line, scm_i_column, scm_i_copy, scm_i_name, scm_i_lambda, scm_i_source, scm_i_more, scm_i_procname, scm_i_dot, scm_i_arrow, scm_i_else, scm_i_unquote, scm_i_uq_splicing, scm_i_apply, scm_i_enter_frame, scm_i_apply_frame, scm_i_exit_frame, scm_i_trace, scm_i_quote, scm_i_begin, scm_i_if, scm_i_and, scm_i_or, scm_i_case, scm_i_cond, scm_i_letstar, scm_i_do, scm_i_quasiquote, scm_i_define, scm_i_letrec, scm_i_let, scm_i_atapply, scm_i_atcall_cc, scm_i_breakpoint): Renamed: Consequently use scm_sym_ as prefix for symbols.
This commit is contained in:
parent
55b0ed6971
commit
92e5aa0e92
4 changed files with 40 additions and 40 deletions
|
@ -70,11 +70,11 @@
|
|||
*
|
||||
*/
|
||||
|
||||
SCM scm_i_filename;
|
||||
SCM scm_i_copy;
|
||||
SCM scm_i_line;
|
||||
SCM scm_i_column;
|
||||
SCM scm_i_breakpoint;
|
||||
SCM scm_sym_filename;
|
||||
SCM scm_sym_copy;
|
||||
SCM scm_sym_line;
|
||||
SCM scm_sym_column;
|
||||
SCM scm_sym_breakpoint;
|
||||
|
||||
long scm_tc16_srcprops;
|
||||
static scm_srcprops_chunk *srcprops_chunklist = 0;
|
||||
|
@ -166,12 +166,12 @@ scm_srcprops_to_plist (obj)
|
|||
{
|
||||
SCM plist = SRCPROPPLIST (obj);
|
||||
if (!SCM_UNBNDP (SRCPROPCOPY (obj)))
|
||||
plist = scm_acons (scm_i_copy, SRCPROPCOPY (obj), plist);
|
||||
plist = scm_acons (scm_sym_copy, SRCPROPCOPY (obj), plist);
|
||||
if (!SCM_UNBNDP (SRCPROPFNAME (obj)))
|
||||
plist = scm_acons (scm_i_filename, SRCPROPFNAME (obj), plist);
|
||||
plist = scm_acons (scm_i_column, SCM_MAKINUM (SRCPROPCOL (obj)), plist);
|
||||
plist = scm_acons (scm_i_line, SCM_MAKINUM (SRCPROPLINE (obj)), plist);
|
||||
plist = scm_acons (scm_i_breakpoint, SRCPROPBRK (obj), plist);
|
||||
plist = scm_acons (scm_sym_filename, SRCPROPFNAME (obj), plist);
|
||||
plist = scm_acons (scm_sym_column, SCM_MAKINUM (SRCPROPCOL (obj)), plist);
|
||||
plist = scm_acons (scm_sym_line, SCM_MAKINUM (SRCPROPLINE (obj)), plist);
|
||||
plist = scm_acons (scm_sym_breakpoint, SRCPROPBRK (obj), plist);
|
||||
return plist;
|
||||
}
|
||||
|
||||
|
@ -235,11 +235,11 @@ scm_source_property (obj, key)
|
|||
p = scm_hashq_ref (scm_source_whash, obj, SCM_EOL);
|
||||
if (SCM_IMP (p) || !SRCPROPSP (p))
|
||||
goto plist;
|
||||
if (scm_i_breakpoint == key) p = SRCPROPBRK (p);
|
||||
else if (scm_i_line == key) p = SCM_MAKINUM (SRCPROPLINE (p));
|
||||
else if (scm_i_column == key) p = SCM_MAKINUM (SRCPROPCOL (p));
|
||||
else if (scm_i_filename == key) p = SRCPROPFNAME (p);
|
||||
else if (scm_i_copy == key) p = SRCPROPCOPY (p);
|
||||
if (scm_sym_breakpoint == key) p = SRCPROPBRK (p);
|
||||
else if (scm_sym_line == key) p = SCM_MAKINUM (SRCPROPLINE (p));
|
||||
else if (scm_sym_column == key) p = SCM_MAKINUM (SRCPROPCOL (p));
|
||||
else if (scm_sym_filename == key) p = SRCPROPFNAME (p);
|
||||
else if (scm_sym_copy == key) p = SRCPROPCOPY (p);
|
||||
else
|
||||
{
|
||||
p = SRCPROPPLIST (p);
|
||||
|
@ -275,7 +275,7 @@ scm_set_source_property_x (obj, key, datum)
|
|||
h = scm_whash_create_handle (scm_source_whash, obj);
|
||||
p = SCM_EOL;
|
||||
}
|
||||
if (scm_i_breakpoint == key)
|
||||
if (scm_sym_breakpoint == key)
|
||||
{
|
||||
if (SCM_FALSEP (datum))
|
||||
CLEARSRCPROPBRK (SCM_NIMP (p) && SRCPROPSP (p)
|
||||
|
@ -296,7 +296,7 @@ scm_set_source_property_x (obj, key, datum)
|
|||
SCM_UNDEFINED,
|
||||
p)));
|
||||
}
|
||||
else if (scm_i_line == key)
|
||||
else if (scm_sym_line == key)
|
||||
{
|
||||
SCM_ASSERT (SCM_INUMP (datum),
|
||||
datum, SCM_ARG3, s_set_source_property_x);
|
||||
|
@ -307,7 +307,7 @@ scm_set_source_property_x (obj, key, datum)
|
|||
scm_make_srcprops (SCM_INUM (datum), 0,
|
||||
SCM_UNDEFINED, SCM_UNDEFINED, p));
|
||||
}
|
||||
else if (scm_i_column == key)
|
||||
else if (scm_sym_column == key)
|
||||
{
|
||||
SCM_ASSERT (SCM_INUMP (datum),
|
||||
datum, SCM_ARG3, s_set_source_property_x);
|
||||
|
@ -318,14 +318,14 @@ scm_set_source_property_x (obj, key, datum)
|
|||
scm_make_srcprops (0, SCM_INUM (datum),
|
||||
SCM_UNDEFINED, SCM_UNDEFINED, p));
|
||||
}
|
||||
else if (scm_i_filename == key)
|
||||
else if (scm_sym_filename == key)
|
||||
{
|
||||
if (SCM_NIMP (p) && SRCPROPSP (p))
|
||||
SRCPROPFNAME (p) = datum;
|
||||
else
|
||||
SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, datum, SCM_UNDEFINED, p));
|
||||
}
|
||||
else if (scm_i_filename == key)
|
||||
else if (scm_sym_filename == key)
|
||||
{
|
||||
if (SCM_NIMP (p) && SRCPROPSP (p))
|
||||
SRCPROPCOPY (p) = datum;
|
||||
|
@ -345,11 +345,11 @@ scm_init_srcprop ()
|
|||
marksrcprops, freesrcprops, prinsrcprops, NULL);
|
||||
scm_source_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (2047));
|
||||
|
||||
scm_i_filename = SCM_CAR (scm_sysintern ("filename", SCM_UNDEFINED));
|
||||
scm_i_copy = SCM_CAR (scm_sysintern ("copy", SCM_UNDEFINED));
|
||||
scm_i_line = SCM_CAR (scm_sysintern ("line", SCM_UNDEFINED));
|
||||
scm_i_column = SCM_CAR (scm_sysintern ("column", SCM_UNDEFINED));
|
||||
scm_i_breakpoint = SCM_CAR (scm_sysintern ("breakpoint", SCM_UNDEFINED));
|
||||
scm_sym_filename = SCM_CAR (scm_sysintern ("filename", SCM_UNDEFINED));
|
||||
scm_sym_copy = SCM_CAR (scm_sysintern ("copy", SCM_UNDEFINED));
|
||||
scm_sym_line = SCM_CAR (scm_sysintern ("line", SCM_UNDEFINED));
|
||||
scm_sym_column = SCM_CAR (scm_sysintern ("column", SCM_UNDEFINED));
|
||||
scm_sym_breakpoint = SCM_CAR (scm_sysintern ("breakpoint", SCM_UNDEFINED));
|
||||
|
||||
scm_sysintern ("source-whash", scm_source_whash);
|
||||
#include "srcprop.x"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue