[Gd-chatter] r11364 - in trunk/fundev/sources: common-dylan deuce dfmc/reader harp/binary-builder harp/coff-builder harp/gnu-outputter io io/streams lib/bulk-io lib/jam lib/java-parser lib/source-records
agent at gwydiondylan.org
agent at gwydiondylan.org
Mon May 21 03:59:30 CEST 2007
Author: agent
Date: Mon May 21 03:59:26 2007
New Revision: 11364
Modified:
trunk/fundev/sources/common-dylan/byte-vector.dylan
trunk/fundev/sources/deuce/lines.dylan
trunk/fundev/sources/deuce/nodes.dylan
trunk/fundev/sources/deuce/streams.dylan
trunk/fundev/sources/dfmc/reader/lexer-support.dylan
trunk/fundev/sources/harp/binary-builder/sections.dylan
trunk/fundev/sources/harp/coff-builder/coff-builder.dylan
trunk/fundev/sources/harp/gnu-outputter/gnu-outputter.dylan
trunk/fundev/sources/io/pprint.dylan
trunk/fundev/sources/io/streams/buffer.dylan
trunk/fundev/sources/io/streams/buffered-stream.dylan
trunk/fundev/sources/io/streams/native-buffer.dylan
trunk/fundev/sources/io/streams/sequence-stream.dylan
trunk/fundev/sources/io/streams/typed-stream.dylan
trunk/fundev/sources/lib/bulk-io/dood-interface.dylan
trunk/fundev/sources/lib/bulk-io/memory-mapped-io.dylan
trunk/fundev/sources/lib/jam/jam-target-build.dylan
trunk/fundev/sources/lib/java-parser/tokenize.dylan
trunk/fundev/sources/lib/source-records/source-locations.dylan
Log:
Bug: 7352
Rationalized copy-bytes argument order.
Modified: trunk/fundev/sources/common-dylan/byte-vector.dylan
==============================================================================
--- trunk/fundev/sources/common-dylan/byte-vector.dylan (original)
+++ trunk/fundev/sources/common-dylan/byte-vector.dylan Mon May 21 03:59:26 2007
@@ -45,11 +45,11 @@
end method;
//---*** It would sure be nice to have low-level run-time support for this
-define open generic copy-bytes (src, src-start, dst, dst-start, n) => ();
+define open generic copy-bytes (dst, dst-start, src, src-start, n) => ();
define open method copy-bytes
- (src :: <sequence>, src-start :: <integer>, dst :: <sequence>,
- dst-start :: <integer>, n :: <integer>)
+ (dst :: <sequence>, dst-start :: <integer>,
+ src :: <sequence>, src-start :: <integer>, n :: <integer>)
=> ()
for (i :: <integer> from 0 below n)
dst[dst-start + i] := src[src-start + i]
@@ -57,8 +57,8 @@
end method;
define open method copy-bytes
- (src :: <vector>, src-start :: <integer>, dst :: <vector>,
- dst-start :: <integer>, n :: <integer>)
+ (dst :: <vector>, dst-start :: <integer>,
+ src :: <vector>, src-start :: <integer>, n :: <integer>)
=> ()
for (i :: <integer> from 0 below n)
dst[dst-start + i] := src[src-start + i]
@@ -66,8 +66,8 @@
end method;
define open method copy-bytes
- (src :: <string>, src-start :: <integer>, dst :: <string>,
- dst-start :: <integer>, n :: <integer>)
+ (dst :: <string>, dst-start :: <integer>,
+ src :: <string>, src-start :: <integer>, n :: <integer>)
=> ()
for (i :: <integer> from 0 below n)
dst[dst-start + i] := src[src-start + i]
@@ -75,8 +75,8 @@
end method;
define open method copy-bytes
- (src :: <vector>, src-start :: <integer>, dst :: <string>,
- dst-start :: <integer>, n :: <integer>)
+ (dst :: <string>, dst-start :: <integer>,
+ src :: <vector>, src-start :: <integer>, n :: <integer>)
=> ()
for (i :: <integer> from 0 below n)
dst[dst-start + i] := as(<character>, src[src-start + i])
@@ -84,8 +84,8 @@
end method;
define open method copy-bytes
- (src :: <string>, src-start :: <integer>, dst :: <vector>,
- dst-start :: <integer>, n :: <integer>)
+ (dst :: <vector>, dst-start :: <integer>,
+ src :: <string>, src-start :: <integer>, n :: <integer>)
=> ()
for (i :: <integer> from 0 below n)
dst[dst-start + i] := as(<integer>, src[src-start + i])
@@ -100,8 +100,8 @@
end function;
define sealed method copy-bytes
- (src :: <byte-vector>, src-start :: <integer>, dst :: <byte-vector>,
- dst-start :: <integer>, n :: <integer>) => ()
+ (dst :: <byte-vector>, dst-start :: <integer>,
+ src :: <byte-vector>, src-start :: <integer>, n :: <integer>) => ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
if (n >= 0 & src-start >= 0 & dst-start >= 0 & src-end <= size(src) & dst-end <= size(dst))
@@ -115,8 +115,8 @@
end method;
define sealed method copy-bytes
- (src :: <byte-vector>, src-start :: <integer>, dst :: <byte-string>,
- dst-start :: <integer>, n :: <integer>) => ()
+ (dst :: <byte-string>, dst-start :: <integer>,
+ src :: <byte-vector>, src-start :: <integer>, n :: <integer>) => ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
if (n >= 0 & src-start >= 0 & dst-start >= 0 & src-end <= size(src) & dst-end <= size(dst))
@@ -130,8 +130,8 @@
end method;
define sealed method copy-bytes
- (src :: <byte-string>, src-start :: <integer>, dst :: <byte-vector>,
- dst-start :: <integer>, n :: <integer>) => ()
+ (dst :: <byte-vector>, dst-start :: <integer>,
+ src :: <byte-string>, src-start :: <integer>, n :: <integer>) => ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
if (n >= 0 & src-start >= 0 & dst-start >= 0 & src-end <= size(src) & dst-end <= size(dst))
@@ -145,8 +145,8 @@
end method;
define sealed method copy-bytes
- (src :: <byte-string>, src-start :: <integer>, dst :: <byte-string>,
- dst-start :: <integer>, n :: <integer>) => ()
+ (dst :: <byte-string>, dst-start :: <integer>,
+ src :: <byte-string>, src-start :: <integer>, n :: <integer>) => ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
if (n >= 0 & src-start >= 0 & dst-start >= 0 & src-end <= size(src) & dst-end <= size(dst))
@@ -160,8 +160,8 @@
end method;
define sealed method copy-bytes
- (src :: <simple-object-vector>, src-start :: <integer>,
- dst :: <byte-vector>, dst-start :: <integer>, n :: <integer>) => ()
+ (dst :: <byte-vector>, dst-start :: <integer>,
+ src :: <simple-object-vector>, src-start :: <integer>, n :: <integer>) => ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
if (n >= 0 & src-start >= 0 & dst-start >= 0 & src-end <= size(src) & dst-end <= size(dst))
@@ -177,8 +177,8 @@
end method;
define sealed method copy-bytes
- (src :: <byte-vector>, src-start :: <integer>,
- dst :: <simple-object-vector>, dst-start :: <integer>, n :: <integer>)
+ (dst :: <simple-object-vector>, dst-start :: <integer>,
+ src :: <byte-vector>, src-start :: <integer>, n :: <integer>)
=> ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
Modified: trunk/fundev/sources/deuce/lines.dylan
==============================================================================
--- trunk/fundev/sources/deuce/lines.dylan (original)
+++ trunk/fundev/sources/deuce/lines.dylan Mon May 21 03:59:26 2007
@@ -179,7 +179,7 @@
= make(object-class(contents),
size: max(length,
floor(contents-length * $line-expansion-factor)));
- copy-bytes(contents, 0, new-contents, 0, line-length(line));
+ copy-bytes(new-contents, 0, contents, 0, line-length(line));
line.%contents := new-contents
end;
line.%length := length;
@@ -332,7 +332,7 @@
let contents = line-contents(line);
let string = make(<byte-string>, size: length);
// Use the fastest method available to copy the line contents
- copy-bytes(contents, 0, string, 0, length);
+ copy-bytes(string, 0, contents, 0, length);
string
end method as;
Modified: trunk/fundev/sources/deuce/nodes.dylan
==============================================================================
--- trunk/fundev/sources/deuce/nodes.dylan (original)
+++ trunk/fundev/sources/deuce/nodes.dylan Mon May 21 03:59:26 2007
@@ -248,7 +248,7 @@
do-lines(method (line, si, ei, last?)
let n :: <integer> = ei - si;
// Use the fastest method available to copy the line contents
- copy-bytes(line-contents(line), si, string, i, n);
+ copy-bytes(string, i, line-contents(line), si, n);
inc!(i, n);
if (~last? | ei > line-length(line))
string[i] := '\n';
Modified: trunk/fundev/sources/deuce/streams.dylan
==============================================================================
--- trunk/fundev/sources/deuce/streams.dylan (original)
+++ trunk/fundev/sources/deuce/streams.dylan Mon May 21 03:59:26 2007
@@ -141,7 +141,7 @@
do-lines(method (line, si, ei, last?)
ignore(last?);
let n :: <integer> = ei - si;
- copy-bytes(line-contents(line), si, dst, i, min(n, limit));
+ copy-bytes(dst, i, line-contents(line), si, min(n, limit));
inc!(i, n);
dec!(limit, n);
when (limit <= 0)
@@ -198,12 +198,12 @@
let contents = line-contents(line);
case
length - index <= size(string) - start =>
- copy-bytes(contents, index, string, start, length - index);
+ copy-bytes(string, start, contents, index, length - index);
grow? =>
string := make(type-for-copy(string), size: length - index);
- copy-bytes(contents, index, string, start, length - index);
+ copy-bytes(string, start, contents, index, length - index);
otherwise =>
- copy-bytes(contents, index, string, start, size(string) - start);
+ copy-bytes(string, start, contents, index, size(string) - start);
end;
let next = line-next-in-buffer(line, stream.%buffer);
if (next)
Modified: trunk/fundev/sources/dfmc/reader/lexer-support.dylan
==============================================================================
--- trunk/fundev/sources/dfmc/reader/lexer-support.dylan (original)
+++ trunk/fundev/sources/dfmc/reader/lexer-support.dylan Mon May 21 03:59:26 2007
@@ -58,9 +58,7 @@
= make(<byte-string>, size: bytes);
let sr :: <compilation-record> = loc.source-location-record;
copy-bytes
- (sr.contents,
- the-start,
- string, 0, bytes);
+ (string, 0, sr.contents, the-start, bytes);
string
end function;
@@ -91,9 +89,7 @@
let bytes = the-end - the-start;
let string :: <byte-string> = make(<byte-string>, size: bytes);
copy-bytes
- (loc.source-location-record.contents,
- the-start,
- string, 0, bytes);
+ (string, 0, loc.source-location-record.contents, the-start, bytes);
string
end function;
Modified: trunk/fundev/sources/harp/binary-builder/sections.dylan
==============================================================================
--- trunk/fundev/sources/harp/binary-builder/sections.dylan (original)
+++ trunk/fundev/sources/harp/binary-builder/sections.dylan Mon May 21 03:59:26 2007
@@ -167,7 +167,7 @@
want := want + want;
end while;
let new-data = make(<byte-vector>, size: want);
- copy-bytes(data, 0, new-data, 0, curr-len);
+ copy-bytes(new-data, 0, data, 0, curr-len);
section.section-data := new-data;
end if;
end method;
Modified: trunk/fundev/sources/harp/coff-builder/coff-builder.dylan
==============================================================================
--- trunk/fundev/sources/harp/coff-builder/coff-builder.dylan (original)
+++ trunk/fundev/sources/harp/coff-builder/coff-builder.dylan Mon May 21 03:59:26 2007
@@ -601,7 +601,7 @@
let pos = section.current-position;
let len = string.size;
section.current-position := pos + len;
- copy-bytes(string, 0, section.section-data, pos, len);
+ copy-bytes(section.section-data, pos, string, 0, len);
end method;
@@ -610,7 +610,7 @@
let pos = section.current-position;
let len = vector.size;
section.current-position := pos + len;
- copy-bytes(vector, 0, section.section-data, pos, len);
+ copy-bytes(section.section-data, pos, vector, 0, len);
end method;
@@ -854,7 +854,7 @@
string :: <byte-string>,
inx :: <integer>) => ()
let len = string.size;
- copy-bytes(string, 0, data, inx, len);
+ copy-bytes(data, inx, string, 0, len);
data[inx + len] := 0; // the null termination
end method;
Modified: trunk/fundev/sources/harp/gnu-outputter/gnu-outputter.dylan
==============================================================================
--- trunk/fundev/sources/harp/gnu-outputter/gnu-outputter.dylan (original)
+++ trunk/fundev/sources/harp/gnu-outputter/gnu-outputter.dylan Mon May 21 03:59:26 2007
@@ -820,7 +820,7 @@
let new-pos = pos + len;
ensure-size-of-section-data(section, new-pos);
section.raw-data-size := new-pos;
- copy-bytes(string, start, section.section-data, pos, len);
+ copy-bytes(section.section-data, pos, string, start, len);
end method;
define method copy-integer-to-section
Modified: trunk/fundev/sources/io/pprint.dylan
==============================================================================
--- trunk/fundev/sources/io/pprint.dylan (original)
+++ trunk/fundev/sources/io/pprint.dylan Mon May 21 03:59:26 2007
@@ -58,7 +58,7 @@
src ~== dst
=> // Use the standard "any which way" version, which is likely to be
// faster.
- copy-bytes(src, src-start, dst, dst-start, n);
+ copy-bytes(dst, dst-start, src, src-start, n);
src-start < 0 | src-start + n > size(src)
=> error("Source parameters for copy-maybe-overlapping-bytes from %= "
"are out of range - start at %d, copy %d bytes.",
@@ -321,7 +321,7 @@
let count = min(chars, available);
let fill-pointer = stream.pretty-stream-buffer-fill-pointer;
let new-fill-ptr = fill-pointer + count;
- copy-bytes(stuff, start, stream.pretty-stream-buffer, fill-pointer, count);
+ copy-bytes(stream.pretty-stream-buffer, fill-pointer, stuff, start, count);
stream.pretty-stream-buffer-fill-pointer := new-fill-ptr;
unless (count == chars)
append-raw-output(stream, stuff, start + count, stop);
@@ -400,8 +400,8 @@
// Therefore, set-indentation grew the prefix enough to put spaces in where
// we are about to put the per-line-prefix.
new-block.logical-block-per-line-prefix-end := column;
- copy-bytes(prefix, 0,
- stream.pretty-stream-prefix, column - prefix.size,
+ copy-bytes(stream.pretty-stream-prefix, column - prefix.size,
+ prefix, 0,
prefix.size);
end;
if (suffix)
@@ -414,15 +414,15 @@
= max(total-suffix-len * 2,
suffix-length + floor/(additional * 5, 4));
let new-total-suffix = make(<byte-string>, size: new-total-suffix-len);
- copy-bytes(total-suffix, total-suffix-len - suffix-length,
- new-total-suffix, new-total-suffix-len - suffix-length,
- suffix-length);
+ copy-bytes(new-total-suffix, new-total-suffix-len - suffix-length,
+ total-suffix, total-suffix-len - suffix-length,
+ suffix-length);
total-suffix := new-total-suffix;
total-suffix-len := new-total-suffix-len;
stream.pretty-stream-suffix := total-suffix;
end;
- copy-bytes(suffix, 0,
- total-suffix, total-suffix-len - new-suffix-len,
+ copy-bytes(total-suffix, total-suffix-len - new-suffix-len,
+ suffix, 0,
additional);
new-block.logical-block-suffix-length := new-suffix-len;
end;
@@ -445,7 +445,7 @@
let new-prefix-len
= max(prefix-len * 2, prefix-len + floor/((column - prefix-len) * 5, 4));
let new-prefix = make(<byte-string>, size: new-prefix-len);
- copy-bytes(prefix, 0, new-prefix, 0, current);
+ copy-bytes(new-prefix, 0, prefix, 0, current);
prefix := stream.pretty-stream-prefix := new-prefix;
end;
if (column > current)
@@ -854,7 +854,7 @@
stop := tabpos;
end;
unless (new-buffer == buffer)
- copy-bytes(buffer, 0, new-buffer, 0, stop);
+ copy-bytes(new-buffer, 0, buffer, 0, stop);
end;
end;
end;
@@ -886,7 +886,7 @@
let new-length = max(length * 2, length + floor/(want * 5, 4));
let new-buffer = make(<byte-string>, size: new-length);
stream.pretty-stream-buffer := new-buffer;
- copy-bytes(buffer, 0, new-buffer, 0, fill-ptr);
+ copy-bytes(new-buffer, 0, buffer, 0, fill-ptr);
new-length - fill-ptr;
end;
end;
@@ -1103,7 +1103,7 @@
copy-maybe-overlapping-bytes
(buffer, amount-to-consume, new-buffer, prefix-len,
fill-ptr - amount-to-consume);
- copy-bytes(stream.pretty-stream-prefix, 0, new-buffer, 0, prefix-len);
+ copy-bytes(new-buffer, 0, stream.pretty-stream-prefix, 0, prefix-len);
stream.pretty-stream-buffer-fill-pointer := new-fill-ptr;
stream.pretty-stream-buffer-offset
:= stream.pretty-stream-buffer-offset + shift;
@@ -1134,7 +1134,7 @@
write(stream.pretty-stream-target, buffer, start: 0, end: count);
stream.pretty-stream-buffer-start-column
:= stream.pretty-stream-buffer-start-column + count;
- copy-bytes(buffer, count, buffer, 0, new-fill-ptr);
+ copy-bytes(buffer, 0, buffer, count, new-fill-ptr);
stream.pretty-stream-buffer-fill-pointer := new-fill-ptr;
stream.pretty-stream-buffer-offset
:= stream.pretty-stream-buffer-offset + count;
Modified: trunk/fundev/sources/io/streams/buffer.dylan
==============================================================================
--- trunk/fundev/sources/io/streams/buffer.dylan (original)
+++ trunk/fundev/sources/io/streams/buffer.dylan Mon May 21 03:59:26 2007
@@ -134,7 +134,7 @@
=> (result :: <byte-string>)
let count = end-index - start-index;
let seq = make(class, size: count);
- copy-bytes(buffer, start-index, seq, 0, count);
+ copy-bytes(seq, 0, buffer, start-index, count);
seq
end method buffer-subsequence;
@@ -144,7 +144,7 @@
=> (result :: <byte-vector>)
let count = end-index - start-index;
let seq = make(class, size: count);
- copy-bytes(buffer, start-index, seq, 0, count);
+ copy-bytes(seq, 0, buffer, start-index, count);
seq
end method buffer-subsequence;
@@ -176,14 +176,14 @@
(buffer :: <buffer>, buffer-start-index :: <buffer-index>,
sequence :: <byte-string>,
#key start: start-index = 0, end: end-index) => ()
- copy-bytes(sequence, start-index, buffer, buffer-start-index, (end-index | sequence.size))
+ copy-bytes(buffer, buffer-start-index, sequence, start-index, (end-index | sequence.size))
end method copy-into-buffer!;
define sealed method copy-into-buffer!
(buffer :: <buffer>, buffer-start-index :: <buffer-index>,
sequence :: <byte-vector>,
#key start: start-index = 0, end: end-index) => ()
- copy-bytes(sequence, start-index, buffer, buffer-start-index, (end-index | sequence.size))
+ copy-bytes(buffer, buffer-start-index, sequence, start-index, (end-index | sequence.size))
end method copy-into-buffer!;
@@ -197,14 +197,14 @@
(buffer :: <buffer>, buffer-start-index :: <buffer-index>,
sequence :: <byte-string>,
#key start: start-index = 0, end: end-index) => ()
- copy-bytes(buffer, buffer-start-index, sequence, start-index, (end-index | sequence.size))
+ copy-bytes(sequence, start-index, buffer, buffer-start-index, (end-index | sequence.size))
end method copy-from-buffer!;
define sealed method copy-from-buffer!
(buffer :: <buffer>, buffer-start-index :: <buffer-index>,
sequence :: <byte-vector>,
#key start: start-index = 0, end: end-index) => ()
- copy-bytes(buffer, buffer-start-index, sequence, start-index, (end-index | sequence.size))
+ copy-bytes(sequence, start-index, buffer, buffer-start-index, (end-index | sequence.size))
end method copy-from-buffer!;
//
Modified: trunk/fundev/sources/io/streams/buffered-stream.dylan
==============================================================================
--- trunk/fundev/sources/io/streams/buffered-stream.dylan (original)
+++ trunk/fundev/sources/io/streams/buffered-stream.dylan Mon May 21 03:59:26 2007
@@ -542,13 +542,13 @@
if (line)
let new = make(stream-sequence-class(stream),
size: line.size + i - bi);
- copy-bytes(line, 0, new, 0, line.size);
- copy-bytes(sb, bi, new, line.size, i - bi);
+ copy-bytes(new, 0, line, 0, line.size);
+ copy-bytes(new, line.size, sb, bi, i - bi);
line := new
else
line := make(stream-sequence-class(stream),
size: i - bi);
- copy-bytes(sb, bi, line, 0, i - bi)
+ copy-bytes(line, 0, sb, bi, i - bi)
end
end method;
iterate loop (sb :: false-or(<buffer>) = sb)
Modified: trunk/fundev/sources/io/streams/native-buffer.dylan
==============================================================================
--- trunk/fundev/sources/io/streams/native-buffer.dylan (original)
+++ trunk/fundev/sources/io/streams/native-buffer.dylan Mon May 21 03:59:26 2007
@@ -291,8 +291,8 @@
end function;
define sealed method copy-bytes
- (src :: <buffer>, src-start :: <integer>, dst :: <byte-string>,
- dst-start :: <integer>, n :: <integer>) => ()
+ (dst :: <byte-string>, dst-start :: <integer>,
+ src :: <buffer>, src-start :: <integer>, n :: <integer>) => ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
if (n >= 0 & src-start >= 0 & dst-start >= 0 & src-end <= size(src) & dst-end <= size(dst))
@@ -306,8 +306,8 @@
end method;
define sealed method copy-bytes
- (src :: <byte-string>, src-start :: <integer>, dst :: <buffer>,
- dst-start :: <integer>, n :: <integer>) => ()
+ (dst :: <buffer>, dst-start :: <integer>,
+ src :: <byte-string>, src-start :: <integer>, n :: <integer>) => ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
if (n >= 0 & src-start >= 0 & dst-start >= 0 & src-end <= size(src)
@@ -322,8 +322,8 @@
end method;
define sealed method copy-bytes
- (src :: <buffer>, src-start :: <integer>, dst :: <buffer>,
- dst-start :: <integer>, n :: <integer>) => ()
+ (dst :: <buffer>, dst-start :: <integer>,
+ src :: <buffer>, src-start :: <integer>, n :: <integer>) => ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
if (n >= 0 & src-start >= 0 & dst-start >= 0 & src-end <= size(src) & dst-end <= size(dst))
@@ -337,8 +337,8 @@
end method;
define sealed method copy-bytes
- (src :: <buffer>, src-start :: <integer>, dst :: <byte-vector>,
- dst-start :: <integer>, n :: <integer>) => ()
+ (dst :: <byte-vector>, dst-start :: <integer>,
+ src :: <buffer>, src-start :: <integer>, n :: <integer>) => ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
if (n >= 0 & src-start >= 0 & dst-start >= 0 & src-end <= size(src) & dst-end <= size(dst))
@@ -352,8 +352,8 @@
end method;
define sealed method copy-bytes
- (src :: <byte-vector>, src-start :: <integer>, dst :: <buffer>,
- dst-start :: <integer>, n :: <integer>) => ()
+ (dst :: <buffer>, dst-start :: <integer>,
+ src :: <byte-vector>, src-start :: <integer>, n :: <integer>) => ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
if (n >= 0 & src-start >= 0 & dst-start >= 0 & src-end <= size(src)
@@ -368,8 +368,8 @@
end method;
define sealed method copy-bytes
- (src :: <simple-object-vector>, src-start :: <integer>,
- dst :: <buffer>, dst-start :: <integer>, n :: <integer>) => ()
+ (dst :: <buffer>, dst-start :: <integer>,
+ src :: <simple-object-vector>, src-start :: <integer>, n :: <integer>) => ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
if (n >= 0 & src-start >= 0 & dst-start >= 0 & src-end <= size(src) & dst-end <= size(dst))
@@ -384,8 +384,8 @@
end method;
define sealed method copy-bytes
- (src :: <buffer>, src-start :: <integer>,
- dst :: <simple-object-vector>, dst-start :: <integer>, n :: <integer>)
+ (dst :: <simple-object-vector>, dst-start :: <integer>,
+ src :: <buffer>, src-start :: <integer>, n :: <integer>)
=> ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
Modified: trunk/fundev/sources/io/streams/sequence-stream.dylan
==============================================================================
--- trunk/fundev/sources/io/streams/sequence-stream.dylan (original)
+++ trunk/fundev/sources/io/streams/sequence-stream.dylan Mon May 21 03:59:26 2007
@@ -189,7 +189,7 @@
let src-n :: <integer> = (stream-limit(stream) | stream.final-position) - pos;
let dst-n :: <integer> = dst.size - start;
let n-read :: <integer> = min(n, src-n, dst-n);
- copy-bytes(seq, pos, dst, start, n-read);
+ copy-bytes(dst, start, seq, pos, n-read);
stream.current-position := pos + n-read;
if (n > src-n & dst-n > src-n
& unsupplied?(on-end-of-stream))
@@ -242,7 +242,7 @@
dst := grow-for-stream(dst, required-space);
stream-sequence(stream) := dst
end;
- copy-bytes(src, start-index, dst, pos, count);
+ copy-bytes(dst, pos, src, start-index, count);
let new-pos = pos + count;
stream.current-position := new-pos;
if (new-pos > stream.final-position)
@@ -255,7 +255,7 @@
=> (new-seq :: <sequence>)
let n :: <integer> = seq.size;
let new-seq = make(object-class(seq), size: max(min-size, 2 * n));
- copy-bytes(seq, 0, new-seq, 0, n);
+ copy-bytes(new-seq, 0, seq, 0, n);
new-seq
end method grow-for-stream;
@@ -304,7 +304,7 @@
let _end = stream-limit(stream) | stream.final-position;
let n = _end - _start;
let result = make(type, size: n);
- copy-bytes(stream-sequence(stream), _start, result, 0, n);
+ copy-bytes(result, 0, stream-sequence(stream), _start, n);
if (clear-contents?)
clear-contents(stream)
end;
Modified: trunk/fundev/sources/io/streams/typed-stream.dylan
==============================================================================
--- trunk/fundev/sources/io/streams/typed-stream.dylan (original)
+++ trunk/fundev/sources/io/streams/typed-stream.dylan Mon May 21 03:59:26 2007
@@ -29,8 +29,10 @@
slot sequence-type /* ---*** :: subclass(<sequence>) */ = <byte-string>;
slot to-element-mapper :: <function> = byte-to-byte-char;
slot from-element-mapper :: <function> = byte-char-to-byte;
- constant slot to-sequence-mapper :: <function> = copy-bytes;
- constant slot from-sequence-mapper :: <function> = copy-bytes;
+ constant slot to-sequence-mapper :: <function> =
+ method (s, ss, d, ds, n) => () copy-bytes(d, ds, s, ss, n) end;
+ constant slot from-sequence-mapper :: <function> =
+ method (s, ss, d, ds, n) => () copy-bytes(d, ds, s, ss, n) end;
end class <typed-stream>;
define open abstract class <general-typed-stream> (<typed-stream>)
@@ -141,7 +143,7 @@
buffer :: <buffer>, buf-start :: <integer>,
sequence :: <sequence>, seq-start :: <integer>,
count :: <integer>) => ()
- copy-bytes(buffer, buf-start, sequence, seq-start, count)
+ copy-bytes(sequence, seq-start, buffer, buf-start, count)
end method coerce-to-sequence;
define sealed inline method coerce-to-sequence
@@ -149,7 +151,7 @@
buffer :: <buffer>, buf-start :: <integer>,
sequence :: <sequence>, seq-start :: <integer>,
count :: <integer>) => ()
- copy-bytes(buffer, buf-start, sequence, seq-start, count)
+ copy-bytes(sequence, seq-start, buffer, buf-start, count)
end method coerce-to-sequence;
define method coerce-to-sequence
@@ -157,7 +159,7 @@
buffer :: <buffer>, buf-start :: <integer>,
sequence :: <sequence>, seq-start :: <integer>,
count :: <integer>) => ()
- copy-bytes(buffer, buf-start, sequence, seq-start, count)
+ copy-bytes(sequence, seq-start, buffer, buf-start, count)
end method coerce-to-sequence;
@@ -180,7 +182,7 @@
buffer :: <buffer>, buf-start :: <integer>,
sequence :: <sequence>, seq-start :: <integer>,
count :: <integer>) => ()
- copy-bytes(sequence, seq-start, buffer, buf-start, count)
+ copy-bytes(buffer, buf-start, sequence, seq-start, count)
end method coerce-from-sequence;
define sealed inline method coerce-from-sequence
@@ -188,7 +190,7 @@
buffer :: <buffer>, buf-start :: <integer>,
sequence :: <sequence>, seq-start :: <integer>,
count :: <integer>) => ()
- copy-bytes(sequence, seq-start, buffer, buf-start, count)
+ copy-bytes(buffer, buf-start, sequence, seq-start, count)
end method coerce-from-sequence;
define method coerce-from-sequence
@@ -196,5 +198,5 @@
buffer :: <buffer>, buf-start :: <integer>,
sequence :: <sequence>, seq-start :: <integer>,
count :: <integer>) => ()
- copy-bytes(sequence, seq-start, buffer, buf-start, count)
+ copy-bytes(buffer, buf-start, sequence, seq-start, count)
end method coerce-from-sequence;
Modified: trunk/fundev/sources/lib/bulk-io/dood-interface.dylan
==============================================================================
--- trunk/fundev/sources/lib/bulk-io/dood-interface.dylan (original)
+++ trunk/fundev/sources/lib/bulk-io/dood-interface.dylan Mon May 21 03:59:26 2007
@@ -79,7 +79,7 @@
=> (count)
ignore(on-end-of-stream);
block ()
- copy-bytes(this.mapped-file, this.stream-position, seq, start, n);
+ copy-bytes(seq, start, this.mapped-file, this.stream-position, n);
this.stream-position := this.stream-position + n;
n
exception (<invalid-index-error>)
@@ -102,7 +102,7 @@
=> ()
if (unsupplied?(last)) last := seq.size; end if;
let n = last - start;
- copy-bytes(seq, start, this.mapped-file, this.stream-position, n);
+ copy-bytes(this.mapped-file, this.stream-position, seq, start, n);
this.stream-position := this.stream-position + n;
if (this.stream-position > this.stream-size)
this.stream-size := this.stream-position;
Modified: trunk/fundev/sources/lib/bulk-io/memory-mapped-io.dylan
==============================================================================
--- trunk/fundev/sources/lib/bulk-io/memory-mapped-io.dylan (original)
+++ trunk/fundev/sources/lib/bulk-io/memory-mapped-io.dylan Mon May 21 03:59:26 2007
@@ -325,8 +325,8 @@
define inline method copy-bytes
- (src :: type-union(<byte-vector>, <byte-string>), src-start :: <integer>,
- dst :: <memory-mapped-file>, dst-start :: <integer>,
+ (dst :: <memory-mapped-file>, dst-start :: <integer>,
+ src :: type-union(<byte-vector>, <byte-string>), src-start :: <integer>,
n :: <integer>) => ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
@@ -343,8 +343,8 @@
define inline method copy-bytes
- (src :: <memory-mapped-file>, src-start :: <integer>,
- dst :: type-union(<byte-vector>, <byte-string>), dst-start :: <integer>,
+ (dst :: type-union(<byte-vector>, <byte-string>), dst-start :: <integer>,
+ src :: <memory-mapped-file>, src-start :: <integer>,
n :: <integer>) => ()
let src-end :: <integer> = src-start + n;
let dst-end :: <integer> = dst-start + n;
Modified: trunk/fundev/sources/lib/jam/jam-target-build.dylan
==============================================================================
--- trunk/fundev/sources/lib/jam/jam-target-build.dylan (original)
+++ trunk/fundev/sources/lib/jam/jam-target-build.dylan Mon May 21 03:59:26 2007
@@ -380,10 +380,10 @@
let new-size = max(truncate/(result.size * 3, 2),
result.size + str-size);
let new-result = make(<byte-string>, size: new-size);
- copy-bytes(result, 0, new-result, 0, result.size);
+ copy-bytes(new-result, 0, result, 0, result.size);
result := new-result;
end if;
- copy-bytes(str, start, result, result-size, str-size);
+ copy-bytes(result, result-size, str, start, str-size);
result-size := result-size + str-size;
end method,
Modified: trunk/fundev/sources/lib/java-parser/tokenize.dylan
==============================================================================
--- trunk/fundev/sources/lib/java-parser/tokenize.dylan (original)
+++ trunk/fundev/sources/lib/java-parser/tokenize.dylan Mon May 21 03:59:26 2007
@@ -131,7 +131,7 @@
(contents :: <byte-vector>, start-pos :: <integer>, end-pos :: <integer>)
let bytes = end-pos - start-pos;
let string :: <byte-string> = make(<byte-string>, size: bytes);
- copy-bytes(contents, start-pos, string, 0, bytes);
+ copy-bytes(string, 0, contents, start-pos, bytes);
string
end;
Modified: trunk/fundev/sources/lib/source-records/source-locations.dylan
==============================================================================
--- trunk/fundev/sources/lib/source-records/source-locations.dylan (original)
+++ trunk/fundev/sources/lib/source-records/source-locations.dylan Mon May 21 03:59:26 2007
@@ -109,7 +109,7 @@
let end-pos = loc.source-location-end-character;
let count = end-pos - start-pos;
let string = make(<byte-string>, size: count);
- copy-bytes(source-record-contents(record), start-pos, string, 0, count);
+ copy-bytes(string, 0, source-record-contents(record), start-pos, count);
string
end;
More information about the chatter
mailing list