Rename blob type to bytes

README.md

@@ -34,12 +34,12 @@ struct line {
 	timestamp	time;
 	point		line_start;
 	point		line_end;
-	blob		comment;
+	bytes		comment;
 };
 ```
 
 Fixed width integer types from 8 to 128 bit are supported, along with the
-`blob` type, which is a variable-length sequence of bytes.
+`bytes` type, which is a variable-length sequence of bytes.
 
 ## Target Languages
 The following target languages are currently supported:
@@ -59,10 +59,10 @@ Target languages are implemented purely as `jinja2` templates.
 ## Serialization format
 The serialization format for fixed-length objects is simply a packed C struct.
 
-For any object which contains `blob` type fields:
+For any object which contains `bytes` type fields:
 - a 32bit unsigned record length is prepended to the struct
-- all `blob` type fields are converted to `u32` and contain the length of the blob
-- all blob contents are appended after the struct in the order in which they appear
+- all `bytes` type fields are converted to `u32` and contain the length of the bytes
+- all bytes contents are appended after the struct in the order in which they appear
 
 For example, following the example above, the serialization would be:
 

examples/example1.xpdt

@@ -18,7 +18,7 @@ struct timespan {
 
 struct item {
 	u32		id; # User id
-	blob		first_name; # given name
-	blob		surname; # surname
+	bytes		first_name; # given name
+	bytes		surname; # surname
 	timestamp	last_login;
 };

test/test_parser.py

@@ -21,7 +21,7 @@
 
 _all_types = '''
 struct fixed {
-    blob blob;
+    bytes bytes;
     u128 u128;
     u64 u64;
     i64 i64;

test/test_roundtrip.py

@@ -21,7 +21,7 @@ def setUp(self):
                         MemberDef('id', BaseType.u32),
                         MemberDef('first_name', BaseType.utf8),
                         MemberDef('surname', BaseType.utf8),
-                        MemberDef('data', BaseType.blob),
+                        MemberDef('data', BaseType.bytes),
                     ),
                 ),
             ),

test/test_stringy.py

@@ -10,7 +10,7 @@ def setUp(self):
                     struct_name='Item',
                     members=[
                         MemberDecl('id', 'u32'),
-                        MemberDecl('name', 'blob'),
+                        MemberDecl('name', 'bytes'),
                     ],
                 ),
                 StructDecl(

xpdt/basetypes.py

@@ -12,7 +12,7 @@
     'base_types',
 )
 
-Blob = BufType()
+Bytes = BufType()
 Utf8 = Utf8Type()
 xu128 = UuidType()
 UnsignedInt8 = IntegralType(8, False)
@@ -28,7 +28,7 @@
 class BaseType(TypeDef, Enum):
     __slots__ = ()
 
-    blob = 'blob', Blob
+    bytes = 'bytes', Bytes
     utf8 = 'utf8', Utf8
     u8 = 'u8', UnsignedInt8
     i8 = 'i8', SignedInt8

xpdt/templates/macros.c

@@ -126,7 +126,7 @@ struct /*{struct.tag}*/ {
 
 
 
-/*#- macro blob_struct_decl(struct) -#*/
+/*#- macro vbuf_struct_decl(struct) -#*/
 
 /*{struct_xptrs(struct)}*/ {
 // for member in struct.vbuf_members

xpdt/templates/xpdt.c

@@ -19,7 +19,7 @@
 
 /*{macros.serialized_struct_decl(struct)}*/
 
-/*{macros.blob_struct_decl(struct)}*/
+/*{macros.vbuf_struct_decl(struct)}*/
 /*# endif #*/
 /*#- endfor -#*/