new binary-data definer syntax

dylan-hackers · Jan 18, 2014 · 03c3fc2 · 03c3fc2
1 parent d2bed73
commit 03c3fc2
Show file tree

Hide file tree

Showing 26 changed files with 438 additions and 435 deletions.
diff --git a/ext/binary-data b/ext/binary-data
diff --git a/id3v2/id3v2-reader.dylan b/id3v2/id3v2-reader.dylan
@@ -1,4 +1,4 @@
-module:         id3v2
+module: id3v2
 author: mb, Andreas Bogk and Hannes Mehnert
 copyright: 2005-2011 mb, Andreas Bogk and Hannes Mehnert. All rights reserved.
 license: see license.txt in this distribution

diff --git a/id3v2/id3v2.dylan b/id3v2/id3v2.dylan
@@ -28,18 +28,18 @@ define method parse-frame
   values(result, 8 * 4);
 end;
 
-define binary-data id3v2-string (container-frame)
+define binary-data <id3v2-string> (<container-frame>)
 end;
 
-define binary-data id3v2-string-with-type (id3v2-string)
+define binary-data <id3v2-string-with-type> (<id3v2-string>)
   field string-type :: <unsigned-byte>;
 end;
 
-define binary-data ascii-string-with-type (id3v2-string-with-type)
+define binary-data <ascii-string-with-type> (<id3v2-string-with-type>)
   field string-data :: <externally-delimited-string>;
 end;
 
-define binary-data ascii-string (id3v2-string)
+define binary-data <ascii-string> (<id3v2-string>)
   field string-data :: <externally-delimited-string>;
 end;
 
@@ -51,18 +51,18 @@ define method parse-frame
                       #x00 => <ascii-string-with-type>;
                         otherwise <ascii-string>;
                     end select;
-  parse-frame(string-type, packet);
+  parse-frame(string-type, packet)
 end;
 
-define binary-data id3v2-flags (container-frame)
+define binary-data <id3v2-flags> (<container-frame>)
   field unsynchronisation :: <1bit-unsigned-integer>;
   field extended-header :: <1bit-unsigned-integer>;
   field experimental-indicator :: <1bit-unsigned-integer>;
   field footer-present :: <1bit-unsigned-integer>;
   field dummy :: <4bit-unsigned-integer>;	// must be zero
 end;
 
-define binary-data id3v2-frame (container-frame)
+define binary-data <id3v2-frame> (<container-frame>)
   field frame-id :: <externally-delimited-string>, static-length: 8 * 4;
   field id3v2-frame-size :: <4byte-7bit-big-endian-unsigned-integer>,
     fixup: byte-offset(frame-size(frame.id3v2-data));
@@ -77,7 +77,7 @@ define binary-data id3v2-frame (container-frame)
             end if; */
 end;
 
-define binary-data id3v2-header (container-frame)
+define binary-data <id3v2-header> (<container-frame>)
   field identifier :: <externally-delimited-string>,
     static-length: 8 * 3;
   field major-version :: <unsigned-byte>;
@@ -86,7 +86,7 @@ define binary-data id3v2-header (container-frame)
   field tag-size :: <4byte-7bit-big-endian-unsigned-integer>;
 end;
 
-define binary-data id3v2-tag (header-frame)
+define binary-data <id3v2-tag> (<header-frame>)
   field id3v2-header :: <id3v2-header>;
   repeated field id3v2-frame :: <id3v2-frame>,
     reached-end?: frame.frame-id.data[0] == #x00;

diff --git a/protocols/bittorrent.dylan b/protocols/bittorrent.dylan
@@ -4,7 +4,7 @@ copyright: 2005-2011 Andreas Bogk and Hannes Mehnert. All rights reserved.
 license: see license.txt in this distribution
 
 //incomplete from http://xbtt.sourceforge.net/udp_tracker_protocol.html
-define binary-data bittorrent-announce (container-frame)
+define binary-data <bittorrent-announce> (<container-frame>)
   field connection-id :: <raw-frame> =
     as(<raw-frame>,
        #(#x0, #x0, #x04, #x17, #x27, #x10, #x19, #x80)),
@@ -31,7 +31,7 @@ define binary-data bittorrent-announce (container-frame)
   field port :: <2byte-big-endian-unsigned-integer> = 6887;
 end;
 
-define binary-data bittorrent-announce-output (container-frame)
+define binary-data <bittorrent-announce-output> (<container-frame>)
   over <udp-frame> 6969;
   field action :: <big-endian-unsigned-integer-4byte>;
   field transaction-id :: <big-endian-unsigned-integer-4byte>;
@@ -42,7 +42,7 @@ define binary-data bittorrent-announce-output (container-frame)
     reached-end?: #f;
 end;
 
-define binary-data ip-and-port (container-frame)
+define binary-data <ip-and-port> (<container-frame>)
   field ip :: <ipv4-address>;
   field port :: <2byte-big-endian-unsigned-integer>;
 end;
+31 −0		arithmetics.dylan
+254 −194		binary-data-definer-macro.dylan
+210 −172		binary-data.dylan
+1 −0		binary-data.lid
+56 −0		documentation/source/efficiency.rst
+20 −0		documentation/source/index.rst
+283 −54		documentation/source/usage.rst
+18 −12		fields.dylan
+34 −19		frame-utils.dylan
+200 −164		leaf-frames.dylan
+124 −84		stretchy-byte-vector.dylan
+24 −24		tests/binary-data-test.dylan
+33 −32		util.dylan