[uim-commit] r2615 - branches/r5rs/sigscheme
yamaken at freedesktop.org
yamaken at freedesktop.org
Fri Dec 16 14:38:46 PST 2005
Author: yamaken
Date: 2005-12-16 14:38:42 -0800 (Fri, 16 Dec 2005)
New Revision: 2615
Modified:
branches/r5rs/sigscheme/MEMO
branches/r5rs/sigscheme/README
branches/r5rs/sigscheme/encoding.c
branches/r5rs/sigscheme/error.c
branches/r5rs/sigscheme/eval.c
branches/r5rs/sigscheme/fileport.c
branches/r5rs/sigscheme/io.c
branches/r5rs/sigscheme/mbcport.c
branches/r5rs/sigscheme/nullport.c
branches/r5rs/sigscheme/operations-nonstd.c
branches/r5rs/sigscheme/operations-r5rs-deepcadrs.c
branches/r5rs/sigscheme/operations-siod.c
branches/r5rs/sigscheme/operations-srfi1.c
branches/r5rs/sigscheme/operations-srfi2.c
branches/r5rs/sigscheme/operations-srfi23.c
branches/r5rs/sigscheme/operations-srfi34.c
branches/r5rs/sigscheme/operations-srfi38.c
branches/r5rs/sigscheme/operations-srfi6.c
branches/r5rs/sigscheme/operations-srfi60.c
branches/r5rs/sigscheme/operations-srfi8.c
branches/r5rs/sigscheme/operations.c
branches/r5rs/sigscheme/print.c
branches/r5rs/sigscheme/read.c
branches/r5rs/sigscheme/sigscheme.c
branches/r5rs/sigscheme/sigscheme.h
branches/r5rs/sigscheme/sigschemetype-compact.h
branches/r5rs/sigscheme/storage-continuation.c
branches/r5rs/sigscheme/storage-gc.c
branches/r5rs/sigscheme/storage-symbol.c
branches/r5rs/sigscheme/storage.c
branches/r5rs/sigscheme/strport.c
branches/r5rs/sigscheme/test-compact.c
Log:
* sigscheme/operations-r5rs-deepcadrs.c
* sigscheme/mbcport.c
* sigscheme/read.c
* sigscheme/encoding.c
* sigscheme/error.c
* sigscheme/operations-srfi34.c
* sigscheme/operations-srfi38.c
* sigscheme/sigschemetype-compact.h
* sigscheme/storage.c
* sigscheme/operations-srfi2.c
* sigscheme/operations-srfi6.c
* sigscheme/operations-srfi8.c
* sigscheme/strport.c
* sigscheme/operations-srfi60.c
* sigscheme/io.c
* sigscheme/storage-continuation.c
* sigscheme/nullport.c
* sigscheme/operations.c
* sigscheme/operations-nonstd.c
* sigscheme/storage-gc.c
* sigscheme/test-compact.c
* sigscheme/operations-srfi1.c
* sigscheme/storage-symbol.c
* sigscheme/sigscheme.c
* sigscheme/README
* sigscheme/sigscheme.h
* sigscheme/MEMO
* sigscheme/operations-siod.c
* sigscheme/fileport.c
* sigscheme/eval.c
* sigscheme/operations-srfi23.c
* sigscheme/print.c
- Trim white space at end of lines
perl -i -pe 's/\s+$/\n/' sigscheme/*
Modified: branches/r5rs/sigscheme/MEMO
===================================================================
--- branches/r5rs/sigscheme/MEMO 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/MEMO 2005-12-16 22:38:42 UTC (rev 2615)
@@ -13,7 +13,7 @@
In gauche, require works at compile time, not at executiontime. SigScheme
should be so. Instead of require, load actually works at execution time.
-Gauche uses dynamic-load to load shared library.
+Gauche uses dynamic-load to load shared library.
If the implementation cost is low, impelmenting autoloading feature would
be a good idea.
@@ -24,7 +24,7 @@
make uim faster. In addition, it would reduce memory consumption.
In Gauche, find, map, for-each, and remove are applyicable to vector.
-This feature need generic function, I think generic function is not
+This feature need generic function, I think generic function is not
need for SigScheme. So I'll propose 'vector-' prefix to impelement
map, for-each, remove for vector. i.e. vector-map is map for vector.
Modified: branches/r5rs/sigscheme/README
===================================================================
--- branches/r5rs/sigscheme/README 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/README 2005-12-16 22:38:42 UTC (rev 2615)
@@ -10,7 +10,7 @@
SigScheme has following features.
- Cover R5RS almost
-- Support Following SRFIs
+- Support Following SRFIs
- SRFI-2 : And-let*
- SRFI-6 : Basic String Ports
- SRFI-8 : Receive
@@ -18,7 +18,7 @@
- SRFI-34 : Exception Handling for Programs
- SRFI-38 : External Representation for Data with Shared Structure
- SRFI-60 : Integer as Bits
-- Multibyte String Support
+- Multibyte String Support
- SIOD compatible mode
Modified: branches/r5rs/sigscheme/encoding.c
===================================================================
--- branches/r5rs/sigscheme/encoding.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/encoding.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -226,7 +226,7 @@
Public API
=======================================*/
-int
+int
scm_mb_strlen(ScmMultibyteString mbs)
{
int len = 0;
@@ -247,7 +247,7 @@
}
/* FIXME: pick a better name. */
-int
+int
scm_mb_bare_c_strlen(const char *s)
{
ScmMultibyteString mbs;
@@ -257,7 +257,7 @@
return scm_mb_strlen(mbs);
}
-ScmMultibyteString
+ScmMultibyteString
scm_mb_substring(ScmMultibyteString mbs, int i, int len)
{
ScmMultibyteString ret;
@@ -530,7 +530,7 @@
}
/* FIXME: NOT TESTED!
- *
+ *
* G0 <- ASCII (or GB 1988?)
* G1 <- GB2312
*
@@ -750,7 +750,7 @@
* 0xE0 .. 0xEF: lead byte of 2-byte char
* 0xF0 .. 0xFC: lead byte of 2-byte char if JIS X 0213 is used
* 0xFD .. 0xFF: undefined
- *
+ *
* 0x40 .. 0x7E: trailing byte of 2-byte char
* 0x80 .. 0xFC: trailing byte of 2-byte char
*/
@@ -820,7 +820,7 @@
/* Single-byte encodings. Please add any that you know are missing.
* Sorted alphabetically.
- *
+ *
* ASCII
* ISO 646
* ISO-8859-*
Modified: branches/r5rs/sigscheme/error.c
===================================================================
--- branches/r5rs/sigscheme/error.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/error.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -74,7 +74,7 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_init_error(void)
{
scm_gc_protect(&err_obj_tag);
@@ -92,19 +92,19 @@
REGISTER_FUNC_TABLE(scm_error_func_info_table);
}
-int
+int
scm_debug_categories(void)
{
return debug_mask;
}
-void
+void
scm_set_debug_categories(int categories)
{
debug_mask = categories;
}
-int
+int
scm_predefined_debug_categories(void)
{
#if SCM_DEBUG
@@ -124,7 +124,7 @@
#endif /* SCM_DEBUG */
}
-void
+void
scm_categorized_debug(int category, const char *msg, ...)
{
va_list va;
@@ -137,7 +137,7 @@
va_end(va);
}
-void
+void
scm_debug(const char *msg, ...)
{
va_list va;
@@ -163,7 +163,7 @@
#endif
/* The name 'error?' should be reserved for SRFI-35 */
-ScmObj
+ScmObj
scm_p_error_objectp(ScmObj obj)
{
DECLARE_FUNCTION("%%error-object?", procedure_fixed_1);
@@ -172,7 +172,7 @@
}
/* FIXME: make (pair? err-obj) #f */
-ScmObj
+ScmObj
scm_make_error_obj(ScmObj reason, ScmObj objs)
{
DECLARE_INTERNAL_FUNCTION("scm_make_error_obj");
@@ -186,7 +186,7 @@
return LIST_4(err_obj_tag, reason, objs, scm_trace_stack());
}
-void
+void
scm_raise_error(ScmObj err_obj)
{
DECLARE_INTERNAL_FUNCTION("scm_raise_error");
@@ -202,7 +202,7 @@
scm_p_fatal_error(err_obj);
}
-void
+void
scm_fatal_error(const char *msg)
{
/* don't use Scheme-level ports here */
@@ -224,7 +224,7 @@
cb_fatal_error = cb;
}
-ScmObj
+ScmObj
scm_p_fatal_error(ScmObj err_obj)
{
const char *msg;
@@ -244,7 +244,7 @@
/* NOTREACHED */
}
-ScmObj
+ScmObj
scm_p_inspect_error(ScmObj err_obj)
{
ScmObj rest, err_obj_tag, reason, objs, trace_stack;
@@ -281,7 +281,7 @@
return SCM_UNDEF;
}
-ScmObj
+ScmObj
scm_p_backtrace(void)
{
DECLARE_FUNCTION("%%backtrace", procedure_fixed_0);
@@ -291,7 +291,7 @@
return SCM_UNDEF;
}
-int
+int
scm_die(const char *msg, const char *filename, int line)
{
char *reason;
@@ -307,7 +307,7 @@
return 1; /* dummy value for boolean expression */
}
-void
+void
scm_error(const char *msg, ...)
{
va_list va;
@@ -325,7 +325,7 @@
}
/* This function obsoletes scm_error_obj(). */
-void
+void
scm_error_obj(const char *func_name, const char *msg, ScmObj obj)
{
char *reason;
@@ -339,7 +339,7 @@
/* NOTREACHED */
}
-void
+void
scm_show_error_header(void)
{
scm_error_printf(SCM_ERR_HEADER);
@@ -363,7 +363,7 @@
}
#endif /* (SCM_DEBUG && SCM_DEBUG_BACKTRACE_VAL) */
-void
+void
scm_show_backtrace(ScmObj trace_stack)
{
#if SCM_DEBUG
Modified: branches/r5rs/sigscheme/eval.c
===================================================================
--- branches/r5rs/sigscheme/eval.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/eval.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -102,7 +102,7 @@
* list.
* @see scm_eval()
*/
-ScmObj
+ScmObj
scm_extend_environment(ScmObj vars, ScmObj vals, ScmObj env)
{
ScmObj frame, rest_vars, rest_vals;
@@ -130,7 +130,7 @@
}
/** Add a binding to newest frame of an env */
-ScmObj
+ScmObj
scm_add_environment(ScmObj var, ScmObj val, ScmObj env)
{
ScmObj newest_frame;
@@ -162,7 +162,7 @@
*
* @return Reference to the variable. SCM_INVALID_REF if not found.
*/
-ScmRef
+ScmRef
scm_lookup_environment(ScmObj var, ScmObj env)
{
ScmObj frame;
@@ -222,7 +222,7 @@
}
/* A wrapper for call() for internal proper tail recursion */
-ScmObj
+ScmObj
scm_tailcall(ScmObj proc, ScmObj args, ScmEvalState *eval_state)
{
eval_state->ret_type = SCM_RETTYPE_AS_IS;
@@ -232,7 +232,7 @@
/* Wrapper for call(). Just like scm_p_apply(), except ARGS is used
* as given---nothing special is done about the last item in the
* list. */
-ScmObj
+ScmObj
scm_call(ScmObj proc, ScmObj args)
{
ScmEvalState state;
@@ -468,7 +468,7 @@
/*===========================================================================
S-Expression Evaluation
===========================================================================*/
-ScmObj
+ScmObj
scm_p_eval(ScmObj obj, ScmObj env)
{
DECLARE_FUNCTION("eval", procedure_fixed_2);
@@ -478,7 +478,7 @@
return scm_eval(obj, env);
}
-ScmObj
+ScmObj
scm_eval(ScmObj obj, ScmObj env)
{
ScmObj ret = SCM_NULL;
@@ -517,7 +517,7 @@
return ret;
}
-ScmObj
+ScmObj
scm_p_apply(ScmObj proc, ScmObj arg0, ScmObj rest, ScmEvalState *eval_state)
{
ScmQueue q;
@@ -544,7 +544,7 @@
}
/* 'var' must be a symbol as precondition */
-ScmObj
+ScmObj
scm_symbol_value(ScmObj var, ScmObj env)
{
ScmRef ref;
@@ -738,7 +738,7 @@
/**
* Performs (relatively) complex operations on a list translator.
- *
+ *
* @see list_translator, tr_msg
*/
static ScmObj
@@ -872,7 +872,7 @@
/*===========================================================================
R5RS : 4.1 Primitive expression types : 4.1.2 Literal expressions
===========================================================================*/
-ScmObj
+ScmObj
scm_s_quote(ScmObj datum, ScmObj env)
{
DECLARE_FUNCTION("quote", syntax_fixed_1);
@@ -882,7 +882,7 @@
/*===========================================================================
R5RS : 4.1 Primitive expression types : 4.1.4 Procedures
===========================================================================*/
-ScmObj
+ScmObj
scm_s_lambda(ScmObj formals, ScmObj body, ScmObj env)
{
DECLARE_FUNCTION("lambda", syntax_variadic_1);
@@ -897,7 +897,7 @@
/*===========================================================================
R5RS : 4.1 Primitive expression types : 4.1.5 Conditionals
===========================================================================*/
-ScmObj
+ScmObj
scm_s_if(ScmObj test, ScmObj conseq, ScmObj rest, ScmEvalState *eval_state)
{
ScmObj env = eval_state->env;
@@ -930,7 +930,7 @@
/*===========================================================================
R5RS : 4.1 Primitive expression types : 4.1.6 Assignment
===========================================================================*/
-ScmObj
+ScmObj
scm_s_setd(ScmObj sym, ScmObj exp, ScmObj env)
{
ScmObj evaled = SCM_FALSE;
@@ -968,7 +968,7 @@
R5RS : 4.2 Derived expression types : 4.2.1 Conditionals
===========================================================================*/
/* body of 'cond' and also invoked from 'case' and 'guard' of SRFI-34 */
-ScmObj
+ScmObj
scm_s_cond_internal(ScmObj args, ScmObj case_key, ScmEvalState *eval_state)
{
/*
@@ -1029,7 +1029,7 @@
}
}
- /*
+ /*
* Handle the case like follows.
*
* (case 1
@@ -1069,7 +1069,7 @@
return SCM_INVALID;
}
-ScmObj
+ScmObj
scm_s_cond(ScmObj args, ScmEvalState *eval_state)
{
ScmObj ret;
@@ -1079,7 +1079,7 @@
return (VALIDP(ret)) ? ret : SCM_UNDEF;
}
-ScmObj
+ScmObj
scm_s_case(ScmObj key, ScmObj clauses, ScmEvalState *eval_state)
{
ScmObj ret;
@@ -1090,7 +1090,7 @@
return (VALIDP(ret)) ? ret : SCM_UNDEF;
}
-ScmObj
+ScmObj
scm_s_and(ScmObj args, ScmEvalState *eval_state)
{
ScmObj env = eval_state->env;
@@ -1113,7 +1113,7 @@
return expr;
}
-ScmObj
+ScmObj
scm_s_or(ScmObj args, ScmEvalState *eval_state)
{
ScmObj env = eval_state->env;
@@ -1146,7 +1146,7 @@
* bound to the closure. <procname>'s scope must not penetrate to the
* surrounding environment.
*/
-ScmObj
+ScmObj
scm_s_let(ScmObj args, ScmEvalState *eval_state)
{
ScmObj env = eval_state->env;
@@ -1227,7 +1227,7 @@
return scm_s_begin(body, eval_state);
}
-ScmObj
+ScmObj
scm_s_letstar(ScmObj bindings, ScmObj body, ScmEvalState *eval_state)
{
ScmObj env = eval_state->env;
@@ -1270,7 +1270,7 @@
return scm_s_begin(body, eval_state);
}
-ScmObj
+ScmObj
scm_s_letrec(ScmObj bindings, ScmObj body, ScmEvalState *eval_state)
{
ScmObj env = eval_state->env;
@@ -1329,7 +1329,7 @@
/*===========================================================================
R5RS : 4.2 Derived expression types : 4.2.3 Sequencing
===========================================================================*/
-ScmObj
+ScmObj
scm_s_begin(ScmObj args, ScmEvalState *eval_state)
{
ScmObj env = eval_state->env;
@@ -1349,7 +1349,7 @@
/*===========================================================================
R5RS : 4.2 Derived expression types : 4.2.4 Iteration
===========================================================================*/
-ScmObj
+ScmObj
scm_s_do(ScmObj bindings, ScmObj testframe, ScmObj commands, ScmEvalState *eval_state)
{
/*
@@ -1447,7 +1447,7 @@
/*===========================================================================
R5RS : 4.2 Derived expression types : 4.2.5 Delayed evaluation
===========================================================================*/
-ScmObj
+ScmObj
scm_s_delay(ScmObj expr, ScmObj env)
{
DECLARE_FUNCTION("delay", syntax_fixed_1);
@@ -1550,7 +1550,7 @@
}
-ScmObj
+ScmObj
scm_s_quasiquote(ScmObj datum, ScmObj env)
{
qquote_result ret = qquote_internal(datum, env, 1);
@@ -1571,7 +1571,7 @@
}
}
-ScmObj
+ScmObj
scm_s_unquote(ScmObj dummy, ScmObj env)
{
DECLARE_FUNCTION("unquote", syntax_fixed_1);
@@ -1580,7 +1580,7 @@
return SCM_NULL;
}
-ScmObj
+ScmObj
scm_s_unquote_splicing(ScmObj dummy, ScmObj env)
{
DECLARE_FUNCTION("unquote-splicing", syntax_fixed_1);
@@ -1605,7 +1605,7 @@
}
}
-ScmObj
+ScmObj
scm_s_define(ScmObj var, ScmObj rest, ScmObj env)
{
ScmObj procname = SCM_FALSE;
@@ -1662,7 +1662,7 @@
/*=======================================
R5RS : 6.5 Eval
=======================================*/
-ScmObj
+ScmObj
scm_p_scheme_report_environment(ScmObj version)
{
DECLARE_FUNCTION("scheme-report-environment", procedure_fixed_1);
@@ -1682,7 +1682,7 @@
return SCM_INTERACTION_ENV;
}
-ScmObj
+ScmObj
scm_p_null_environment(ScmObj version)
{
DECLARE_FUNCTION("null-environment", procedure_fixed_1);
@@ -1702,7 +1702,7 @@
return SCM_INTERACTION_ENV;
}
-ScmObj
+ScmObj
scm_p_interaction_environment(void)
{
DECLARE_FUNCTION("interaction-environment", procedure_fixed_0);
Modified: branches/r5rs/sigscheme/fileport.c
===================================================================
--- branches/r5rs/sigscheme/fileport.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/fileport.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -122,7 +122,7 @@
* Client code must call this first even if current implementation does not
* contain actual code.
*/
-void
+void
scm_fileport_init(void)
{
return;
Modified: branches/r5rs/sigscheme/io.c
===================================================================
--- branches/r5rs/sigscheme/io.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/io.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -85,7 +85,7 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_init_io(void)
{
scm_fileport_init();
@@ -106,7 +106,7 @@
scm_gc_protect(&scm_current_error_port);
}
-void
+void
scm_set_lib_path(const char *path)
{
scm_lib_path = path;
@@ -132,7 +132,7 @@
return scm_make_port(scm_make_char_port(bport), flag);
}
-void
+void
scm_port_printf(ScmObj port, const char *fmt, ...)
{
va_list args;
@@ -142,7 +142,7 @@
va_end(args);
}
-void
+void
scm_port_vprintf(ScmObj port, const char *fmt, va_list args)
{
SCM_PORT_VPRINTF(port, fmt, args);
@@ -151,14 +151,14 @@
#endif
}
-void
+void
scm_port_newline(ScmObj port)
{
SCM_PORT_PUTS(port, SCM_NEWLINE_STR);
SCM_PORT_FLUSH(port); /* required */
}
-void
+void
scm_error_printf(const char *fmt, ...)
{
va_list args;
@@ -168,13 +168,13 @@
va_end(args);
}
-void
+void
scm_error_vprintf(const char *fmt, va_list args)
{
scm_port_vprintf(scm_current_error_port, fmt, args);
}
-void
+void
scm_error_newline(void)
{
scm_port_newline(scm_current_error_port);
@@ -186,7 +186,7 @@
/*===========================================================================
R5RS : 6.6 Input and Output : 6.6.1 Ports
===========================================================================*/
-ScmObj
+ScmObj
scm_p_call_with_input_file(ScmObj filepath, ScmObj proc)
{
ScmObj port, ret;
@@ -204,7 +204,7 @@
return ret;
}
-ScmObj
+ScmObj
scm_p_call_with_output_file(ScmObj filepath, ScmObj proc)
{
ScmObj port, ret;
@@ -222,7 +222,7 @@
return ret;
}
-ScmObj
+ScmObj
scm_p_input_portp(ScmObj port)
{
DECLARE_FUNCTION("input-port?", procedure_fixed_1);
@@ -232,7 +232,7 @@
return (SCM_PORT_FLAG(port) & SCM_PORTFLAG_INPUT) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_output_portp(ScmObj port)
{
DECLARE_FUNCTION("output-port?", procedure_fixed_1);
@@ -242,7 +242,7 @@
return (SCM_PORT_FLAG(port) & SCM_PORTFLAG_OUTPUT) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_current_input_port(void)
{
DECLARE_FUNCTION("current-input-port", procedure_fixed_0);
@@ -250,7 +250,7 @@
return scm_current_input_port;
}
-ScmObj
+ScmObj
scm_p_current_output_port(void)
{
DECLARE_FUNCTION("current-output-port", procedure_fixed_0);
@@ -258,7 +258,7 @@
return scm_current_output_port;
}
-ScmObj
+ScmObj
scm_p_with_input_from_file(ScmObj filepath, ScmObj thunk)
{
ScmObj saved_port, ret;
@@ -278,7 +278,7 @@
return ret;
}
-ScmObj
+ScmObj
scm_p_with_output_to_file(ScmObj filepath, ScmObj thunk)
{
ScmObj saved_port, ret;
@@ -298,7 +298,7 @@
return ret;
}
-ScmObj
+ScmObj
scm_p_open_input_file(ScmObj filepath)
{
ScmBytePort *bport;
@@ -313,7 +313,7 @@
return scm_make_port(scm_make_char_port(bport), SCM_PORTFLAG_INPUT);
}
-ScmObj
+ScmObj
scm_p_open_output_file(ScmObj filepath)
{
ScmBytePort *bport;
@@ -328,7 +328,7 @@
return scm_make_port(scm_make_char_port(bport), SCM_PORTFLAG_OUTPUT);
}
-ScmObj
+ScmObj
scm_p_close_input_port(ScmObj port)
{
int flag;
@@ -344,7 +344,7 @@
return SCM_UNDEF;
}
-ScmObj
+ScmObj
scm_p_close_output_port(ScmObj port)
{
int flag;
@@ -373,7 +373,7 @@
} while (/* CONSTCOND */ 0)
-ScmObj
+ScmObj
scm_p_read(ScmObj args)
{
ScmObj port;
@@ -383,7 +383,7 @@
return scm_read(port);
}
-ScmObj
+ScmObj
scm_p_read_char(ScmObj args)
{
ScmObj port;
@@ -399,7 +399,7 @@
return scm_make_char(ch);
}
-ScmObj
+ScmObj
scm_p_peek_char(ScmObj args)
{
ScmObj port;
@@ -415,7 +415,7 @@
return scm_make_char(ch);
}
-ScmObj
+ScmObj
scm_p_eof_objectp(ScmObj obj)
{
DECLARE_FUNCTION("eof-object?", procedure_fixed_1);
@@ -423,7 +423,7 @@
return (EOFP(obj)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_char_readyp(ScmObj args)
{
ScmObj port;
@@ -437,7 +437,7 @@
/*===========================================================================
R5RS : 6.6 Input and Output : 6.6.3 Output
===========================================================================*/
-ScmObj
+ScmObj
scm_p_write(ScmObj obj, ScmObj args)
{
ScmObj port;
@@ -448,7 +448,7 @@
return SCM_UNDEF;
}
-ScmObj
+ScmObj
scm_p_display(ScmObj obj, ScmObj args)
{
ScmObj port;
@@ -459,7 +459,7 @@
return SCM_UNDEF;
}
-ScmObj
+ScmObj
scm_p_newline(ScmObj args)
{
ScmObj port;
@@ -470,7 +470,7 @@
return SCM_UNDEF;
}
-ScmObj
+ScmObj
scm_p_write_char(ScmObj obj, ScmObj args)
{
ScmObj port;
@@ -486,7 +486,7 @@
/*===========================================================================
R5RS : 6.6 Input and Output : 6.6.4 System Interface
===========================================================================*/
-ScmObj
+ScmObj
scm_load(const char *c_filename)
{
#if !SCM_GCC4_READY_GC
@@ -586,7 +586,7 @@
}
}
-ScmObj
+ScmObj
scm_p_load(ScmObj filename)
{
DECLARE_FUNCTION("load", procedure_fixed_1);
@@ -658,7 +658,7 @@
argv = scm_realloc(argv, sizeof(char *) * (++argc + 1));
argv[argc] = NULL;
}
- }
+ }
argv[argc] = NULL;
return argv;
Modified: branches/r5rs/sigscheme/mbcport.c
===================================================================
--- branches/r5rs/sigscheme/mbcport.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/mbcport.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -252,7 +252,7 @@
SCM_MBS_SET_SIZE(mbs, end - port->rbuf);
mbc = SCM_CHARCODEC_SCAN_CHAR(port->codec, mbs);
-
+
if (SCM_MBCINFO_ERRORP(mbc))
SCM_CHARPORT_ERROR(port, "ScmMultibyteCharPort: broken character");
if (!SCM_MBCINFO_INCOMPLETEP(mbc) && SCM_MBCINFO_GET_SIZE(mbc))
Modified: branches/r5rs/sigscheme/nullport.c
===================================================================
--- branches/r5rs/sigscheme/nullport.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/nullport.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -103,7 +103,7 @@
* Client code must call this first even if current implementation does not
* contain actual code.
*/
-void
+void
scm_nullport_init(void)
{
}
Modified: branches/r5rs/sigscheme/operations-nonstd.c
===================================================================
--- branches/r5rs/sigscheme/operations-nonstd.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/operations-nonstd.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -62,7 +62,7 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_initialize_nonstd_features(void)
{
REGISTER_FUNC_TABLE(nonstd_func_info_table);
@@ -78,7 +78,7 @@
* procedure with global-variable-bound?.
*/
/* The implementation is fully compatible with SIOD */
-ScmObj
+ScmObj
scm_p_symbol_boundp(ScmObj sym, ScmObj rest)
{
ScmObj env = SCM_INVALID;
@@ -97,7 +97,7 @@
}
/* SIOD compatible */
-ScmObj
+ScmObj
scm_p_load_path(void)
{
DECLARE_FUNCTION("load-path", procedure_fixed_0);
@@ -105,7 +105,7 @@
}
/* FIXME: add ScmObj scm_require(const char *c_filename) */
-ScmObj
+ScmObj
scm_p_require(ScmObj filename)
{
ScmObj loaded_str = SCM_FALSE;
@@ -150,7 +150,7 @@
* TODO: replace original specification with a SRFI standard or other de facto
* standard
*/
-ScmObj
+ScmObj
scm_p_provide(ScmObj feature)
{
DECLARE_FUNCTION("provide", procedure_fixed_1);
@@ -166,7 +166,7 @@
* TODO: replace original specification with a SRFI standard or other de facto
* standard
*/
-ScmObj
+ScmObj
scm_p_providedp(ScmObj feature)
{
DECLARE_FUNCTION("provided?", procedure_fixed_1);
@@ -180,7 +180,7 @@
* TODO: describe compatibility with de facto standard of other Scheme
* implementations
*/
-ScmObj
+ScmObj
scm_p_file_existsp(ScmObj filepath)
{
FILE *f;
@@ -197,7 +197,7 @@
}
/* TODO: remove to ensure security */
-ScmObj
+ScmObj
scm_p_delete_file(ScmObj filepath)
{
DECLARE_FUNCTION("delete-file", procedure_fixed_1);
Modified: branches/r5rs/sigscheme/operations-r5rs-deepcadrs.c
===================================================================
--- branches/r5rs/sigscheme/operations-r5rs-deepcadrs.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/operations-r5rs-deepcadrs.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -61,134 +61,134 @@
/*=======================================
Function Implementations
=======================================*/
-ScmObj
+ScmObj
scm_p_caaar(ScmObj lst)
{
DECLARE_FUNCTION("caaar", procedure_fixed_1);
return scm_p_car( scm_p_car( scm_p_car(lst) ));
}
-ScmObj
+ScmObj
scm_p_caadr(ScmObj lst)
{
DECLARE_FUNCTION("caadr", procedure_fixed_1);
return scm_p_car( scm_p_car( scm_p_cdr(lst) ));
}
-ScmObj
+ScmObj
scm_p_cadar(ScmObj lst)
{
DECLARE_FUNCTION("cadar", procedure_fixed_1);
return scm_p_car( scm_p_cdr( scm_p_car(lst) ));
}
-ScmObj
+ScmObj
scm_p_cdaar(ScmObj lst)
{
DECLARE_FUNCTION("cdaar", procedure_fixed_1);
return scm_p_cdr( scm_p_car( scm_p_car(lst) ));
}
-ScmObj
+ScmObj
scm_p_cdadr(ScmObj lst)
{
DECLARE_FUNCTION("cdadr", procedure_fixed_1);
return scm_p_cdr( scm_p_car( scm_p_cdr(lst) ));
}
-ScmObj
+ScmObj
scm_p_cddar(ScmObj lst)
{
DECLARE_FUNCTION("cddar", procedure_fixed_1);
return scm_p_cdr( scm_p_cdr( scm_p_car(lst) ));
}
-ScmObj
+ScmObj
scm_p_caaaar(ScmObj lst)
{
DECLARE_FUNCTION("caaaar", procedure_fixed_1);
return scm_p_car( scm_p_car( scm_p_car( scm_p_car(lst) )));
}
-ScmObj
+ScmObj
scm_p_caaadr(ScmObj lst)
{
DECLARE_FUNCTION("caaadr", procedure_fixed_1);
return scm_p_car( scm_p_car( scm_p_car( scm_p_cdr(lst) )));
}
-ScmObj
+ScmObj
scm_p_caadar(ScmObj lst)
{
DECLARE_FUNCTION("caadar", procedure_fixed_1);
return scm_p_car( scm_p_car( scm_p_cdr( scm_p_car(lst) )));
}
-ScmObj
+ScmObj
scm_p_caaddr(ScmObj lst)
{
DECLARE_FUNCTION("caaddr", procedure_fixed_1);
return scm_p_car( scm_p_car( scm_p_cdr( scm_p_cdr(lst) )));
}
-ScmObj
+ScmObj
scm_p_cadaar(ScmObj lst)
{
DECLARE_FUNCTION("cadaar", procedure_fixed_1);
return scm_p_car( scm_p_cdr( scm_p_car( scm_p_car(lst) )));
}
-ScmObj
+ScmObj
scm_p_cadadr(ScmObj lst)
{
DECLARE_FUNCTION("cadadr", procedure_fixed_1);
return scm_p_car( scm_p_cdr( scm_p_car( scm_p_cdr(lst) )));
}
-ScmObj
+ScmObj
scm_p_caddar(ScmObj lst)
{
DECLARE_FUNCTION("caddar", procedure_fixed_1);
return scm_p_car( scm_p_cdr( scm_p_cdr( scm_p_car(lst) )));
}
-ScmObj
+ScmObj
scm_p_cadddr(ScmObj lst)
{
DECLARE_FUNCTION("cadddr", procedure_fixed_1);
return scm_p_car( scm_p_cdr( scm_p_cdr( scm_p_cdr(lst) )));
}
-ScmObj
+ScmObj
scm_p_cdaaar(ScmObj lst)
{
DECLARE_FUNCTION("cdaaar", procedure_fixed_1);
return scm_p_cdr( scm_p_car( scm_p_car( scm_p_car(lst) )));
}
-ScmObj
+ScmObj
scm_p_cdaadr(ScmObj lst)
{
DECLARE_FUNCTION("cdaadr", procedure_fixed_1);
return scm_p_cdr( scm_p_car( scm_p_car( scm_p_cdr(lst) )));
}
-ScmObj
+ScmObj
scm_p_cdadar(ScmObj lst)
{
DECLARE_FUNCTION("cdadar", procedure_fixed_1);
return scm_p_cdr( scm_p_car( scm_p_cdr( scm_p_car(lst) )));
}
-ScmObj
+ScmObj
scm_p_cdaddr(ScmObj lst)
{
DECLARE_FUNCTION("cdaddr", procedure_fixed_1);
return scm_p_cdr( scm_p_car( scm_p_cdr( scm_p_cdr(lst) )));
}
-ScmObj
+ScmObj
scm_p_cddaar(ScmObj lst)
{
DECLARE_FUNCTION("cddaar", procedure_fixed_1);
return scm_p_cdr( scm_p_cdr( scm_p_car( scm_p_car(lst) )));
}
-ScmObj
+ScmObj
scm_p_cddadr(ScmObj lst)
{
DECLARE_FUNCTION("cddadr", procedure_fixed_1);
return scm_p_cdr( scm_p_cdr( scm_p_car( scm_p_cdr(lst) )));
}
-ScmObj
+ScmObj
scm_p_cdddar(ScmObj lst)
{
DECLARE_FUNCTION("cdddar", procedure_fixed_1);
return scm_p_cdr( scm_p_cdr( scm_p_cdr( scm_p_car(lst) )));
}
-ScmObj
+ScmObj
scm_p_cddddr(ScmObj lst)
{
DECLARE_FUNCTION("cddddr", procedure_fixed_1);
Modified: branches/r5rs/sigscheme/operations-siod.c
===================================================================
--- branches/r5rs/sigscheme/operations-siod.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/operations-siod.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -98,7 +98,7 @@
TODO : remove these functions!
=======================================*/
-void
+void
scm_initialize_siod(void)
{
REGISTER_FUNC_TABLE(siod_func_info_table);
@@ -129,7 +129,7 @@
* - make the portable proc interface similar to a de facto standard of other
* Scheme implementations if existing
*/
-ScmObj
+ScmObj
scm_p_symbol_value(ScmObj var)
{
DECLARE_FUNCTION("symbol-value", procedure_fixed_1);
@@ -146,7 +146,7 @@
* - make the portable proc interface similar to a de facto standard of other
* Scheme implementations if existing
*/
-ScmObj
+ScmObj
scm_p_set_symbol_valued(ScmObj var, ScmObj val)
{
DECLARE_FUNCTION("set-symbol-value!", procedure_fixed_2);
@@ -156,7 +156,7 @@
return SCM_SYMBOL_SET_VCELL(var, val);
}
-ScmObj
+ScmObj
scm_p_siod_equal(ScmObj obj1, ScmObj obj2)
{
DECLARE_FUNCTION("=", procedure_fixed_2);
@@ -171,7 +171,7 @@
return SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_the_environment(ScmEvalState *eval_state)
{
DECLARE_FUNCTION("the-environment", procedure_fixed_tailrec_0);
@@ -181,7 +181,7 @@
return eval_state->env;
}
-ScmObj
+ScmObj
scm_p_closure_code(ScmObj closure)
{
ScmObj exp, body;
@@ -194,11 +194,11 @@
body = CADR(exp);
else
body = CONS(scm_intern("begin"), CDR(exp));
-
+
return CONS(CAR(exp), body);
}
-ScmObj
+ScmObj
scm_p_verbose(ScmObj args)
{
DECLARE_FUNCTION("verbose", procedure_variadic_0);
@@ -212,14 +212,14 @@
return scm_make_int(sscm_verbose_level);
}
-ScmObj
+ScmObj
scm_p_eof_val(void)
{
DECLARE_FUNCTION("eof-val", procedure_fixed_0);
return SCM_EOF;
}
-ScmObj
+ScmObj
scm_s_undefine(ScmObj var, ScmObj env)
{
ScmRef val;
@@ -236,13 +236,13 @@
return SCM_FALSE;
}
-long
+long
scm_get_verbose_level(void)
{
return sscm_verbose_level;
}
-void
+void
scm_set_verbose_level(long level)
{
if (level < 0)
Modified: branches/r5rs/sigscheme/operations-srfi1.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi1.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/operations-srfi1.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -60,7 +60,7 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_initialize_srfi1(void)
{
/*=======================================================================
@@ -72,14 +72,14 @@
/*==============================================================================
SRFI1 : The procedures : Constructors
==============================================================================*/
-ScmObj
+ScmObj
scm_p_srfi1_xcons(ScmObj a, ScmObj b)
{
DECLARE_FUNCTION("xcons", procedure_fixed_2);
return CONS(b, a);
}
-ScmObj
+ScmObj
scm_p_srfi1_consstar(ScmObj args)
{
ScmObj tail_cons = SCM_FALSE;
@@ -101,7 +101,7 @@
return args;
}
-ScmObj
+ScmObj
scm_p_srfi1_make_list(ScmObj length, ScmObj args)
{
ScmObj filler = SCM_FALSE;
@@ -128,7 +128,7 @@
return head;
}
-ScmObj
+ScmObj
scm_p_srfi1_list_tabulate(ScmObj scm_n, ScmObj args)
{
ScmObj proc = SCM_FALSE;
@@ -160,7 +160,7 @@
return head;
}
-ScmObj
+ScmObj
scm_p_srfi1_list_copy(ScmObj lst)
{
ScmObj head = SCM_FALSE;
@@ -192,7 +192,7 @@
return head;
}
-ScmObj
+ScmObj
scm_p_srfi1_circular_list(ScmObj args)
{
DECLARE_FUNCTION("circular-list", procedure_variadic_0);
@@ -204,7 +204,7 @@
return args;
}
-ScmObj
+ScmObj
scm_p_srfi1_iota(ScmObj scm_count, ScmObj args)
{
ScmObj scm_start = SCM_FALSE;
@@ -244,14 +244,14 @@
/*==============================================================================
SRFI1 : The procedures : Predicates
==============================================================================*/
-ScmObj
+ScmObj
scm_p_srfi1_proper_listp(ScmObj lst)
{
DECLARE_FUNCTION("proper-list?", procedure_fixed_1);
return scm_p_listp(lst);
}
-ScmObj
+ScmObj
scm_p_srfi1_circular_listp(ScmObj obj)
{
ScmObj slow = obj;
@@ -277,7 +277,7 @@
return SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_srfi1_dotted_listp(ScmObj obj)
{
ScmObj slow = obj;
@@ -303,14 +303,14 @@
return SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_srfi1_not_pairp(ScmObj pair)
{
DECLARE_FUNCTION("not-pair?", procedure_fixed_1);
return CONSP(pair) ? SCM_FALSE : SCM_TRUE;
}
-ScmObj
+ScmObj
scm_p_srfi1_null_listp(ScmObj lst)
{
DECLARE_FUNCTION("null-list?", procedure_fixed_1);
@@ -318,7 +318,7 @@
return NULLP(lst) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_srfi1_listequal(ScmObj eqproc, ScmObj args)
{
ScmObj first_lst = SCM_FALSE;
@@ -368,84 +368,84 @@
return SCM_TRUE;
}
-ScmObj
+ScmObj
scm_p_srfi1_first(ScmObj lst)
{
DECLARE_FUNCTION("first", procedure_fixed_1);
return scm_p_car(lst);
}
-ScmObj
+ScmObj
scm_p_srfi1_second(ScmObj lst)
{
DECLARE_FUNCTION("second", procedure_fixed_1);
return scm_p_cadr(lst);
}
-ScmObj
+ScmObj
scm_p_srfi1_third(ScmObj lst)
{
DECLARE_FUNCTION("third", procedure_fixed_1);
return scm_p_caddr(lst);
}
-ScmObj
+ScmObj
scm_p_srfi1_fourth(ScmObj lst)
{
DECLARE_FUNCTION("fourth", procedure_fixed_1);
return scm_p_cadddr(lst);
}
-ScmObj
+ScmObj
scm_p_srfi1_fifth(ScmObj lst)
{
DECLARE_FUNCTION("fifth", procedure_fixed_1);
return scm_p_car(scm_p_cddddr(lst));
}
-ScmObj
+ScmObj
scm_p_srfi1_sixth(ScmObj lst)
{
DECLARE_FUNCTION("sixth", procedure_fixed_1);
return scm_p_cadr(scm_p_cddddr(lst));
}
-ScmObj
+ScmObj
scm_p_srfi1_seventh(ScmObj lst)
{
DECLARE_FUNCTION("seventh", procedure_fixed_1);
return scm_p_caddr(scm_p_cddddr(lst));
}
-ScmObj
+ScmObj
scm_p_srfi1_eighth(ScmObj lst)
{
DECLARE_FUNCTION("eighth", procedure_fixed_1);
return scm_p_cadddr(scm_p_cddddr(lst));
}
-ScmObj
+ScmObj
scm_p_srfi1_ninth(ScmObj lst)
{
DECLARE_FUNCTION("ninth", procedure_fixed_1);
return scm_p_car(scm_p_cddddr(scm_p_cddddr(lst)));
}
-ScmObj
+ScmObj
scm_p_srfi1_tenth(ScmObj lst)
{
DECLARE_FUNCTION("tenth", procedure_fixed_1);
return scm_p_cadr(scm_p_cddddr(scm_p_cddddr(lst)));
}
-ScmObj
+ScmObj
scm_p_srfi1_carpluscdr(ScmObj lst)
{
DECLARE_FUNCTION("car+cdr", procedure_fixed_1);
return scm_p_values(LIST_2(CAR(lst), CDR(lst)));
}
-ScmObj
+ScmObj
scm_p_srfi1_take(ScmObj lst, ScmObj scm_idx)
{
ScmObj tmp = lst;
@@ -476,7 +476,7 @@
return ret;
}
-ScmObj
+ScmObj
scm_p_srfi1_drop(ScmObj lst, ScmObj scm_idx)
{
ScmObj ret = lst;
@@ -497,7 +497,7 @@
return ret;
}
-ScmObj
+ScmObj
scm_p_srfi1_take_right(ScmObj lst, ScmObj scm_elem)
{
ScmObj tmp = lst;
@@ -514,7 +514,7 @@
return scm_p_srfi1_drop(lst, scm_make_int(len));
}
-ScmObj
+ScmObj
scm_p_srfi1_drop_right(ScmObj lst, ScmObj scm_elem)
{
ScmObj tmp = lst;
@@ -531,7 +531,7 @@
return scm_p_srfi1_take(lst, scm_make_int(len));
}
-ScmObj
+ScmObj
scm_p_srfi1_taked(ScmObj lst, ScmObj scm_idx)
{
ScmObj tmp = lst;
@@ -552,7 +552,7 @@
return lst;
}
-ScmObj
+ScmObj
scm_p_srfi1_drop_rightd(ScmObj lst, ScmObj scm_idx)
{
ScmObj tmp = lst;
@@ -577,7 +577,7 @@
return lst;
}
-ScmObj
+ScmObj
scm_p_srfi1_split_at(ScmObj lst, ScmObj idx)
{
DECLARE_FUNCTION("split-at", procedure_fixed_2);
@@ -586,7 +586,7 @@
scm_p_srfi1_drop(lst, idx)));
}
-ScmObj
+ScmObj
scm_p_srfi1_split_atd(ScmObj lst, ScmObj idx)
{
ScmObj drop = scm_p_srfi1_drop(lst, idx);
@@ -596,7 +596,7 @@
drop));
}
-ScmObj
+ScmObj
scm_p_srfi1_last(ScmObj lst)
{
DECLARE_FUNCTION("last", procedure_fixed_1);
@@ -608,7 +608,7 @@
return CAR(scm_p_srfi1_last_pair(lst));
}
-ScmObj
+ScmObj
scm_p_srfi1_last_pair(ScmObj lst)
{
DECLARE_FUNCTION("last-pair", procedure_fixed_1);
@@ -626,7 +626,7 @@
/*==============================================================================
SRFI1 : The procedures : Miscellaneous
==============================================================================*/
-ScmObj
+ScmObj
scm_p_srfi1_lengthplus(ScmObj lst)
{
DECLARE_FUNCTION("length+", procedure_fixed_1);
@@ -638,7 +638,7 @@
return scm_p_length(lst);
}
-ScmObj
+ScmObj
scm_p_srfi1_concatenate(ScmObj args)
{
ScmObj lsts_of_lst = CAR(args);
Modified: branches/r5rs/sigscheme/operations-srfi2.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi2.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/operations-srfi2.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -61,7 +61,7 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_initialize_srfi2(void)
{
/*=======================================================================
@@ -70,7 +70,7 @@
REGISTER_FUNC_TABLE(srfi2_func_info_table);
}
-ScmObj
+ScmObj
scm_s_srfi2_and_letstar(ScmObj claws, ScmObj body, ScmEvalState *eval_state)
{
ScmObj env = eval_state->env;
Modified: branches/r5rs/sigscheme/operations-srfi23.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi23.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/operations-srfi23.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -60,7 +60,7 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_initialize_srfi23(void)
{
/*=======================================================================
@@ -85,7 +85,7 @@
* error object to an exception handler. The default exception handler then
* might do something as described in points 1 to 3.
*/
-ScmObj
+ScmObj
scm_p_srfi23_error(ScmObj reason, ScmObj args)
{
ScmObj err_obj;
Modified: branches/r5rs/sigscheme/operations-srfi34.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi34.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/operations-srfi34.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -119,7 +119,7 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_initialize_srfi34(void)
{
ScmObj *const *var;
@@ -221,7 +221,7 @@
/* with-exception-handler */
-ScmObj
+ScmObj
scm_p_srfi34_with_exception_handler(ScmObj handler, ScmObj thunk)
{
ScmObj handlers;
@@ -236,7 +236,7 @@
/* raise */
-ScmObj
+ScmObj
scm_p_srfi34_raise(ScmObj obj)
{
ScmObj handler, rest_handlers, thunk, err_obj;
@@ -281,7 +281,7 @@
proc_guard_int = scm_s_lambda(LIST_1(sym_guard_k),
LIST_1(LIST_2(syn_guard_internal, sym_guard_k)),
eval_state->env);
-
+
ret = scm_call_with_current_continuation(proc_guard_int, eval_state);
eval_state->env = lex_env;
eval_state->ret_type = SCM_RETTYPE_AS_IS;
Modified: branches/r5rs/sigscheme/operations-srfi38.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi38.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/operations-srfi38.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -59,7 +59,7 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_initialize_srfi38(void)
{
REGISTER_FUNC_TABLE(srfi38_func_info_table);
@@ -73,7 +73,7 @@
/*=============================================================================
SRFI38 : External Representation for Data With Shared Structure
=============================================================================*/
-ScmObj
+ScmObj
scm_p_srfi38_write_with_shared_structure(ScmObj obj, ScmObj args)
{
ScmObj port = scm_current_output_port;
Modified: branches/r5rs/sigscheme/operations-srfi6.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi6.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/operations-srfi6.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -64,7 +64,7 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_initialize_srfi6(void)
{
scm_strport_init();
@@ -81,7 +81,7 @@
scm_gc_unprotect((ScmObj *)opaque);
}
-ScmObj
+ScmObj
scm_p_srfi6_open_input_string(ScmObj str)
{
ScmObj *hold_str;
@@ -97,7 +97,7 @@
return scm_make_port(scm_make_char_port(bport), SCM_PORTFLAG_INPUT);
}
-ScmObj
+ScmObj
scm_p_srfi6_open_output_string(void)
{
ScmBytePort *bport;
@@ -107,7 +107,7 @@
return scm_make_port(scm_make_char_port(bport), SCM_PORTFLAG_OUTPUT);
}
-ScmObj
+ScmObj
scm_p_srfi6_get_output_string(ScmObj port)
{
ScmBaseCharPort *cport;
Modified: branches/r5rs/sigscheme/operations-srfi60.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi60.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/operations-srfi60.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -80,7 +80,7 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_initialize_srfi60(void)
{
/*=======================================================================
@@ -122,7 +122,7 @@
BITWISE_OPERATION_BODY(^, "logxor");
}
-ScmObj
+ScmObj
scm_p_srfi60_lognot(ScmObj n)
{
DECLARE_FUNCTION("lognot", procedure_fixed_1);
@@ -132,7 +132,7 @@
return scm_make_int(~SCM_INT_VALUE(n));
}
-ScmObj
+ScmObj
scm_p_srfi60_bitwise_if(ScmObj mask, ScmObj n0, ScmObj n1)
{
int result, c_mask;
@@ -148,7 +148,7 @@
return scm_make_int(result);
}
-ScmObj
+ScmObj
scm_p_srfi60_logtest(ScmObj j, ScmObj k)
{
DECLARE_FUNCTION("logtest", procedure_fixed_2);
Modified: branches/r5rs/sigscheme/operations-srfi8.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi8.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/operations-srfi8.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -60,7 +60,7 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_initialize_srfi8(void)
{
/*=======================================================================
@@ -72,7 +72,7 @@
/*=============================================================================
SRFI8 : Receive
=============================================================================*/
-ScmObj
+ScmObj
scm_s_srfi8_receive(ScmObj formals, ScmObj expr, ScmObj body, ScmEvalState *eval_state)
{
/*
Modified: branches/r5rs/sigscheme/operations.c
===================================================================
--- branches/r5rs/sigscheme/operations.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/operations.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -71,7 +71,7 @@
/*==============================================================================
R5RS : 6.1 Equivalence predicates
==============================================================================*/
-ScmObj
+ScmObj
scm_p_eqvp(ScmObj obj1, ScmObj obj2)
{
enum ScmObjType type;
@@ -109,14 +109,14 @@
return SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_eqp(ScmObj obj1, ScmObj obj2)
{
DECLARE_FUNCTION("eq?", procedure_fixed_2);
return (EQ(obj1, obj2)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_equalp(ScmObj obj1, ScmObj obj2)
{
enum ScmObjType type;
@@ -209,7 +209,7 @@
==============================================================================*/
/* Note: SigScheme supports only the integer part of the numerical tower. */
-ScmObj
+ScmObj
scm_p_add(ScmObj left, ScmObj right, enum ScmReductionState *state)
{
int result = 0;
@@ -233,7 +233,7 @@
return scm_make_int(result);
}
-ScmObj
+ScmObj
scm_p_multiply(ScmObj left, ScmObj right, enum ScmReductionState *state)
{
int result = 1;
@@ -257,7 +257,7 @@
return scm_make_int(result);
}
-ScmObj
+ScmObj
scm_p_subtract(ScmObj left, ScmObj right, enum ScmReductionState *state)
{
int result = 0;
@@ -281,7 +281,7 @@
return scm_make_int(result);
}
-ScmObj
+ScmObj
scm_p_divide(ScmObj left, ScmObj right, enum ScmReductionState *state)
{
int result = 1;
@@ -306,14 +306,14 @@
return scm_make_int(result);
}
-ScmObj
+ScmObj
scm_p_numberp(ScmObj obj)
{
DECLARE_FUNCTION("number?", procedure_fixed_1);
return (INTP(obj)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_equal(ScmObj left, ScmObj right, enum ScmReductionState *state)
{
DECLARE_FUNCTION("=", reduction_operator);
@@ -338,28 +338,28 @@
COMPARATOR_BODY(==);
}
-ScmObj
+ScmObj
scm_p_less(ScmObj left, ScmObj right, enum ScmReductionState *state)
{
DECLARE_FUNCTION("<", reduction_operator);
COMPARATOR_BODY(<);
}
-ScmObj
+ScmObj
scm_p_less_eq(ScmObj left, ScmObj right, enum ScmReductionState *state)
{
DECLARE_FUNCTION("<=", reduction_operator);
COMPARATOR_BODY(<=);
}
-ScmObj
+ScmObj
scm_p_greater(ScmObj left, ScmObj right, enum ScmReductionState *state)
{
DECLARE_FUNCTION(">", reduction_operator);
COMPARATOR_BODY(>);
}
-ScmObj
+ScmObj
scm_p_greater_eq(ScmObj left, ScmObj right, enum ScmReductionState *state)
{
DECLARE_FUNCTION(">=", reduction_operator);
@@ -367,7 +367,7 @@
#undef COMPARATOR_BODY
}
-ScmObj
+ScmObj
scm_p_zerop(ScmObj scm_num)
{
DECLARE_FUNCTION("zero?", procedure_fixed_1);
@@ -375,7 +375,7 @@
return (SCM_INT_VALUE(scm_num) == 0) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_positivep(ScmObj scm_num)
{
DECLARE_FUNCTION("positive?", procedure_fixed_1);
@@ -383,7 +383,7 @@
return (SCM_INT_VALUE(scm_num) > 0) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_negativep(ScmObj scm_num)
{
DECLARE_FUNCTION("negative?", procedure_fixed_1);
@@ -391,7 +391,7 @@
return (SCM_INT_VALUE(scm_num) < 0) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_oddp(ScmObj scm_num)
{
DECLARE_FUNCTION("odd?", procedure_fixed_1);
@@ -399,7 +399,7 @@
return (SCM_INT_VALUE(scm_num) & 0x1) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_evenp(ScmObj scm_num)
{
DECLARE_FUNCTION("even?", procedure_fixed_1);
@@ -407,7 +407,7 @@
return (SCM_INT_VALUE(scm_num) & 0x1) ? SCM_FALSE : SCM_TRUE;
}
-ScmObj
+ScmObj
scm_p_max(ScmObj left, ScmObj right, enum ScmReductionState *state)
{
DECLARE_FUNCTION("max", reduction_operator);
@@ -419,7 +419,7 @@
return SCM_INT_VALUE(left) > SCM_INT_VALUE(right) ? left : right;
}
-ScmObj
+ScmObj
scm_p_min(ScmObj left, ScmObj right, enum ScmReductionState *state)
{
DECLARE_FUNCTION("min", reduction_operator);
@@ -432,7 +432,7 @@
}
-ScmObj
+ScmObj
scm_p_abs(ScmObj scm_num)
{
int num = 0;
@@ -445,7 +445,7 @@
return (num < 0) ? scm_make_int(-num) : scm_num;
}
-ScmObj
+ScmObj
scm_p_quotient(ScmObj scm_n1, ScmObj scm_n2)
{
int n1 = 0;
@@ -464,7 +464,7 @@
return scm_make_int((int)(n1 / n2));
}
-ScmObj
+ScmObj
scm_p_modulo(ScmObj scm_n1, ScmObj scm_n2)
{
int n1 = 0;
@@ -491,7 +491,7 @@
return scm_make_int(rem);
}
-ScmObj
+ScmObj
scm_p_remainder(ScmObj scm_n1, ScmObj scm_n2)
{
int n1 = 0;
@@ -513,7 +513,7 @@
/*==============================================================================
R5RS : 6.2 Numbers : 6.2.6 Numerical input and output
==============================================================================*/
-ScmObj
+ScmObj
scm_p_number2string(ScmObj num, ScmObj args)
{
char buf[sizeof(int)*CHAR_BIT + 1];
@@ -562,7 +562,7 @@
return scm_make_mutable_string_copying(p);
}
-ScmObj
+ScmObj
scm_p_string2number(ScmObj str, ScmObj args)
{
ScmObj radix = SCM_FALSE;
@@ -601,14 +601,14 @@
/*==============================================================================
R5RS : 6.3 Other data types : 6.3.1 Booleans
==============================================================================*/
-ScmObj
+ScmObj
scm_p_not(ScmObj obj)
{
DECLARE_FUNCTION("not", procedure_fixed_1);
return (FALSEP(obj)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_booleanp(ScmObj obj)
{
DECLARE_FUNCTION("boolean?", procedure_fixed_1);
@@ -618,7 +618,7 @@
/*==============================================================================
R5RS : 6.3 Other data types : 6.3.2 Pairs and lists
==============================================================================*/
-ScmObj
+ScmObj
scm_p_car(ScmObj obj)
{
DECLARE_FUNCTION("car", procedure_fixed_1);
@@ -632,7 +632,7 @@
return CAR(obj);
}
-ScmObj
+ScmObj
scm_p_cdr(ScmObj obj)
{
DECLARE_FUNCTION("cdr", procedure_fixed_1);
@@ -646,21 +646,21 @@
return CDR(obj);
}
-ScmObj
+ScmObj
scm_p_pairp(ScmObj obj)
{
DECLARE_FUNCTION("pair?", procedure_fixed_1);
return (CONSP(obj)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_cons(ScmObj car, ScmObj cdr)
{
DECLARE_FUNCTION("cons", procedure_fixed_2);
return CONS(car, cdr);
}
-ScmObj
+ScmObj
scm_p_set_card(ScmObj pair, ScmObj car)
{
DECLARE_FUNCTION("set-car!", procedure_fixed_2);
@@ -675,7 +675,7 @@
#endif
}
-ScmObj
+ScmObj
scm_p_set_cdrd(ScmObj pair, ScmObj cdr)
{
DECLARE_FUNCTION("set-cdr!", procedure_fixed_2);
@@ -690,59 +690,59 @@
#endif
}
-ScmObj
+ScmObj
scm_p_caar(ScmObj lst)
{
DECLARE_FUNCTION("caar", procedure_fixed_1);
return scm_p_car( scm_p_car(lst) );
}
-ScmObj
+ScmObj
scm_p_cadr(ScmObj lst)
{
DECLARE_FUNCTION("cadr", procedure_fixed_1);
return scm_p_car( scm_p_cdr(lst) );
}
-ScmObj
+ScmObj
scm_p_cdar(ScmObj lst)
{
DECLARE_FUNCTION("cdar", procedure_fixed_1);
return scm_p_cdr( scm_p_car(lst) );
}
-ScmObj
+ScmObj
scm_p_cddr(ScmObj lst)
{
DECLARE_FUNCTION("cddr", procedure_fixed_1);
return scm_p_cdr( scm_p_cdr(lst) );
}
-ScmObj
+ScmObj
scm_p_caddr(ScmObj lst)
{
DECLARE_FUNCTION("caddr", procedure_fixed_1);
return scm_p_car( scm_p_cdr( scm_p_cdr(lst) ));
}
-ScmObj
+ScmObj
scm_p_cdddr(ScmObj lst)
{
DECLARE_FUNCTION("cdddr", procedure_fixed_1);
return scm_p_cdr( scm_p_cdr( scm_p_cdr(lst) ));
}
-ScmObj
+ScmObj
scm_p_list(ScmObj args)
{
DECLARE_FUNCTION("list", procedure_variadic_0);
return args;
}
-ScmObj
+ScmObj
scm_p_nullp(ScmObj obj)
{
DECLARE_FUNCTION("null?", procedure_fixed_1);
return (NULLP(obj)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_listp(ScmObj obj)
{
int len = 0;
@@ -767,7 +767,7 @@
* - Rename to scm_c_length() since it isn't a Scheme procedure
* - Insert its copyright and license into this file properly
*/
-int
+int
scm_p_c_length(ScmObj lst)
{
ScmObj slow = lst;
@@ -792,7 +792,7 @@
return len;
}
-ScmObj
+ScmObj
scm_p_length(ScmObj obj)
{
int len = scm_p_c_length(obj);
@@ -804,7 +804,7 @@
return scm_make_int(len);
}
-ScmObj
+ScmObj
scm_p_append(ScmObj args)
{
ScmQueue q;
@@ -829,7 +829,7 @@
return res;
}
-ScmObj
+ScmObj
scm_p_reverse(ScmObj lst)
{
ScmObj ret_lst = SCM_NULL;
@@ -856,7 +856,7 @@
return lst;
}
-ScmObj
+ScmObj
scm_p_list_tail(ScmObj lst, ScmObj scm_k)
{
ScmObj ret;
@@ -871,7 +871,7 @@
return ret;
}
-ScmObj
+ScmObj
scm_p_list_ref(ScmObj lst, ScmObj scm_k)
{
ScmObj tail = SCM_NULL;
@@ -882,7 +882,7 @@
tail = scm_p_listtail_internal(lst, SCM_INT_VALUE(scm_k));
if (EQ(tail, SCM_INVALID) || NULLP(tail))
ERR_OBJ("out of range or bad list, arglist is", CONS(lst, scm_k));
-
+
return CAR(tail);
}
@@ -894,7 +894,7 @@
return SCM_FALSE; \
} while (/* CONSTCOND */ 0)
-ScmObj
+ScmObj
scm_p_memq(ScmObj obj, ScmObj lst)
{
DECLARE_FUNCTION("memq", procedure_fixed_2);
@@ -911,7 +911,7 @@
return SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_memv(ScmObj obj, ScmObj lst)
{
DECLARE_FUNCTION("memv", procedure_fixed_2);
@@ -928,7 +928,7 @@
return SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_member(ScmObj obj, ScmObj lst)
{
DECLARE_FUNCTION("member", procedure_fixed_2);
@@ -945,7 +945,7 @@
return SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_assq(ScmObj obj, ScmObj alist)
{
ScmObj tmp_lst = SCM_NULL;
@@ -969,7 +969,7 @@
return SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_assv(ScmObj obj, ScmObj alist)
{
ScmObj tmp_lst = SCM_NULL;
@@ -993,7 +993,7 @@
return SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_assoc(ScmObj obj, ScmObj alist)
{
ScmObj tmp_lst = SCM_NULL;
@@ -1021,14 +1021,14 @@
/*==============================================================================
R5RS : 6.3 Other data types : 6.3.3 Symbols
==============================================================================*/
-ScmObj
+ScmObj
scm_p_symbolp(ScmObj obj)
{
DECLARE_FUNCTION("symbol?", procedure_fixed_1);
return (SYMBOLP(obj)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_symbol2string(ScmObj obj)
{
DECLARE_FUNCTION("symbol->string", procedure_fixed_1);
@@ -1036,7 +1036,7 @@
return scm_make_immutable_string_copying(SCM_SYMBOL_NAME(obj));
}
-ScmObj
+ScmObj
scm_p_string2symbol(ScmObj str)
{
DECLARE_FUNCTION("string->symbol", procedure_fixed_1);
@@ -1047,14 +1047,14 @@
/*==============================================================================
R5RS : 6.3 Other data types : 6.3.4 Characters
==============================================================================*/
-ScmObj
+ScmObj
scm_p_charp(ScmObj obj)
{
DECLARE_FUNCTION("char?", procedure_fixed_1);
return (CHARP(obj)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_charequalp(ScmObj ch1, ScmObj ch2)
{
DECLARE_FUNCTION("char=?", procedure_fixed_2);
@@ -1065,7 +1065,7 @@
return (SCM_CHAR_VALUE(ch1) == SCM_CHAR_VALUE(ch2)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_char_alphabeticp(ScmObj obj)
{
int ch;
@@ -1078,7 +1078,7 @@
return (isascii(ch) && isalpha(ch)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_char_numericp(ScmObj obj)
{
int ch;
@@ -1091,7 +1091,7 @@
return (isascii(ch) && isdigit(ch)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_char_whitespacep(ScmObj obj)
{
int ch;
@@ -1104,7 +1104,7 @@
return (isascii(ch) && isspace(ch)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_char_upper_casep(ScmObj obj)
{
int ch;
@@ -1117,7 +1117,7 @@
return (isascii(ch) && isupper(ch)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_char_lower_casep(ScmObj obj)
{
int ch;
@@ -1130,7 +1130,7 @@
return (isascii(ch) && islower(ch)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_char2integer(ScmObj obj)
{
DECLARE_FUNCTION("char->integer", procedure_fixed_1);
@@ -1140,7 +1140,7 @@
return scm_make_int(SCM_CHAR_VALUE(obj));
}
-ScmObj
+ScmObj
scm_p_integer2char(ScmObj obj)
{
int val;
@@ -1155,7 +1155,7 @@
return scm_make_char(val);
}
-ScmObj
+ScmObj
scm_p_char_upcase(ScmObj obj)
{
int ch;
@@ -1170,7 +1170,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_p_char_downcase(ScmObj obj)
{
int ch;
@@ -1188,14 +1188,14 @@
/*==============================================================================
R5RS : 6.3 Other data types : 6.3.5 Strings
==============================================================================*/
-ScmObj
+ScmObj
scm_p_stringp(ScmObj obj)
{
DECLARE_FUNCTION("string?", procedure_fixed_1);
return (STRINGP(obj)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_make_string(ScmObj length, ScmObj args)
{
int filler_val, len, i;
@@ -1230,14 +1230,14 @@
return scm_p_srfi6_get_output_string(sport);
}
-ScmObj
+ScmObj
scm_p_string(ScmObj args)
{
DECLARE_FUNCTION("string", procedure_variadic_0);
return scm_p_list2string(args);
}
-ScmObj
+ScmObj
scm_p_string_length(ScmObj str)
{
DECLARE_FUNCTION("string-length", procedure_fixed_1);
@@ -1245,7 +1245,7 @@
return scm_make_int(scm_mb_bare_c_strlen(SCM_STRING_STR(str)));
}
-ScmObj
+ScmObj
scm_p_string_ref(ScmObj str, ScmObj k)
{
int c_index = 0;
@@ -1274,7 +1274,7 @@
return scm_make_char(ch);
}
-ScmObj
+ScmObj
scm_p_string_setd(ScmObj str, ScmObj k, ScmObj ch)
{
int c_start_index = 0;
@@ -1334,7 +1334,7 @@
return str;
}
-ScmObj
+ScmObj
scm_p_stringequalp(ScmObj str1, ScmObj str2)
{
DECLARE_FUNCTION("string=?", procedure_fixed_2);
@@ -1348,7 +1348,7 @@
return SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_substring(ScmObj str, ScmObj start, ScmObj end)
{
int c_start_index = 0;
@@ -1389,7 +1389,7 @@
return scm_make_mutable_string(new_str);
}
-ScmObj
+ScmObj
scm_p_string_append(ScmObj args)
{
/* FIXME: transition to new arg extraction mechanism incomplete. */
@@ -1427,7 +1427,7 @@
return scm_make_mutable_string(new_str);
}
-ScmObj
+ScmObj
scm_p_string2list(ScmObj str)
{
ScmQueue q;
@@ -1465,7 +1465,7 @@
return res;
}
-ScmObj
+ScmObj
scm_p_list2string(ScmObj lst)
{
ScmObj rest, ch, sport;
@@ -1489,7 +1489,7 @@
return scm_p_srfi6_get_output_string(sport);
}
-ScmObj
+ScmObj
scm_p_string_copy(ScmObj str)
{
DECLARE_FUNCTION("string-copy", procedure_fixed_1);
@@ -1497,7 +1497,7 @@
return scm_make_mutable_string_copying(SCM_STRING_STR(str));
}
-ScmObj
+ScmObj
scm_p_string_filld(ScmObj str, ScmObj ch)
{
int char_size = 0;
@@ -1537,14 +1537,14 @@
/*==============================================================================
R5RS : 6.3 Other data types : 6.3.6 Vectors
==============================================================================*/
-ScmObj
+ScmObj
scm_p_vectorp(ScmObj obj)
{
DECLARE_FUNCTION("vector?", procedure_fixed_1);
return (VECTORP(obj)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_make_vector(ScmObj vector_len, ScmObj args)
{
ScmObj *vec = NULL;
@@ -1574,7 +1574,7 @@
return scm_make_vector(vec, len);
}
-ScmObj
+ScmObj
scm_p_vector(ScmObj args)
{
int len, i;
@@ -1590,7 +1590,7 @@
return scm_make_vector(vec, len);
}
-ScmObj
+ScmObj
scm_p_vector_length(ScmObj vec)
{
DECLARE_FUNCTION("vector-length", procedure_fixed_1);
@@ -1599,7 +1599,7 @@
return scm_make_int(SCM_VECTOR_LEN(vec));
}
-ScmObj
+ScmObj
scm_p_vector_ref(ScmObj vec, ScmObj scm_k)
{
DECLARE_FUNCTION("vector-ref", procedure_fixed_2);
@@ -1614,7 +1614,7 @@
return SCM_VECTOR_REF(vec, scm_k);
}
-ScmObj
+ScmObj
scm_p_vector_setd(ScmObj vec, ScmObj scm_k, ScmObj obj)
{
DECLARE_FUNCTION("vector-set!", procedure_fixed_3);
@@ -1631,7 +1631,7 @@
return SCM_UNDEF;
}
-ScmObj
+ScmObj
scm_p_vector2list(ScmObj vec)
{
ScmQueue q;
@@ -1653,7 +1653,7 @@
return res;
}
-ScmObj
+ScmObj
scm_p_list2vector(ScmObj lst)
{
ScmObj scm_len = SCM_NULL;
@@ -1677,7 +1677,7 @@
return scm_make_vector(v, c_len);
}
-ScmObj
+ScmObj
scm_p_vector_filld(ScmObj vec, ScmObj fill)
{
int c_len = 0;
@@ -1697,14 +1697,14 @@
/*=======================================
R5RS : 6.4 Control Features
=======================================*/
-ScmObj
+ScmObj
scm_p_procedurep(ScmObj obj)
{
DECLARE_FUNCTION("procedure?", procedure_fixed_1);
return (PROCEDUREP(obj)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj
+ScmObj
scm_p_map(ScmObj proc, ScmObj args)
{
DECLARE_FUNCTION("map", procedure_variadic_1);
@@ -1768,7 +1768,7 @@
}
}
-ScmObj
+ScmObj
scm_p_for_each(ScmObj proc, ScmObj args)
{
DECLARE_FUNCTION("for-each", procedure_variadic_1);
@@ -1777,7 +1777,7 @@
return SCM_UNDEF;
}
-ScmObj
+ScmObj
scm_p_force(ScmObj closure)
{
DECLARE_FUNCTION("force", procedure_fixed_1);
@@ -1787,7 +1787,7 @@
return scm_call(closure, SCM_NULL);
}
-ScmObj
+ScmObj
scm_p_call_with_current_continuation(ScmObj proc, ScmEvalState *eval_state)
{
DECLARE_FUNCTION("call-with-current-continuation", procedure_fixed_tailrec_1);
@@ -1797,7 +1797,7 @@
return scm_call_with_current_continuation(proc, eval_state);
}
-ScmObj
+ScmObj
scm_p_values(ScmObj args)
{
DECLARE_FUNCTION("values", procedure_variadic_0);
@@ -1828,11 +1828,11 @@
/* extract */
vals = SCM_VALUEPACKET_VALUES(vals);
}
-
+
return scm_tailcall(consumer, vals, eval_state);
}
-ScmObj
+ScmObj
scm_p_dynamic_wind(ScmObj before, ScmObj thunk, ScmObj after)
{
DECLARE_FUNCTION("dynamic-wind", procedure_fixed_3);
@@ -1849,7 +1849,7 @@
#endif
#if SCM_USE_NONSTD_FEATURES
#include "operations-nonstd.c"
-#endif
+#endif
#if SCM_USE_SRFI1
#include "operations-srfi1.c"
#endif
Modified: branches/r5rs/sigscheme/print.c
===================================================================
--- branches/r5rs/sigscheme/print.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/print.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -126,13 +126,13 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_display(ScmObj obj)
{
scm_display_to_port(scm_current_output_port, obj);
}
-void
+void
scm_write_to_port(ScmObj port, ScmObj obj)
{
DECLARE_INTERNAL_FUNCTION("scm_write_to_port");
@@ -149,7 +149,7 @@
#endif /* SCM_VOLATILE_OUTPUT */
}
-void
+void
scm_display_to_port(ScmObj port, ScmObj obj)
{
DECLARE_INTERNAL_FUNCTION("scm_display_to_port");
@@ -274,7 +274,7 @@
}
}
- /* other control chars are printed in hexadecimal form */
+ /* other control chars are printed in hexadecimal form */
if (isascii(c) && iscntrl(c)) {
scm_port_printf(port, "x%02x", c);
return;
@@ -648,7 +648,7 @@
return 0;
}
-void
+void
scm_write_to_port_with_shared_structure(ScmObj port, ScmObj obj)
{
write_ss_context ctx = {{0}};
Modified: branches/r5rs/sigscheme/read.c
===================================================================
--- branches/r5rs/sigscheme/read.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/read.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -136,7 +136,7 @@
/*===========================================================================
S-Expression Parser
===========================================================================*/
-ScmObj
+ScmObj
scm_read(ScmObj port)
{
ScmObj sexp = SCM_FALSE;
@@ -155,7 +155,7 @@
return sexp;
}
-ScmObj
+ScmObj
scm_read_char(ScmObj port)
{
DECLARE_INTERNAL_FUNCTION("scm_read_char");
@@ -604,11 +604,11 @@
int err;
ScmLBuf(char) lbuf;
char init_buf[SCM_INITIAL_SYMBOL_BUF_SIZE];
-
+
CDBG((SCM_DBG_PARSER, "read_symbol"));
LBUF_INIT(lbuf, init_buf, sizeof(init_buf));
-
+
for (offset = 0;;) {
tail_len = read_token(port, &err,
&LBUF_BUF(lbuf)[offset],
@@ -619,10 +619,10 @@
offset += tail_len;
LBUF_EXTEND(lbuf, SCM_LBUF_F_SYMBOL, LBUF_SIZE(lbuf) + MB_MAX_SIZE);
}
-
+
sym = scm_intern(LBUF_BUF(lbuf));
LBUF_FREE(lbuf);
-
+
return sym;
}
Modified: branches/r5rs/sigscheme/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/sigscheme.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/sigscheme.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -115,7 +115,7 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_initialize(void)
{
#if SCM_GCC4_READY_GC
@@ -184,33 +184,33 @@
scm_initialized = TRUE;
}
-void
+void
scm_finalize()
{
scm_finalize_storage();
scm_initialized = FALSE;
}
-void
+void
scm_define_alias(const char *newsym, const char *sym)
{
SCM_SYMBOL_SET_VCELL(scm_intern(newsym),
SCM_SYMBOL_VCELL(scm_intern(sym)));
}
-void
+void
scm_provide(ScmObj feature)
{
features = CONS(feature, features);
}
-int
+int
scm_providedp(ScmObj feature)
{
return NFALSEP(scm_p_member(feature, features));
}
-int
+int
scm_use(const char *feature)
{
ScmObj ok;
@@ -233,7 +233,7 @@
* - Make the module_info_table dynamically registerable for dynamic loadable
* objects (if necessary)
*/
-ScmObj
+ScmObj
scm_s_use(ScmObj feature, ScmObj env)
{
struct module_info *mod;
@@ -256,7 +256,7 @@
return SCM_FALSE;
}
-ScmObj
+ScmObj
scm_eval_c_string(const char *exp)
{
#if !SCM_GCC4_READY_GC
@@ -279,7 +279,7 @@
return ret;
}
-ScmObj
+ScmObj
scm_eval_c_string_internal(const char *exp)
{
ScmObj str_port, ret;
@@ -299,7 +299,7 @@
}
#if SCM_COMPAT_SIOD
-ScmObj
+ScmObj
scm_return_value(void)
{
return scm_return_value_cache;
@@ -360,7 +360,7 @@
return rest;
}
-void
+void
scm_free_argv(char **argv)
{
char **argp;
Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/sigscheme.h 2005-12-16 22:38:42 UTC (rev 2615)
@@ -743,7 +743,7 @@
#else /* SCM_GCC4_READY_GC */
void scm_gc_protect_stack(ScmObj *stack_start);
#endif /* SCM_GCC4_READY_GC */
-void scm_gc_unprotect_stack(ScmObj *stack_start);
+void scm_gc_unprotect_stack(ScmObj *stack_start);
/* storage-symbol.c */
ScmObj scm_intern(const char *name);
Modified: branches/r5rs/sigscheme/sigschemetype-compact.h
===================================================================
--- branches/r5rs/sigscheme/sigschemetype-compact.h 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/sigschemetype-compact.h 2005-12-16 22:38:42 UTC (rev 2615)
@@ -116,8 +116,8 @@
* impl (ScmCharPort*) : 2
* Continuation
* opaque (void*) : 2
- *
*
+ *
*/
/*=======================================
@@ -652,12 +652,12 @@
Integer need to preserve 'singed' or 'unsigned', so need special accessor.
Current pack and unpack algorithm is like this.
-
+
int pack(int a) {
return (a < 0) ? (~a << OFFSET) | SIGNED_MARK
: (a << OFFSET);
}
-
+
int unpack(int a) {
return (a & SIGN_BIT_MASK) ? ~((a & SIGN_VALUE_MASK) >> OFFSET) | SIGNED_MARK
: (a >> OFFSET);
Modified: branches/r5rs/sigscheme/storage-continuation.c
===================================================================
--- branches/r5rs/sigscheme/storage-continuation.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/storage-continuation.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -102,7 +102,7 @@
/*=======================================
Function Implementations
=======================================*/
-void
+void
scm_init_continuation(void)
{
initialize_dynamic_extent();
@@ -112,7 +112,7 @@
scm_gc_protect((ScmObj *)&trace_stack);
}
-void
+void
scm_finalize_continuation(void)
{
finalize_continuation_env();
@@ -192,13 +192,13 @@
}
}
-ScmObj
+ScmObj
scm_dynamic_wind(ScmObj before, ScmObj thunk, ScmObj after)
{
ScmObj ret;
scm_call(before, SCM_NULL);
-
+
wind_onto_dynamic_extent(before, after);
ret = scm_call(thunk, SCM_NULL);
unwind_dynamic_extent();
@@ -260,13 +260,13 @@
return dest_cont;
}
-void
+void
scm_destruct_continuation(ScmObj cont)
{
/* no object to free(3) in this implementation */
}
-ScmObj
+ScmObj
scm_call_with_current_continuation(ScmObj proc, ScmEvalState *eval_state)
{
volatile ScmObj cont, ret;
@@ -321,7 +321,7 @@
}
}
-void
+void
scm_call_continuation(ScmObj cont, ScmObj ret)
{
struct continuation_frame *frame;
@@ -359,7 +359,7 @@
/*============================================================================
Trace Stack
============================================================================*/
-void
+void
scm_push_trace_frame(ScmObj obj, ScmObj env)
{
ScmObj frame;
@@ -368,13 +368,13 @@
trace_stack = CONS(frame, trace_stack);
}
-void
+void
scm_pop_trace_frame(void)
{
trace_stack = CDR(trace_stack);
}
-ScmObj
+ScmObj
scm_trace_stack(void)
{
return trace_stack;
Modified: branches/r5rs/sigscheme/storage-gc.c
===================================================================
--- branches/r5rs/sigscheme/storage-gc.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/storage-gc.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -152,14 +152,14 @@
initialize_heap(heap_size, heap_alloc_threshold, n_heaps_max, n_heaps_init);
}
-void
+void
scm_finalize_gc(void)
{
finalize_heap();
finalize_protected_var();
}
-ScmObj
+ScmObj
scm_make_obj_from_heap(void)
{
ScmObj ret = SCM_FALSE;
@@ -198,7 +198,7 @@
return NULL;
}
-void
+void
scm_gc_protect(ScmObj *var)
{
ScmObj **slot;
@@ -215,7 +215,7 @@
*slot = var;
}
-void
+void
scm_gc_unprotect(ScmObj *var)
{
ScmObj **slot;
@@ -252,7 +252,7 @@
#else /* SCM_GCC4_READY_GC */
-void
+void
scm_gc_protect_stack(ScmObj *stack_start)
{
if (!stack_start_pointer)
@@ -260,7 +260,7 @@
}
#endif /* SCM_GCC4_READY_GC */
-void
+void
scm_gc_unprotect_stack(ScmObj *stack_start)
{
if (stack_start_pointer == stack_start)
Modified: branches/r5rs/sigscheme/storage-symbol.c
===================================================================
--- branches/r5rs/sigscheme/storage-symbol.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/storage-symbol.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -66,7 +66,7 @@
/*=======================================
Function Implementations
=======================================*/
-ScmObj
+ScmObj
scm_intern(const char *name)
{
ScmObj sym, lst, rest;
@@ -89,7 +89,7 @@
}
/* lookup the symbol bound to an obj reversely */
-ScmObj
+ScmObj
scm_symbol_bound_to(ScmObj obj)
{
int i;
@@ -107,13 +107,13 @@
return SCM_FALSE;
}
-void
+void
scm_init_symbol(void)
{
initialize_symbol_hash();
}
-void
+void
scm_finalize_symbol(void)
{
finalize_symbol_hash();
Modified: branches/r5rs/sigscheme/storage.c
===================================================================
--- branches/r5rs/sigscheme/storage.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/storage.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -113,7 +113,7 @@
scm_init_symbol();
}
-void
+void
scm_finalize_storage(void)
{
scm_finalize_symbol();
@@ -149,7 +149,7 @@
/*===========================================================================
Object Allocators
===========================================================================*/
-ScmObj
+ScmObj
scm_make_cons(ScmObj a, ScmObj b)
{
ScmObj obj = scm_make_obj_from_heap();
@@ -161,7 +161,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_make_int(int val)
{
ScmObj obj = scm_make_obj_from_heap();
@@ -172,7 +172,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_make_symbol(char *name, ScmObj v_cell)
{
ScmObj obj = scm_make_obj_from_heap();
@@ -184,7 +184,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_make_char(int val)
{
ScmObj obj = scm_make_obj_from_heap();
@@ -195,7 +195,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_make_string(char *str, int is_immutable)
{
ScmObj obj = scm_make_obj_from_heap();
@@ -212,31 +212,31 @@
return obj;
}
-ScmObj
+ScmObj
scm_make_immutable_string(char *str)
{
return scm_make_string(str, 1);
}
-ScmObj
+ScmObj
scm_make_immutable_string_copying(const char *str)
{
return scm_make_string(strdup(str), 1);
}
-ScmObj
+ScmObj
scm_make_mutable_string(char *str)
{
return scm_make_string(str, 0);
}
-ScmObj
+ScmObj
scm_make_mutable_string_copying(const char *str)
{
return scm_make_string(strdup(str), 0);
}
-ScmObj
+ScmObj
scm_make_func(enum ScmFuncTypeCode type, ScmFuncType func)
{
ScmObj obj = scm_make_obj_from_heap();
@@ -248,7 +248,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_make_closure(ScmObj exp, ScmObj env)
{
ScmObj obj = scm_make_obj_from_heap();
@@ -260,7 +260,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_make_vector(ScmObj *vec, int len)
{
ScmObj obj = scm_make_obj_from_heap();
@@ -272,7 +272,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_make_port(ScmCharPort *cport, enum ScmPortFlag flag)
{
ScmObj obj = scm_make_obj_from_heap();
@@ -290,7 +290,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_make_continuation(void)
{
ScmObj obj = scm_make_obj_from_heap();
@@ -303,7 +303,7 @@
}
#if !SCM_USE_VALUECONS
-ScmObj
+ScmObj
scm_make_value_packet(ScmObj values)
{
ScmObj obj = scm_make_obj_from_heap();
@@ -316,7 +316,7 @@
#endif
#if SCM_USE_NONSTD_FEATURES
-ScmObj
+ScmObj
scm_make_cpointer(void *data)
{
ScmObj obj = scm_make_obj_from_heap();
@@ -327,7 +327,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_make_cfunc_pointer(ScmCFunc func)
{
ScmObj obj = scm_make_obj_from_heap();
@@ -340,7 +340,7 @@
#endif /* SCM_USE_NONSTD_FEATURES */
#if SCM_OBJ_COMPACT
-enum ScmObjType
+enum ScmObjType
scm_type(ScmObj obj)
{
if (SCM_TAG_CONSP(obj)) {
Modified: branches/r5rs/sigscheme/strport.c
===================================================================
--- branches/r5rs/sigscheme/strport.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/strport.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -159,7 +159,7 @@
* Client code must call this first even if current implementation does not
* contain actual code.
*/
-void
+void
scm_strport_init(void)
{
return;
@@ -375,7 +375,7 @@
#if HAVE_VASPRINTF
char *appendix;
int len;
-
+
len = vasprintf(&appendix, str, args);
if (!appendix)
SCM_PORT_ERROR_NOMEM(BYTE, port, ScmOutputStrPort);
Modified: branches/r5rs/sigscheme/test-compact.c
===================================================================
--- branches/r5rs/sigscheme/test-compact.c 2005-12-16 22:30:34 UTC (rev 2614)
+++ branches/r5rs/sigscheme/test-compact.c 2005-12-16 22:38:42 UTC (rev 2615)
@@ -183,7 +183,7 @@
return ret;
}
-ScmObj
+ScmObj
scm_check_int(int val)
{
ScmObj obj;
@@ -200,7 +200,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_check_cons()
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
@@ -252,7 +252,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_check_symbol(const char *name)
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
@@ -299,7 +299,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_check_char(unsigned int val)
{
ScmObj obj;
@@ -316,7 +316,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_check_string_copying(char *str)
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
@@ -350,7 +350,7 @@
SCM_ASSERT(SCM_STRING_MUTATION_TYPE(obj) == SCM_STR_IMMUTABLE);
SCM_ASSERT(SCM_IS_UNMARKED(obj));
check_type(ScmString, obj);
- SCM_ASSERT(strlen(str) == SCM_STRING_LEN(obj));
+ SCM_ASSERT(strlen(str) == SCM_STRING_LEN(obj));
/* marked state */
SCM_DO_MARK(obj);
@@ -382,7 +382,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_check_func(void *funcptr)
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
@@ -423,7 +423,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_check_closure()
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
@@ -477,7 +477,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_check_vector(unsigned int len)
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
@@ -539,7 +539,7 @@
}
-ScmObj
+ScmObj
scm_check_port()
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
@@ -581,7 +581,7 @@
}
-ScmObj
+ScmObj
scm_check_continuation(void *val)
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
@@ -620,7 +620,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_check_value_packet()
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
@@ -653,7 +653,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_check_cpointer(void *data)
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
@@ -683,7 +683,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_check_cfunc_pointer(ScmCFunc funcptr)
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
@@ -713,7 +713,7 @@
return obj;
}
-ScmObj
+ScmObj
scm_check_constant()
{
PRINT_SECTION("Constant");
@@ -751,7 +751,7 @@
return SCM_NULL;
}
-ScmObj
+ScmObj
scm_check_ref()
{
PRINT_SECTION("REF");
More information about the uim-commit
mailing list