[uim-commit] r1977 - in branches/r5rs/sigscheme: . script
kzk at freedesktop.org
kzk at freedesktop.org
Thu Nov 3 07:28:50 PST 2005
Author: kzk
Date: 2005-11-03 07:28:46 -0800 (Thu, 03 Nov 2005)
New Revision: 1977
Modified:
branches/r5rs/sigscheme/eval.c
branches/r5rs/sigscheme/operations-siod.c
branches/r5rs/sigscheme/operations-srfi1.c
branches/r5rs/sigscheme/operations-srfi2.c
branches/r5rs/sigscheme/operations-srfi8.c
branches/r5rs/sigscheme/operations.c
branches/r5rs/sigscheme/script/build_func_table.rb
branches/r5rs/sigscheme/script/functable-header.txt
branches/r5rs/sigscheme/sigscheme.c
branches/r5rs/sigscheme/sigscheme.h
Log:
* Final work to introduce auto-generated func table
* sigscheme/operations.c
- (ScmOp_set_card, ScmOp_set_cdrd): fixed typo
- (ScmOp_charequalp): renamed from ScmOp_char_equal
- (ScmOp_stringequal): renamed from ScmOp_string_equal
- (ScmOp_substring): renamed from ScmOp_string_substring
- (ScmOp_eqvp, ScmOp_equalp): use ScmOp_charequalp
* sigscheme/operations-srfi1.c
- (ScmOp_SRFI1_consstar): renamed from ScmOp_SRFI1_cons_star
- (ScmOp_SRFI1_taked): renamed from ScmOp_SRFI1_take_d
- (ScmOp_SRFI1_drop_rightd): renamed from ScmOp_SRFI1_drop_right_d
- (ScmOp_SRFI1_split_atd): renamed from ScmOp_SRFI1_split_at_d
* sigscheme/operations-srfi2.c
- (ScmExp_SRFI2_and_letstar): renamed from ScmOp_SRFI2_and_let_star
* sigscheme/operations-srfi8.c
- (ScmExp_SRFI8_receive): renamed from ScmOp_SRFI8_receive
* sigscheme/operations-siod.c
- (ScmOp_set_symbol_valued): renamed from ScmOp_set_symbol_value
- (ScmOp_sscm_closure_code): renamed from ScmOp_closure_code
- (ScmExp_undefine): renamed from ScmOp_undefine
* sigscheme/eval.c
- (ScmExp_let,
ScmExp_letstar,
ScmExp_letrec): fixed typo
* sigscheme/sigscheme.c
- (SigScm_Initialize_internal)
- (ScmOp_charequalp): renamed from ScmOp_char_equal
- (ScmOp_stringequal): renamed from ScmOp_string_equal
- (ScmOp_substring): renamed from ScmOp_string_substring
* sigscheme/script/build_func_table.rb
- handle c_function name prefix
* sigscheme/script/functable-header.txt
- include sigscheme.h
- (REGISTER_FUNC_TABLE): new macro
Modified: branches/r5rs/sigscheme/eval.c
===================================================================
--- branches/r5rs/sigscheme/eval.c 2005-11-03 14:50:20 UTC (rev 1976)
+++ branches/r5rs/sigscheme/eval.c 2005-11-03 15:28:46 UTC (rev 1977)
@@ -1105,7 +1105,7 @@
ScmObj val = SCM_FALSE;
ScmObj vars = SCM_NULL;
ScmObj vals = SCM_NULL;
- DECLARE_FUNCTION("let", SyntaxVariadicTalRec0);
+ DECLARE_FUNCTION("let", SyntaxVariadicTailRec0);
/*========================================================================
normal let:
@@ -1178,7 +1178,7 @@
ScmObj var = SCM_FALSE;
ScmObj val = SCM_FALSE;
ScmObj binding = SCM_FALSE;
- DECLARE_FUNCTION("let*", SyntaxVariadicTalRec1);
+ DECLARE_FUNCTION("let*", SyntaxVariadicTailRec1);
/*========================================================================
(let* <bindings> <body>)
@@ -1228,7 +1228,7 @@
ScmObj binding = SCM_FALSE;
ScmObj var = SCM_FALSE;
ScmObj val = SCM_FALSE;
- DECLARE_FUNCTION("letrec", SyntaxVariadicTalRec1);
+ DECLARE_FUNCTION("letrec", SyntaxVariadicTailRec1);
/*========================================================================
(letrec <bindings> <body>)
Modified: branches/r5rs/sigscheme/operations-siod.c
===================================================================
--- branches/r5rs/sigscheme/operations-siod.c 2005-11-03 14:50:20 UTC (rev 1976)
+++ branches/r5rs/sigscheme/operations-siod.c 2005-11-03 15:28:46 UTC (rev 1977)
@@ -101,15 +101,15 @@
Scm_DefineAlias("bit-not" , "lognot");
Scm_RegisterProcedureFixed1("symbol-value" , ScmOp_symbol_value);
- Scm_RegisterProcedureFixed2("set-symbol-value!" , ScmOp_set_symbol_value);
+ Scm_RegisterProcedureFixed2("set-symbol-value!" , ScmOp_set_symbol_valued);
#if SCM_COMPAT_SIOD_BUGS
Scm_RegisterProcedureFixed2("=" , ScmOp_siod_eql);
#endif
Scm_RegisterProcedureFixedTailRec0("the-environment" , ScmOp_the_environment);
- Scm_RegisterProcedureFixed1("%%closure-code" , ScmOp_closure_code);
+ Scm_RegisterProcedureFixed1("%%closure-code" , ScmOp_sscm_closure_code);
Scm_RegisterProcedureVariadic0("verbose" , ScmOp_verbose);
Scm_RegisterProcedureFixed0("eof-val" , ScmOp_eof_val);
- Scm_RegisterSyntaxFixed1("undefine" , ScmOp_undefine);
+ Scm_RegisterSyntaxFixed1("undefine" , ScmExp_undefine);
saved_output_port = SCM_FALSE;
saved_error_port = SCM_FALSE;
@@ -141,7 +141,7 @@
* - make the portable proc interface similar to a de facto standard of other
* Scheme implementations if existing
*/
-ScmObj ScmOp_set_symbol_value(ScmObj var, ScmObj val)
+ScmObj ScmOp_set_symbol_valued(ScmObj var, ScmObj val)
{
DECLARE_FUNCTION("set-symbol-value!", ProcedureFixed2);
@@ -173,7 +173,7 @@
return eval_state->env;
}
-ScmObj ScmOp_closure_code(ScmObj closure)
+ScmObj ScmOp_sscm_closure_code(ScmObj closure)
{
ScmObj exp, body;
DECLARE_FUNCTION("%%closure-code", ProcedureFixed1);
@@ -208,7 +208,7 @@
return SCM_EOF;
}
-ScmObj ScmOp_undefine(ScmObj var, ScmObj env)
+ScmObj ScmExp_undefine(ScmObj var, ScmObj env)
{
ScmObj val = SCM_FALSE;
DECLARE_FUNCTION("undefine", SyntaxFixed1);
Modified: branches/r5rs/sigscheme/operations-srfi1.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi1.c 2005-11-03 14:50:20 UTC (rev 1976)
+++ branches/r5rs/sigscheme/operations-srfi1.c 2005-11-03 15:28:46 UTC (rev 1977)
@@ -69,7 +69,7 @@
Scm_RegisterProcedureFixed2("xcons" , ScmOp_SRFI1_xcons);
Scm_RegisterProcedureVariadic0("circular-list" , ScmOp_SRFI1_circular_list);
Scm_RegisterProcedureVariadic1("iota" , ScmOp_SRFI1_iota);
- Scm_RegisterProcedureVariadic0("cons*" , ScmOp_SRFI1_cons_star);
+ Scm_RegisterProcedureVariadic0("cons*" , ScmOp_SRFI1_consstar);
Scm_RegisterProcedureVariadic1("make-list" , ScmOp_SRFI1_make_list);
Scm_RegisterProcedureVariadic1("list-tabulate" , ScmOp_SRFI1_list_tabulate);
Scm_RegisterProcedureFixed1("proper-list?" , ScmOp_SRFI1_proper_listp);
@@ -92,10 +92,10 @@
Scm_RegisterProcedureFixed2("drop" , ScmOp_SRFI1_drop);
Scm_RegisterProcedureFixed2("take-right" , ScmOp_SRFI1_take_right);
Scm_RegisterProcedureFixed2("drop-right" , ScmOp_SRFI1_drop_right);
- Scm_RegisterProcedureFixed2("take!" , ScmOp_SRFI1_take_d);
- Scm_RegisterProcedureFixed2("drop-right!" , ScmOp_SRFI1_drop_right_d);
+ Scm_RegisterProcedureFixed2("take!" , ScmOp_SRFI1_taked);
+ Scm_RegisterProcedureFixed2("drop-right!" , ScmOp_SRFI1_drop_rightd);
Scm_RegisterProcedureFixed2("split-at" , ScmOp_SRFI1_split_at);
- Scm_RegisterProcedureFixed2("split-at!" , ScmOp_SRFI1_split_at_d);
+ Scm_RegisterProcedureFixed2("split-at!" , ScmOp_SRFI1_split_atd);
Scm_RegisterProcedureFixed1("last" , ScmOp_SRFI1_last);
Scm_RegisterProcedureFixed1("last-pair" , ScmOp_SRFI1_last_pair);
Scm_RegisterProcedureFixed1("length+" , ScmOp_SRFI1_lengthplus);
@@ -111,7 +111,7 @@
return CONS(b, a);
}
-ScmObj ScmOp_SRFI1_cons_star(ScmObj args)
+ScmObj ScmOp_SRFI1_consstar(ScmObj args)
{
ScmObj tail_cons = SCM_FALSE;
ScmObj prev_last = args;
@@ -535,7 +535,7 @@
return ScmOp_SRFI1_take(lst, Scm_NewInt(len));
}
-ScmObj ScmOp_SRFI1_take_d(ScmObj lst, ScmObj scm_idx)
+ScmObj ScmOp_SRFI1_taked(ScmObj lst, ScmObj scm_idx)
{
ScmObj tmp = lst;
int idx = 0;
@@ -555,7 +555,7 @@
return lst;
}
-ScmObj ScmOp_SRFI1_drop_right_d(ScmObj lst, ScmObj scm_idx)
+ScmObj ScmOp_SRFI1_drop_rightd(ScmObj lst, ScmObj scm_idx)
{
ScmObj tmp = lst;
int len = 0;
@@ -587,12 +587,12 @@
ScmOp_SRFI1_drop(lst, idx)));
}
-ScmObj ScmOp_SRFI1_split_at_d(ScmObj lst, ScmObj idx)
+ScmObj ScmOp_SRFI1_split_atd(ScmObj lst, ScmObj idx)
{
ScmObj drop = ScmOp_SRFI1_drop(lst, idx);
DECLARE_FUNCTION("split-at!", ProcedureFixed2);
- return ScmOp_values(LIST_2(ScmOp_SRFI1_take_d(lst, idx),
+ return ScmOp_values(LIST_2(ScmOp_SRFI1_taked(lst, idx),
drop));
}
Modified: branches/r5rs/sigscheme/operations-srfi2.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi2.c 2005-11-03 14:50:20 UTC (rev 1976)
+++ branches/r5rs/sigscheme/operations-srfi2.c 2005-11-03 15:28:46 UTC (rev 1977)
@@ -66,10 +66,10 @@
/*=======================================================================
SRFI-2 Procedure
=======================================================================*/
- Scm_RegisterSyntaxVariadicTailRec1("and-let*", ScmOp_SRFI2_and_let_star);
+ Scm_RegisterSyntaxVariadicTailRec1("and-let*", ScmExp_SRFI2_and_letstar);
}
-ScmObj ScmOp_SRFI2_and_let_star(ScmObj claws, ScmObj body, ScmEvalState *eval_state)
+ScmObj ScmExp_SRFI2_and_letstar(ScmObj claws, ScmObj body, ScmEvalState *eval_state)
{
ScmObj env = eval_state->env;
ScmObj claw = SCM_FALSE;
Modified: branches/r5rs/sigscheme/operations-srfi8.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi8.c 2005-11-03 14:50:20 UTC (rev 1976)
+++ branches/r5rs/sigscheme/operations-srfi8.c 2005-11-03 15:28:46 UTC (rev 1977)
@@ -65,13 +65,13 @@
/*=======================================================================
SRFI-8 Procedure
=======================================================================*/
- Scm_RegisterSyntaxVariadicTailRec2("receive", ScmOp_SRFI8_receive);
+ Scm_RegisterSyntaxVariadicTailRec2("receive", ScmExp_SRFI8_receive);
}
/*=============================================================================
SRFI8 : Receive
=============================================================================*/
-ScmObj ScmOp_SRFI8_receive(ScmObj formals, ScmObj expr, ScmObj body, ScmEvalState *eval_state)
+ScmObj ScmExp_SRFI8_receive(ScmObj formals, ScmObj expr, ScmObj body, ScmEvalState *eval_state)
{
/*
* (receive <formals> <expression> <body>)
Modified: branches/r5rs/sigscheme/operations.c
===================================================================
--- branches/r5rs/sigscheme/operations.c 2005-11-03 14:50:20 UTC (rev 1976)
+++ branches/r5rs/sigscheme/operations.c 2005-11-03 15:28:46 UTC (rev 1977)
@@ -92,7 +92,7 @@
break;
case ScmChar:
- return ScmOp_char_equal(obj1, obj2);
+ return ScmOp_charequalp(obj1, obj2);
#if SCM_DEBUG
case ScmFreeCell:
@@ -138,7 +138,7 @@
break;
case ScmChar:
- return ScmOp_char_equal(obj1, obj2);
+ return ScmOp_charequalp(obj1, obj2);
case ScmString:
if (strcmp(SCM_STRING_STR(obj1), SCM_STRING_STR(obj2)) == 0)
@@ -617,7 +617,7 @@
ScmObj ScmOp_set_card(ScmObj pair, ScmObj car)
{
- DECLARE_FUNCTION("set-car!", SyntaxFixed2);
+ DECLARE_FUNCTION("set-car!", ProcedureFixed2);
ASSERT_CONSP(pair);
SET_CAR(pair, car);
@@ -631,7 +631,7 @@
ScmObj ScmOp_set_cdrd(ScmObj pair, ScmObj cdr)
{
- DECLARE_FUNCTION("set-cdr!", SyntaxFixed2);
+ DECLARE_FUNCTION("set-cdr!", ProcedureFixed2);
ASSERT_CONSP(pair);
SET_CDR(pair, cdr);
@@ -1088,7 +1088,7 @@
return (CHARP(obj)) ? SCM_TRUE : SCM_FALSE;
}
-ScmObj ScmOp_char_equal(ScmObj ch1, ScmObj ch2)
+ScmObj ScmOp_charequalp(ScmObj ch1, ScmObj ch2)
{
DECLARE_FUNCTION("char=?", ProcedureFixed2);
ASSERT_CHARP(ch1);
@@ -1337,7 +1337,7 @@
return str;
}
-ScmObj ScmOp_string_equal(ScmObj str1, ScmObj str2)
+ScmObj ScmOp_stringequal(ScmObj str1, ScmObj str2)
{
DECLARE_FUNCTION("string=", ProcedureFixed2);
@@ -1350,7 +1350,7 @@
return SCM_FALSE;
}
-ScmObj ScmOp_string_substring(ScmObj str, ScmObj start, ScmObj end)
+ScmObj ScmOp_substring(ScmObj str, ScmObj start, ScmObj end)
{
int c_start_index = 0;
int c_end_index = 0;
Modified: branches/r5rs/sigscheme/script/build_func_table.rb
===================================================================
--- branches/r5rs/sigscheme/script/build_func_table.rb 2005-11-03 14:50:20 UTC (rev 1976)
+++ branches/r5rs/sigscheme/script/build_func_table.rb 2005-11-03 15:28:46 UTC (rev 1977)
@@ -39,9 +39,9 @@
FUNC_TYPE_REDUCTION = 3
TYPE2PREFIX = {
- FUNC_TYPE_SYNTAX => "ScmExp_",
- FUNC_TYPE_PROCEDURE => "ScmOp_",
- FUNC_TYPE_REDUCTION => "ScmOp_",
+ FUNC_TYPE_SYNTAX => "ScmExp",
+ FUNC_TYPE_PROCEDURE => "ScmOp",
+ FUNC_TYPE_REDUCTION => "ScmOp",
}
SCM2C_FUNCNAME_RULE = [
@@ -62,8 +62,8 @@
[/!$/, "d"],
# suffix or intermediate
+ [/->/, "2"],
[/-/, "_"],
- [/->/, "2"],
[/\?/, "_"],
[/!/, "_"],
[/\=/, "equal"],
@@ -71,9 +71,14 @@
[/\+/, "plus"],
]
-def guess_c_funcname(scm_funcname, type)
+def guess_c_funcname(prefix, scm_funcname, type)
# guess prefix
- prefix = TYPE2PREFIX[type] || "";
+ c_prefix = TYPE2PREFIX[type] || "";
+ if (prefix.length != 0)
+ c_prefix += prefix
+ else
+ c_prefix += "_"
+ end
# apply replace rule
c_funcname = scm_funcname
@@ -81,10 +86,10 @@
c_funcname = c_funcname.gsub(rule[0], rule[1])
}
- return prefix + c_funcname
+ return c_prefix + c_funcname
end
-def search_declare_function(filename)
+def search_declare_function(prefix, filename)
puts " /* #{filename} */"
IO.readlines(filename).each{ |line|
if line.strip =~ /DECLARE_FUNCTION\(\"(\S+)\",\s*((Syntax|Procedure|Reduction)\S+)\);/
@@ -101,15 +106,15 @@
FUNC_TYPE_INVALID
end
- c_func = guess_c_funcname(scm_func, type)
+ c_func = guess_c_funcname(prefix, scm_func, type)
puts " { \"#{scm_func}\", (ScmBuiltinFunc)#{c_func}, (ScmRegisterFunc)#{reg_func} },"
end
}
end
-def build_table(filename)
- search_declare_function(filename)
+def build_table(prefix, filename)
+ search_declare_function(prefix, filename)
end
def null_entry()
@@ -125,10 +130,10 @@
puts ""
end
-def build_functable(tablename, filelist)
+def build_functable(prefix, tablename, filelist)
print_tableheader(tablename)
filelist.each { |filename|
- build_table(filename)
+ build_table(prefix, filename)
}
null_entry()
print_tablefooter
@@ -154,45 +159,54 @@
# Header
print_header
-
# R5RS
-build_functable("r5rs_func_info_table",
+build_functable("",
+ "r5rs_func_info_table",
["eval.c", "io.c", "operations.c", "sigscheme.c"])
# SRFI-1
-build_functable("srfi1_func_info_table",
+build_functable("_SRFI1_",
+ "srfi1_func_info_table",
["operations-srfi1.c"])
# SRFI-2
-build_functable("srfi2_func_info_table",
+build_functable("_SRFI2_",
+ "srfi2_func_info_table",
["operations-srfi2.c"])
# SRFI-6
-build_functable("srfi6_func_info_table",
+build_functable("_SRFI6_",
+ "srfi6_func_info_table",
["operations-srfi6.c"])
# SRFI-8
-build_functable("srfi8_func_info_table",
+build_functable("_SRFI8_",
+ "srfi8_func_info_table",
["operations-srfi8.c"])
# SRFI-23
-build_functable("srfi23_func_info_table",
+build_functable("_SRFI23_",
+ "srfi23_func_info_table",
["operations-srfi23.c"])
# SRFI-34
-build_functable("srfi34_func_info_table",
+build_functable("_SRFI34_",
+ "srfi34_func_info_table",
["operations-srfi34.c"])
# SRFI-38
-build_functable("srfi38_func_info_table",
+build_functable("_SRFI38_",
+ "srfi38_func_info_table",
["operations-srfi38.c"])
# SRFI-60
-build_functable("srfi60_func_info_table",
+build_functable("_SRFI60_",
+ "srfi60_func_info_table",
["operations-srfi60.c"])
# SIOD
-build_functable("siod_func_info_table",
+build_functable("",
+ "siod_func_info_table",
["operations-siod.c"])
# Footer
Modified: branches/r5rs/sigscheme/script/functable-header.txt
===================================================================
--- branches/r5rs/sigscheme/script/functable-header.txt 2005-11-03 14:50:20 UTC (rev 1976)
+++ branches/r5rs/sigscheme/script/functable-header.txt 2005-11-03 15:28:46 UTC (rev 1977)
@@ -41,8 +41,20 @@
/*=======================================
Local Include
=======================================*/
+#include "sigscheme.h"
/*=======================================
+ Macro Definitions
+=======================================*/
+#define REGISTER_FUNC_TABLE(functable) \
+ do { \
+ struct builtin_func_info *info = NULL; \
+ for (info = functable; info->funcname; info++) { \
+ (*info->reg_func)(info->funcname, info->c_func); \
+ } \
+ } while (/* CONSTCOND */ 0)
+
+/*=======================================
Type Definitions
=======================================*/
typedef ScmObj (*ScmBuiltinFunc)(void);
Modified: branches/r5rs/sigscheme/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/sigscheme.c 2005-11-03 14:50:20 UTC (rev 1976)
+++ branches/r5rs/sigscheme/sigscheme.c 2005-11-03 15:28:46 UTC (rev 1977)
@@ -282,7 +282,7 @@
Scm_RegisterProcedureFixed1("symbol->string" , ScmOp_symbol2string);
Scm_RegisterProcedureFixed1("string->symbol" , ScmOp_string2symbol);
Scm_RegisterProcedureFixed1("char?" , ScmOp_charp);
- Scm_RegisterProcedureFixed2("char=?" , ScmOp_char_equal);
+ Scm_RegisterProcedureFixed2("char=?" , ScmOp_charequalp);
Scm_RegisterProcedureFixed1("char-alphabetic?" , ScmOp_char_alphabeticp);
Scm_RegisterProcedureFixed1("char-numeric?" , ScmOp_char_numericp);
Scm_RegisterProcedureFixed1("char-whitespace?" , ScmOp_char_whitespacep);
@@ -296,8 +296,8 @@
Scm_RegisterProcedureFixed2("string-ref" , ScmOp_string_ref);
Scm_RegisterProcedureFixed3("string-set!" , ScmOp_string_setd);
Scm_RegisterProcedureFixed1("string-length" , ScmOp_string_length);
- Scm_RegisterProcedureFixed2("string=?" , ScmOp_string_equal);
- Scm_RegisterProcedureFixed3("substring" , ScmOp_string_substring);
+ Scm_RegisterProcedureFixed2("string=?" , ScmOp_stringequal);
+ Scm_RegisterProcedureFixed3("substring" , ScmOp_substring);
Scm_RegisterProcedureVariadic0("string-append" , ScmOp_string_append);
Scm_RegisterProcedureFixed1("string->list" , ScmOp_string2list);
Scm_RegisterProcedureFixed1("list->string" , ScmOp_list2string);
Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h 2005-11-03 14:50:20 UTC (rev 1976)
+++ branches/r5rs/sigscheme/sigscheme.h 2005-11-03 15:28:46 UTC (rev 1977)
@@ -518,7 +518,7 @@
ScmObj ScmOp_string2symbol(ScmObj str);
ScmObj ScmOp_charp(ScmObj obj);
-ScmObj ScmOp_char_equal(ScmObj ch1, ScmObj ch2);
+ScmObj ScmOp_charequalp(ScmObj ch1, ScmObj ch2);
/* TODO : many comparing functions around char is unimplemented */
ScmObj ScmOp_char_alphabeticp(ScmObj obj);
ScmObj ScmOp_char_numericp(ScmObj obj);
@@ -534,9 +534,9 @@
ScmObj ScmOp_string_length(ScmObj str);
ScmObj ScmOp_string_ref(ScmObj str, ScmObj k);
ScmObj ScmOp_string_setd(ScmObj str, ScmObj k, ScmObj ch);
-ScmObj ScmOp_string_equal(ScmObj str1, ScmObj str2);
+ScmObj ScmOp_stringequal(ScmObj str1, ScmObj str2);
/* TODO : many comparing functions around string is unimplemented */
-ScmObj ScmOp_string_substring(ScmObj str, ScmObj start, ScmObj end);
+ScmObj ScmOp_substring(ScmObj str, ScmObj start, ScmObj end);
ScmObj ScmOp_string_append(ScmObj args);
ScmObj ScmOp_string2list(ScmObj string);
ScmObj ScmOp_list2string(ScmObj lst);
@@ -640,7 +640,7 @@
/* operations-srfi1.c */
void SigScm_Initialize_SRFI1(void);
ScmObj ScmOp_SRFI1_xcons(ScmObj a, ScmObj b);
-ScmObj ScmOp_SRFI1_cons_star(ScmObj args);
+ScmObj ScmOp_SRFI1_consstar(ScmObj args);
ScmObj ScmOp_SRFI1_make_list(ScmObj length, ScmObj args);
ScmObj ScmOp_SRFI1_list_tabulate(ScmObj scm_n, ScmObj args);
ScmObj ScmOp_SRFI1_list_copy(ScmObj lst);
@@ -667,10 +667,10 @@
ScmObj ScmOp_SRFI1_drop(ScmObj lst, ScmObj scm_idx);
ScmObj ScmOp_SRFI1_take_right(ScmObj lst, ScmObj scm_elem);
ScmObj ScmOp_SRFI1_drop_right(ScmObj lst, ScmObj scm_elem);
-ScmObj ScmOp_SRFI1_take_d(ScmObj lst, ScmObj scm_idx);
-ScmObj ScmOp_SRFI1_drop_right_d(ScmObj lst, ScmObj scm_idx);
+ScmObj ScmOp_SRFI1_taked(ScmObj lst, ScmObj scm_idx);
+ScmObj ScmOp_SRFI1_drop_rightd(ScmObj lst, ScmObj scm_idx);
ScmObj ScmOp_SRFI1_split_at(ScmObj lst, ScmObj idx);
-ScmObj ScmOp_SRFI1_split_at_d(ScmObj lst, ScmObj idx);
+ScmObj ScmOp_SRFI1_split_atd(ScmObj lst, ScmObj idx);
ScmObj ScmOp_SRFI1_last(ScmObj lst);
ScmObj ScmOp_SRFI1_last_pair(ScmObj lst);
ScmObj ScmOp_SRFI1_lengthplus(ScmObj lst);
@@ -679,7 +679,7 @@
#if SCM_USE_SRFI2
/* operations-srfi2.c */
void SigScm_Initialize_SRFI2(void);
-ScmObj ScmOp_SRFI2_and_let_star(ScmObj claws, ScmObj body, ScmEvalState *eval_state);
+ScmObj ScmExp_SRFI2_and_letstar(ScmObj claws, ScmObj body, ScmEvalState *eval_state);
#endif
#if SCM_USE_SRFI6
/* operations-srfi6.c */
@@ -691,7 +691,7 @@
#if SCM_USE_SRFI8
/* operations-srfi8.c */
void SigScm_Initialize_SRFI8(void);
-ScmObj ScmOp_SRFI8_receive(ScmObj formals, ScmObj expr, ScmObj body, ScmEvalState *eval_state);
+ScmObj ScmExp_SRFI8_receive(ScmObj formals, ScmObj expr, ScmObj body, ScmEvalState *eval_state);
#endif
#if SCM_USE_SRFI23
/* operations-srfi23.c */
@@ -727,13 +727,13 @@
/* operations-siod.c */
void SigScm_Initialize_SIOD(void);
ScmObj ScmOp_symbol_value(ScmObj var);
-ScmObj ScmOp_set_symbol_value(ScmObj var, ScmObj val);
+ScmObj ScmOp_set_symbol_valued(ScmObj var, ScmObj val);
ScmObj ScmOp_siod_eql(ScmObj obj1, ScmObj obj2);
ScmObj ScmOp_the_environment(ScmEvalState *eval_state);
-ScmObj ScmOp_closure_code(ScmObj closure);
+ScmObj ScmOp_sscm_closure_code(ScmObj closure);
ScmObj ScmOp_verbose(ScmObj args);
ScmObj ScmOp_eof_val(void);
-ScmObj ScmOp_undefine(ScmObj var, ScmObj env);
+ScmObj ScmExp_undefine(ScmObj var, ScmObj env);
long SigScm_GetVerboseLevel(void);
void SigScm_SetVerboseLevel(long level);
#endif
More information about the uim-commit
mailing list