[Gd-chatter] r11487 - in trunk/fundev/experimental/sources: deuce harp/gnu-outputter

[agent at gwydiondylan.org]

Author: agent
Date: Sat Nov 10 04:22:03 2007
New Revision: 11487

Modified:
   trunk/fundev/experimental/sources/deuce/lines.dylan
   trunk/fundev/experimental/sources/deuce/nodes.dylan
   trunk/fundev/experimental/sources/deuce/streams.dylan
   trunk/fundev/experimental/sources/harp/gnu-outputter/gnu-outputter.dylan
Log:
Job: fd
Changed copy-bytes argument order in fundev/experimental to be consistent with
the rest of the source code.


Modified: trunk/fundev/experimental/sources/deuce/lines.dylan
==============================================================================
--- trunk/fundev/experimental/sources/deuce/lines.dylan	(original)
+++ trunk/fundev/experimental/sources/deuce/lines.dylan	Sat Nov 10 04:22:03 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/experimental/sources/deuce/nodes.dylan
==============================================================================
--- trunk/fundev/experimental/sources/deuce/nodes.dylan	(original)
+++ trunk/fundev/experimental/sources/deuce/nodes.dylan	Sat Nov 10 04:22:03 2007
@@ -240,7 +240,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/experimental/sources/deuce/streams.dylan
==============================================================================
--- trunk/fundev/experimental/sources/deuce/streams.dylan	(original)
+++ trunk/fundev/experimental/sources/deuce/streams.dylan	Sat Nov 10 04:22:03 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/experimental/sources/harp/gnu-outputter/gnu-outputter.dylan
==============================================================================
--- trunk/fundev/experimental/sources/harp/gnu-outputter/gnu-outputter.dylan	(original)
+++ trunk/fundev/experimental/sources/harp/gnu-outputter/gnu-outputter.dylan	Sat Nov 10 04:22:03 2007
@@ -821,7 +821,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