divine 0.0.4 → 0.0.5

data/lib/divine/code_generators/java.rb

@@ -81,7 +81,7 @@ abstract class Divine <%= toplevel_class %> {
 
 	protected String readString(ByteArrayInputStream data) throws IOException {
 		// Force utf8
-		return new String(readBytes(readInt16(data), data), UTF8);
+		return new String(readBytes((int)readDint63(data), data), UTF8);
 	}
 
 	private byte[] readBytes(int size, ByteArrayInputStream data) throws IOException {
@@ -91,19 +91,15 @@ abstract class Divine <%= toplevel_class %> {
 	}
 
 	protected byte[] readBinary(ByteArrayInputStream data) throws IOException {
-		long c = readInt32(data);
+		long c = readDint63(data);
 		if (c > Integer.MAX_VALUE) {
 			throw new IndexOutOfBoundsException("Binary data to big for java");
 		}
 		return readBytes((int) c, data);
 	}
 
-	protected byte[] readShortBinary(ByteArrayInputStream data) throws IOException {
-		return readBytes(readInt8(data), data);
-	}
-
 	protected String readIpNumber(ByteArrayInputStream data) throws IOException {
-		byte[] ips = readShortBinary(data);		
+		byte[] ips = readBytes(readInt8(data), data);
 		if(ips.length == 4){
 			return readIpv4Number(ips);
 		} else{
@@ -207,8 +203,10 @@ abstract class Divine <%= toplevel_class %> {
 		
 		for (int i = bytes.length - 1; i >= 0; i--){
 			String s = bytes[i];
-			s += new String(new char[7 - s.length()]).replace("\\\\0", "0") + Math.min(i, 1);
-			int t = Integer.parseInt(new StringBuffer(s).reverse().toString(), 2);
+			char[] zeros = new char[ 7 - s.length()];
+      Arrays.fill(zeros, '0');
+      s += new String(zeros) + Math.min(i, 1);
+      int t = Integer.parseInt(new StringBuffer(s).reverse().toString(), 2);
 			this.writeInt8(t, out);
 		}
 	}
@@ -222,7 +220,7 @@ abstract class Divine <%= toplevel_class %> {
 		if (bs.length > 0xFFFF) {
 			raiseError("Too large string: " + bs.length + " bytes");
 		}
-		writeInt16(bs.length, out);
+		writeDint63(bs.length, out);
 		out.write(bs);
 	}
 
@@ -230,7 +228,7 @@ abstract class Divine <%= toplevel_class %> {
 		if (v.length > 0xFFFFFFFFL) {
 			raiseError("Too large binary: " + v.length + " bytes");
 		}
-		writeInt32(v.length, out);
+		writeDint63(v.length, out);
 		out.write(v);
 	}
 
@@ -245,14 +243,6 @@ abstract class Divine <%= toplevel_class %> {
 		}
 	}
 
-	protected void writeShortBinary(byte[] v, ByteArrayOutputStream out) throws IOException {
-		if (v.length > 0xFF) {
-			raiseError("Too large short_binary: " + v.length + " bytes");
-		}
-		writeInt8(v.length, out);
-		out.write(v);
-	}
-
 	protected void writeIpNumber(String v, ByteArrayOutputStream out) throws IOException {
 		if(v.contains(":")){
 			writeIpv6Number( v, out);
@@ -271,7 +261,8 @@ abstract class Divine <%= toplevel_class %> {
 			}
 		}
 		if (ss.length == 0 || ss.length == 4) {
-			writeShortBinary(ss, out);
+			writeInt8(ss.length, out);
+      out.write(ss);
 		} else {
 			raiseError("Unknown IP v4 number " + v); // Only IPv4 for now 
 		}
@@ -423,7 +414,6 @@ EOS
 #  * string   --> ""
 #  * ip_number--> ""
 #  * binary   --> new Byte[0]
-#  * short_binary --> new Byte[0]
 #  * list     --> new ArrayList<type>()
 #  * map      --> new HashMap<keyType, valueType>()
 
@@ -446,7 +436,7 @@ EOS
 
       else
         case types
-        when :binary, :short_binary
+        when :binary
           is_reference_type ? "new Byte[0]" : "new byte[0]"
         when :int8, :int16, :sint32
           "0"
@@ -454,6 +444,8 @@ EOS
           "0L"
         when :string, :ip_number
           "\"\""
+        when :bool
+          false
         else
           if $all_structs[types]
             types
@@ -476,7 +468,6 @@ EOS
 #  * string   --> String
 #  * ip_number--> String
 #  * binary   --> Byte[]
-#  * short_binary --> Byte[]
 #  * list     --> ArrayList<type>
 #  * map      --> HashMap<keyType, valueType>
 
@@ -502,7 +493,7 @@ EOS
 
       else
         case types
-        when :binary, :short_binary
+        when :binary
           is_reference_type ? "Byte[]" : "byte[]"
         when :int8, :int16, :sint32
           is_reference_type ? "Integer" : "int"
@@ -510,6 +501,8 @@ EOS
           is_reference_type ? "Long" : "long"
         when :string, :ip_number
           "String"
+        when :bool
+          "boolean"
         else
           if $all_structs[types]
             types
@@ -532,7 +525,7 @@ EOS
           nv = get_fresh_variable_name
           idx = get_fresh_variable_name
           return [
-                  "writeInt32(#{var}.size(), baos);",
+                  "writeDint63(#{var}.size(), baos);",
                   "for(int #{idx}=0; #{idx}<#{var}.size(); #{idx}++) {",
                   :indent,
                   "#{java_get_type_declaration types[1]} #{nv} = #{var}.get(#{idx});",
@@ -544,7 +537,7 @@ EOS
           nv1 = get_fresh_variable_name      
           nv2 = get_fresh_variable_name
           return [
-                  "writeInt32(#{var}.size(), baos);",
+                  "writeDint63(#{var}.size(), baos);",
                   "for(#{java_get_type_declaration types[1]} #{nv1} : #{var}.keySet()) {",
                   :indent,
                   "#{java_get_type_declaration types[2]} #{nv2} = #{var}.get(#{nv1});",
@@ -583,7 +576,7 @@ EOS
           iter = get_fresh_variable_name
           return [
                   "#{"#{java_get_type_declaration(types)} " unless var.include? "this."}#{var} = #{java_get_empty_declaration(types)};",
-                  "int #{count} = (int)this.readInt32(bais);",
+                  "int #{count} = (int)this.readDint63(bais);",
                   "for(int #{iter}=0; #{iter}<#{count}; #{iter}++) {",
                   :indent,
                   java_deserialize_internal(nv, types[1]),
@@ -597,7 +590,7 @@ EOS
           nv2 = get_fresh_variable_name
           iter = get_fresh_variable_name
           return ["#{"#{java_get_type_declaration(types)} " unless var.include? "this."}#{var} = #{java_get_empty_declaration(types)};",
-                  "int #{count} = (int)readInt32(bais);",
+                  "int #{count} = (int)readDint63(bais);",
                   "for(int #{iter}=0; #{iter}<#{count}; #{iter}++) {",
                   :indent,
                   java_deserialize_internal(nv1, types[1]),
@@ -684,6 +677,7 @@ EOS
         "java.io.ByteArrayOutputStream",
         "java.io.IOException",
         "java.util.ArrayList",
+        "java.util.Arrays",
         "java.util.HashMap",
         "java.util.regex.Pattern",
         "java.nio.charset.Charset"

data/lib/divine/code_generators/javascript.rb

@@ -150,16 +150,16 @@ DivineHelper.prototype.read_dint63 = function (data) {
     return val;
 }
 
-DivineHelper.prototype.read_binary = function (data) {
-    return data.read(this.read_int32(data));
-};
+DivineHelper.prototype.read_bool = function (data) {
+    return this.read_int8(data) == 1;
+}
 
-DivineHelper.prototype.read_short_binary = function (data) {
-    return data.read(this.read_int8(data));
+DivineHelper.prototype.read_binary = function (data) {
+    return data.read(this.read_dint63(data));
 };
 
 DivineHelper.prototype.read_ip_number = function (data) {
-    var ip_array = this.read_short_binary(data);
+    var ip_array = data.read(this.read_int8(data));
     if(ip_array.length == 4){
        return this.read_ipv4_number(ip_array);
     }else{
@@ -194,7 +194,7 @@ DivineHelper.prototype.read_ipv6_number = function (ip_array) {
 };
 
 DivineHelper.prototype.read_string = function (data) {
-    return this.decode_utf8(data.read(this.read_int16(data)))
+    return this.decode_utf8(data.read(this.read_dint63(data)))
 };
 
 DivineHelper.prototype.write_int8 = function (v, out) {
@@ -290,18 +290,18 @@ DivineHelper.prototype.write_bool = function (v, out) {
 DivineHelper.prototype.write_string = function (v, out) {
     var s = this.encode_utf8(v);
     if (s.length > 0xFFFF) this.raise_error("Too large string: " + s.length + " bytes");
-    this.write_int16(s.length, out);
+    this.write_dint63(s.length, out);
     out.write(s);
 }
 
 DivineHelper.prototype.write_binary = function (v, out) {
     if ((v instanceof Array) || (v instanceof Uint8Array)) {
         if (v.length > 0xFFFFFFFF) this.raise_error("Too large binary: " + v.length + " (" + v.constructor.name + ")");
-        this.write_int32(v.length, out)
+        this.write_dint63(v.length, out)
         out.write(v);
     } else if (v.constructor == String) {
         if (v.length > 0xFFFFFFFF) this.raise_error("Too large binary: " + v.length + " (" + v.constructor.name + ")");
-        this.write_int32(v.length, out)
+        this.write_dint63(v.length, out)
         out.write(v);
     } else if (v == null) {
         this.raise_error("Unsupported binary 'null'");
@@ -325,22 +325,6 @@ DivineHelper.prototype.write_16_binary = function (v, out) {
     }
 }
 
-DivineHelper.prototype.write_short_binary = function (v, out) {
-    if ((v instanceof Array) || (v instanceof Uint8Array)) {
-        if (v.length > 0xFF) this.raise_error("Too large binary: " + v.length + " (" + v.constructor.name + ")");
-        this.write_int8(v.length, out)
-        out.write(v);
-    } else if (v.constructor == String) {
-        if (v.length > 0xFF) this.raise_error("Too large binary: " + v.length + " (" + v.constructor.name + ")");
-        this.write_int8(v.length, out)
-        out.write(v);
-    } else if (v == null) {
-        this.raise_error("Unsupported binary 'null'");
-    } else {
-        this.raise_error("Unsupported binary of type '" + v.constructor.name + "'");
-    }
-}
-
 DivineHelper.prototype.write_ip_number = function (v, out) {
     if ((v instanceof Array) || (v instanceof Uint8Array)){
       if(v.length == 4){
@@ -362,7 +346,8 @@ DivineHelper.prototype.write_ip_number = function (v, out) {
 DivineHelper.prototype.write_ipv4_number = function (v, out) {
     if ((v instanceof Array) || (v instanceof Uint8Array)) {
         if (v.length != 4 && v.length != 0) this.raise_error("Unknown IP v4 number " + v);
-        this.write_short_binary(v, out)
+        this.write_int8(v.length, out)
+        out.write(v);
     } else if (v.constructor == String) {
         var ss = [];
         if (v.length > 0) {
@@ -615,13 +600,12 @@ EOS
 #  * string   --> ""
 #  * ip_number--> ""
 #  * binary   --> []
-#  * short_binary --> []
 #  * list     --> []
 #  * map      --> {}
 
     def javascript_get_empty_declaration(field)
       case field.type
-      when :list, :binary, :short_binary
+      when :list, :binary
         "[]"
       when :map
         "{}"
@@ -629,6 +613,8 @@ EOS
         "0"
       when :string, :ip_number
         "\"\""
+      when :bool
+        false
       else
         raise "Unkown field type #{field.type}"
       end
@@ -647,7 +633,7 @@ EOS
           nv = get_fresh_variable_name
           idx = get_fresh_variable_name
           return [
-                  "this.write_int32(#{var}.length, out);",
+                  "this.write_dint63(#{var}.length, out);",
                   "for(var #{idx}=0; #{idx}<#{var}.length; #{idx}++) {",
                   :indent,
                   "var #{nv} = #{var}[#{idx}];",
@@ -662,7 +648,7 @@ EOS
           key = get_fresh_variable_name
           return [
                   "var #{len} = Object.keys(#{var}).length;",
-                  "this.write_int32(#{len}, out);",
+                  "this.write_dint63(#{len}, out);",
                   "for(var #{nv1} in #{var}) {",
                   :indent,
                   "var #{nv2} = #{var}[#{nv1}];",
@@ -702,7 +688,7 @@ EOS
           iter = get_fresh_variable_name
           return [
                   "#{"var " unless var.include? "this."}#{var} = [];",
-                  "var #{count} = this.read_int32(data);",
+                  "var #{count} = this.read_dint63(data);",
                   "for(var #{iter}=0; #{iter}<#{count}; #{iter}++) {",
                   :indent,
                   javascript_deserialize_internal(nv, types[1]),
@@ -716,7 +702,7 @@ EOS
           nv2 = get_fresh_variable_name
           iter = get_fresh_variable_name
           return ["#{"var " unless var.include? "this."}#{var} = {};",
-                  "var #{count} = this.read_int32(data);",
+                  "var #{count} = this.read_dint63(data);",
                   "for(var #{iter}=0; #{iter}<#{count}; #{iter}++) {",
                   :indent,
                   javascript_deserialize_internal(nv1, types[1]),

data/lib/divine/code_generators/ruby.rb

@@ -86,19 +86,15 @@ module Divine
     end
 
     def read_string(data)
-      data.read(read_int16(data)).force_encoding('UTF-8')
+      data.read(read_dint63(data)).force_encoding('UTF-8')
     end
 
     def read_binary(data)
-      data.read(read_int32(data))
-    end
-
-    def read_short_binary(data)
-      data.read(read_int8(data))
+      data.read(read_dint63(data))
     end
 
     def read_ip_number(data)
-      ips = read_short_binary(data)
+      ips = data.read(read_int8(data))
       if ips.size == 4
         read_ipv4_number(ips)
       else
@@ -200,20 +196,20 @@ module Divine
     def write_string(v, out)
       s = force_to_utf8_string(v)
       raise_error "Too large string: #{s.bytesize} bytes" if s.bytesize > 0xFFFF
-      write_int16(s.bytesize, out)
+      write_dint63(s.bytesize, out)
       out << s.bytes.to_a
     end
 
     def write_binary(v, out)
       if v.is_a?(Array)
         raise_error "Too large binary: #{v.size} (#{v.class.name})" unless v.size < 0xFFFFFFFF 
-        write_int32(v.size, out)
+        write_dint63(v.size, out)
         v.each do |x|
           write_int8(x, out)
         end
       elsif v.is_a?(String)
         raise_error "Too large binary: #{v.size} (#{v.class.name})" unless v.size < 0xFFFFFFFF 
-        write_int32(v.size, out)
+        write_dint63(v.size, out)
         out << v.bytes.to_a
       else 
         raise_error "Unsupported binary 'nil'" if v == nil
@@ -234,23 +230,6 @@ module Divine
       end
     end
 
-    def write_short_binary(v, out)
-      if v.is_a?(Array)
-        raise_error "Too large short_binary: #{v.size} (#{v.class.name})" unless v.size < 0xFF
-        write_int8(v.size, out)
-        v.each do |x|
-          write_int8(x, out)
-        end
-      elsif v.is_a?(String)
-        raise_error "To large short_binary: #{v.size} (#{v.class.name})" unless v.size < 0xFF
-        write_int8(v.size, out)
-        out << v.bytes.to_a
-      else 
-        raise_error "Unsupported binary 'nil'" if v == nil
-        raise_error "Unsupported binary of type '#{v.class.name}'"
-      end
-    end
-
     def write_ip_number(v, out)
       if v.is_a?(Array)
         if v.size == 4
@@ -272,7 +251,10 @@ module Divine
     def write_ipv4_number(v,out)
       if v.is_a?(Array)
         raise_error "Unknown IP v4 number #{v}" unless v.size == 0 || v.size == 4 # Only IPv4 for now 
-        write_short_binary(v, out)
+        write_int8(v.size, out)
+        v.each do |x|
+          write_int8(x, out)
+        end
       elsif v.is_a?(String)
         ss = v.split(/\./).map do |s|
           s.to_i
@@ -431,13 +413,12 @@ module Divine
 #  * string   --> ""
 #  * ip_number--> ""
 #  * binary   --> []
-#  * short_binary --> []
 #  * list     --> []
 #  * map      --> {}
 
     def ruby_get_empty_declaration(field)
       case field.type
-      when :list, :binary, :short_binary
+      when :list, :binary
         "[]"
       when :map
         "{}"
@@ -445,6 +426,8 @@ module Divine
         "0"
       when :string, :ip_number
         "\"\""
+      when :bool
+        false
       else
         raise "Unkown field type #{field.type}"
       end
@@ -462,7 +445,7 @@ module Divine
         when :list
           nv = get_fresh_variable_name
           return [
-                  "write_int32(#{var}.size, out)",
+                  "write_dint63(#{var}.size, out)",
                   "#{var}.each do |#{nv}|",
                   :indent,
                   ruby_serialize_internal(nv, types[1]),
@@ -473,7 +456,7 @@ module Divine
           nv1 = get_fresh_variable_name      
           nv2 = get_fresh_variable_name
           return [
-                  "write_int32(#{var}.size, out)",
+                  "write_dint63(#{var}.size, out)",
                   "#{var}.each_pair do |#{nv1}, #{nv2}|",
                   :indent,
                   ruby_serialize_internal(nv1, types[1]),
@@ -511,7 +494,7 @@ module Divine
           nv = get_fresh_variable_name
           return [
                   "#{var} = []",
-                  "#{count} = read_int32(data)",
+                  "#{count} = read_dint63(data)",
                   "(1..#{count}).each do",
                   :indent,
                   ruby_deserialize_internal(nv, types[1]),
@@ -524,7 +507,7 @@ module Divine
           nv1 = get_fresh_variable_name      
           nv2 = get_fresh_variable_name
           return ["#{var} = {}",
-                  "#{count} = read_int32(data)",
+                  "#{count} = read_dint63(data)",
                   "(1..#{count}).each do",
                   :indent,
                   ruby_deserialize_internal(nv1, types[1]),