split ttys from other cases

also, get_wchar should be static

os/charsio.c

@@ -113,7 +113,7 @@ static Int dopeek( int sno )
   ocharcount = s->charcount;
   olinecount = s->linecount;
   olinepos = s->linepos;
-  ch = get_wchar(sno);
+  ch = s->stream_wgetc( sno );
   s->charcount = ocharcount;
   s->linecount = olinecount;
   s->linepos = olinepos;

os/iopreds.c

@@ -88,6 +88,9 @@ static char SccsId[] = "%W% %G%";
 #endif
 #include "iopreds.h"
 
+static int get_wchar( int);
+static int get_wchar_from_file( int);
+
 FILE *Yap_stdin;
 FILE *Yap_stdout;
 FILE *Yap_stderr;
@@ -157,7 +160,10 @@ void
 Yap_DefaultStreamOps( StreamDesc * st)
 {
   st->stream_wputc = put_wchar;
-  st->stream_wgetc = get_wchar;
+  if (!(st->status & (Tty_Stream_f|Reset_Eof_Stream_f|Promptable_Stream_f)))
+    st->stream_wgetc = get_wchar_from_file;
+  else
+    st->stream_wgetc = get_wchar;
   if (GLOBAL_CharConversionTable != NULL)
     st->stream_wgetc_for_read = ISOWGetc;
   else
@@ -266,7 +272,8 @@ InitFileIO(StreamDesc *s)
       s->stream_wputc = put_wchar;
       s->stream_getc = PlGetc;
       s->stream_gets = PlGetsFunc();
-    }
+      s->stream_wgetc = get_wchar_from_file;
+   }
   }
   s->stream_wputc = put_wchar;
   s->stream_wgetc = get_wchar;
@@ -779,6 +786,122 @@ utf8_nof(char ch)
   return 5;
 }
 
+#define wide_char() \
+      switch (GLOBAL_Stream[sno].encoding) { \
+      case ENC_OCTET:\
+        return ch;\
+      case ENC_ISO_LATIN1:\
+        return ch;\
+      case ENC_ISO_ASCII:\
+        if (ch & 0x80) {\
+          /* error */\
+        }\
+        return ch;\
+      case ENC_ISO_ANSI:\
+      {\
+        char buf[1];\
+        int out;\
+        \
+        if (!how_many) {\
+          memset((void *)&(GLOBAL_Stream[sno].mbstate), 0, sizeof(mbstate_t));\
+        }\
+        buf[0] = ch;\
+        if ((out = mbrtowc(&wch, buf, 1, &(GLOBAL_Stream[sno].mbstate))) == 1)\
+          return wch;\
+        if (out == -1) {\
+          /* error */\
+        }\
+        how_many++;\
+        break;\
+      }\
+      case ENC_ISO_UTF8:\
+      {\
+        if (!how_many) {\
+          if (ch & 0x80) {\
+            how_many = utf8_nof(ch);\
+            /*\
+             keep a backup of the start character in case we meet an error,\
+             useful if we are scanning ISO files.\
+             */\
+            GLOBAL_Stream[sno].och = ch;\
+            wch = (ch & ((1<<(6-how_many))-1))<<(6*how_many);\
+          } else {\
+            return ch;\
+          }\
+        } else {\
+          how_many--;\
+          if ((ch & 0xc0) == 0x80) {\
+            wch += (ch & ~0xc0) << (how_many*6);\
+          } else {\
+            /* error */\
+            /* try to recover character, assume this is our first character */\
+            wchar_t och = GLOBAL_Stream[sno].och;\
+	    return och;\
+          }\
+          if (!how_many) {\
+            return wch;\
+          }\
+        }\
+      }\
+        break;\
+      case ENC_UTF16_BE:\
+        if (how_many) {\
+          return wch+ch;\
+        }\
+        how_many=1;\
+        wch = ch << 8;\
+        break;\
+      case ENC_UTF16_LE:\
+        if (how_many) {\
+          return wch+(ch<<8);\
+        }\
+        how_many=1;\
+        wch = ch;\
+        break;\
+      case ENC_ISO_UTF32_LE:\
+        if (!how_many) {\
+          how_many = 4;\
+          wch = 0;\
+        }\
+        how_many--;\
+        wch += ((unsigned char) (ch & 0xff)) << (how_many*8);\
+        if (how_many == 0)\
+          return wch;\
+        break;\
+      case ENC_ISO_UTF32_BE:\
+        if (!how_many) {\
+          how_many = 4;\
+          wch = 0;\
+        }\
+        how_many--;\
+        wch += ((unsigned char) (ch & 0xff)) << ((3-how_many)*8);\
+        if (how_many == 0)\
+          return wch;\
+        break;\
+    }\
+
+
+static int
+get_wchar(int sno)
+{
+  int ch;
+  wchar_t wch;
+  int how_many = 0;
+
+  while (TRUE) {
+    ch = GLOBAL_Stream[sno].stream_getc(sno);
+    if (ch == -1) {
+      if (how_many) {
+	/* error */
+      }
+      return EOF;
+    }
+    wide_char();
+  }
+  return EOF;
+}
+
+// layered version
 static int
 get_wchar__(int sno)
 {
@@ -795,104 +918,13 @@ get_wchar__(int sno)
       }
       return post_process_weof(s);
     }
-    switch (GLOBAL_Stream[sno].encoding) {
+    wide_char();
-      case ENC_OCTET:
-        return ch;
-      case ENC_ISO_LATIN1:
-        return ch;
-      case ENC_ISO_ASCII:
-        if (ch & 0x80) {
-          /* error */
-        }
-        return ch;
-      case ENC_ISO_ANSI:
-      {
-        char buf[1];
-        int out;
-        
-        if (!how_many) {
-          memset((void *)&(GLOBAL_Stream[sno].mbstate), 0, sizeof(mbstate_t));
-        }
-        buf[0] = ch;
-        if ((out = mbrtowc(&wch, buf, 1, &(GLOBAL_Stream[sno].mbstate))) == 1)
-          return wch;
-        if (out == -1) {
-          /* error */
-        }
-        how_many++;
-        break;
-      }
-      case ENC_ISO_UTF8:
-      {
-        if (!how_many) {
-          if (ch & 0x80) {
-            how_many = utf8_nof(ch);
-            /*
-             keep a backup of the start character in case we meet an error,
-             useful if we are scanning ISO files.
-             */
-            GLOBAL_Stream[sno].och = ch;
-            wch = (ch & ((1<<(6-how_many))-1))<<(6*how_many);
-          } else {
-            return ch;
-          }
-        } else {
-          how_many--;
-          if ((ch & 0xc0) == 0x80) {
-            wch += (ch & ~0xc0) << (how_many*6);
-          } else {
-            /* error */
-            /* try to recover character, assume this is our first character */
-            wchar_t och = GLOBAL_Stream[sno].och;
-	    return och;
-          }
-          if (!how_many) {
-            return wch;
-          }
-        }
-      }
-        break;
-      case ENC_UTF16_BE:
-        if (how_many) {
-          return wch+ch;
-        }
-        how_many=1;
-        wch = ch << 8;
-        break;
-      case ENC_UTF16_LE:
-        if (how_many) {
-          return wch+(ch<<8);
-        }
-        how_many=1;
-        wch = ch;
-        break;
-      case ENC_ISO_UTF32_LE:
-        if (!how_many) {
-          how_many = 4;
-          wch = 0;
-        }
-        how_many--;
-        wch += ((unsigned char) (ch & 0xff)) << (how_many*8);
-        if (how_many == 0)
-          return wch;
-        break;
-      case ENC_ISO_UTF32_BE:
-        if (!how_many) {
-          how_many = 4;
-          wch = 0;
-        }
-        how_many--;
-        wch += ((unsigned char) (ch & 0xff)) << ((3-how_many)*8);
-        if (how_many == 0)
-          return wch;
-        break;
-    }
   }
   return EOF;
 }
 
-int
+static int
-get_wchar(int sno)
+get_wchar_from_file(int sno)
 {
   return post_process_read_char( get_wchar__( sno ), GLOBAL_Stream+sno );
 }
@@ -1691,6 +1723,22 @@ Yap_CheckTextStream (Term arg, int kind, const char *msg)
 }
 
  
+/* used from C-interface */
+int Yap_GetFreeStreamDForReading(void) {
+  int sno = GetFreeStreamD();
+  StreamDesc *s;
+
+  if (sno < 0)
+    return sno;
+  s = GLOBAL_Stream + sno;
+  s->status |= User_Stream_f | Input_Stream_f;
+  s->charcount = 0;
+  s->linecount = 1;
+  s->linepos = 0;
+  Yap_DefaultStreamOps( s );
+  UNLOCK(s->streamlock);
+  return sno;
+}
 
 static Int
 always_prompt_user( USES_REGS1 )

os/iopreds.h

@@ -318,7 +318,6 @@ GetsFunc PlGetsFunc(void);
 int PlGetc (int sno);
 int FilePutc (int sno, int c);
 int DefaultGets( int,UInt,char*);
-int get_wchar( int);
 int put_wchar(int sno, wchar_t ch);
 Int GetStreamFd(int sno);
 int ResetEOF(StreamDesc *s);

os/streams.c

@@ -145,34 +145,6 @@ int GetFreeStreamD(void) {
 
 int Yap_GetFreeStreamD(void) { return GetFreeStreamD(); }
 
-/* used from C-interface */
-int Yap_GetFreeStreamDForReading(void) {
-  CACHE_REGS
-  int sno = GetFreeStreamD();
-  StreamDesc *s;
-
-  if (sno < 0)
-    return sno;
-  s = GLOBAL_Stream + sno;
-  s->status |= User_Stream_f | Input_Stream_f;
-  s->charcount = 0;
-  s->linecount = 1;
-  s->linepos = 0;
-  s->stream_wgetc = get_wchar;
-  s->stream_wputc = put_wchar;
-  s->encoding = LOCAL_encoding;
-  if (GLOBAL_CharConversionTable != NULL)
-    s->stream_wgetc_for_read = ISOWGetc;
-  else
-    s->stream_wgetc_for_read = s->stream_wgetc;
-  if (s->encoding == ENC_ISO_UTF8)
-    s->stream_getc_for_utf8 = s->stream_getc;
-  else
-    s->stream_getc_for_utf8 = GetUTF8;
-  UNLOCK(s->streamlock);
-  return sno;
-}
-
 static Int p_stream_flags(USES_REGS1) { /* '$stream_flags'(+N,-Flags) */
   Term trm;
   trm = Deref(ARG1);