Revision: 7276
Author: nogu.dev
Date: Sat Aug 27 01:16:05 2011
Log: * src/read.c
- (read_number_or_peculiar): Remove unused variable "len".
- (read_number): Ditto.
* src/error.c
- (scm_p_inspect_error): Remove unused variables.
* src/write.c
- (write_errobj): Ditto.
- (write_ss_scan): Ditto.
* src/sigscheme.h
- (SCM_ASSERT_FUNCTYPE): suppress warnings.
* src/main.c
- (repl_loop): Remove unused variable "sym_guard".
http://code.google.com/p/uim/source/detail?r=7276
Modified:
/sigscheme-trunk/src/error.c
/sigscheme-trunk/src/main.c
/sigscheme-trunk/src/read.c
/sigscheme-trunk/src/sigscheme.h
/sigscheme-trunk/src/write.c
=======================================
--- /sigscheme-trunk/src/error.c Wed Feb 13 07:03:48 2008
+++ /sigscheme-trunk/src/error.c Sat Aug 27 01:16:05 2011
@@ -275,18 +275,29 @@
SCM_EXPORT ScmObj
scm_p_inspect_error(ScmObj err_obj)
{
- ScmObj rest, err_obj_tag, reason, objs, trace_stack;
+ ScmObj rest;
+#if SCM_USE_BACKTRACE
+ ScmObj trace_stack;
+#endif
DECLARE_FUNCTION("%%inspect-error", procedure_fixed_1);
if (ERROBJP(err_obj)) {
rest = err_obj;
- err_obj_tag = MUST_POP_ARG(rest);
- reason = MUST_POP_ARG(rest);
- objs = MUST_POP_ARG(rest);
+ MUST_POP_ARG(rest);
+ MUST_POP_ARG(rest);
+ MUST_POP_ARG(rest);
+#if SCM_USE_BACKTRACE
trace_stack = MUST_POP_ARG(rest);
+#else
+ MUST_POP_ARG(rest);
+#endif
ASSERT_NO_MORE_ARG(rest);
} else {
+#if SCM_USE_BACKTRACE
trace_stack = scm_trace_stack();
+#else
+ scm_trace_stack();
+#endif
}
if (scm_debug_categories() & SCM_DBG_ERRMSG) {
=======================================
--- /sigscheme-trunk/src/main.c Wed Feb 13 07:03:48 2008
+++ /sigscheme-trunk/src/main.c Sat Aug 27 01:16:05 2011
@@ -123,14 +123,14 @@
ScmEvalState eval_state;
ScmBaseCharPort *cport;
ScmBytePort *bport;
- ScmObj sym_guard, cond_catch, proc_read, proc_eval, err;
+ ScmObj cond_catch, proc_read, proc_eval, err;
proc_read = scm_symbol_value(scm_intern("read"), SCM_INTERACTION_ENV);
proc_eval = scm_symbol_value(scm_intern("eval"), SCM_INTERACTION_ENV);
err = CONS(SCM_UNDEF, SCM_UNDEF); /* unique ID */
/* prepare the constant part of the form to get the loop fast */
- sym_guard = scm_intern("guard");
+ scm_intern("guard");
cond_catch = LIST_2(scm_intern("err"),
LIST_3(scm_intern("else"),
LIST_2(scm_intern("%%inspect-error"),
=======================================
--- /sigscheme-trunk/src/read.c Wed Feb 13 07:03:48 2008
+++ /sigscheme-trunk/src/read.c Sat Aug 27 01:16:05 2011
@@ -946,7 +946,6 @@
{
scm_ichar_t c;
int err;
- size_t len;
char buf[INT_LITERAL_LEN_MAX + sizeof("")];
DECLARE_INTERNAL_FUNCTION("read");
@@ -961,7 +960,7 @@
return read_number(port, 'd');
if (c == '+' || c == '-') {
- len = read_token(port, &err, buf, sizeof(buf), SCM_CH_DELIMITER);
+ read_token(port, &err, buf, sizeof(buf), SCM_CH_DELIMITER);
if (err == TOKEN_BUF_EXCEEDED)
ERR("invalid number literal");
@@ -1019,11 +1018,10 @@
read_number(ScmObj port, char prefix)
{
int err;
- size_t len;
char buf[INT_LITERAL_LEN_MAX + sizeof("")];
DECLARE_INTERNAL_FUNCTION("read");
- len = read_token(port, &err, buf, sizeof(buf), SCM_CH_DELIMITER);
+ read_token(port, &err, buf, sizeof(buf), SCM_CH_DELIMITER);
if (err == TOKEN_BUF_EXCEEDED)
ERR("invalid number literal");
=======================================
--- /sigscheme-trunk/src/sigscheme.h Tue Dec 28 00:10:27 2010
+++ /sigscheme-trunk/src/sigscheme.h Sat Aug 27 01:16:05 2011
@@ -230,6 +230,7 @@
do
{ \
type
f; \
if (0) f = (c_func); /* compile-time type check
*/ \
+ (void)f; /* suppress warnings
*/ \
} while (/* CONSTCOND */ 0)
#if 0
=======================================
--- /sigscheme-trunk/src/write.c Wed Feb 13 07:03:48 2008
+++ /sigscheme-trunk/src/write.c Sat Aug 27 01:16:05 2011
@@ -575,13 +575,13 @@
static void
write_errobj(ScmObj port, ScmObj obj, enum ScmOutputType otype)
{
- ScmObj err_obj_tag, reason, objs, trace_stack, elm;
+ ScmObj reason, objs, elm;
DECLARE_INTERNAL_FUNCTION("write");
- err_obj_tag = MUST_POP_ARG(obj);
+ MUST_POP_ARG(obj);
reason = MUST_POP_ARG(obj);
objs = MUST_POP_ARG(obj);
- trace_stack = MUST_POP_ARG(obj);
+ MUST_POP_ARG(obj);
ASSERT_NO_MORE_ARG(obj);
switch (otype) {
@@ -704,14 +704,14 @@
scm_int_t i, len;
#endif
scm_hash_entry *ent;
- ScmObj err_obj_tag, reason, objs, trace_stack;
+ ScmObj reason, objs;
DECLARE_INTERNAL_FUNCTION("write-with-shared-structure");
if (ERROBJP(obj)) {
- err_obj_tag = MUST_POP_ARG(obj);
+ MUST_POP_ARG(obj);
reason = MUST_POP_ARG(obj);
objs = MUST_POP_ARG(obj);
- trace_stack = MUST_POP_ARG(obj);
+ MUST_POP_ARG(obj);
ASSERT_NO_MORE_ARG(obj);
write_ss_scan(reason, ctx);
