gcl-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gcl-devel] read-from-string bug


From: Camm Maguire
Subject: Re: [Gcl-devel] read-from-string bug
Date: Tue, 03 Jan 2012 10:47:56 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux)

Greetings!  This looks right -- please try and let me know and I'll
commit.

Index: read.d
===================================================================
RCS file: /sources/gcl/gcl/o/read.d,v
retrieving revision 1.14.4.1.2.2.2.4.6.1.6.1.4.9
diff -u -u -r1.14.4.1.2.2.2.4.6.1.6.1.4.9 read.d
--- read.d      27 Aug 2010 16:53:25 -0000      1.14.4.1.2.2.2.4.6.1.6.1.4.9
+++ read.d      3 Jan 2012 15:46:22 -0000
@@ -2057,17 +2057,23 @@
                        goto READ;
                }
        }
-       if (eof_errorp == Cnil && recursivep == Cnil)
-               @(return eof_value)
-       end_of_stream(strm);
+       /* if (eof_errorp == Cnil && recursivep == Cnil) */
+       /*      @(return eof_value) */
+       /* end_of_stream(strm); */
 
 READ:
        if (recursivep == Cnil)
                preserving_whitespace_flag = TRUE;
-       if (recursivep == Cnil)
+        detect_eos_flag = TRUE;
+        if (recursivep == Cnil)
                x = read_object_non_recursive(strm);
        else
                x = read_object_recursive(strm);
+       if (x == OBJNULL) {
+               if (eof_errorp == Cnil && recursivep == Cnil)
+                       @(return eof_value)
+               end_of_stream(strm);
+       }
        @(return x)
 @)
 


address@hidden writes:

> gcl-2.6.8 built from repository source on Dec 22, 2011
>
> This works:
>
> (read-from-string ";;;" nil nil :start 0)
>
> This fails:
>
> (read-from-string ";;;" nil nil :start 0 :preserve-whitespace t)
>
> The read-from-string calls read-preserving-whitespace 
> which wanders off to lsp/gcl_iolib.c
> which is where you lost me.
>
> Tim Daly
>
>
>
>

-- 
Camm Maguire                                        address@hidden
==========================================================================
"The earth is but one country, and mankind its citizens."  --  Baha'u'llah



reply via email to

[Prev in Thread] Current Thread [Next in Thread]