[uim-commit] r1322 - branches/r5rs/sigscheme
kzk at freedesktop.org
kzk at freedesktop.org
Thu Aug 25 21:04:34 PDT 2005
Author: kzk
Date: 2005-08-25 21:04:32 -0700 (Thu, 25 Aug 2005)
New Revision: 1322
Modified:
branches/r5rs/sigscheme/datas.c
branches/r5rs/sigscheme/debug.c
branches/r5rs/sigscheme/eval.c
branches/r5rs/sigscheme/io.c
branches/r5rs/sigscheme/main.c
branches/r5rs/sigscheme/operations-srfi1.c
branches/r5rs/sigscheme/operations-srfi8.c
branches/r5rs/sigscheme/operations.c
branches/r5rs/sigscheme/read.c
branches/r5rs/sigscheme/sigscheme.c
branches/r5rs/sigscheme/sigscheme.h
branches/r5rs/sigscheme/sigschemeinternal.h
branches/r5rs/sigscheme/sigschemetype.h
Log:
* rename "SCM_NIL" to "SCM_NULL"
* sigscheme/operations-srfi1.c
* sigscheme/io.c
* sigscheme/sigscheme.c
* sigscheme/sigschemeinternal.h
* sigscheme/read.c
* sigscheme/sigscheme.h
* sigscheme/operations-srfi8.c
* sigscheme/sigschemetype.h
* sigscheme/operations.c
* sigscheme/main.c
* sigscheme/debug.c
* sigscheme/eval.c
* sigscheme/datas.c
- rename SCM_NIL to SCM_NULL
- rename SigScm_nil to SigScm_null
- rename SigScm_nil_impl to SigScm_null_impl
Modified: branches/r5rs/sigscheme/datas.c
===================================================================
--- branches/r5rs/sigscheme/datas.c 2005-08-25 22:47:18 UTC (rev 1321)
+++ branches/r5rs/sigscheme/datas.c 2005-08-26 04:04:32 UTC (rev 1322)
@@ -109,7 +109,7 @@
#define NAMEHASH_SIZE 1024
#define SCM_NEW_OBJ_INTERNAL(VALNAME) \
- if (EQ(scm_freelist, SCM_NIL)) \
+ if (EQ(scm_freelist, SCM_NULL)) \
gc_mark_and_sweep(); \
VALNAME = scm_freelist; \
scm_freelist = SCM_FREECELL_CDR(scm_freelist); \
@@ -213,7 +213,7 @@
/* allocate heap */
(*heaps) = (ScmObj*)malloc(sizeof(ScmObj) * num_heap);
- (*freelist) = SCM_NIL;
+ (*freelist) = SCM_NULL;
/* fill with zero and construct free_list */
for (i = 0; i < num_heap; i++) {
@@ -324,7 +324,7 @@
int i = 0;
mark_loop:
- /* no need to mark SCM_NIL */
+ /* no need to mark SCM_NULL */
if (NULLP(obj))
return;
@@ -397,7 +397,7 @@
{
/* The core part of Conservative GC */
int i = 0;
- ScmObj head = SCM_NIL;
+ ScmObj head = SCM_NULL;
for (i = 0; i < scm_heap_num; i++) {
if ((head = scm_heaps[i])
&& (head <= obj)
@@ -420,7 +420,7 @@
static void gc_mark_locations_n(ScmObj *start, int n)
{
int i = 0;
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
/* mark stack */
for (i = 0; i < n; i++) {
@@ -538,8 +538,8 @@
int j = 0;
int corrected_obj_num = 0;
- ScmObj obj = SCM_NIL;
- ScmObj scm_new_freelist = SCM_NIL;
+ ScmObj obj = SCM_NULL;
+ ScmObj scm_new_freelist = SCM_NULL;
/* iterate heaps */
for (i = 0; i < scm_heap_num; i++) {
corrected_obj_num = 0;
@@ -552,7 +552,7 @@
sweep_obj(obj);
SCM_ENTYPE_FREECELL(obj);
- SCM_SETFREECELL_CAR(obj, SCM_NIL);
+ SCM_SETFREECELL_CAR(obj, SCM_NULL);
SCM_SETFREECELL_CDR(obj, scm_new_freelist);
scm_new_freelist = obj;
corrected_obj_num++;
@@ -583,7 +583,7 @@
===========================================================================*/
ScmObj Scm_NewCons(ScmObj a, ScmObj b)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
SCM_NEW_OBJ_INTERNAL(obj);
SCM_ENTYPE_CONS(obj);
@@ -595,7 +595,7 @@
ScmObj Scm_NewInt(int val)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
SCM_NEW_OBJ_INTERNAL(obj);
SCM_ENTYPE_INT(obj);
@@ -606,7 +606,7 @@
ScmObj Scm_NewSymbol(char *name, ScmObj v_cell)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
SCM_NEW_OBJ_INTERNAL(obj);
SCM_ENTYPE_SYMBOL(obj);
@@ -618,7 +618,7 @@
ScmObj Scm_NewChar(char *ch)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
/* check length */
if (SigScm_default_encoding_strlen(ch) != 1) {
@@ -636,7 +636,7 @@
ScmObj Scm_NewString(char *str)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
SCM_NEW_OBJ_INTERNAL(obj);
@@ -649,7 +649,7 @@
ScmObj Scm_NewStringCopying(const char *str)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
SCM_NEW_OBJ_INTERNAL(obj);
@@ -663,7 +663,7 @@
ScmObj Scm_NewString_With_StrLen(char *str, int len)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
SCM_NEW_OBJ_INTERNAL(obj);
SCM_ENTYPE_STRING(obj);
@@ -675,7 +675,7 @@
ScmObj Scm_NewFunc(enum ScmFuncArgType num_arg, ScmFuncType func)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
SCM_NEW_OBJ_INTERNAL(obj);
SCM_ENTYPE_FUNC(obj);
@@ -687,7 +687,7 @@
ScmObj Scm_NewClosure(ScmObj exp, ScmObj env)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
SCM_NEW_OBJ_INTERNAL(obj);
SCM_ENTYPE_CLOSURE(obj);
@@ -699,7 +699,7 @@
ScmObj Scm_NewVector(ScmObj *vec, int len)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
SCM_NEW_OBJ_INTERNAL(obj);
SCM_ENTYPE_VECTOR(obj);
@@ -711,7 +711,7 @@
ScmObj Scm_NewFilePort(FILE *file, const char *filename, enum ScmPortDirection pdirection)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
ScmPortInfo *pinfo = (ScmPortInfo *)malloc(sizeof(ScmPortInfo));
SCM_NEW_OBJ_INTERNAL(obj);
@@ -731,7 +731,7 @@
ScmObj Scm_NewStringPort(const char *str)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
ScmPortInfo *pinfo = (ScmPortInfo *)malloc(sizeof(ScmPortInfo));
SCM_NEW_OBJ_INTERNAL(obj);
@@ -750,7 +750,7 @@
ScmObj Scm_NewContinuation(void)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
ScmContInfo *cinfo = NULL;
SCM_NEW_OBJ_INTERNAL(obj);
@@ -764,7 +764,7 @@
ScmObj Scm_NewValuePacket(ScmObj values)
{
- ScmObj packet = SCM_NIL;
+ ScmObj packet = SCM_NULL;
SCM_NEW_OBJ_INTERNAL(packet);
SCM_ENTYPE_VALUEPACKET(packet);
@@ -775,7 +775,7 @@
#if SCM_USE_NONSTD_FEATURES
ScmObj Scm_NewCPointer(void *data)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
SCM_NEW_OBJ_INTERNAL(obj);
SCM_ENTYPE_C_POINTER(obj);
@@ -786,7 +786,7 @@
ScmObj Scm_NewCFuncPointer(C_FUNC func)
{
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
SCM_NEW_OBJ_INTERNAL(obj);
SCM_ENTYPE_C_FUNCPOINTER(obj);
@@ -811,7 +811,7 @@
int i = 0;
symbol_hash = (ScmObj*)malloc(sizeof(ScmObj) * NAMEHASH_SIZE);
for (i = 0; i < NAMEHASH_SIZE; i++) {
- symbol_hash[i] = SCM_NIL;
+ symbol_hash[i] = SCM_NULL;
}
}
@@ -834,8 +834,8 @@
ScmObj Scm_Intern(const char *name)
{
int n = symbol_name_hash(name);
- ScmObj sym = SCM_NIL;
- ScmObj list = SCM_NIL;
+ ScmObj sym = SCM_NULL;
+ ScmObj list = SCM_NULL;
ScmObj sym_list = symbol_hash[n];
char *symname;
@@ -907,8 +907,8 @@
ScmObj Scm_eval_c_string(const char *exp)
{
ScmObj stack_start;
- ScmObj str_port = SCM_NIL;
- ScmObj ret = SCM_NIL;
+ ScmObj str_port = SCM_NULL;
+ ScmObj ret = SCM_NULL;
/* start protecting stack */
SigScm_gc_protect_stack(&stack_start);
@@ -916,7 +916,7 @@
str_port = Scm_NewStringPort(exp);
ret = SigScm_Read(str_port);
- ret = ScmOp_eval(ret, SCM_NIL);
+ ret = ScmOp_eval(ret, SCM_NULL);
#if SCM_COMPAT_SIOD
scm_return_value = ret;
Modified: branches/r5rs/sigscheme/debug.c
===================================================================
--- branches/r5rs/sigscheme/debug.c 2005-08-25 22:47:18 UTC (rev 1321)
+++ branches/r5rs/sigscheme/debug.c 2005-08-26 04:04:32 UTC (rev 1322)
@@ -228,9 +228,9 @@
static void print_list(FILE *f, ScmObj list, enum OutputType otype)
{
- ScmObj car = SCM_NIL;
- ScmObj cdr = SCM_NIL;
- ScmObj tmp = SCM_NIL;
+ ScmObj car = SCM_NULL;
+ ScmObj cdr = SCM_NULL;
+ ScmObj tmp = SCM_NULL;
/* print left parenthesis */
fprintf(f, "(");
@@ -310,7 +310,7 @@
static void print_etc(FILE *f, ScmObj obj, enum OutputType otype)
{
- if (EQ(obj, SCM_NIL))
+ if (EQ(obj, SCM_NULL))
fprintf(f, "()");
else if (EQ(obj, SCM_TRUE))
fprintf(f, "#t");
Modified: branches/r5rs/sigscheme/eval.c
===================================================================
--- branches/r5rs/sigscheme/eval.c 2005-08-25 22:47:18 UTC (rev 1321)
+++ branches/r5rs/sigscheme/eval.c 2005-08-26 04:04:32 UTC (rev 1322)
@@ -88,7 +88,7 @@
=======================================*/
ScmObj extend_environment(ScmObj vars, ScmObj vals, ScmObj env)
{
- ScmObj frame = SCM_NIL;
+ ScmObj frame = SCM_NULL;
ScmObj tmp_vars = vars;
ScmObj tmp_vals = vals;
@@ -101,7 +101,7 @@
if (!NULLP(CDR(tmp_vars)) && !CONSP(CDR(tmp_vars))) {
/* create new value */
SET_CDR(tmp_vals, Scm_NewCons(CDR(tmp_vals),
- SCM_NIL));
+ SCM_NULL));
}
tmp_vars = CDR(tmp_vars);
@@ -113,7 +113,7 @@
/* add to env */
if (NULLP(env))
- env = Scm_NewCons(frame, SCM_NIL);
+ env = Scm_NewCons(frame, SCM_NULL);
else if (CONSP(env))
env = Scm_NewCons(frame, env);
else
@@ -133,10 +133,10 @@
/* add (var val) pair to the newest frame in env */
if (NULLP(env)) {
- newest_frame = Scm_NewCons(Scm_NewCons(var, SCM_NIL),
- Scm_NewCons(val, SCM_NIL));
+ newest_frame = Scm_NewCons(Scm_NewCons(var, SCM_NULL),
+ Scm_NewCons(val, SCM_NULL));
env = Scm_NewCons(newest_frame,
- SCM_NIL);
+ SCM_NULL);
} else if (CONSP(env)) {
newest_frame = CAR(env);
new_varlist = Scm_NewCons(var, CAR(newest_frame));
@@ -160,12 +160,12 @@
========================================================*/
ScmObj lookup_environment(ScmObj var, ScmObj env)
{
- ScmObj frame = SCM_NIL;
- ScmObj val = SCM_NIL;
+ ScmObj frame = SCM_NULL;
+ ScmObj val = SCM_NULL;
/* sanity check */
if (NULLP(env))
- return SCM_NIL;
+ return SCM_NULL;
if (!CONSP(env))
SigScm_ErrorObj("Broken environent : ", env);
@@ -177,17 +177,17 @@
return val;
}
- return SCM_NIL;
+ return SCM_NULL;
}
ScmObj lookup_frame(ScmObj var, ScmObj frame)
{
- ScmObj vals = SCM_NIL;
- ScmObj vars = SCM_NIL;
+ ScmObj vals = SCM_NULL;
+ ScmObj vars = SCM_NULL;
/* sanity check */
if (NULLP(frame))
- return SCM_NIL;
+ return SCM_NULL;
else if (!CONSP(frame))
SigScm_ErrorObj("Broken frame : ", frame);
@@ -215,7 +215,7 @@
vals = CDR(vals);
}
- return SCM_NIL;
+ return SCM_NULL;
}
/*===========================================================================
@@ -223,9 +223,9 @@
===========================================================================*/
ScmObj ScmOp_eval(ScmObj obj, ScmObj env)
{
- ScmObj tmp = SCM_NIL;
- ScmObj arg = SCM_NIL;
- ScmObj ret = SCM_NIL;
+ ScmObj tmp = SCM_NULL;
+ ScmObj arg = SCM_NULL;
+ ScmObj ret = SCM_NULL;
int tail_flag = 0;
/* for debugging */
@@ -323,7 +323,7 @@
/* check 1st arg */
if (NULLP(obj)) {
- ret = SCM_FUNC_EXEC_SUBR2N(tmp, SCM_NIL, SCM_NIL);
+ ret = SCM_FUNC_EXEC_SUBR2N(tmp, SCM_NULL, SCM_NULL);
goto eval_done;
}
@@ -332,7 +332,7 @@
/* check 2nd arg */
if (NULLP(CDR(obj))) {
- ret = SCM_FUNC_EXEC_SUBR2N(tmp, ret, SCM_NIL);
+ ret = SCM_FUNC_EXEC_SUBR2N(tmp, ret, SCM_NULL);
goto eval_done;
}
@@ -413,9 +413,9 @@
if (SYMBOLP(arg)) {
/* (1) : <variable> */
- env = extend_environment(Scm_NewCons(arg, SCM_NIL),
+ env = extend_environment(Scm_NewCons(arg, SCM_NULL),
Scm_NewCons(map_eval(CDR(obj), env),
- SCM_NIL),
+ SCM_NULL),
SCM_CLOSURE_ENV(tmp));
} else if (CONSP(arg)) {
/*
@@ -431,8 +431,8 @@
/*
* (2') : <variable> is '()
*/
- env = extend_environment(SCM_NIL,
- SCM_NIL,
+ env = extend_environment(SCM_NULL,
+ SCM_NULL,
SCM_CLOSURE_ENV(tmp));
} else {
SigScm_ErrorObj("lambda : bad syntax with ", arg);
@@ -484,8 +484,8 @@
ScmObj ScmOp_apply(ScmObj args, ScmObj env)
{
- ScmObj proc = SCM_NIL;
- ScmObj obj = SCM_NIL;
+ ScmObj proc = SCM_NULL;
+ ScmObj obj = SCM_NULL;
int tail_flag = 0;
/* sanity check */
@@ -513,12 +513,12 @@
args = obj;
/* check 1st arg */
if (NULLP(args))
- return SCM_FUNC_EXEC_SUBR2N(proc, SCM_NIL, SCM_NIL);
+ return SCM_FUNC_EXEC_SUBR2N(proc, SCM_NULL, SCM_NULL);
/* eval 1st arg */
obj = CAR(args);
/* check 2nd arg */
if (NULLP(CDR(args)))
- return SCM_FUNC_EXEC_SUBR2N(proc, obj, SCM_NIL);
+ return SCM_FUNC_EXEC_SUBR2N(proc, obj, SCM_NULL);
/* call proc with each 2 objs */
for (args = CDR(args); !NULLP(args); args = CDR(args)) {
obj = SCM_FUNC_EXEC_SUBR2N(proc,
@@ -579,8 +579,8 @@
args = CAR(SCM_CLOSURE_EXP(proc)); /* arg is <formals> */
if (SYMBOLP(args)) {
/* (1) : <variable> */
- env = extend_environment(Scm_NewCons(args, SCM_NIL),
- Scm_NewCons(obj, SCM_NIL),
+ env = extend_environment(Scm_NewCons(args, SCM_NULL),
+ Scm_NewCons(obj, SCM_NULL),
SCM_CLOSURE_ENV(proc));
} else if (CONSP(args)) {
/*
@@ -596,8 +596,8 @@
/*
* (2') : <variable> is '()
*/
- env = extend_environment(SCM_NIL,
- SCM_NIL,
+ env = extend_environment(SCM_NULL,
+ SCM_NULL,
SCM_CLOSURE_ENV(proc));
} else {
SigScm_ErrorObj("lambda : bad syntax with ", args);
@@ -616,12 +616,12 @@
}
/* never reaches here */
- return SCM_NIL;
+ return SCM_NULL;
}
ScmObj symbol_value(ScmObj var, ScmObj env)
{
- ScmObj val = SCM_NIL;
+ ScmObj val = SCM_NULL;
/* sanity check */
if (!SYMBOLP(var))
@@ -652,20 +652,20 @@
ScmObj map_eval(ScmObj args, ScmObj env)
{
- ScmObj result = SCM_NIL;
- ScmObj tail = SCM_NIL;
- ScmObj newtail = SCM_NIL;
+ ScmObj result = SCM_NULL;
+ ScmObj tail = SCM_NULL;
+ ScmObj newtail = SCM_NULL;
/* sanity check */
if (NULLP(args))
- return SCM_NIL;
+ return SCM_NULL;
/* eval each element of args */
- result = Scm_NewCons(ScmOp_eval(CAR(args), env), SCM_NIL);
+ result = Scm_NewCons(ScmOp_eval(CAR(args), env), SCM_NULL);
tail = result;
- newtail = SCM_NIL;
+ newtail = SCM_NULL;
for (args = CDR(args); !NULLP(args); args = CDR(args)) {
- newtail = Scm_NewCons(ScmOp_eval(CAR(args), env), SCM_NIL);
+ newtail = Scm_NewCons(ScmOp_eval(CAR(args), env), SCM_NULL);
SET_CDR(tail, newtail);
tail = newtail;
}
@@ -689,12 +689,12 @@
*/
static ScmObj qquote_internal(ScmObj qexpr, ScmObj env, int nest)
{
- ScmObj ls = SCM_NIL;
- ScmObj obj = SCM_NIL;
- ScmObj car = SCM_NIL;
- ScmObj args = SCM_NIL;
- ScmObj result = SCM_NIL;
- ScmObj ret_list = SCM_NIL;
+ ScmObj ls = SCM_NULL;
+ ScmObj obj = SCM_NULL;
+ ScmObj car = SCM_NULL;
+ ScmObj args = SCM_NULL;
+ ScmObj result = SCM_NULL;
+ ScmObj ret_list = SCM_NULL;
ScmObj *ret_tail = NULL;
int splice_flag = 0;
@@ -705,7 +705,7 @@
ScmObj src = qexpr; \
ret_tail = &ret_list; \
while (!EQ(src, end)) { \
- *ret_tail = Scm_NewCons(CAR(src), SCM_NIL); \
+ *ret_tail = Scm_NewCons(CAR(src), SCM_NULL); \
ret_tail = &CDR(*ret_tail); \
src = CDR(src); \
} \
@@ -759,7 +759,7 @@
if (QQUOTE_IS_VERBATIM(result)) {
if (!qquote_copy_delayed()) {
- *ret_tail = Scm_NewCons(obj, SCM_NIL);
+ *ret_tail = Scm_NewCons(obj, SCM_NULL);
ret_tail = &CDR(*ret_tail);
}
} else {
@@ -775,7 +775,7 @@
SigScm_ErrorObj("unquote-splicing: bad list: ",
result);
} else {
- *ret_tail = Scm_NewCons(result, SCM_NIL);
+ *ret_tail = Scm_NewCons(result, SCM_NULL);
ret_tail = &CDR(*ret_tail);
}
}
@@ -813,12 +813,12 @@
*/
static ScmObj qquote_vector(ScmObj src, ScmObj env, int nest)
{
- ScmObj splices = SCM_NIL;
- ScmObj expr = SCM_NIL;
- ScmObj ret = SCM_NIL;
+ ScmObj splices = SCM_NULL;
+ ScmObj expr = SCM_NULL;
+ ScmObj ret = SCM_NULL;
ScmObj *copy_buf = NULL;
- ScmObj result = SCM_NIL;
- ScmObj splice_len = SCM_NIL;
+ ScmObj result = SCM_NULL;
+ ScmObj splice_len = SCM_NULL;
int len = SCM_VECTOR_LEN(src);
int growth = 0;
int next_splice_index = -1;
@@ -838,7 +838,7 @@
ret = Scm_NewVector(copy_buf, len + growth); \
/* fill with something the garbage collector recognizes */ \
for (k=n; k < len + growth; k++) \
- copy_buf[k] = SCM_NIL; \
+ copy_buf[k] = SCM_NULL; \
} while(0)
QQUOTE_SET_VERBATIM(ret);
@@ -946,8 +946,8 @@
ScmObj ScmExp_if(ScmObj exp, ScmObj *envp, int *tail_flag)
{
ScmObj env = *envp;
- ScmObj pred = SCM_NIL;
- ScmObj false_exp = SCM_NIL;
+ ScmObj pred = SCM_NULL;
+ ScmObj false_exp = SCM_NULL;
/* set tail_flag */
(*tail_flag) = 1;
@@ -982,8 +982,8 @@
ScmObj env = *envp;
ScmObj sym = CAR(arg);
ScmObj val = CAR(CDR(arg));
- ScmObj ret = SCM_NIL;
- ScmObj tmp = SCM_NIL;
+ ScmObj ret = SCM_NULL;
+ ScmObj tmp = SCM_NULL;
/* set tail_flag */
(*tail_flag) = 0;
@@ -1027,10 +1027,10 @@
* (<test> => <expression)
*/
ScmObj env = *envp;
- ScmObj clause = SCM_NIL;
- ScmObj test = SCM_NIL;
- ScmObj exps = SCM_NIL;
- ScmObj proc = SCM_NIL;
+ ScmObj clause = SCM_NULL;
+ ScmObj test = SCM_NULL;
+ ScmObj exps = SCM_NULL;
+ ScmObj proc = SCM_NULL;
/* set tail_flag */
(*tail_flag) = 0;
@@ -1068,7 +1068,7 @@
SigScm_ErrorObj("cond : the value of exp after => must be the procedure but got ", proc);
return ScmOp_apply(SCM_LIST_2(proc,
- Scm_NewCons(test, SCM_NIL)),
+ Scm_NewCons(test, SCM_NULL)),
env);
}
@@ -1083,9 +1083,9 @@
{
ScmObj env = *envp;
ScmObj key = ScmOp_eval(CAR(arg), env);
- ScmObj clause = SCM_NIL;
- ScmObj datums = SCM_NIL;
- ScmObj exps = SCM_NIL;
+ ScmObj clause = SCM_NULL;
+ ScmObj datums = SCM_NULL;
+ ScmObj exps = SCM_NULL;
/* looping in each clause */
for (arg = CDR(arg); !NULLP(arg); arg = CDR(arg)) {
@@ -1113,7 +1113,7 @@
ScmObj ScmExp_and(ScmObj arg, ScmObj *envp, int *tail_flag)
{
ScmObj env = *envp;
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
/* sanity check */
if (NULLP(arg))
@@ -1143,13 +1143,13 @@
}
}
- return SCM_NIL;
+ return SCM_NULL;
}
ScmObj ScmExp_or(ScmObj arg, ScmObj *envp, int *tail_flag)
{
ScmObj env = *envp;
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
/* sanity check */
if (NULLP(arg))
@@ -1179,7 +1179,7 @@
}
- return SCM_NIL;
+ return SCM_NULL;
}
/*===========================================================================
@@ -1188,11 +1188,11 @@
ScmObj ScmExp_let(ScmObj arg, ScmObj *envp, int *tail_flag)
{
ScmObj env = *envp;
- ScmObj bindings = SCM_NIL;
- ScmObj body = SCM_NIL;
- ScmObj vars = SCM_NIL;
- ScmObj vals = SCM_NIL;
- ScmObj binding = SCM_NIL;
+ ScmObj bindings = SCM_NULL;
+ ScmObj body = SCM_NULL;
+ ScmObj vars = SCM_NULL;
+ ScmObj vals = SCM_NULL;
+ ScmObj binding = SCM_NULL;
/* sanity check */
if CHECK_2_ARGS(arg)
@@ -1221,7 +1221,7 @@
SigScm_ErrorObj("let : invalid binding form : ", binding);
#else
if (NULLP(CDR(binding)))
- SET_CDR(binding, Scm_NewCons(SCM_NIL, SCM_NIL));
+ SET_CDR(binding, Scm_NewCons(SCM_NULL, SCM_NULL));
#endif
vars = Scm_NewCons(CAR(binding), vars);
@@ -1271,11 +1271,11 @@
ScmObj ScmExp_let_star(ScmObj arg, ScmObj *envp, int *tail_flag)
{
ScmObj env = *envp;
- ScmObj bindings = SCM_NIL;
- ScmObj body = SCM_NIL;
- ScmObj vars = SCM_NIL;
- ScmObj vals = SCM_NIL;
- ScmObj binding = SCM_NIL;
+ ScmObj bindings = SCM_NULL;
+ ScmObj body = SCM_NULL;
+ ScmObj vars = SCM_NULL;
+ ScmObj vals = SCM_NULL;
+ ScmObj binding = SCM_NULL;
/* sanity check */
if CHECK_2_ARGS(arg)
@@ -1300,11 +1300,11 @@
SigScm_ErrorObj("let* : invalid binding form : ", binding);
#else
if (NULLP(CDR(binding)))
- SET_CDR(binding, Scm_NewCons(SCM_NIL, SCM_NIL));
+ SET_CDR(binding, Scm_NewCons(SCM_NULL, SCM_NULL));
#endif
- vars = Scm_NewCons(CAR(binding), SCM_NIL);
- vals = Scm_NewCons(ScmOp_eval(CAR(CDR(binding)), env), SCM_NIL);
+ vars = Scm_NewCons(CAR(binding), SCM_NULL);
+ vals = Scm_NewCons(ScmOp_eval(CAR(CDR(binding)), env), SCM_NULL);
/* add env to each time!*/
env = extend_environment(vars, vals, env);
@@ -1315,8 +1315,8 @@
return ScmExp_begin(body, &env, tail_flag);
} else if (NULLP(bindings)) {
/* extend null environment */
- env = extend_environment(SCM_NIL,
- SCM_NIL,
+ env = extend_environment(SCM_NULL,
+ SCM_NULL,
env);
/* set new env */
@@ -1334,14 +1334,14 @@
ScmObj ScmExp_letrec(ScmObj arg, ScmObj *envp, int *tail_flag)
{
ScmObj env = *envp;
- ScmObj bindings = SCM_NIL;
- ScmObj body = SCM_NIL;
- ScmObj vars = SCM_NIL;
- ScmObj vals = SCM_NIL;
- ScmObj binding = SCM_NIL;
- ScmObj var = SCM_NIL;
- ScmObj val = SCM_NIL;
- ScmObj frame = SCM_NIL;
+ ScmObj bindings = SCM_NULL;
+ ScmObj body = SCM_NULL;
+ ScmObj vars = SCM_NULL;
+ ScmObj vals = SCM_NULL;
+ ScmObj binding = SCM_NULL;
+ ScmObj var = SCM_NULL;
+ ScmObj val = SCM_NULL;
+ ScmObj frame = SCM_NULL;
/* sanity check */
if (NULLP(arg) || NULLP(CDR(arg)))
@@ -1366,7 +1366,7 @@
SigScm_ErrorObj("letrec : invalid binding form : ", binding);
#else
if (NULLP(CDR(binding)))
- SET_CDR(binding, Scm_NewCons(SCM_NIL, SCM_NIL));
+ SET_CDR(binding, Scm_NewCons(SCM_NULL, SCM_NULL));
#endif
var = CAR(binding);
@@ -1385,7 +1385,7 @@
env = extend_environment(CAR(frame), CDR(frame), env);
/* ok, vars of letrec is extended to env */
- scm_letrec_env = SCM_NIL;
+ scm_letrec_env = SCM_NULL;
/* set new env */
*envp = env;
@@ -1413,7 +1413,7 @@
ScmObj ScmExp_begin(ScmObj arg, ScmObj *envp, int *tail_flag)
{
ScmObj env = *envp;
- ScmObj exp = SCM_NIL;
+ ScmObj exp = SCM_NULL;
/* set tail_flag */
(*tail_flag) = 1;
@@ -1429,7 +1429,7 @@
exp = CAR(arg);
/* return last expression's result */
- if (EQ(CDR(arg), SCM_NIL)) {
+ if (EQ(CDR(arg), SCM_NULL)) {
/* doesn't evaluate exp now for tail-recursion. */
return exp;
}
@@ -1461,18 +1461,18 @@
*/
ScmObj env = *envp;
ScmObj bindings = CAR(arg);
- ScmObj vars = SCM_NIL;
- ScmObj vals = SCM_NIL;
- ScmObj steps = SCM_NIL;
- ScmObj binding = SCM_NIL;
- ScmObj step = SCM_NIL;
- ScmObj testframe = SCM_NIL;
- ScmObj test = SCM_NIL;
- ScmObj expression = SCM_NIL;
- ScmObj commands = SCM_NIL;
- ScmObj tmp_vars = SCM_NIL;
- ScmObj tmp_steps = SCM_NIL;
- ScmObj obj = SCM_NIL;
+ ScmObj vars = SCM_NULL;
+ ScmObj vals = SCM_NULL;
+ ScmObj steps = SCM_NULL;
+ ScmObj binding = SCM_NULL;
+ ScmObj step = SCM_NULL;
+ ScmObj testframe = SCM_NULL;
+ ScmObj test = SCM_NULL;
+ ScmObj expression = SCM_NULL;
+ ScmObj commands = SCM_NULL;
+ ScmObj tmp_vars = SCM_NULL;
+ ScmObj tmp_steps = SCM_NULL;
+ ScmObj obj = SCM_NULL;
/* sanity check */
if (SCM_INT_VALUE(ScmOp_length(arg)) < 2)
@@ -1515,7 +1515,7 @@
* results. each excution must be done independently. So, we store the
* results to the "vals" variable and set it in hand.
*/
- vals = SCM_NIL;
+ vals = SCM_NULL;
for (tmp_steps = steps; !NULLP(tmp_steps); tmp_steps = CDR(tmp_steps)) {
vals = Scm_NewCons(ScmOp_eval(CAR(tmp_steps), env), vals);
}
@@ -1552,7 +1552,7 @@
SigScm_Error("delay : Wrong number of arguments\n");
/* closure exp = ( () CAR(arg) ) */
- return Scm_NewClosure(SCM_LIST_2(SCM_NIL, CAR(arg)), env);
+ return Scm_NewClosure(SCM_LIST_2(SCM_NULL, CAR(arg)), env);
}
/*===========================================================================
@@ -1577,7 +1577,7 @@
if (!CONSP(obj) || !NULLP(CDR(obj)))
SigScm_ErrorObj("unquote: bad argument list: ", obj);
SigScm_Error("unquote outside quasiquote");
- return SCM_NIL;
+ return SCM_NULL;
}
ScmObj ScmOp_unquote_splicing(ScmObj obj, ScmObj *envp, int *tail_flag)
@@ -1585,7 +1585,7 @@
if (!CONSP(obj) || !NULLP(CDR(obj)))
SigScm_ErrorObj("unquote-splicing: bad argument list: ", obj);
SigScm_Error("unquote-splicing outside quasiquote");
- return SCM_NIL;
+ return SCM_NULL;
}
@@ -1597,8 +1597,8 @@
ScmObj env = *envp;
ScmObj var = CAR(arg);
ScmObj body = CAR(CDR(arg));
- ScmObj val = SCM_NIL;
- ScmObj formals = SCM_NIL;
+ ScmObj val = SCM_NULL;
+ ScmObj formals = SCM_NULL;
/* set tail_flag */
(*tail_flag) = 0;
@@ -1650,7 +1650,7 @@
}
SigScm_ErrorObj("define : syntax error ", arg);
- return SCM_NIL;
+ return SCM_NULL;
}
/*=======================================
@@ -1658,12 +1658,12 @@
=======================================*/
ScmObj ScmOp_scheme_report_environment(ScmObj version)
{
- return SCM_NIL;
+ return SCM_NULL;
}
ScmObj ScmOp_null_environment(ScmObj version)
{
- return SCM_NIL;
+ return SCM_NULL;
}
#if SCM_COMPAT_SIOD
@@ -1688,7 +1688,7 @@
if (!SYMBOLP(var))
SigScm_ErrorObj("symbol-value : require symbol but got ", var);
- return symbol_value(var, SCM_NIL);
+ return symbol_value(var, SCM_NULL);
}
ScmObj ScmOp_set_symbol_value(ScmObj var, ScmObj val)
Modified: branches/r5rs/sigscheme/io.c
===================================================================
--- branches/r5rs/sigscheme/io.c 2005-08-25 22:47:18 UTC (rev 1321)
+++ branches/r5rs/sigscheme/io.c 2005-08-26 04:04:32 UTC (rev 1322)
@@ -85,8 +85,8 @@
===========================================================================*/
ScmObj ScmOp_call_with_input_file(ScmObj filepath, ScmObj proc)
{
- ScmObj port = SCM_NIL;
- ScmObj ret = SCM_NIL;
+ ScmObj port = SCM_NULL;
+ ScmObj ret = SCM_NULL;
if (!STRINGP(filepath))
SigScm_ErrorObj("call-with-input-file : string required but got", filepath);
@@ -98,8 +98,8 @@
/* (apply proc (port)) */
ret = ScmOp_apply(SCM_LIST_2(proc,
- Scm_NewCons(port, SCM_NIL)),
- SCM_NIL);
+ Scm_NewCons(port, SCM_NULL)),
+ SCM_NULL);
/* close port */
ScmOp_close_input_port(port);
@@ -109,8 +109,8 @@
ScmObj ScmOp_call_with_output_file(ScmObj filepath, ScmObj proc)
{
- ScmObj port = SCM_NIL;
- ScmObj ret = SCM_NIL;
+ ScmObj port = SCM_NULL;
+ ScmObj ret = SCM_NULL;
if (!STRINGP(filepath))
SigScm_ErrorObj("call-with-output-file : string required but got ", filepath);
@@ -122,8 +122,8 @@
/* (apply proc (port)) */
ret = ScmOp_apply(SCM_LIST_2(proc,
- Scm_NewCons(port, SCM_NIL)),
- SCM_NIL);
+ Scm_NewCons(port, SCM_NULL)),
+ SCM_NULL);
/* close port */
ScmOp_close_output_port(port);
@@ -159,8 +159,8 @@
ScmObj ScmOp_with_input_from_file(ScmObj filepath, ScmObj thunk)
{
- ScmObj tmp_port = SCM_NIL;
- ScmObj ret = SCM_NIL;
+ ScmObj tmp_port = SCM_NULL;
+ ScmObj ret = SCM_NULL;
if (!STRINGP(filepath))
SigScm_ErrorObj("with-input-from-file : string required but got ", filepath);
@@ -173,8 +173,8 @@
/* (apply thunk ())*/
ret = ScmOp_apply(SCM_LIST_2(thunk,
- Scm_NewCons(SCM_NIL, SCM_NIL)),
- SCM_NIL);
+ Scm_NewCons(SCM_NULL, SCM_NULL)),
+ SCM_NULL);
/* close port */
ScmOp_close_input_port(scm_current_input_port);
@@ -187,8 +187,8 @@
ScmObj ScmOp_with_output_to_file(ScmObj filepath, ScmObj thunk)
{
- ScmObj tmp_port = SCM_NIL;
- ScmObj ret = SCM_NIL;
+ ScmObj tmp_port = SCM_NULL;
+ ScmObj ret = SCM_NULL;
if (!STRINGP(filepath))
SigScm_ErrorObj("with-output-to-file : string required but got ", filepath);
@@ -201,8 +201,8 @@
/* (apply thunk ())*/
ret = ScmOp_apply(SCM_LIST_2(thunk,
- Scm_NewCons(SCM_NIL, SCM_NIL)),
- SCM_NIL);
+ Scm_NewCons(SCM_NULL, SCM_NULL)),
+ SCM_NULL);
/* close port */
ScmOp_close_output_port(scm_current_output_port);
@@ -272,7 +272,7 @@
===========================================================================*/
ScmObj ScmOp_read(ScmObj arg, ScmObj env)
{
- ScmObj port = SCM_NIL;
+ ScmObj port = SCM_NULL;
if (NULLP(arg)) {
/* (read) */
port = scm_current_input_port;
@@ -288,7 +288,7 @@
ScmObj ScmOp_read_char(ScmObj arg, ScmObj env)
{
- ScmObj port = SCM_NIL;
+ ScmObj port = SCM_NULL;
char *buf = NULL;
if (NULLP(arg)) {
/* (read-char) */
@@ -327,8 +327,8 @@
===========================================================================*/
ScmObj ScmOp_write(ScmObj arg, ScmObj env)
{
- ScmObj obj = SCM_NIL;
- ScmObj port = SCM_NIL;
+ ScmObj obj = SCM_NULL;
+ ScmObj port = SCM_NULL;
if CHECK_1_ARG(arg)
SigScm_Error("write : invalid parameter\n");
@@ -348,8 +348,8 @@
ScmObj ScmOp_display(ScmObj arg, ScmObj env)
{
- ScmObj obj = SCM_NIL;
- ScmObj port = SCM_NIL;
+ ScmObj obj = SCM_NULL;
+ ScmObj port = SCM_NULL;
if CHECK_1_ARG(arg)
SigScm_Error("display : invalid parameter\n");
@@ -372,8 +372,8 @@
#if SCM_USE_NONSTD_FEATURES
ScmObj ScmOp_print(ScmObj arg, ScmObj env)
{
- ScmObj obj = SCM_NIL;
- ScmObj port = SCM_NIL;
+ ScmObj obj = SCM_NULL;
+ ScmObj port = SCM_NULL;
if CHECK_1_ARG(arg)
SigScm_Error("print : invalid parameter\n");
@@ -412,8 +412,8 @@
ScmObj ScmOp_write_char(ScmObj arg, ScmObj env)
{
- ScmObj obj = SCM_NIL;
- ScmObj port = SCM_NIL;
+ ScmObj obj = SCM_NULL;
+ ScmObj port = SCM_NULL;
if CHECK_1_ARG(arg)
SigScm_Error("write-char : invalid parameter\n");
@@ -441,8 +441,8 @@
ScmObj SigScm_load(const char *filename)
{
ScmObj stack_start;
- ScmObj port = SCM_NIL;
- ScmObj s_expression = SCM_NIL;
+ ScmObj port = SCM_NULL;
+ ScmObj s_expression = SCM_NULL;
char *filepath = create_valid_path(filename);
/* start protecting stack */
@@ -459,14 +459,14 @@
/* open port */
port = ScmOp_open_input_file(Scm_NewStringCopying(filepath));
- s_expression = SCM_NIL;
+ s_expression = SCM_NULL;
/* read & eval cycle */
for (s_expression = SigScm_Read(port);
!EOFP(s_expression);
s_expression = SigScm_Read(port))
{
- ScmOp_eval(s_expression, SCM_NIL);
+ ScmOp_eval(s_expression, SCM_NULL);
}
/* close port */
@@ -533,7 +533,7 @@
ScmObj ScmOp_require(ScmObj filename)
{
ScmObj stack_start;
- ScmObj loaded_str = SCM_NIL;
+ ScmObj loaded_str = SCM_NULL;
if (!STRINGP(filename))
SigScm_ErrorObj("require : string required but got ", filename);
Modified: branches/r5rs/sigscheme/main.c
===================================================================
--- branches/r5rs/sigscheme/main.c 2005-08-25 22:47:18 UTC (rev 1321)
+++ branches/r5rs/sigscheme/main.c 2005-08-26 04:04:32 UTC (rev 1322)
@@ -58,10 +58,10 @@
static void repl(void)
{
ScmObj stack_start;
- ScmObj stdin_port = SCM_NIL;
- ScmObj stdout_port = SCM_NIL;
- ScmObj s_exp = SCM_NIL;
- ScmObj result = SCM_NIL;
+ ScmObj stdin_port = SCM_NULL;
+ ScmObj stdout_port = SCM_NULL;
+ ScmObj s_exp = SCM_NULL;
+ ScmObj result = SCM_NULL;
/* start protecting stack */
SigScm_gc_protect_stack(&stack_start);
@@ -76,7 +76,7 @@
!EOFP(s_exp);
s_exp = SigScm_Read(stdin_port))
{
- result = ScmOp_eval(s_exp, SCM_NIL);
+ result = ScmOp_eval(s_exp, SCM_NULL);
SigScm_DisplayToPort(stdout_port, result);
printf("\nsscm> ");
}
Modified: branches/r5rs/sigscheme/operations-srfi1.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi1.c 2005-08-25 22:47:18 UTC (rev 1321)
+++ branches/r5rs/sigscheme/operations-srfi1.c 2005-08-26 04:04:32 UTC (rev 1322)
@@ -58,7 +58,7 @@
static ScmObj list_gettailcons(ScmObj head)
{
if (NULLP(head))
- return SCM_NIL;
+ return SCM_NULL;
if (NULLP(CDR(head)))
return head;
@@ -68,7 +68,7 @@
}
SigScm_Error("list_gettailcons : cannot get tailcons?\n");
- return SCM_NIL;
+ return SCM_NULL;
}
/*=======================================
@@ -84,7 +84,7 @@
ScmObj ScmOp_SRFI1_cons_star(ScmObj obj, ScmObj env)
{
- ScmObj tail_cons = SCM_NIL;
+ ScmObj tail_cons = SCM_NULL;
ScmObj prev_tail = obj;
if (NULLP(CDR(obj)))
@@ -93,7 +93,7 @@
for (tail_cons = CDR(obj); !NULLP(tail_cons); tail_cons = CDR(tail_cons)) {
/* check tail cons cell */
if (NULLP(CDR(tail_cons))) {
- SCM_SETCDR(prev_tail, CAR(tail_cons));
+ SET_CDR(prev_tail, CAR(tail_cons));
}
prev_tail = tail_cons;
@@ -104,8 +104,8 @@
ScmObj ScmOp_SRFI1_make_list(ScmObj args, ScmObj env)
{
- ScmObj fill = SCM_NIL;
- ScmObj head = SCM_NIL;
+ ScmObj fill = SCM_NULL;
+ ScmObj head = SCM_NULL;
int n = 0;
int i = 0;
@@ -136,9 +136,9 @@
ScmObj ScmOp_SRFI1_list_tabulate(ScmObj args, ScmObj env)
{
ScmObj scm_n = CAR(args);
- ScmObj proc = SCM_NIL;
- ScmObj head = SCM_NIL;
- ScmObj num = SCM_NIL;
+ ScmObj proc = SCM_NULL;
+ ScmObj head = SCM_NULL;
+ ScmObj num = SCM_NULL;
int n = 0;
int i = 0;
@@ -160,7 +160,7 @@
if (!NULLP(proc)) {
/* evaluate (proc num) */
num = ScmOp_eval(Scm_NewCons(proc,
- Scm_NewCons(num, SCM_NIL)),
+ Scm_NewCons(num, SCM_NULL)),
env);
}
@@ -172,9 +172,9 @@
ScmObj ScmOp_SRFI1_list_copy(ScmObj list)
{
- ScmObj head = SCM_NIL;
- ScmObj tail = SCM_NIL;
- ScmObj obj = SCM_NIL;
+ ScmObj head = SCM_NULL;
+ ScmObj tail = SCM_NULL;
+ ScmObj obj = SCM_NULL;
if (FALSEP(ScmOp_listp(list)))
SigScm_ErrorObj("list-copy : list required but got ", list);
@@ -187,9 +187,9 @@
obj = ScmOp_SRFI1_list_copy(obj);
/* then create new cons */
- obj = Scm_NewCons(obj, SCM_NIL);
+ obj = Scm_NewCons(obj, SCM_NULL);
if (!NULLP(tail)) {
- SCM_SETCDR(tail, obj);
+ SET_CDR(tail, obj);
tail = obj;
} else {
head = obj;
@@ -202,23 +202,23 @@
ScmObj ScmOp_SRFI1_circular_list(ScmObj list, ScmObj env)
{
- ScmObj tailcons = SCM_NIL;
+ ScmObj tailcons = SCM_NULL;
if (FALSEP(ScmOp_listp(list)))
SigScm_ErrorObj("circular-list : list required but got ", list);
tailcons = list_gettailcons(list);
- SCM_SETCDR(tailcons, list);
+ SET_CDR(tailcons, list);
return list;
}
ScmObj ScmOp_SRFI1_iota(ScmObj args, ScmObj env)
{
- ScmObj scm_count = SCM_NIL;
- ScmObj scm_start = SCM_NIL;
- ScmObj scm_step = SCM_NIL;
- ScmObj head = SCM_NIL;
+ ScmObj scm_count = SCM_NULL;
+ ScmObj scm_start = SCM_NULL;
+ ScmObj scm_step = SCM_NULL;
+ ScmObj head = SCM_NULL;
int count = 0;
int start = 0;
int step = 0;
Modified: branches/r5rs/sigscheme/operations-srfi8.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi8.c 2005-08-25 22:47:18 UTC (rev 1321)
+++ branches/r5rs/sigscheme/operations-srfi8.c 2005-08-26 04:04:32 UTC (rev 1322)
@@ -69,11 +69,11 @@
* (receive <formals> <expression> <body>)
*/
ScmObj env = *envp;
- ScmObj formals = SCM_NIL;
- ScmObj expr = SCM_NIL;
- ScmObj body = SCM_NIL;
- ScmObj actuals = SCM_NIL;
- ScmObj closure = SCM_NIL;
+ ScmObj formals = SCM_NULL;
+ ScmObj expr = SCM_NULL;
+ ScmObj body = SCM_NULL;
+ ScmObj actuals = SCM_NULL;
+ ScmObj closure = SCM_NULL;
/* sanity check */
if (CHECK_3_ARGS(args))
@@ -93,7 +93,7 @@
if (VALUEPACKETP(actuals))
actuals = SCM_VALUEPACKET_VALUES(actuals);
else
- actuals = Scm_NewCons(actuals, SCM_NIL);
+ actuals = Scm_NewCons(actuals, SCM_NULL);
closure = Scm_NewClosure(Scm_NewCons(formals, body), env);
Modified: branches/r5rs/sigscheme/operations.c
===================================================================
--- branches/r5rs/sigscheme/operations.c 2005-08-25 22:47:18 UTC (rev 1321)
+++ branches/r5rs/sigscheme/operations.c 2005-08-26 04:04:32 UTC (rev 1322)
@@ -353,7 +353,7 @@
ScmObj ScmOp_equal(ScmObj args, ScmObj env)
{
int val = 0;
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
/* arglen check */
if CHECK_2_ARGS(args)
@@ -385,7 +385,7 @@
{
int val = 0;
int car_val = 0;
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
if (NULLP(args) || NULLP(CDR(args)))
SigScm_Error("< : Wrong number of arguments\n");
@@ -417,7 +417,7 @@
{
int val = 0;
int car_val = 0;
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
/* type check */
if (FALSEP(ScmOp_numberp(CAR(args))))
@@ -450,7 +450,7 @@
{
int val = 0;
int car_val = 0;
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
/* type check */
if (FALSEP(ScmOp_numberp(CAR(args))))
@@ -464,7 +464,7 @@
val = SCM_INT_VALUE(CAR(args));
/* compare following value */
- obj = SCM_NIL;
+ obj = SCM_NULL;
for (args = CDR(args); !NULLP(args); args = CDR(args)) {
obj = CAR(args);
if (FALSEP(ScmOp_numberp(obj)))
@@ -484,7 +484,7 @@
{
int val = 0;
int car_val = 0;
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
/* type check */
if (FALSEP(ScmOp_numberp(CAR(args))))
@@ -498,7 +498,7 @@
val = SCM_INT_VALUE(CAR(args));
/* compare following value */
- obj = SCM_NIL;
+ obj = SCM_NULL;
for (args = CDR(args); !NULLP(args); args = CDR(args)) {
obj = CAR(args);
if (FALSEP(ScmOp_numberp(obj)))
@@ -558,8 +558,8 @@
{
int max = 0;
int car_val = 0;
- ScmObj car = SCM_NIL;
- ScmObj maxobj = SCM_NIL;
+ ScmObj car = SCM_NULL;
+ ScmObj maxobj = SCM_NULL;
if (NULLP(args))
SigScm_Error("max : at least 1 number required\n");
@@ -583,8 +583,8 @@
{
int min = 0;
int car_val = 0;
- ScmObj car = SCM_NIL;
- ScmObj minobj = SCM_NIL;
+ ScmObj car = SCM_NULL;
+ ScmObj minobj = SCM_NULL;
if (NULLP(args))
SigScm_Error("min : at least 1 number required\n");
@@ -791,7 +791,7 @@
SigScm_Error("car : empty list\n");
#endif
if (NULLP(obj))
- return SCM_NIL;
+ return SCM_NULL;
if (!CONSP(obj))
SigScm_ErrorObj("car : list required but got ", obj);
@@ -813,7 +813,7 @@
SigScm_Error("cdr : empty list\n");
#endif
if (NULLP(obj))
- return SCM_NIL;
+ return SCM_NULL;
if (!CONSP(obj))
SigScm_ErrorObj("cdr : list required but got ", obj);
@@ -1032,20 +1032,20 @@
ScmObj ScmOp_append(ScmObj args, ScmObj env)
{
- ScmObj ret_list = SCM_NIL;
+ ScmObj ret_list = SCM_NULL;
ScmObj *ret_tail = &ret_list;
ScmObj ls;
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
if (NULLP(args))
- return SCM_NIL;
+ return SCM_NULL;
/* duplicate and merge all but the last argument */
for (; !NULLP(CDR(args)); args = CDR(args)) {
for (ls = CAR(args); CONSP(ls); ls = CDR(ls)) {
obj = CAR(ls);
- *ret_tail = Scm_NewCons(obj, SCM_NIL);
+ *ret_tail = Scm_NewCons(obj, SCM_NULL);
ret_tail = &CDR(*ret_tail);
}
if (!NULLP(ls))
@@ -1061,7 +1061,7 @@
ScmObj ScmOp_reverse(ScmObj list)
{
- ScmObj ret_list = SCM_NIL;
+ ScmObj ret_list = SCM_NULL;
for (; CONSP(list); list = CDR(list))
ret_list = Scm_NewCons(CAR(list), ret_list);
@@ -1100,7 +1100,7 @@
ScmObj ScmOp_list_ref(ScmObj list, ScmObj scm_k)
{
- ScmObj list_tail = SCM_NIL;
+ ScmObj list_tail = SCM_NULL;
if (FALSEP(ScmOp_numberp(scm_k)))
SigScm_ErrorObj("list-ref : int required but got ", scm_k);
@@ -1115,7 +1115,7 @@
ScmObj ScmOp_memq(ScmObj obj, ScmObj list)
{
- ScmObj tmplist = SCM_NIL;
+ ScmObj tmplist = SCM_NULL;
for (tmplist = list; CONSP(tmplist); tmplist = CDR(tmplist)) {
if (EQ(obj, CAR(tmplist))) {
return tmplist;
@@ -1127,8 +1127,8 @@
ScmObj ScmOp_memv(ScmObj obj, ScmObj list)
{
- ScmObj tmplist = SCM_NIL;
- ScmObj tmpobj = SCM_NIL;
+ ScmObj tmplist = SCM_NULL;
+ ScmObj tmpobj = SCM_NULL;
for (tmplist = list; CONSP(tmplist); tmplist = CDR(tmplist)) {
tmpobj = CAR(tmplist);
if (NFALSEP(ScmOp_eqvp(obj, tmpobj))) {
@@ -1141,8 +1141,8 @@
ScmObj ScmOp_member(ScmObj obj, ScmObj list)
{
- ScmObj tmplist = SCM_NIL;
- ScmObj tmpobj = SCM_NIL;
+ ScmObj tmplist = SCM_NULL;
+ ScmObj tmpobj = SCM_NULL;
for (tmplist = list; CONSP(tmplist); tmplist = CDR(tmplist)) {
tmpobj = CAR(tmplist);
if (NFALSEP(ScmOp_equalp(obj, tmpobj))) {
@@ -1155,8 +1155,8 @@
ScmObj ScmOp_assq(ScmObj obj, ScmObj alist)
{
- ScmObj tmplist = SCM_NIL;
- ScmObj tmpobj = SCM_NIL;
+ ScmObj tmplist = SCM_NULL;
+ ScmObj tmpobj = SCM_NULL;
ScmObj car;
for (tmplist = alist; CONSP(tmplist); tmplist = CDR(tmplist)) {
@@ -1178,8 +1178,8 @@
ScmObj ScmOp_assv(ScmObj obj, ScmObj alist)
{
- ScmObj tmplist = SCM_NIL;
- ScmObj tmpobj = SCM_NIL;
+ ScmObj tmplist = SCM_NULL;
+ ScmObj tmpobj = SCM_NULL;
ScmObj car;
for (tmplist = alist; CONSP(tmplist); tmplist = CDR(tmplist)) {
@@ -1201,8 +1201,8 @@
ScmObj ScmOp_assoc(ScmObj obj, ScmObj alist)
{
- ScmObj tmplist = SCM_NIL;
- ScmObj tmpobj = SCM_NIL;
+ ScmObj tmplist = SCM_NULL;
+ ScmObj tmpobj = SCM_NULL;
ScmObj car;
for (tmplist = alist; CONSP(tmplist); tmplist = CDR(tmplist)) {
@@ -1391,8 +1391,8 @@
int argc = SCM_INT_VALUE(ScmOp_length(arg));
int len = 0;
char *tmp = NULL;
- ScmObj str = SCM_NIL;
- ScmObj ch = SCM_NIL;
+ ScmObj str = SCM_NULL;
+ ScmObj ch = SCM_NULL;
/* sanity check */
if (argc != 1 && argc != 2)
@@ -1564,8 +1564,8 @@
{
int total_size = 0;
int total_len = 0;
- ScmObj strings = SCM_NIL;
- ScmObj obj = SCM_NIL;
+ ScmObj strings = SCM_NULL;
+ ScmObj obj = SCM_NULL;
char *new_str = NULL;
char *p = NULL;
@@ -1602,7 +1602,7 @@
{
char *string_str = NULL;
int str_len = 0;
- ScmObj head = SCM_NIL;
+ ScmObj head = SCM_NULL;
ScmObj prev = NULL;
ScmObj next = NULL;
int i = 0;
@@ -1616,7 +1616,7 @@
string_str = SCM_STRING_STR(string);
str_len = SCM_STRING_LEN(string);
if (str_len == 0)
- return SCM_NIL;
+ return SCM_NULL;
for (i = 0; i < str_len; i++) {
ch_start_ptr = SigScm_default_encoding_str_startpos(string_str, i);
@@ -1626,7 +1626,7 @@
memset(new_ch, 0, sizeof(char) * (ch_end_ptr - ch_start_ptr + 1));
strncpy(new_ch, ch_start_ptr, (sizeof(char) * (ch_end_ptr - ch_start_ptr)));
- next = Scm_NewCons(Scm_NewChar(new_ch), SCM_NIL);
+ next = Scm_NewCons(Scm_NewChar(new_ch), SCM_NULL);
if (prev)
SET_CDR(prev, next);
else
@@ -1641,8 +1641,8 @@
ScmObj ScmOp_list2string(ScmObj list)
{
int total_size = 0;
- ScmObj chars = SCM_NIL;
- ScmObj obj = SCM_NIL;
+ ScmObj chars = SCM_NULL;
+ ScmObj obj = SCM_NULL;
char *new_str = NULL;
char *p = NULL;
@@ -1725,7 +1725,7 @@
{
ScmObj *vec = NULL;
ScmObj scm_k = CAR(arg);
- ScmObj fill = SCM_NIL;
+ ScmObj fill = SCM_NULL;
int c_k = 0;
int i = 0;
@@ -1809,10 +1809,10 @@
v = SCM_VECTOR_VEC(vec);
c_len = SCM_VECTOR_LEN(vec);
if (c_len == 0)
- return SCM_NIL;
+ return SCM_NULL;
for (i = 0; i < c_len; i++) {
- next = Scm_NewCons(v[i], SCM_NIL);
+ next = Scm_NewCons(v[i], SCM_NULL);
if (prev) {
SET_CDR(prev, next);
@@ -1828,7 +1828,7 @@
ScmObj ScmOp_list2vector(ScmObj list)
{
- ScmObj scm_len = SCM_NIL;
+ ScmObj scm_len = SCM_NULL;
ScmObj *v = NULL;
int c_len = 0;
int i = 0;
@@ -1879,12 +1879,12 @@
{
int arg_len = SCM_INT_VALUE(ScmOp_length(map_arg));
ScmObj proc = CAR(map_arg);
- ScmObj args = SCM_NIL;
- ScmObj ret = SCM_NIL;
- ScmObj tmp = SCM_NIL;
+ ScmObj args = SCM_NULL;
+ ScmObj ret = SCM_NULL;
+ ScmObj tmp = SCM_NULL;
- ScmObj arg_vector = SCM_NIL;
- ScmObj arg1 = SCM_NIL;
+ ScmObj arg_vector = SCM_NULL;
+ ScmObj arg1 = SCM_NULL;
int vector_len = 0;
int i = 0;
@@ -1901,7 +1901,7 @@
/* create list for "apply" op */
tmp = SCM_LIST_2(proc,
- Scm_NewCons(tmp, SCM_NIL));
+ Scm_NewCons(tmp, SCM_NULL));
/* apply proc */
ret = Scm_NewCons(ScmOp_apply(tmp, env), ret);
@@ -1914,12 +1914,12 @@
vector_len = SCM_VECTOR_LEN(arg_vector);
while (1) {
/* create arg */
- arg1 = SCM_NIL;
+ arg1 = SCM_NULL;
for (i = 0; i < vector_len; i++) {
tmp = SCM_VECTOR_CREF(arg_vector, i);
/* check if we can continue next loop */
if (NULLP(tmp)) {
- /* if next item is SCM_NIL, let's return! */
+ /* if next item is SCM_NULL, let's return! */
return ScmOp_reverse(ret);
}
@@ -1937,7 +1937,7 @@
/* never reaches here */
SigScm_Error("map bug?\n");
- return SCM_NIL;
+ return SCM_NULL;
}
ScmObj ScmOp_for_each(ScmObj arg, ScmObj env)
@@ -1955,14 +1955,14 @@
SigScm_Error("force : not proper delayed object\n");
/* evaluated exp = ( CAR(arg) ) */
- return ScmOp_eval(Scm_NewCons(CAR(arg), SCM_NIL), env);
+ return ScmOp_eval(Scm_NewCons(CAR(arg), SCM_NULL), env);
}
ScmObj ScmOp_call_with_current_continuation(ScmObj arg, ScmObj env)
{
int jmpret = 0;
ScmObj proc = CAR(arg);
- ScmObj cont = SCM_NIL;
+ ScmObj cont = SCM_NULL;
if (!CLOSUREP(proc))
SigScm_ErrorObj("call-with-current-continuation : closure required but got ", proc);
@@ -1977,7 +1977,7 @@
}
/* execute (proc cont) */
- SET_CDR(arg, Scm_NewCons(cont, SCM_NIL));
+ SET_CDR(arg, Scm_NewCons(cont, SCM_NULL));
return ScmOp_eval(arg, env);
}
@@ -2003,12 +2003,12 @@
SigScm_ErrorObj("call-with-values: too few arguments: ", argl);
/* make the list (producer) and evaluate it */
- cons_wrapper = Scm_NewCons(CAR(argl), SCM_NIL);
+ cons_wrapper = Scm_NewCons(CAR(argl), SCM_NULL);
vals = ScmOp_eval(cons_wrapper, *envp);
if (!VALUEPACKETP(vals)) {
/* got back a single value */
- vals = Scm_NewCons(vals, SCM_NIL);
+ vals = Scm_NewCons(vals, SCM_NULL);
} else {
/* extract */
vals = SCM_VALUEPACKET_VALUES(vals);
Modified: branches/r5rs/sigscheme/read.c
===================================================================
--- branches/r5rs/sigscheme/read.c 2005-08-25 22:47:18 UTC (rev 1321)
+++ branches/r5rs/sigscheme/read.c 2005-08-26 04:04:32 UTC (rev 1322)
@@ -217,10 +217,10 @@
static ScmObj read_list(ScmObj port, int closeParen)
{
- ScmObj list_head = SCM_NIL;
- ScmObj list_tail = SCM_NIL;
- ScmObj item = SCM_NIL;
- ScmObj cdr = SCM_NIL;
+ ScmObj list_head = SCM_NULL;
+ ScmObj list_tail = SCM_NULL;
+ ScmObj item = SCM_NULL;
+ ScmObj cdr = SCM_NULL;
int line = SCM_PORTINFO_LINE(port);
int c = 0;
int c2 = 0;
@@ -286,11 +286,11 @@
/* Append item to the list_tail. */
if (NULLP(list_tail)) {
/* create new list */
- list_head = Scm_NewCons(item, SCM_NIL);
+ list_head = Scm_NewCons(item, SCM_NULL);
list_tail = list_head;
} else {
/* update list_tail */
- SET_CDR(list_tail, Scm_NewCons(item, SCM_NIL));
+ SET_CDR(list_tail, Scm_NewCons(item, SCM_NULL));
list_tail = CDR(list_tail);
}
}
@@ -393,7 +393,7 @@
int is_str = 0;
int str_len = 0;
char *str = NULL;
- ScmObj obj = SCM_NIL;
+ ScmObj obj = SCM_NULL;
#if DEBUG_PARSER
printf("read_number_or_symbol\n");
@@ -518,5 +518,5 @@
static ScmObj read_quote(ScmObj port, ScmObj quoter)
{
- return Scm_NewCons(quoter, Scm_NewCons(read_sexpression(port), SCM_NIL));
+ return Scm_NewCons(quoter, Scm_NewCons(read_sexpression(port), SCM_NULL));
}
Modified: branches/r5rs/sigscheme/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/sigscheme.c 2005-08-25 22:47:18 UTC (rev 1321)
+++ branches/r5rs/sigscheme/sigscheme.c 2005-08-26 04:04:32 UTC (rev 1322)
@@ -58,10 +58,10 @@
=======================================*/
static void Scm_RegisterFunc(const char *name, enum ScmFuncArgType argnum, ScmFuncType func);
-ScmObj SigScm_nil, SigScm_true, SigScm_false, SigScm_eof;
+ScmObj SigScm_null, SigScm_true, SigScm_false, SigScm_eof;
ScmObj SigScm_quote, SigScm_quasiquote, SigScm_unquote, SigScm_unquote_splicing;
ScmObj SigScm_unbound, SigScm_undef;
-ScmObjInternal SigScm_nil_impl, SigScm_true_impl, SigScm_false_impl, SigScm_eof_impl;
+ScmObjInternal SigScm_null_impl, SigScm_true_impl, SigScm_false_impl, SigScm_eof_impl;
ScmObjInternal SigScm_quote_impl, SigScm_quasiquote_impl, SigScm_unquote_impl, SigScm_unquote_splicing_impl;
ScmObjInternal SigScm_unbound_impl, SigScm_undef_impl;
@@ -80,7 +80,7 @@
/*=======================================================================
Etc Variable Initialization
=======================================================================*/
- SCM_NEW_ETC(SigScm_nil, SigScm_nil_impl, 1);
+ SCM_NEW_ETC(SigScm_null, SigScm_null_impl, 1);
SCM_NEW_ETC(SigScm_true, SigScm_true_impl, 2);
SCM_NEW_ETC(SigScm_false, SigScm_false_impl, 3);
SCM_NEW_ETC(SigScm_eof, SigScm_eof_impl, 4);
@@ -88,14 +88,14 @@
SCM_NEW_ETC(SigScm_undef, SigScm_undef_impl, 10);
#if SCM_COMPAT_SIOD_BUGS
- SigScm_false = SigScm_nil;
+ SigScm_false = SigScm_null;
#endif
/*=======================================================================
Externed Variable Initialization
=======================================================================*/
- scm_continuation_thrown_obj = SCM_NIL;
- scm_letrec_env = SCM_NIL;
+ scm_continuation_thrown_obj = SCM_NULL;
+ scm_letrec_env = SCM_NULL;
/*=======================================================================
Storage Initialization
=======================================================================*/
@@ -337,7 +337,7 @@
Scm_RegisterFuncL("the-environment" , ScmOp_the_environment);
Scm_RegisterFunc1("%%closure-code" , ScmOp_closure_code);
/* datas.c */
- scm_return_value = SCM_NIL;
+ scm_return_value = SCM_NULL;
#endif
SigScm_gc_unprotect_stack(&obj);
Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h 2005-08-25 22:47:18 UTC (rev 1321)
+++ branches/r5rs/sigscheme/sigschemeinternal.h 2005-08-26 04:04:32 UTC (rev 1322)
@@ -153,25 +153,25 @@
/* Macros For Creating List */
#define SCM_LIST_1(obj1) \
- (Scm_NewCons((obj1), SCM_NIL))
+ (Scm_NewCons((obj1), SCM_NULL))
#define SCM_LIST_2(obj1, obj2) \
(Scm_NewCons((obj1), \
- Scm_NewCons((obj2), SCM_NIL)))
+ Scm_NewCons((obj2), SCM_NULL)))
#define SCM_LIST_3(obj1, obj2, obj3) \
(Scm_NewCons((obj1), \
Scm_NewCons((obj2), \
- Scm_NewCons((obj3), SCM_NIL))))
+ Scm_NewCons((obj3), SCM_NULL))))
#define SCM_LIST_4(obj1, obj2, obj3, obj4) \
(Scm_NewCons((obj1), \
Scm_NewCons((obj2), \
Scm_NewCons((obj3), \
- Scm_NewCons((obj4), SCM_NIL)))))
+ Scm_NewCons((obj4), SCM_NULL)))))
#define SCM_LIST_5(obj1, obj2, obj3, obj4, obj5) \
(Scm_NewCons((obj1), \
Scm_NewCons((obj2), \
Scm_NewCons((obj3), \
Scm_NewCons((obj4), \
- Scm_NewCons((obj5), SCM_NIL))))))
+ Scm_NewCons((obj5), SCM_NULL))))))
/*=======================================
Function Declarations
Modified: branches/r5rs/sigscheme/sigschemetype.h
===================================================================
--- branches/r5rs/sigscheme/sigschemetype.h 2005-08-25 22:47:18 UTC (rev 1321)
+++ branches/r5rs/sigscheme/sigschemetype.h 2005-08-26 04:04:32 UTC (rev 1322)
@@ -335,7 +335,7 @@
#define SCM_VALUEPACKET_SET_VALUES(a, v) (SCM_VALUEPACKET_VALUES(a) = (v))
/*============================================================================
- Etcetra variables (Special Symbols like NIL)
+ Etcetra variables (Special Symbols like NULL)
============================================================================*/
#define SCM_ETCP(a) (SCM_TYPE(a) == ScmEtc)
#define SCM_ETC(a) (sigassert(SCM_ETCP(a)), (a))
@@ -363,11 +363,11 @@
#define SCM_C_FUNCPOINTER_VALUE(a) (SCM_C_FUNCPOINTER(a)->obj.c_func_pointer.func)
#define SCM_C_FUNCPOINTER_SET_VALUE(a, funcptr) (SCM_C_FUNCPOINTER_VALUE(a) = funcptr)
-extern ScmObj SigScm_nil, SigScm_true, SigScm_false, SigScm_eof;
+extern ScmObj SigScm_null, SigScm_true, SigScm_false, SigScm_eof;
extern ScmObj SigScm_quote, SigScm_quasiquote, SigScm_unquote, SigScm_unquote_splicing;
extern ScmObj SigScm_unbound, SigScm_undef;
-#define SCM_NIL SigScm_nil
+#define SCM_NULL SigScm_null
#define SCM_TRUE SigScm_true
#define SCM_FALSE SigScm_false
#define SCM_EOF SigScm_eof
@@ -380,8 +380,8 @@
#define SCM_EQ(a, b) ((a) == (b))
#define SCM_NEQ(a, b) ((a) != (b))
-#define SCM_NULLP(a) (SCM_EQ((a), SCM_NIL))
-#define SCM_NNULLP(a) (SCM_NEQ((a), SCM_NIL))
+#define SCM_NULLP(a) (SCM_EQ((a), SCM_NULL))
+#define SCM_NNULLP(a) (SCM_NEQ((a), SCM_NULL))
#define SCM_FALSEP(a) (SCM_EQ((a), SCM_FALSE))
#define SCM_NFALSEP(a) (SCM_NEQ((a), SCM_FALSE))
#define SCM_EOFP(a) (SCM_EQ((a), SCM_EOF))
More information about the uim-commit
mailing list