mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 14:50:19 +02:00
Code Activity

* backtrace.c, debug.c, eval.c, eval.h, gsubr.c, procprop.h,

Browse source 
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:
Mikael Djurfeldt 1999-08-17 08:47:47 +00:00
parent 55b0ed6971
commit 92e5aa0e92
4 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libguile/procprop.h
View file

@ -48,7 +48,7 @@
extern SCM scm_i_name; extern SCM scm_sym_name;
extern SCM scm_sym_arity; extern SCM scm_sym_arity;
extern SCM scm_sym_system_procedure; extern SCM scm_sym_system_procedure;

16
libguile/read.c
View file

@ -297,19 +297,19 @@ tryagain_no_flush_ws:
goto tryagain; goto tryagain;
case '\'': case '\'':
p = scm_i_quote; p = scm_sym_quote;
goto recquote; goto recquote;
case '`': case '`':
p = scm_i_quasiquote; p = scm_sym_quasiquote;
goto recquote; goto recquote;
case ',': case ',':
c = scm_getc (port); c = scm_getc (port);
if ('@' == c) if ('@' == c)
p = scm_i_uq_splicing; p = scm_sym_uq_splicing;
else else
{ {
scm_ungetc (c, port); scm_ungetc (c, port);
p = scm_i_unquote; p = scm_sym_unquote;
} }
recquote: recquote:
p = scm_cons2 (p, p = scm_cons2 (p,
@ -629,7 +629,7 @@ scm_lreadparen (tok_buf, port, name, copy)
if (')' == c) if (')' == c)
return SCM_EOL; return SCM_EOL;
scm_ungetc (c, port); scm_ungetc (c, port);
if (scm_i_dot == (tmp = scm_lreadr (tok_buf, port, copy))) if (scm_sym_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
{ {
ans = scm_lreadr (tok_buf, port, copy); ans = scm_lreadr (tok_buf, port, copy);
closeit: closeit:
@ -641,7 +641,7 @@ scm_lreadparen (tok_buf, port, name, copy)
while (')' != (c = scm_flush_ws (port, name))) while (')' != (c = scm_flush_ws (port, name)))
{ {
scm_ungetc (c, port); scm_ungetc (c, port);
if (scm_i_dot == (tmp = scm_lreadr (tok_buf, port, copy))) if (scm_sym_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
{ {
SCM_SETCDR (tl, scm_lreadr (tok_buf, port, copy)); SCM_SETCDR (tl, scm_lreadr (tok_buf, port, copy));
goto closeit; goto closeit;
@ -672,7 +672,7 @@ scm_lreadrecparen (tok_buf, port, name, copy)
if (')' == c) if (')' == c)
return SCM_EOL; return SCM_EOL;
scm_ungetc (c, port); scm_ungetc (c, port);
if (scm_i_dot == (tmp = scm_lreadr (tok_buf, port, copy))) if (scm_sym_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
{ {
ans = scm_lreadr (tok_buf, port, copy); ans = scm_lreadr (tok_buf, port, copy);
if (')' != (c = scm_flush_ws (port, name))) if (')' != (c = scm_flush_ws (port, name)))
@ -689,7 +689,7 @@ scm_lreadrecparen (tok_buf, port, name, copy)
while (')' != (c = scm_flush_ws (port, name))) while (')' != (c = scm_flush_ws (port, name)))
{ {
scm_ungetc (c, port); scm_ungetc (c, port);
if (scm_i_dot == (tmp = scm_lreadr (tok_buf, port, copy))) if (scm_sym_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
{ {
SCM_SETCDR (tl, tmp = scm_lreadr (tok_buf, port, copy)); SCM_SETCDR (tl, tmp = scm_lreadr (tok_buf, port, copy));
if (SCM_COPY_SOURCE_P) if (SCM_COPY_SOURCE_P)

50
libguile/srcprop.c
View file

@ -70,11 +70,11 @@
* *
*/ */
SCM scm_i_filename; SCM scm_sym_filename;
SCM scm_i_copy; SCM scm_sym_copy;
SCM scm_i_line; SCM scm_sym_line;
SCM scm_i_column; SCM scm_sym_column;
SCM scm_i_breakpoint; SCM scm_sym_breakpoint;
long scm_tc16_srcprops; long scm_tc16_srcprops;
static scm_srcprops_chunk *srcprops_chunklist = 0; static scm_srcprops_chunk *srcprops_chunklist = 0;
@ -166,12 +166,12 @@ scm_srcprops_to_plist (obj)
{ {
SCM plist = SRCPROPPLIST (obj); SCM plist = SRCPROPPLIST (obj);
if (!SCM_UNBNDP (SRCPROPCOPY (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))) if (!SCM_UNBNDP (SRCPROPFNAME (obj)))
plist = scm_acons (scm_i_filename, SRCPROPFNAME (obj), plist); plist = scm_acons (scm_sym_filename, SRCPROPFNAME (obj), plist);
plist = scm_acons (scm_i_column, SCM_MAKINUM (SRCPROPCOL (obj)), plist); plist = scm_acons (scm_sym_column, SCM_MAKINUM (SRCPROPCOL (obj)), plist);
plist = scm_acons (scm_i_line, SCM_MAKINUM (SRCPROPLINE (obj)), plist); plist = scm_acons (scm_sym_line, SCM_MAKINUM (SRCPROPLINE (obj)), plist);
plist = scm_acons (scm_i_breakpoint, SRCPROPBRK (obj), plist); plist = scm_acons (scm_sym_breakpoint, SRCPROPBRK (obj), plist);
return plist; return plist;
} }
@ -235,11 +235,11 @@ scm_source_property (obj, key)
p = scm_hashq_ref (scm_source_whash, obj, SCM_EOL); p = scm_hashq_ref (scm_source_whash, obj, SCM_EOL);
if (SCM_IMP (p) || !SRCPROPSP (p)) if (SCM_IMP (p) || !SRCPROPSP (p))
goto plist; goto plist;
if (scm_i_breakpoint == key) p = SRCPROPBRK (p); if (scm_sym_breakpoint == key) p = SRCPROPBRK (p);
else if (scm_i_line == key) p = SCM_MAKINUM (SRCPROPLINE (p)); else if (scm_sym_line == key) p = SCM_MAKINUM (SRCPROPLINE (p));
else if (scm_i_column == key) p = SCM_MAKINUM (SRCPROPCOL (p)); else if (scm_sym_column == key) p = SCM_MAKINUM (SRCPROPCOL (p));
else if (scm_i_filename == key) p = SRCPROPFNAME (p); else if (scm_sym_filename == key) p = SRCPROPFNAME (p);
else if (scm_i_copy == key) p = SRCPROPCOPY (p); else if (scm_sym_copy == key) p = SRCPROPCOPY (p);
else else
{ {
p = SRCPROPPLIST (p); p = SRCPROPPLIST (p);
@ -275,7 +275,7 @@ scm_set_source_property_x (obj, key, datum)
h = scm_whash_create_handle (scm_source_whash, obj); h = scm_whash_create_handle (scm_source_whash, obj);
p = SCM_EOL; p = SCM_EOL;
} }
if (scm_i_breakpoint == key) if (scm_sym_breakpoint == key)
{ {
if (SCM_FALSEP (datum)) if (SCM_FALSEP (datum))
CLEARSRCPROPBRK (SCM_NIMP (p) && SRCPROPSP (p) CLEARSRCPROPBRK (SCM_NIMP (p) && SRCPROPSP (p)
@ -296,7 +296,7 @@ scm_set_source_property_x (obj, key, datum)
SCM_UNDEFINED, SCM_UNDEFINED,
p))); p)));
} }
else if (scm_i_line == key) else if (scm_sym_line == key)
{ {
SCM_ASSERT (SCM_INUMP (datum), SCM_ASSERT (SCM_INUMP (datum),
datum, SCM_ARG3, s_set_source_property_x); 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_make_srcprops (SCM_INUM (datum), 0,
SCM_UNDEFINED, SCM_UNDEFINED, p)); SCM_UNDEFINED, SCM_UNDEFINED, p));
} }
else if (scm_i_column == key) else if (scm_sym_column == key)
{ {
SCM_ASSERT (SCM_INUMP (datum), SCM_ASSERT (SCM_INUMP (datum),
datum, SCM_ARG3, s_set_source_property_x); 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_make_srcprops (0, SCM_INUM (datum),
SCM_UNDEFINED, SCM_UNDEFINED, p)); SCM_UNDEFINED, SCM_UNDEFINED, p));
} }
else if (scm_i_filename == key) else if (scm_sym_filename == key)
{ {
if (SCM_NIMP (p) && SRCPROPSP (p)) if (SCM_NIMP (p) && SRCPROPSP (p))
SRCPROPFNAME (p) = datum; SRCPROPFNAME (p) = datum;
else else
SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, datum, SCM_UNDEFINED, p)); 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)) if (SCM_NIMP (p) && SRCPROPSP (p))
SRCPROPCOPY (p) = datum; SRCPROPCOPY (p) = datum;
@ -345,11 +345,11 @@ scm_init_srcprop ()
marksrcprops, freesrcprops, prinsrcprops, NULL); marksrcprops, freesrcprops, prinsrcprops, NULL);
scm_source_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (2047)); scm_source_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (2047));
scm_i_filename = SCM_CAR (scm_sysintern ("filename", SCM_UNDEFINED)); scm_sym_filename = SCM_CAR (scm_sysintern ("filename", SCM_UNDEFINED));
scm_i_copy = SCM_CAR (scm_sysintern ("copy", SCM_UNDEFINED)); scm_sym_copy = SCM_CAR (scm_sysintern ("copy", SCM_UNDEFINED));
scm_i_line = SCM_CAR (scm_sysintern ("line", SCM_UNDEFINED)); scm_sym_line = SCM_CAR (scm_sysintern ("line", SCM_UNDEFINED));
scm_i_column = SCM_CAR (scm_sysintern ("column", SCM_UNDEFINED)); scm_sym_column = SCM_CAR (scm_sysintern ("column", SCM_UNDEFINED));
scm_i_breakpoint = SCM_CAR (scm_sysintern ("breakpoint", SCM_UNDEFINED)); scm_sym_breakpoint = SCM_CAR (scm_sysintern ("breakpoint", SCM_UNDEFINED));
scm_sysintern ("source-whash", scm_source_whash); scm_sysintern ("source-whash", scm_source_whash);
#include "srcprop.x" #include "srcprop.x"

12
libguile/srcprop.h
View file

@ -111,13 +111,13 @@ typedef struct scm_srcprops_chunk
&& SRCPROPSP (t.arg1)\ && SRCPROPSP (t.arg1)\
&& (1L << 16) & SCM_CAR (t.arg1)) && (1L << 16) & SCM_CAR (t.arg1))
#define PROCTRACEP(x) SCM_NFALSEP (scm_procedure_property (x, scm_i_trace)) #define PROCTRACEP(x) SCM_NFALSEP (scm_procedure_property (x, scm_sym_trace))
extern SCM scm_i_filename; extern SCM scm_sym_filename;
extern SCM scm_i_copy; extern SCM scm_sym_copy;
extern SCM scm_i_line; extern SCM scm_sym_line;
extern SCM scm_i_column; extern SCM scm_sym_column;
extern SCM scm_i_breakpoint; extern SCM scm_sym_breakpoint;