Commit: f9625aeadb4881a873b97c4aaa004dbef18e503a - uim (git)

A multilingual input method framework

Commit MetaInfo

• Révision: f9625aeadb4881a873b97c4aaa004dbef18e503a (tree)
• l'heure: 2006-12-22 06:33:14
• Auteur: yamaken <yamaken@ff9a...>
• Commiter: yamaken

Message de Log

* This commit make SigScheme-based uim runnable again

* sigscheme/configure.in

- Change settings for

--enable-conf=uim. --disable-strict-toplevel-definitions and
--enable-srfi75-named-chars have been added

- Add --enable-soft-assert by default if --enable-debug

* sigscheme/src/module-srfi6.c

- (istrport_finalize): Rename to srfi6_istrport_finalize() to avoid

func name conflict on combind mode

- (srfi6_istrport_finalize): Renamed from istrport_finalize()
- (scm_p_srfi6_open_input_string): Follow the renaming

* uim/uim-scm.c

- (uim_scm_init): Enclose encoding handling into #if

SCM_USE_MULTIBYTE_CHAR

* scm/prime.scm

- (prime-reset-handler): Fix malformed empty lambda body

* scm/util.scm

- (hyphen-sym): New variable
- (define-record): Fix R5RS-inconformant hyphen-prefixed symbol with

hyphen-sym

* scm/uim-module-manager.scm

- (prepare-installed-im-list): Ditto

* sigscheme/QALog

- Update

Change Summary

• modified: scm/prime.scm
• modified: scm/uim-module-manager.scm
• modified: scm/util.scm
• modified: sigscheme/QALog
• modified: sigscheme/configure.in
• modified: sigscheme/src/module-srfi6.c
• modified: uim/uim-scm.c

Modification

--- a/scm/prime.scm
+++ b/scm/prime.scm
@@ -2048,7 +2048,7 @@
 (define prime-reset-handler
   (lambda (context)
     ;(print "prime-reset-handler")
-    ))
+    #f))
 
 (define prime-mode-set
   (lambda (context mode)

--- a/scm/uim-module-manager.scm
+++ b/scm/uim-module-manager.scm
@@ -29,6 +29,7 @@
 ;;; SUCH DAMAGE.
 ;;;;
 
+(require "util.scm")
 (require "im.scm")
 (require "lazy-load.scm")
 
@@ -43,9 +44,10 @@
       ;; XXX temporary solution to register all IM in a file
       (set! require
 	    (lambda (file)
-	      (let* ((file-sym (string->symbol file))
-		     (loaded-sym (symbolconc '* file-sym '-loaded*))
-		     (reloaded-sym (symbolconc '* file-sym '-reloaded*)))
+	      (let* ((loaded-sym (string->symbol
+				  (string-append "*" file "-loaded*")))
+		     (reloaded-sym (string->symbol
+				    (string-append "*" file "-reloaded*"))))
 		(cond
 		 ((symbol-bound? reloaded-sym)
 		  loaded-sym)

--- a/scm/util.scm
+++ b/scm/util.scm
@@ -34,6 +34,8 @@
 ;(require "slib-mulapply.scm")
 ;(require "slib-srfi-1.scm")
 
+(define hyphen-sym (string->symbol "-"))
+
 ;;
 ;; generic utilities
 ;;
@@ -574,10 +576,10 @@
     (for-each (lambda (spec index)
 		(let* ((elem-sym (list-ref spec 0))
 		       (default  (list-ref spec 1))
-		       (getter-sym (symbolconc rec-sym '- elem-sym))
+		       (getter-sym (symbolconc rec-sym hyphen-sym elem-sym))
 		       (getter (lambda (rec)
 				 (list-ref rec index)))
-		       (setter-sym (symbolconc rec-sym '-set- elem-sym '!))
+		       (setter-sym (symbolconc rec-sym hyphen-sym 'set- elem-sym '!))
 		       (setter (lambda (rec val)
 				 (set-car! (nthcdr index rec)
 					   val))))
@@ -587,7 +589,7 @@
 			(interaction-environment))))
 	      rec-spec
 	      (iota (length rec-spec)))
-    (let ((creator-sym (symbolconc rec-sym '-new))
+    (let ((creator-sym (symbolconc rec-sym hyphen-sym 'new))
 	  (creator (let ((defaults (map cadr rec-spec)))
 		     (lambda init-lst
 		       (cond

--- a/sigscheme/QALog
+++ b/sigscheme/QALog
@@ -911,7 +911,7 @@ corner case tests:
 
 file:              module-srfi6.c
 category:          srfi
-spec by eyes:      yamaken@r3992
+spec by eyes:      yamaken@r3992, yamaken@r4172
 spec by tests:     yamaken@r3992
 general review:    yamaken@r3992
 64-bit by eyes:    yamaken@r3992

--- a/sigscheme/configure.in
+++ b/sigscheme/configure.in
@@ -288,7 +288,7 @@ AX_FEATURE_ARG_X(conf, [select base configuration of SigScheme.
       r5rs)
         use_strict_r5rs=yes
         ;;
-      full|dev|uim)
+      full|dev)
         use_strict_r5rs=no
         #use_const_list_literal=yes
         use_const_vector_literal=yes
@@ -298,6 +298,16 @@ AX_FEATURE_ARG_X(conf, [select base configuration of SigScheme.
         use_strict_toplevel_definitions=yes
         use_internal_definitions=yes
         ;;
+      uim)
+        use_strict_r5rs=no
+        #use_const_list_literal=yes
+        use_const_vector_literal=yes
+        use_strict_null_form=no
+        use_strict_vector_form=yes
+        use_strict_argcheck=yes
+        use_strict_toplevel_definitions=no
+        use_internal_definitions=yes
+        ;;
       small|siod)
         use_strict_r5rs=no
         use_const_list_literal=no
@@ -456,7 +466,7 @@ AX_FEATURE_ARG_X(conf, [select base configuration of SigScheme.
         use_srfi38=yes
         use_srfi48=yes
         use_srfi60=yes
-        use_srfi75_named_chars=no
+        use_srfi75_named_chars=yes
         use_srfi75=no
         use_sscm_extensions=yes
         use_sscm_format_extensions=yes
@@ -657,7 +667,7 @@ default_encoding_sjis:       sjis  sjis_as_default
 AX_FEATURE_RESOLVE_DEPENDENCIES([recommended], [
 conf_dev: warning_suppressor
 storage_fatty: valuecons const_list_literal const_vector_literal
-debug: accessor_assert strict_argcheck strict_encoding_check
+debug: soft_assert accessor_assert strict_argcheck strict_encoding_check
 backtrace: srfi38
 ])
 

--- a/sigscheme/src/module-srfi6.c
+++ b/sigscheme/src/module-srfi6.c
@@ -58,7 +58,8 @@
 /*=======================================
   File Local Function Declarations
 =======================================*/
-static void istrport_finalize(char **str, scm_bool ownership, void **opaque);
+static void srfi6_istrport_finalize(char **str, scm_bool ownership,
+                                    void **opaque);
 
 /*=======================================
   Function Definitions
@@ -72,7 +73,7 @@ scm_initialize_srfi6(void)
 }
 
 static void
-istrport_finalize(char **str, scm_bool ownership, void **opaque)
+srfi6_istrport_finalize(char **str, scm_bool ownership, void **opaque)
 {
     SCM_ASSERT(!ownership);
 
@@ -89,7 +90,8 @@ scm_p_srfi6_open_input_string(ScmObj str)
 
     ENSURE_STRING(str);
 
-    bport = ScmInputStrPort_new_const(SCM_STRING_STR(str), istrport_finalize);
+    bport = ScmInputStrPort_new_const(SCM_STRING_STR(str),
+                                      srfi6_istrport_finalize);
     hold_str = (ScmObj *)ScmInputStrPort_ref_opaque(bport);
     scm_gc_protect_with_init(hold_str, str);
     cport = scm_make_char_port(bport);

--- a/uim/uim-scm.c
+++ b/uim/uim-scm.c
@@ -590,6 +590,7 @@ uim_scm_init(const char *verbose_level)
     vlevel = atoi(verbose_level) % 10;
   }
 
+#if SCM_USE_MULTIBYTE_CHAR
   /* *GC safe operation*
    * 
    * Set the raw unibyte codec which accepts all (multi)byte sequence
@@ -599,6 +600,7 @@ uim_scm_init(const char *verbose_level)
    * "ISO-8859-1" is a dummy name for the codec.
    */
   scm_current_char_codec = scm_mb_find_codec("ISO-8859-1");
+#endif
 
   storage_conf.heap_size            = 16384;
   storage_conf.heap_alloc_threshold = 16384;