[Gd-chatter] r10931 - in trunk/libraries: id3v2 packetizer packetizer/packetizer-test

[hannes at gwydiondylan.org]

Author: hannes
Date: Wed Oct 18 01:36:14 2006
New Revision: 10931

Modified:
   trunk/libraries/id3v2/id3v2.dylan
   trunk/libraries/packetizer/dns.dylan
   trunk/libraries/packetizer/ieee80211.dylan
   trunk/libraries/packetizer/ipv4.dylan
   trunk/libraries/packetizer/packetizer-test/packetizer-test.dylan
   trunk/libraries/packetizer/pcap.dylan
   trunk/libraries/packetizer/protocol-definer-macro.dylan
Log:
Bug: 7299
*make a unhygienic reference to frame in reached-end? block like done in fixup, dynamic-start/end/length

Modified: trunk/libraries/id3v2/id3v2.dylan
==============================================================================
--- trunk/libraries/id3v2/id3v2.dylan	(original)
+++ trunk/libraries/id3v2/id3v2.dylan	Wed Oct 18 01:36:14 2006
@@ -88,9 +88,6 @@
 define protocol id3v2-tag (header-frame)
   field id3v2-header :: <id3v2-header>;
   repeated field id3v2-frame :: <id3v2-frame>,
-    reached-end?: 
-      method (frame :: <id3v2-frame>)
-        frame.frame-id.data[0] == #x00
-      end method;
+    reached-end?: frame.frame-id.data[0] == #x00;
   //field payload :: <raw-frame>, start: frame.id3v2-header.tag-size * 8;
 end;

Modified: trunk/libraries/packetizer/dns.dylan
==============================================================================
--- trunk/libraries/packetizer/dns.dylan	(original)
+++ trunk/libraries/packetizer/dns.dylan	Wed Oct 18 01:36:14 2006
@@ -36,9 +36,7 @@
 
 define protocol domain-name (container-frame)
   repeated field fragment :: <domain-name-fragment>,
-    reached-end?: method(frame :: <domain-name-fragment>)
-                      frame.type-code = 3 | frame.length = 0
-                  end;
+    reached-end?: frame.type-code = 3 | frame.length = 0;
 end;
 
 define method as (class == <string>, domain-name :: <domain-name>)

Modified: trunk/libraries/packetizer/ieee80211.dylan
==============================================================================
--- trunk/libraries/packetizer/ieee80211.dylan	(original)
+++ trunk/libraries/packetizer/ieee80211.dylan	Wed Oct 18 01:36:14 2006
@@ -104,7 +104,7 @@
 
 define protocol ieee80211-supported-rates (ieee80211-information-field)
   repeated field supported-rate :: <rate>,
-    reached-end?: method(x) #f end,
+    reached-end?: #f,
     length: frame.length * 8;
 end;
 
@@ -244,7 +244,7 @@
   field ssid :: <ieee80211-information-element>;
   field supported-rates :: <ieee80211-information-element>;
   repeated field additional-information :: <ieee80211-information-element>,
-    reached-end?: method (x) #f end;
+    reached-end?: #f;
 end;
 
 define protocol ieee80211-authentication (ieee80211-management-frame)
@@ -253,7 +253,7 @@
   field transaction-sequence-number :: <2byte-little-endian-unsigned-integer>;
   field status-code :: <2byte-little-endian-unsigned-integer>;
   repeated field additional-information :: <ieee80211-information-element>,
-    reached-end?: method (x) #f end;
+    reached-end?: #f;
 end;
 
 define protocol ieee80211-deauthentication (ieee80211-management-frame)
@@ -271,7 +271,7 @@
   field ssid :: <ieee80211-information-element>;
   field supported-rates :: <ieee80211-information-element>;
   repeated field additional-information :: <ieee80211-information-element>,
-    reached-end?: method (x) #f end;
+    reached-end?: #f;
 end;
 
 // ieee80211 data frames

Modified: trunk/libraries/packetizer/ipv4.dylan
==============================================================================
--- trunk/libraries/packetizer/ipv4.dylan	(original)
+++ trunk/libraries/packetizer/ipv4.dylan	Wed Oct 18 01:36:14 2006
@@ -129,9 +129,7 @@
   field source-address :: <ipv4-address>;
   field destination-address :: <ipv4-address>;
   repeated field options :: <ip-option-frame> = make(<stretchy-vector>),
-    reached-end?: method(value :: <ip-option-frame>)
-                      instance?(value, <end-of-option-ip-option>)
-                  end;
+    reached-end?: instance?(frame, <end-of-option-ip-option>);
   variably-typed-field payload,
     start: frame.header-length * 4 * 8,
     end: frame.total-length * 8,

Modified: trunk/libraries/packetizer/packetizer-test/packetizer-test.dylan
==============================================================================
--- trunk/libraries/packetizer/packetizer-test/packetizer-test.dylan	(original)
+++ trunk/libraries/packetizer/packetizer-test/packetizer-test.dylan	Wed Oct 18 01:36:14 2006
@@ -102,7 +102,7 @@
 define protocol repeated-test (container-frame)
   field foo :: <unsigned-byte>;
   repeated field bar :: <unsigned-byte>,
-    reached-end?: method (frame) frame = 0 end;
+    reached-end?: frame = 0;
   field after :: <unsigned-byte>;
 end;
 
@@ -135,7 +135,7 @@
     fixup: frame.options.size + 2;
   field type-code :: <unsigned-byte> = #x23;
   repeated field options :: <unsigned-byte>,
-    reached-end?: method(frame) frame = 0 end;
+    reached-end?: frame = 0;
   field payload :: <raw-frame>,
     start: frame.header-length * 8;
 end;
@@ -217,7 +217,7 @@
 define protocol labe (container-frame)
   field a :: <unsigned-byte>;
   repeated field b :: <frag>,
-    reached-end?: method(frame) frame.data-length = 0 end;
+    reached-end?: frame.data-length = 0;
   field c :: <unsigned-byte>;
 end;
 

Modified: trunk/libraries/packetizer/pcap.dylan
==============================================================================
--- trunk/libraries/packetizer/pcap.dylan	(original)
+++ trunk/libraries/packetizer/pcap.dylan	Wed Oct 18 01:36:14 2006
@@ -129,9 +129,7 @@
 define protocol pcap-file (container-frame)
   field header :: <pcap-file-header>;
   repeated field packets :: <pcap-packet>,
-    reached-end?: method(v :: <pcap-packet>)
-                      #f
-                  end;
+    reached-end?: #f;
 end;
 
 //linktype => payload-type mapping

Modified: trunk/libraries/packetizer/protocol-definer-macro.dylan
==============================================================================
--- trunk/libraries/packetizer/protocol-definer-macro.dylan	(original)
+++ trunk/libraries/packetizer/protocol-definer-macro.dylan	Wed Oct 18 01:36:14 2006
@@ -134,7 +134,7 @@
     { type-function: ?type:expression, ... }
       => { type-function: method(?=frame :: <frame>) ?type end, ... }
     { reached-end?: ?reached:expression, ... }
-      => { reached-end?: ?reached, ... }
+      => { reached-end?: method(?=frame) ?reached end, ... }
     { fixup: ?fixup:expression, ... }
       => { fixup: method(?=frame :: <frame>) ?fixup end, ... }
     { static-start: ?start:expression, ... }