[uim-commit] r1337 - in branches/r5rs: scm sigscheme

[kzk at freedesktop.org]

Author: kzk
Date: 2005-08-26 10:54:03 -0700 (Fri, 26 Aug 2005)
New Revision: 1337

Modified:
   branches/r5rs/scm/util.scm
   branches/r5rs/sigscheme/io.c
   branches/r5rs/sigscheme/sigscheme.c
   branches/r5rs/sigscheme/sigscheme.h
Log:
* remove "print" procedure from SigScheme

* scm/util.scm
  - (print): added
* sigscheme/sigscheme.c
  - (SigScm_Initialize): remove "print"
* sigscheme/sigscheme.h
* sigscheme/io.c
  - (ScmOp_print): removed


Modified: branches/r5rs/scm/util.scm
===================================================================
--- branches/r5rs/scm/util.scm	2005-08-26 15:12:18 UTC (rev 1336)
+++ branches/r5rs/scm/util.scm	2005-08-26 17:54:03 UTC (rev 1337)
@@ -324,6 +324,8 @@
     (write obj)
     (newline)))
 
+(define print siod-print)
+
 ;;
 ;; SRFI procedures (don't expect 100% compatibility)
 ;;

Modified: branches/r5rs/sigscheme/io.c
===================================================================
--- branches/r5rs/sigscheme/io.c	2005-08-26 15:12:18 UTC (rev 1336)
+++ branches/r5rs/sigscheme/io.c	2005-08-26 17:54:03 UTC (rev 1337)
@@ -369,33 +369,6 @@
     return SCM_UNDEF;
 }
 
-#if SCM_USE_NONSTD_FEATURES
-ScmObj ScmOp_print(ScmObj arg, ScmObj env)
-{
-    ScmObj obj  = SCM_NULL;
-    ScmObj port = SCM_NULL;
-
-    if CHECK_1_ARG(arg)
-        SigScm_Error("print : invalid parameter\n");
-
-    /* get obj */
-    obj = CAR(arg);
-    arg = CDR(arg);
-
-    /* get port */
-    port = scm_current_output_port;
-    
-    /* (display obj port) */
-    if (!NULLP(arg) && PORTP(CAR(arg)))
-        port = CAR(arg);
-
-    SigScm_DisplayToPort(port, obj);
-    SigScm_DisplayToPort(port, Scm_NewStringCopying("\n"));
-    return SCM_UNDEF;
-
-}
-#endif /* SCM_USE_NONSTD_FEATURES */
-
 ScmObj ScmOp_newline(ScmObj arg, ScmObj env)
 {
     /* get port */

Modified: branches/r5rs/sigscheme/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/sigscheme.c	2005-08-26 15:12:18 UTC (rev 1336)
+++ branches/r5rs/sigscheme/sigscheme.c	2005-08-26 17:54:03 UTC (rev 1337)
@@ -280,9 +280,6 @@
     Scm_RegisterFunc1("eof-object?"          , ScmOp_eof_objectp);
     Scm_RegisterFuncL("write"                , ScmOp_write);
     Scm_RegisterFuncL("display"              , ScmOp_display);
-#if SCM_USE_NONSTD_FEATURES
-    Scm_RegisterFuncL("print"                , ScmOp_print);
-#endif
     Scm_RegisterFuncL("newline"              , ScmOp_newline);
     Scm_RegisterFuncL("write-char"           , ScmOp_write_char);
     Scm_RegisterFunc1("load"                 , ScmOp_load);

Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-08-26 15:12:18 UTC (rev 1336)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-08-26 17:54:03 UTC (rev 1337)
@@ -301,9 +301,6 @@
 ScmObj ScmOp_char_readyp(ScmObj arg, ScmObj env);
 ScmObj ScmOp_write(ScmObj arg, ScmObj env);
 ScmObj ScmOp_display(ScmObj arg, ScmObj env);
-#if SCM_USE_NONSTD_FEATURES
-ScmObj ScmOp_print(ScmObj arg, ScmObj env);
-#endif
 ScmObj ScmOp_newline(ScmObj arg, ScmObj env);
 ScmObj ScmOp_write_char(ScmObj arg, ScmObj env);