[Gd-chatter] r10929 - trunk/libraries/packetizer

[hannes at gwydiondylan.org]

Author: hannes
Date: Wed Oct 18 00:34:05 2006
New Revision: 10929

Modified:
   trunk/libraries/packetizer/ipv4.dylan
   trunk/libraries/packetizer/leaf-frames.dylan
   trunk/libraries/packetizer/packetizer.dylan
Log:
Bug: 7299
*remove define constant <byte-vector-subsequence>, use <byte-sequence> instead

Modified: trunk/libraries/packetizer/ipv4.dylan
==============================================================================
--- trunk/libraries/packetizer/ipv4.dylan	(original)
+++ trunk/libraries/packetizer/ipv4.dylan	Wed Oct 18 00:34:05 2006
@@ -82,7 +82,7 @@
   write(stream, as(<string>, object));
 end;
 
-define function calculate-checksum (frame :: type-union(<byte-vector-subsequence>, <byte-vector>),
+define function calculate-checksum (frame :: <byte-sequence>,
                                     count :: <integer>) => (res :: <integer>)
   let checksum :: <integer> = 0;
   for (i from 0 below count - 1 by 2)

Modified: trunk/libraries/packetizer/leaf-frames.dylan
==============================================================================
--- trunk/libraries/packetizer/leaf-frames.dylan	(original)
+++ trunk/libraries/packetizer/leaf-frames.dylan	Wed Oct 18 00:34:05 2006
@@ -305,7 +305,7 @@
 
 define method assemble-frame-as (frame-type :: subclass(<big-endian-unsigned-integer-byte-frame>),
                                  data :: <integer>)
-  => (packet :: <byte-vector-subsequence>)
+  => (packet :: <byte-sequence>)
   let result = make(<stretchy-byte-vector-subsequence>, end: byte-offset(frame-size(frame-type)));
   assemble-frame-into-as(frame-type, data, result);
   result;
@@ -313,7 +313,7 @@
 
 define method assemble-frame-into-as (frame-type :: subclass(<big-endian-unsigned-integer-byte-frame>),
                                       data :: <integer>,
-                                      packet :: <byte-vector-subsequence>) => (res :: <integer>)
+                                      packet :: <byte-sequence>) => (res :: <integer>)
   for (i from 0 below byte-offset(frame-size(frame-type)))
     packet[i] := logand(#xff, ash(data, - (frame-size(frame-type) - i * 8 - 8)));
   end;

Modified: trunk/libraries/packetizer/packetizer.dylan
==============================================================================
--- trunk/libraries/packetizer/packetizer.dylan	(original)
+++ trunk/libraries/packetizer/packetizer.dylan	Wed Oct 18 00:34:05 2006
@@ -42,8 +42,6 @@
 end;
 
 define constant <byte-sequence> = <stretchy-vector-subsequence>;
-define constant <byte-vector-subsequence> = <stretchy-vector-subsequence>;
-
 define constant <bit-vector> = <stretchy-bit-vector-subsequence>;
 
 define constant $protocols = make(<table>);
@@ -251,7 +249,7 @@
 end;
 
 define open abstract class <unparsed-container-frame> (<container-frame>)
-  slot packet :: <byte-vector-subsequence>, init-keyword: packet:;
+  slot packet :: <byte-sequence>, init-keyword: packet:;
   slot cache :: <container-frame>, init-keyword: cache:;
 end;