guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, master, updated. release_1-9-1-26-ga87


From: Michael Gran
Subject: [Guile-commits] GNU Guile branch, master, updated. release_1-9-1-26-ga876e7d
Date: Sat, 01 Aug 2009 18:22:46 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=a876e7dcea78e770bedba40017fbb225cf88bff5

The branch, master has been updated
       via  a876e7dcea78e770bedba40017fbb225cf88bff5 (commit)
       via  f7118e35525e1c137f2fb96619233610549fae12 (commit)
      from  4c402b889eecaa7ffc61da6656f415c8c983507a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a876e7dcea78e770bedba40017fbb225cf88bff5
Author: Michael Gran <address@hidden>
Date:   Sat Aug 1 11:21:46 2009 -0700

    Don't doubly define scm_t_wchar
    
            * libguile/chars.h: don't define scm_t_wchar
            * libguile/numbers.h: define scm_t_wchar here

commit f7118e35525e1c137f2fb96619233610549fae12
Author: Michael Gran <address@hidden>
Date:   Sat Aug 1 11:04:43 2009 -0700

    Fix coding style compliance for recent 32-bit char changes
    
            * libguile/print.c (iprin1): extra braces
    
            * libguile/chars.h (SCM_IS_UNICODE_CHAR): coding style

-----------------------------------------------------------------------

Summary of changes:
 libguile/chars.h   |   11 +++--------
 libguile/numbers.h |    3 ---
 libguile/print.c   |   20 +++++++-------------
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/libguile/chars.h b/libguile/chars.h
index 8e1bc64..4d1be1d 100644
--- a/libguile/chars.h
+++ b/libguile/chars.h
@@ -24,16 +24,11 @@
 
 
 #include "libguile/__scm.h"
+#include "libguile/numbers.h"
 
 
 /* Immediate Characters
  */
-
-#ifndef SCM_WCHAR_DEFINED
-typedef scm_t_int32 scm_t_wchar;
-#define SCM_WCHAR_DEFINED
-#endif
-
 #define SCM_CHARP(x) (SCM_ITAG8(x) == scm_tc8_char)
 #define SCM_CHAR(x) ((scm_t_wchar)SCM_ITAG8_DATA(x))
 
@@ -44,8 +39,8 @@ typedef scm_t_int32 scm_t_wchar;
 
 #define SCM_CODEPOINT_MAX (0x10ffff)
 #define SCM_IS_UNICODE_CHAR(c)                                          \
-  ((scm_t_wchar)(c)<=0xd7ff ||                                          \
-   ((scm_t_wchar)(c)>=0xe000 && (scm_t_wchar)(c)<=SCM_CODEPOINT_MAX))
+  ((scm_t_wchar) (c) <= 0xd7ff                                          \
+   || ((scm_t_wchar) (c) >= 0xe000 && (scm_t_wchar) (c) <= SCM_CODEPOINT_MAX))
 
 
 
diff --git a/libguile/numbers.h b/libguile/numbers.h
index f30f7d0..bb72d7a 100644
--- a/libguile/numbers.h
+++ b/libguile/numbers.h
@@ -174,10 +174,7 @@ typedef struct scm_t_complex
   double imag;
 } scm_t_complex;
 
-#ifndef SCM_WCHAR_DEFINED
 typedef scm_t_int32 scm_t_wchar;
-#define SCM_WCHAR_DEFINED
-#endif
 
 
 
diff --git a/libguile/print.c b/libguile/print.c
index 1a5aebe..f43856b 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -454,22 +454,16 @@ iprin1 (SCM exp, SCM port, scm_print_state *pstate)
                 /* Print the character if is graphic character.  */
                 {
                   if (i<256)
-                    {
-                      /* Character is graphic.  Print it.  */
-                      scm_putc (i, port);
-                    }
+                    /* Character is graphic.  Print it.  */
+                    scm_putc (i, port);
                   else
-                    {
-                      /* Character is graphic but unrepresentable in
-                         this port's encoding.  */
-                      scm_intprint (i, 8, port);
-                    }
+                    /* Character is graphic but unrepresentable in
+                       this port's encoding.  */
+                    scm_intprint (i, 8, port);
                 }
               else
-                {
-                  /* Character is a non-graphical character.  */
-                  scm_intprint (i, 8, port);
-                }
+                /* Character is a non-graphical character.  */
+                scm_intprint (i, 8, port);
            }
          else
            scm_putc (i, port);


hooks/post-receive
-- 
GNU Guile




reply via email to

[Prev in Thread] Current Thread [Next in Thread]