*** empty log message ***

[bpt/guile.git] / libguile / genio.c

diff --git a/libguile/genio.c b/libguile/genio.c
index 51e18ec..b11bf02 100644 (file)
--- a/libguile/genio.c
+++ b/libguile/genio.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995,1996, 1997 Free Software Foundation, Inc.
+/*     Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -69,10 +69,6 @@ scm_puts (s, port)
 {
   scm_sizet i = SCM_PTOBNUM (port);
   SCM_SYSCALL ((scm_ptobs[i].fputs) (s, port));
-#ifdef TRANSCRIPT_SUPPORT
-  if (scm_trans && (port == def_outp || port == cur_errp))
-    SCM_SYSCALL (fputs (s, scm_trans));
-#endif
 }
 
 void 
@@ -83,10 +79,6 @@ scm_lfwrite (ptr, size, port)
 {
   scm_sizet i = SCM_PTOBNUM (port);
   SCM_SYSCALL (scm_ptobs[i].fwrite (ptr, size, 1, port));
-#ifdef TRANSCRIPT_SUPPORT
-  if (scm_trans && (port == def_outp || port == cur_errp))
-    SCM_SYSCALL (fwrite (ptr, size, 1, scm_trans));
-#endif
 }
 
 
@@ -108,11 +100,10 @@ scm_getc (port)
   int c;
   scm_sizet i;
 
-  /* One char may be stored in the high bits of (car port) orre@nada.kth.se. */
   if (SCM_CRDYP (port))
     {
       c = SCM_CGETUN (port);
-      SCM_CLRDY (port);         /* Clear ungetted char */
+      SCM_TRY_CLRDY (port);         /* Clear ungetted char */
     }
   else
     {
@@ -158,8 +149,8 @@ scm_ungetc (c, port)
      int c;
      SCM port;
 {
-/*     SCM_ASSERT(!SCM_CRDYP(port), port, SCM_ARG2, "too many scm_ungetc");*/
   SCM_CUNGET (c, port);
+
   if (c == '\n')
     {
       /* What should col be in this case?
@@ -172,6 +163,23 @@ scm_ungetc (c, port)
 }
 
 
+void 
+scm_ungets (s, n, port)
+     char *s;
+     int n;
+     SCM port;
+{
+  /* This is simple minded and inefficient, but unreading strings is
+   * probably not a common operation, and remember that line and
+   * column numbers have to be handled...
+   *
+   * Please feel freee to write an optimized version!
+   */
+  while (n--)
+    scm_ungetc (s[n], port);
+}
+
+
 char *
 scm_do_read_line (port, len)
      SCM port;