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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-03-02 12:15:32 -0800 (Thu, 02 Mar 2006)
New Revision: 3156

Modified:
   branches/r5rs/sigscheme/src/baseport.h
   branches/r5rs/sigscheme/src/encoding.h
   branches/r5rs/sigscheme/src/number.c
   branches/r5rs/sigscheme/src/sigscheme.h
Log:
* sigscheme/src/number.c
  - (scm_string2number): Fix printf directive

* sigscheme/src/sigscheme.h
  - (scm_true): Change to explicit value to ensure that char can
    hold it
* sigscheme/src/baseport.h
  - (scm_true): Ditto
* sigscheme/src/encoding.h
  - (scm_true): Ditto


Modified: branches/r5rs/sigscheme/src/baseport.h
===================================================================
--- branches/r5rs/sigscheme/src/baseport.h	2006-03-02 19:17:24 UTC (rev 3155)
+++ branches/r5rs/sigscheme/src/baseport.h	2006-03-02 20:15:32 UTC (rev 3156)
@@ -145,7 +145,7 @@
 #ifndef SCM_BOOL_DEFINED
 typedef int scm_bool;
 #define scm_false 0
-#define scm_true  (!scm_false)
+#define scm_true  1
 #define SCM_BOOL_DEFINED
 #endif /* SCM_BOOL_DEFINED */
 

Modified: branches/r5rs/sigscheme/src/encoding.h
===================================================================
--- branches/r5rs/sigscheme/src/encoding.h	2006-03-02 19:17:24 UTC (rev 3155)
+++ branches/r5rs/sigscheme/src/encoding.h	2006-03-02 20:15:32 UTC (rev 3156)
@@ -137,7 +137,7 @@
 #ifndef SCM_BOOL_DEFINED
 typedef int scm_bool;
 #define scm_false 0
-#define scm_true  (!scm_false)
+#define scm_true  1
 #define SCM_BOOL_DEFINED
 #endif /* SCM_BOOL_DEFINED */
 

Modified: branches/r5rs/sigscheme/src/number.c
===================================================================
--- branches/r5rs/sigscheme/src/number.c	2006-03-02 19:17:24 UTC (rev 3155)
+++ branches/r5rs/sigscheme/src/number.c	2006-03-02 20:15:32 UTC (rev 3156)
@@ -511,7 +511,7 @@
 #endif
 
     if (errno == ERANGE || n < SCM_INT_MIN || SCM_INT_MAX < n)
-        ERR("fixnum limit exceeded: %d", n);
+        ERR("fixnum limit exceeded: " SCM_INT_T_FMT, n);
 
     empty_strp = (end == str);  /* apply the first rule above */
     *err = (empty_strp || *end);

Modified: branches/r5rs/sigscheme/src/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.h	2006-03-02 19:17:24 UTC (rev 3155)
+++ branches/r5rs/sigscheme/src/sigscheme.h	2006-03-02 20:15:32 UTC (rev 3156)
@@ -243,7 +243,7 @@
 #ifndef SCM_BOOL_DEFINED
 typedef int scm_bool;
 #define scm_false 0
-#define scm_true  (!scm_false)
+#define scm_true  1
 #define SCM_BOOL_DEFINED
 #endif /* SCM_BOOL_DEFINED */