[Help-smalltalk] [PATCH 1/2] streams: Fix the ConcatenatedStream>>#copyFrom:to: implementation

[Holger Hans Peter Freyther]

From: Holger Hans Peter Freyther <address@hidden>

$ gst-convert -F squeak -o out.st File1.st File2.st File3.st

failed with nil doesn't understand copyFrom: to:. This happens when
the stream is at the end and 'self stream' returns nil and the last
stream is not migrated to 'last'. Check for this condition in the
copyFrom:to:.

2012-10-06  Holger Freyther  <address@hidden>

        * kernel/StreamOps.st: Modify ConcatenatedStream>>#copyFrom:to:
        when at the end of the last stream.
        * tests/stream.st: Add testcase for ConcatenatedStream>>#copyFrom:to:
        at the end of the last stream.
        * tests/stream.ok: Create the test result.
        * tests/testsuite.at: Add the stream.st to the regression tests.
---
 ChangeLog           |    9 +++++++++
 kernel/StreamOps.st |    2 +-
 tests/testsuite.at  |    1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 91c384e..9ddd89e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-10-06  Holger Freyther  <address@hidden>
+
+       * kernel/StreamOps.st: Modify ConcatenatedStream>>#copyFrom:to:
+       when at the end of the last stream.
+       * tests/stream.st: Add testcase for ConcatenatedStream>>#copyFrom:to:
+       at the end of the last stream.
+       * tests/stream.ok: Create the test result.
+       * tests/testsuite.at: Add the stream.st to the regression tests.
+
 2012-10-02  Holger Freyther  <address@hidden>
 
        * tests/stcompiler.st: Add testcase for pragma parsing.
diff --git a/kernel/StreamOps.st b/kernel/StreamOps.st
index 9fd1769..0525e5f 100644
--- a/kernel/StreamOps.st
+++ b/kernel/StreamOps.st
@@ -158,7 +158,7 @@ Stream subclass: ConcatenatedStream [
 
        <category: 'all'>
        | adjust stream |
-       stream := self stream.
+       stream := self stream ifNil: [streams first].
        end + 1 = start ifTrue: [^''].
        adjust := end <= startPos 
            ifTrue: [stream := last. lastStart]
diff --git a/tests/testsuite.at b/tests/testsuite.at
index ffa3919..d64f061 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -52,6 +52,7 @@ AT_DIFF_TEST([getopt.st])
 AT_DIFF_TEST([quit.st])
 AT_DIFF_TEST([pools.st])
 AT_DIFF_TEST([shape.st])
+AT_DIFF_TEST([stream.st])
 
 AT_BANNER([Other simple tests.])
 AT_DIFF_TEST([ackermann.st])
-- 
1.7.10.4