[uim-commit] r1761 - in branches/r5rs: sigscheme uim

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-10-03 03:05:06 -0700 (Mon, 03 Oct 2005)
New Revision: 1761

Modified:
   branches/r5rs/sigscheme/sigschemeinternal.h
   branches/r5rs/sigscheme/sigschemetype.h
   branches/r5rs/uim/uim-compat-scm.c
Log:
* sigscheme/sigschemeinternal.h
  - (SigScm_quote, SigScm_quasiquote, SigScm_unquote;
    SigScm_unquote_splicing): Move to sigschemetype.h
* sigscheme/sigschemetype.h
  - (SigScm_quote, SigScm_quasiquote, SigScm_unquote;
    SigScm_unquote_splicing): Moved from sigschemeinternal.h
  - (SCM_QUOTE, SCM_QUASIQUOTE, SCM_UNQUOTE, SCM_UNQUOTE_SPLICING):
    Move into new section "Predefined Symbols"
* uim/uim-compat-scm.c
  - (uim_scm_quote): Simplify


Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h	2005-10-03 09:32:28 UTC (rev 1760)
+++ branches/r5rs/sigscheme/sigschemeinternal.h	2005-10-03 10:05:06 UTC (rev 1761)
@@ -81,8 +81,6 @@
 #if SCM_USE_VALUECONS
 extern ScmObj SigScm_null_values;
 #endif
-extern ScmObj SigScm_quote, SigScm_quasiquote, SigScm_unquote;
-extern ScmObj SigScm_unquote_splicing;
 
 /* operations-srfi34.c */
 #if SCM_USE_SRFI34

Modified: branches/r5rs/sigscheme/sigschemetype.h
===================================================================
--- branches/r5rs/sigscheme/sigschemetype.h	2005-10-03 09:32:28 UTC (rev 1760)
+++ branches/r5rs/sigscheme/sigschemetype.h	2005-10-03 10:05:06 UTC (rev 1761)
@@ -418,16 +418,12 @@
 #define SCM_SET(ref, obj) (*(ref) = (obj))
 
 /*============================================================================
-  Special Constants
+  Special Constants and Predicates
 ============================================================================*/
 #define SCM_NULL             SigScm_null
 #define SCM_TRUE             SigScm_true
 #define SCM_FALSE            SigScm_false
 #define SCM_EOF              SigScm_eof
-#define SCM_QUOTE            SigScm_quote
-#define SCM_QUASIQUOTE       SigScm_quasiquote
-#define SCM_UNQUOTE          SigScm_unquote
-#define SCM_UNQUOTE_SPLICING SigScm_unquote_splicing
 #define SCM_UNBOUND          SigScm_unbound
 #define SCM_UNDEF            SigScm_undef
 
@@ -440,8 +436,17 @@
 #define SCM_EOFP(a)    (SCM_EQ((a),  SCM_EOF))
 
 /*============================================================================
-  Internal Declarations For Special Constants
+  Predefined Symbols
 ============================================================================*/
+/* for list construction */
+#define SCM_QUOTE            SigScm_quote
+#define SCM_QUASIQUOTE       SigScm_quasiquote
+#define SCM_UNQUOTE          SigScm_unquote
+#define SCM_UNQUOTE_SPLICING SigScm_unquote_splicing
+
+/*============================================================================
+  Internal Declarations For Special Constants And Predefined Symbols
+============================================================================*/
 /*
  * These declarations are dedicated to internal use. libsscm users MUST NOT
  * refer these internal representations directly.
@@ -451,7 +456,12 @@
  * incompatibility from it, use the abstract macro such as SCM_NULL defined
  * above. They safely hides the internal model against such change.
  */
+/* datas.c */
 extern ScmObj SigScm_null, SigScm_true, SigScm_false, SigScm_eof;
-extern ScmObj SigScm_quote, SigScm_unbound, SigScm_undef;
+extern ScmObj SigScm_unbound, SigScm_undef;
 
+/* sigscheme.c */
+extern ScmObj SigScm_quote, SigScm_quasiquote, SigScm_unquote;
+extern ScmObj SigScm_unquote_splicing;
+
 #endif /* __SIGSCMTYPE_H */

Modified: branches/r5rs/uim/uim-compat-scm.c
===================================================================
--- branches/r5rs/uim/uim-compat-scm.c	2005-10-03 09:32:28 UTC (rev 1760)
+++ branches/r5rs/uim/uim-compat-scm.c	2005-10-03 10:05:06 UTC (rev 1761)
@@ -220,10 +220,7 @@
 uim_lisp
 uim_scm_quote(uim_lisp obj)
 {
-  /* TODO : fixme Kazuki Ohta <mover at hct.zaq.ne.jp> */
-  return (uim_lisp)Scm_NewCons(SCM_QUOTE,
-			       Scm_NewCons((ScmObj)obj,
-					   SCM_NULL));
+  return (uim_lisp)SCM_LIST_2(SCM_QUOTE, (ScmObj)obj);
 }
 
 uim_lisp