mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-20 02:30:23 +02:00
revert the ill-considered part of the 2001-05-24 changes
This commit is contained in:
Michael Livshin
parent
f3f70257a3
commit
c014a02eec
63 changed files with 723 additions and 813 deletions
|
|
@ -162,7 +162,7 @@ char *alloca ();
|
|||
SCM *
|
||||
scm_ilookup (SCM iloc, SCM env)
|
||||
{
|
||||
register scm_bits_t ir = SCM_IFRAME (iloc);
|
||||
register long ir = SCM_IFRAME (iloc);
|
||||
register SCM er = env;
|
||||
for (; 0 != ir; --ir)
|
||||
er = SCM_CDR (er);
|
||||
|
|
@ -419,7 +419,7 @@ scm_unmemocar (SCM form, SCM env)
|
|||
#ifdef DEBUG_EXTENSIONS
|
||||
else if (SCM_ILOCP (c))
|
||||
{
|
||||
scm_bits_t ir;
|
||||
long ir;
|
||||
|
||||
for (ir = SCM_IFRAME (c); ir != 0; --ir)
|
||||
env = SCM_CDR (env);
|
||||
|
|
@ -536,7 +536,7 @@ SCM_GLOBAL_SYMBOL(scm_sym_if, s_if);
|
|||
SCM
|
||||
scm_m_if (SCM xorig, SCM env)
|
||||
{
|
||||
scm_bits_t len = scm_ilength (SCM_CDR (xorig));
|
||||
long len = scm_ilength (SCM_CDR (xorig));
|
||||
SCM_ASSYNT (len >= 2 && len <= 3, scm_s_expression, "if");
|
||||
return scm_cons (SCM_IM_IF, SCM_CDR (xorig));
|
||||
}
|
||||
|
|
@ -563,7 +563,7 @@ SCM_GLOBAL_SYMBOL(scm_sym_and, s_and);
|
|||
SCM
|
||||
scm_m_and (SCM xorig, SCM env)
|
||||
{
|
||||
scm_bits_t len = scm_ilength (SCM_CDR (xorig));
|
||||
long len = scm_ilength (SCM_CDR (xorig));
|
||||
SCM_ASSYNT (len >= 0, scm_s_test, s_and);
|
||||
if (len >= 1)
|
||||
return scm_cons (SCM_IM_AND, SCM_CDR (xorig));
|
||||
|
|
@ -577,7 +577,7 @@ SCM_GLOBAL_SYMBOL(scm_sym_or,s_or);
|
|||
SCM
|
||||
scm_m_or (SCM xorig, SCM env)
|
||||
{
|
||||
scm_bits_t len = scm_ilength (SCM_CDR (xorig));
|
||||
long len = scm_ilength (SCM_CDR (xorig));
|
||||
SCM_ASSYNT (len >= 0, scm_s_test, s_or);
|
||||
if (len >= 1)
|
||||
return scm_cons (SCM_IM_OR, SCM_CDR (xorig));
|
||||
|
|
@ -615,7 +615,7 @@ SCM
|
|||
scm_m_cond (SCM xorig, SCM env)
|
||||
{
|
||||
SCM arg1, cdrx = scm_list_copy (SCM_CDR (xorig)), x = cdrx;
|
||||
scm_bits_t len = scm_ilength (x);
|
||||
long len = scm_ilength (x);
|
||||
SCM_ASSYNT (len >= 1, scm_s_clauses, s_cond);
|
||||
while (SCM_NIMP (x))
|
||||
{
|
||||
|
|
@ -705,7 +705,7 @@ SCM
|
|||
scm_m_letstar (SCM xorig, SCM env)
|
||||
{
|
||||
SCM x = SCM_CDR (xorig), arg1, proc, vars = SCM_EOL, *varloc = &vars;
|
||||
scm_bits_t len = scm_ilength (x);
|
||||
long len = scm_ilength (x);
|
||||
SCM_ASSYNT (len >= 2, scm_s_body, s_letstar);
|
||||
proc = SCM_CAR (x);
|
||||
SCM_ASSYNT (scm_ilength (proc) >= 0, scm_s_bindings, s_letstar);
|
||||
|
|
@ -747,7 +747,7 @@ scm_m_do (SCM xorig, SCM env)
|
|||
SCM x = SCM_CDR (xorig), arg1, proc;
|
||||
SCM vars = SCM_EOL, inits = SCM_EOL, steps = SCM_EOL;
|
||||
SCM *initloc = &inits, *steploc = &steps;
|
||||
scm_bits_t len = scm_ilength (x);
|
||||
long len = scm_ilength (x);
|
||||
SCM_ASSYNT (len >= 2, scm_s_test, "do");
|
||||
proc = SCM_CAR (x);
|
||||
SCM_ASSYNT (scm_ilength (proc) >= 0, scm_s_bindings, "do");
|
||||
|
|
@ -780,7 +780,7 @@ scm_m_do (SCM xorig, SCM env)
|
|||
#define evalcar scm_eval_car
|
||||
|
||||
|
||||
static SCM iqq (SCM form, SCM env, scm_bits_t depth);
|
||||
static SCM iqq (SCM form, SCM env, long depth);
|
||||
|
||||
SCM_SYNTAX(s_quasiquote, "quasiquote", scm_makacro, scm_m_quasiquote);
|
||||
SCM_GLOBAL_SYMBOL(scm_sym_quasiquote, s_quasiquote);
|
||||
|
|
@ -795,15 +795,15 @@ scm_m_quasiquote (SCM xorig, SCM env)
|
|||
|
||||
|
||||
static SCM
|
||||
iqq (SCM form, SCM env, scm_bits_t depth)
|
||||
iqq (SCM form, SCM env, long depth)
|
||||
{
|
||||
SCM tmp;
|
||||
scm_bits_t edepth = depth;
|
||||
long edepth = depth;
|
||||
if (SCM_IMP (form))
|
||||
return form;
|
||||
if (SCM_VECTORP (form))
|
||||
{
|
||||
scm_bits_t i = SCM_VECTOR_LENGTH (form);
|
||||
long i = SCM_VECTOR_LENGTH (form);
|
||||
SCM *data = SCM_VELTS (form);
|
||||
tmp = SCM_EOL;
|
||||
for (; --i >= 0;)
|
||||
|
|
@ -1043,7 +1043,7 @@ SCM_SYNTAX (s_nil_cond, "nil-cond", scm_makmmacro, scm_m_nil_cond);
|
|||
SCM
|
||||
scm_m_nil_cond (SCM xorig, SCM env)
|
||||
{
|
||||
scm_bits_t len = scm_ilength (SCM_CDR (xorig));
|
||||
long len = scm_ilength (SCM_CDR (xorig));
|
||||
SCM_ASSYNT (len >= 1 && (len & 1) == 1, scm_s_expression, "nil-cond");
|
||||
return scm_cons (SCM_IM_NIL_COND, SCM_CDR (xorig));
|
||||
}
|
||||
|
|
@ -1071,7 +1071,7 @@ SCM_SYNTAX (s_0_cond, "0-cond", scm_makmmacro, scm_m_0_cond);
|
|||
SCM
|
||||
scm_m_0_cond (SCM xorig, SCM env)
|
||||
{
|
||||
scm_bits_t len = scm_ilength (SCM_CDR (xorig));
|
||||
long len = scm_ilength (SCM_CDR (xorig));
|
||||
SCM_ASSYNT (len >= 1 && (len & 1) == 1, scm_s_expression, "0-cond");
|
||||
return scm_cons (SCM_IM_0_COND, SCM_CDR (xorig));
|
||||
}
|
||||
|
|
@ -1658,11 +1658,11 @@ scm_debug_frame_t *scm_last_debug_frame;
|
|||
* stack frames at each real stack frame.
|
||||
*/
|
||||
|
||||
scm_bits_t scm_debug_eframe_size;
|
||||
long scm_debug_eframe_size;
|
||||
|
||||
int scm_debug_mode, scm_check_entry_p, scm_check_apply_p, scm_check_exit_p;
|
||||
|
||||
scm_bits_t scm_eval_stack;
|
||||
long scm_eval_stack;
|
||||
|
||||
scm_option_t scm_eval_opts[] = {
|
||||
{ SCM_OPTION_INTEGER, "stack", 22000, "Size of thread stacks (in machine words)." }
|
||||
|
|
@ -2304,7 +2304,7 @@ dispatch:
|
|||
* cuts down execution time for type dispatch to 50%.
|
||||
*/
|
||||
{
|
||||
scm_bits_t i, n, end, mask;
|
||||
long i, n, end, mask;
|
||||
SCM z = SCM_CDDR (x);
|
||||
n = SCM_INUM (SCM_CAR (z)); /* maximum number of specializers */
|
||||
proc = SCM_CADR (z);
|
||||
|
|
@ -2319,8 +2319,8 @@ dispatch:
|
|||
else
|
||||
{
|
||||
/* Compute a hash value */
|
||||
scm_bits_t hashset = SCM_INUM (proc);
|
||||
scm_bits_t j = n;
|
||||
long hashset = SCM_INUM (proc);
|
||||
long j = n;
|
||||
mask = SCM_INUM (SCM_CAR (z = SCM_CDDR (z)));
|
||||
proc = SCM_CADR (z);
|
||||
i = 0;
|
||||
|
|
@ -2340,7 +2340,7 @@ dispatch:
|
|||
/* Search for match */
|
||||
do
|
||||
{
|
||||
scm_bits_t j = n;
|
||||
long j = n;
|
||||
z = SCM_VELTS (proc)[i];
|
||||
t.arg1 = arg2; /* list of arguments */
|
||||
if (SCM_NIMP (t.arg1))
|
||||
|
|
@ -3632,18 +3632,18 @@ ret:
|
|||
and claim that the i'th element of ARGV is WHO's i+2'th argument. */
|
||||
static inline void
|
||||
check_map_args (SCM argv,
|
||||
scm_bits_t len,
|
||||
long len,
|
||||
SCM gf,
|
||||
SCM proc,
|
||||
SCM args,
|
||||
const char *who)
|
||||
{
|
||||
SCM *ve = SCM_VELTS (argv);
|
||||
scm_bits_t i;
|
||||
long i;
|
||||
|
||||
for (i = SCM_VECTOR_LENGTH (argv) - 1; i >= 1; i--)
|
||||
{
|
||||
scm_bits_t elt_len = scm_ilength (ve[i]);
|
||||
long elt_len = scm_ilength (ve[i]);
|
||||
|
||||
if (elt_len < 0)
|
||||
{
|
||||
|
|
@ -3674,7 +3674,7 @@ SCM
|
|||
scm_map (SCM proc, SCM arg1, SCM args)
|
||||
#define FUNC_NAME s_map
|
||||
{
|
||||
scm_bits_t i, len;
|
||||
long i, len;
|
||||
SCM res = SCM_EOL;
|
||||
SCM *pres = &res;
|
||||
SCM *ve = &args; /* Keep args from being optimized away. */
|
||||
|
|
@ -3723,7 +3723,7 @@ scm_for_each (SCM proc, SCM arg1, SCM args)
|
|||
#define FUNC_NAME s_for_each
|
||||
{
|
||||
SCM *ve = &args; /* Keep args from being optimized away. */
|
||||
scm_bits_t i, len;
|
||||
long i, len;
|
||||
len = scm_ilength (arg1);
|
||||
SCM_GASSERTn (len >= 0, g_for_each, scm_cons2 (proc, arg1, args),
|
||||
SCM_ARG2, s_for_each);
|
||||
|
|
@ -3862,7 +3862,7 @@ SCM_DEFINE (scm_copy_tree, "copy-tree", 1, 0, 0,
|
|||
return obj;
|
||||
if (SCM_VECTORP (obj))
|
||||
{
|
||||
size_t i = SCM_VECTOR_LENGTH (obj);
|
||||
unsigned long i = SCM_VECTOR_LENGTH (obj);
|
||||
ans = scm_c_make_vector (i, SCM_UNSPECIFIED);
|
||||
while (i--)
|
||||
SCM_VELTS (ans)[i] = scm_copy_tree (SCM_VELTS (obj)[i]);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue