[uim-commit] r2980 - branches/r5rs/sigscheme/src

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-22 14:49:55 -0800 (Sun, 22 Jan 2006)
New Revision: 2980

Modified:
   branches/r5rs/sigscheme/src/operations.c
   branches/r5rs/sigscheme/src/sigscheme.c
   branches/r5rs/sigscheme/src/sigscheme.h
   branches/r5rs/sigscheme/src/sigschemeinternal.h
Log:
* sigscheme/src/sigschemeinternal.h
  - (NUMBERP): New macro
* sigscheme/src/sigscheme.h
  - (scm_p_integerp): New function decl
* sigscheme/src/operations.c
  - (scm_p_numberp): Make number objects other than integer acceptable
  - (scm_p_integerp): New function
* sigscheme/src/sigscheme.c
  - (scm_initialize_internal): Remove the alias definition for integer?


Modified: branches/r5rs/sigscheme/src/operations.c
===================================================================
--- branches/r5rs/sigscheme/src/operations.c	2006-01-22 22:38:00 UTC (rev 2979)
+++ branches/r5rs/sigscheme/src/operations.c	2006-01-22 22:49:55 UTC (rev 2980)
@@ -362,6 +362,14 @@
 {
     DECLARE_FUNCTION("number?", procedure_fixed_1);
 
+    return MAKE_BOOL(NUMBERP(obj));
+}
+
+ScmObj
+scm_p_integerp(ScmObj obj)
+{
+    DECLARE_FUNCTION("integer?", procedure_fixed_1);
+
     return MAKE_BOOL(INTP(obj));
 }
 

Modified: branches/r5rs/sigscheme/src/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.c	2006-01-22 22:38:00 UTC (rev 2979)
+++ branches/r5rs/sigscheme/src/sigscheme.c	2006-01-22 22:49:55 UTC (rev 2980)
@@ -174,7 +174,6 @@
 
     /* R5RS Procedures */
     REGISTER_FUNC_TABLE(r5rs_procedure_func_info_table);
-    scm_define_alias("integer?", "number?");
 
 #if SCM_USE_DEEP_CADRS
     /* Deep c[ad]+r Functions */

Modified: branches/r5rs/sigscheme/src/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.h	2006-01-22 22:38:00 UTC (rev 2979)
+++ branches/r5rs/sigscheme/src/sigscheme.h	2006-01-22 22:49:55 UTC (rev 2980)
@@ -1159,6 +1159,7 @@
 ScmObj scm_p_greater_eq(ScmObj left, ScmObj right,
                         enum ScmReductionState *state);
 ScmObj scm_p_numberp(ScmObj obj);
+ScmObj scm_p_integerp(ScmObj obj);
 ScmObj scm_p_zerop(ScmObj n);
 ScmObj scm_p_positivep(ScmObj n);
 ScmObj scm_p_negativep(ScmObj n);

Modified: branches/r5rs/sigscheme/src/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/src/sigschemeinternal.h	2006-01-22 22:38:00 UTC (rev 2979)
+++ branches/r5rs/sigscheme/src/sigschemeinternal.h	2006-01-22 22:49:55 UTC (rev 2980)
@@ -193,6 +193,7 @@
 #endif /* SCM_USE_NONSTD_FEATURES */
 #define MAKE_VALUEPACKET              SCM_MAKE_VALUEPACKET
 
+#define NUMBERP        SCM_NUMBERP
 #define INTP           SCM_INTP
 #define CONSP          SCM_CONSP
 #define SYMBOLP        SCM_SYMBOLP