Cleaned up binary schema encoding/decoding

Clarified bit masks

Author: bminer

bool.go

@@ -32,11 +32,11 @@ func (s *BoolSchema) MarshalJSON() ([]byte, error) {
 // Bytes encodes the schema in a portable binary format
 func (s *BoolSchema) MarshalSchemer() ([]byte, error) {
 	// bool schemas are 1 byte long
-	var schema []byte = []byte{BoolSchemaMask}
+	var schema []byte = []byte{BoolByte}
 
-	// The most signifiant bit indicates whether or not the type is nullable
+	// The most significant bit indicates whether or not the type is nullable
 	if s.Nullable() {
-		schema[0] |= 0x80
+		schema[0] |= NullMask
 	}
 
 	return schema, nil

complex.go

@@ -53,11 +53,11 @@ func (s *ComplexSchema) MarshalJSON() ([]byte, error) {
 func (s *ComplexSchema) MarshalSchemer() ([]byte, error) {
 
 	// floating point schemas are 1 byte long
-	var schema []byte = []byte{ComplexSchemaMask}
+	var schema []byte = []byte{ComplexByte}
 
 	// bit 8 indicates whether or not the type is nullable
 	if s.Nullable() {
-		schema[0] |= 0x80
+		schema[0] |= NullMask
 	}
 
 	// bit 1 = complex number size in (64 << n) bits

date.go

@@ -46,15 +46,15 @@ func (sg dateSchemaGenerator) DecodeSchema(r io.Reader) (Schema, error) {
 		return nil, err
 	}
 
-	if tmpBuf[0]&CustomSchemaMask == CustomSchemaMask {
+	if tmpBuf[0]&CustomMask == CustomMask {
 		if tmpBuf[0]&(dateSchemaUUID<<4) != (dateSchemaUUID << 4) {
 			return nil, nil
 		}
 	} else {
 		return nil, nil
 	}
 
-	nullable := (tmpBuf[0]&SchemaNullBit == SchemaNullBit)
+	nullable := (tmpBuf[0]&NullMask == NullMask)
 
 	s := DateSchema{}
 	s.SetNullable(nullable)
@@ -130,8 +130,8 @@ func (s *DateSchema) MarshalSchemer() ([]byte, error) {
 	// string schemas are 1 byte long
 	var schema []byte = make([]byte, schemerDateSize)
 
-	schema[0] |= CustomSchemaMask
-	schema[0] |= (dateSchemaUUID<<4)
+	schema[0] |= CustomMask
+	schema[0] |= (dateSchemaUUID << 4)
 
 	// The most signifiant bit indicates whether or not the type is nullable
 	if s.Nullable() {

enum.go

@@ -42,22 +42,22 @@ func (s *EnumSchema) MarshalJSON() ([]byte, error) {
 func (s EnumSchema) MarshalSchemer() ([]byte, error) {
 
 	// fixed length schemas are 1 byte long total
-	var schema []byte = []byte{EnumSchemaMask}
+	var schema []byte = []byte{EnumByte}
 
 	// The most signifiant bit indicates whether or not the type is nullable
 	if s.Nullable() {
-		schema[0] |= 0x80
+		schema[0] |= NullMask
 	}
 
 	// write all the enumerated values as part of the schema...
 	var buf bytes.Buffer
 
-	varObjectSchema, err := SchemaOf(s.Values)
-	if err != nil {
-		return nil, err
+	mapSchema := VarObjectSchema{
+		Key:   &VarIntSchema{Signed: false},
+		Value: &VarStringSchema{},
 	}
 
-	err = varObjectSchema.Encode(&buf, s.Values)
+	err := mapSchema.Encode(&buf, s.Values)
 	if err != nil {
 		return nil, err
 	}

fixedarray.go

@@ -33,11 +33,11 @@ func (s *FixedArraySchema) Valid() bool {
 func (s *FixedArraySchema) MarshalSchemer() ([]byte, error) {
 
 	// fixed length schemas are 1 byte long total
-	var schema []byte = []byte{FixedArraySchemaMask}
+	var schema []byte = []byte{FixedArrayByte}
 
 	// The most signifiant bit indicates whether or not the type is nullable
 	if s.Nullable() {
-		schema[0] |= 0x80
+		schema[0] |= NullMask
 	}
 
 	// encode array fixed length as a varint

fixedint.go

@@ -71,11 +71,11 @@ func (s *FixedIntSchema) Valid() bool {
 func (s *FixedIntSchema) MarshalSchemer() ([]byte, error) {
 
 	// fixed length schemas are 1 byte long total
-	var schema []byte = []byte{FixedIntSchemaMask}
+	var schema []byte = []byte{FixedIntByte}
 
 	// bit8 indicates whether or not the type is nullable
 	if s.Nullable() {
-		schema[0] |= 0x80
+		schema[0] |= NullMask
 	}
 
 	// bit1 indicates if the the fixed length int is signed or not

fixedobject.go

@@ -72,11 +72,11 @@ func (s *FixedObjectSchema) MarshalJSON() ([]byte, error) {
 func (s *FixedObjectSchema) MarshalSchemer() ([]byte, error) {
 
 	// fixedObject schemas are 1 byte long
-	var schemaBytes []byte = []byte{FixedObjectSchemaMask}
+	var schemaBytes []byte = []byte{FixedObjectByte}
 
 	// The most signifiant bit indicates whether or not the type is nullable
 	if s.Nullable() {
-		schemaBytes[0] |= 0x80
+		schemaBytes[0] |= NullMask
 	}
 
 	// encode total number of fields as a varint

fixedstring.go

@@ -48,11 +48,11 @@ func (s *FixedStringSchema) MarshalJSON() ([]byte, error) {
 func (s *FixedStringSchema) MarshalSchemer() ([]byte, error) {
 
 	// string schemas are 1 byte long
-	var schema []byte = []byte{FixedStringSchemaMask}
+	var schema []byte = []byte{FixedStringByte}
 
 	// The most signifiant bit indicates whether or not the type is nullable
 	if s.Nullable() {
-		schema[0] |= 0x80
+		schema[0] |= NullMask
 	}
 
 	// set bit 1, which indicates this is fixed len string

float.go

@@ -52,11 +52,11 @@ func (s *FloatSchema) MarshalJSON() ([]byte, error) {
 func (s *FloatSchema) MarshalSchemer() ([]byte, error) {
 
 	// floating point schemas are 1 byte long
-	var schema []byte = []byte{FloatBinarySchemaFormat}
+	var schema []byte = []byte{FloatByte}
 
 	// The most signifiant bit indicates whether or not the type is nullable
 	if s.Nullable() {
-		schema[0] |= 0x80
+		schema[0] |= NullMask
 	}
 
 	if s.Bits == 32 {

ipv4.go

@@ -46,15 +46,15 @@ func (sg ipv4SchemaGenerator) DecodeSchema(r io.Reader) (Schema, error) {
 		return nil, err
 	}
 
-	if tmpBuf[0]&CustomSchemaMask == CustomSchemaMask {
+	if tmpBuf[0]&CustomMask == CustomMask {
 		if tmpBuf[0]&(ipV4SchemaUUID<<4) != (ipV4SchemaUUID << 4) {
 			return nil, nil
 		}
 	} else {
 		return nil, nil
 	}
 
-	nullable := (tmpBuf[0]&SchemaNullBit == SchemaNullBit)
+	nullable := (tmpBuf[0]&NullMask == NullMask)
 
 	s := ipv4Schema{}
 	s.SetNullable(nullable)
@@ -138,7 +138,7 @@ func (s *ipv4Schema) MarshalSchemer() ([]byte, error) {
 	// string schemas are 1 byte long
 	var schema []byte = make([]byte, schemerDateSize)
 
-	schema[0] |= CustomSchemaMask
+	schema[0] |= CustomMask
 	schema[0] |= (ipV4SchemaUUID << 4)
 
 	// The most signifiant bit indicates whether or not the type is nullable