divine 0.0.1 → 0.0.2

data/LICENSE.txt

@@ -1,4 +1,5 @@
-Copyright (c) 2012 Nils Franzen
+Copyright (c) 2012 Nils Franzen (https://github.com/franzen)
+Copyright (c) 2012 Ahmed H. Ali (https://github.com/Ahmedrali)
 Copyright (c) 2009-2010, Patrick Reiter Horn (Javascript UTF8 string encode/decode methods taken from the ProtoJS project)
 
 MIT License

data/Rakefile

@@ -1 +1,50 @@
 require "bundler/gem_tasks"
+
+namespace :test  do
+  
+  desc "Run Ruby code test suite"
+  task :ruby => :environment do
+    ruby "test/basic_complex_test/ruby_test/ruby_test.rb"
+    ruby "test/binaryTree_test/ruby_test/ruby_test.rb"
+    ruby "test/ipv6_test/ruby_test/ruby_test.rb"
+    ruby "test/complex_test/ruby_test/ruby_test.rb"
+  end
+
+
+  desc "Run JS code test suite"
+  task :js => :environment do
+    system("node test/basic_complex_test/js_test/js_testBasic.js")
+    system("node test/basic_complex_test/js_test/js_testComplex.js")
+    system("node test/binaryTree_test/js_test/js_test.js")
+    system("node test/ipv6_test/js_test/js_test.js")
+    system("node test/complex_test/js_test/js_test.js")
+  end
+
+  desc "Run java code test suite"
+  task :java => :environment do
+    system("javac -cp test/java_lib/junit.jar: test/ipv6_test/java_test/*.java")
+    system("java -cp test/ipv6_test/java_test/:test/java_lib/junit.jar:. org.junit.runner.JUnitCore JavaTest")
+
+    system("javac -cp test/java_lib/junit.jar: test/complex_test/java_test/*.java")
+    system("java -cp test/complex_test/java_test/:test/java_lib/junit.jar:. org.junit.runner.JUnitCore JavaTest")
+
+    system("javac -cp test/java_lib/junit.jar: test/binaryTree_test/java_test/*.java")
+    system("java -cp test/binaryTree_test/java_test/:test/java_lib/junit.jar:. org.junit.runner.JUnitCore JavaTest")
+
+    system("javac -cp test/java_lib/junit.jar: test/basic_complex_test/java_test/*.java")
+    system("java -cp test/basic_complex_test/java_test/:test/java_lib/junit.jar:. org.junit.runner.JUnitCore JavaTest")
+  end
+
+
+  desc "Generate Source Code"
+  task :environment do
+    puts "Divine Version #{Divine::VERSION}"
+    lang = Rake.application.top_level_tasks[0].match(/:(.*)/)[1]
+
+    ruby "test/basic_complex_test/basic_complex_test.rb #{lang}"
+    ruby "test/ipv6_test/ipv6_test.rb #{lang}"
+    ruby "test/complex_test/complex_test.rb #{lang}"
+    ruby "test/binaryTree_test/binaryTree_test.rb #{lang}"
+  end
+end
+

data/lib/divine/code_generators/code_generator.rb

@@ -35,15 +35,38 @@ module Divine
       raise "Unknown taget language: #{target}" unless gen
       puts "Generating code for #{target}"
       src = gen.generate_code($all_structs, opts)
-      if opts[:file]
-        filename = opts[:file]
-        File.open(filename, 'w+') do |f|
-          puts "... writing #{filename}"
-          f.write(src)
+      target_dir = getTargetDir(opts[:target_dir])
+
+      if opts[:package]
+        path = target_dir + opts[:package]
+        Dir.mkdir(path) unless File.exists?(path)
+        for cls in src
+           file_name = path+"/"+cls[:file]
+           writeFile(file_name, cls[:src])
         end
+      elsif opts[:file]
+        path = target_dir + opts[:file]
+        writeFile(path, src[0][:src])
       else
         puts src
       end
     end
+
+    def getTargetDir(dir)
+      # check if the path is relative or absolute if exist
+      if dir && File.directory?(dir)
+        return dir + "/"
+      elsif dir && File.directory?(Dir.pwd + "/" + dir)
+        return Dir.pwd + dir + "/"
+      end
+      ""
+    end
+    
+    def writeFile(path, content)
+      File.open(path, 'w+') do |f|
+        puts "... writing #{path}"
+        f.write(content)
+      end
+    end
   end
-end
+end

data/lib/divine/code_generators/java.rb

@@ -53,7 +53,7 @@ abstract class BabelBase <%= toplevel_class %> {
 		if (c > Integer.MAX_VALUE) {
 			throw new IndexOutOfBoundsException("Binary data to big for java");
 		}
-		return readBytes((int) readInt32(data), data);
+		return readBytes((int) c, data);
 	}
 
 	protected byte[] readShortBinary(ByteArrayInputStream data) throws IOException {
@@ -61,7 +61,15 @@ abstract class BabelBase <%= toplevel_class %> {
 	}
 
 	protected String readIpNumber(ByteArrayInputStream data) throws IOException {
-		byte[] ips = readShortBinary(data);
+		byte[] ips = readShortBinary(data);		
+		if(ips.length == 4){
+			return readIpv4Number(ips);
+		} else{
+			return readIpv6Number(ips);
+		}
+	}
+
+	protected String readIpv4Number(byte[] ips){
 		String ip = "";
 		for (byte b : ips) {
 			if (ip.length() > 0) {
@@ -72,9 +80,27 @@ abstract class BabelBase <%= toplevel_class %> {
 		return ip;
 	}
 
+	protected String readIpv6Number(byte[] ips) throws IOException {
+		String ip = "";
+                int part1, part2;
+		for (int i = 0; i < ips.length; i+=2) {
+			part1   = ips[i] & 0xFF;
+			part2   = ips[i+1] & 0xFF;
+			ip += part1 == 0? "" : Integer.toHexString(part1);
+			ip += (part1 == 0 && part2 == 0)? "" : (part2 < 10 && part1 != 0? "0" + Integer.toHexString(part2): Integer.toHexString(part2));
+			if (i < ips.length-2) {
+				ip += ":";
+			}
+		}
+		ip = ip.replaceAll(":{3,}", "::");
+		return ip;
+	}
+
 	protected void writeInt8(int v, ByteArrayOutputStream out) {
 		if (v > 0xFF) { // Max 255
 			raiseError("Too large int8 number: " + v);
+		}else if(v < 0){
+			raiseError("a negative number passed  to int8 number: " + v);
 		}
 		out.write(v);
 	}
@@ -82,22 +108,28 @@ abstract class BabelBase <%= toplevel_class %> {
 	protected void writeInt16(int v, ByteArrayOutputStream out) {
 		if (v > 0xFFFF) { // Max 65.535 
 			raiseError("Too large int16 number: " + v);
+		}else if(v < 0){
+			raiseError("a negative number passed  to int16 number: " + v);
 		}
 		writeInt8(v >> 8 & 0xFF, out);
 		writeInt8(v & 0xFF, out);
 	}
 
 	protected void writeInt24(int v, ByteArrayOutputStream out) {
-		if (v > 0xFFFFFF) { // Max 16.777.215
+		if (v > 0xFFFFFF) { 	// Max 16.777.215
 			raiseError("Too large int24 number: " + v);
+		}else if(v < 0){	// In Case added to Java declaration
+			raiseError("a negative number passed  to int24 number: " + v);
 		}
 		writeInt8(v >> 16 & 0xFF, out);
 		writeInt16(v & 0xFFFF, out);
 	}
 
 	protected void writeInt32(long v, ByteArrayOutputStream out) {
-		if (v > 0xFFFFFFFF) { // Max 4.294.967.295
+		if (v > 0xFFFFFFFFL) { // Max 4.294.967.295
 			raiseError("Too large int32 number: " + v);
+		}else if(v < 0){
+			raiseError("a negative number passed  to int32 number: " + v);
 		}
 		writeInt8((int) ((v >> 24) & 0xFF), out);
 		writeInt24((int) (v & 0xFFFFFF), out);
@@ -117,13 +149,24 @@ abstract class BabelBase <%= toplevel_class %> {
 	}
 
 	protected void writeBinary(byte[] v, ByteArrayOutputStream out) throws IOException {
-		if (v.length > 0xFFFFFFFF) {
+		if (v.length > 0xFFFFFFFFL) {
 			raiseError("Too large binary: " + v.length + " bytes");
 		}
 		writeInt32(v.length, out);
 		out.write(v);
 	}
 
+
+	protected void write16Binary(int[] v, ByteArrayOutputStream out) throws IOException {
+		if (v.length > 0xFF) {
+			raiseError("Too large 16_binary: " + (v.length*2) + " bytes");
+		}
+		writeInt8(v.length*2, out);
+		for(int i = 0; i < v.length; i++){
+			this.writeInt16(v[i], out);
+		}
+	}
+
 	protected void writeShortBinary(byte[] v, ByteArrayOutputStream out) throws IOException {
 		if (v.length > 0xFF) {
 			raiseError("Too large short_binary: " + v.length + " bytes");
@@ -133,10 +176,21 @@ abstract class BabelBase <%= toplevel_class %> {
 	}
 
 	protected void writeIpNumber(String v, ByteArrayOutputStream out) throws IOException {
-		String[] bs = v.split(".");
-		byte[] ss = new byte[bs.length];
-		for (int i = 0; i < bs.length; i++) {
-			ss[i] = (byte) (Integer.parseInt(bs[i]) & 0xFF);
+		if(v.contains(":")){
+			writeIpv6Number( v, out);
+		}else{
+			writeIpv4Number( v, out);
+    		}
+	}
+        
+        protected void writeIpv4Number(String v, ByteArrayOutputStream out) throws IOException {
+		byte[] ss = new byte[0];
+		if(!v.isEmpty()){
+			String[] bs = v.split("\\\\.");
+			ss = new byte[bs.length];
+			for (int i = 0; i < bs.length; i++) {
+				ss[i] = (byte) (Integer.parseInt(bs[i]) & 0xFF);
+			}
 		}
 		if (ss.length == 0 || ss.length == 4) {
 			writeShortBinary(ss, out);
@@ -145,6 +199,42 @@ abstract class BabelBase <%= toplevel_class %> {
 		}
 	}
 
+        protected void writeIpv6Number(String v, ByteArrayOutputStream out)
+			throws IOException {
+		v = v.replaceAll(" ", "") + " "; // Temporary: To avoid the split problem when we have : at the
+					// end of "v"
+		int[] ss = new int[0];
+		boolean contains_ipv6_letters = Pattern.compile("[0-9a-f]+").matcher(
+				v.trim().toLowerCase()).find();
+		boolean contains_other_letters = Pattern.compile("[^:0-9a-f]+")
+				.matcher(v.trim().toLowerCase()).find();
+		// make sure of v must have only one "::" and no more than two of ":".
+		// e.g. 1::1::1 & 1:::1:205
+		if (!v.trim().isEmpty() && v.split(":{3,}").length == 1
+				&& v.split(":{2}").length <= 2 && !contains_other_letters
+				&& contains_ipv6_letters) {
+			String[] bs = v.split(":");
+			ss = new int[bs.length];
+			for (int i = 0; i < bs.length; i++) {
+				String s = bs[i].trim();
+				if (s.length() <= 4) // to avoid such number 0125f
+					ss[i] = Integer.parseInt(
+							(s.isEmpty() ? "0" : bs[i].trim()), 16);
+				else
+					raiseError("Unknown IPv6 Group " + i + " which is " + s);
+			}
+		}
+		// Check for make sure of the size of the IP groups in case "::" is used
+		// [> 2 & < 8]or not [must == 8]
+		if (!contains_other_letters
+				&& (!v.contains("::") && ss.length == 0 || ss.length == 8)
+				|| (v.contains("::") && ss.length > 2 && ss.length < 8)) {
+			write16Binary(ss, out);
+		} else {
+			raiseError("Unknown IP v6 number " + v);
+		}
+	}
+
 	protected void raiseError(String msg) {
 		throw new IllegalArgumentException("[" + this.getClass().getCanonicalName() + "] " + msg);
 	}
@@ -154,7 +244,7 @@ EOS
 
     def java_class_template_str
       <<EOS2
-public class <%= c.name %> extends BabelBase {
+class <%= c.name %> extends BabelBase {
 <% unless c.fields.empty? %>
 <% c.fields.each do |f| %>
 	public <%= this.java_get_type_declaration(f) %> <%= f.name %> = <%= this.java_get_empty_declaration(f) %>;
@@ -172,7 +262,7 @@ public class <%= c.name %> extends BabelBase {
 	}
 
 	@Override
-	void deserialize(ByteArrayInputStream bais) throws IOException {
+	public void deserialize(ByteArrayInputStream bais) throws IOException {
 <% c.simple_fields.each do |f| %>
 		this.<%= f.name %> = <%= this.camelize("read", f.type) %>(bais);
 <% end %>
@@ -389,8 +479,16 @@ EOS2
     
       # User defined super class?
       toplevel = opts[:parent_class] || nil
-      toplevel = " extends #{toplevel}" if toplevel 
-      return "#{java_get_begin_module(opts)}#{base_template.result({ toplevel_class: toplevel })}\n\n#{src.join("\n\n")}"
+      toplevel = " extends #{toplevel}" if toplevel
+      if opts[:package]
+        res = [{file: "BabelBase.java", src: "#{java_get_begin_module(opts)}public #{base_template.result({ toplevel_class: toplevel })}"}]
+	for cls in src
+          res << {file: cls.match(/class (.*) extends/)[1]+".java", src: "#{java_get_begin_module(opts)}public #{cls}"}
+        end
+        return res
+      else
+        return [{file: opts[:file], src: "#{java_get_begin_module(opts)}#{base_template.result({ toplevel_class: toplevel })}\n\n#{src.join("\n\n")}"}]
+      end
     end
   
     def java_get_begin_module(opts)
@@ -402,10 +500,19 @@ EOS2
           "import java.io.IOException;",
           "import java.util.ArrayList;",
           "import java.util.HashMap;",
+          "import java.util.regex.Pattern;",
           "import java.nio.charset.Charset;\n\n"
         ].join("\n")
       else 
-        nil
+        [
+          "import java.io.ByteArrayInputStream;",
+          "import java.io.ByteArrayOutputStream;",
+          "import java.io.IOException;",
+          "import java.util.ArrayList;",
+          "import java.util.HashMap;",
+          "import java.util.regex.Pattern;",
+          "import java.nio.charset.Charset;\n\n"
+        ].join("\n")
       end
     end
   end

data/lib/divine/code_generators/javascript.rb

@@ -95,6 +95,14 @@ BabelHelper.prototype.read_short_binary = function (data) {
 
 BabelHelper.prototype.read_ip_number = function (data) {
     var ip_array = this.read_short_binary(data);
+    if(ip_array.length == 4){
+       return this.read_ipv4_number(ip_array);
+    }else{
+       return this.read_ipv6_number(ip_array);
+    }
+};
+
+BabelHelper.prototype.read_ipv4_number = function (ip_array) {
     ip = "";
     for (i = 0, len = ip_array.length; i < len; i++) {
         b = ip_array[i];
@@ -105,6 +113,20 @@ BabelHelper.prototype.read_ip_number = function (data) {
     }
     return ip;
 };
+BabelHelper.prototype.read_ipv6_number = function (ip_array) {
+    var ip = "";
+    var part1, part2;
+    for (i = 0, len = ip_array.length; i < len; i+=2) {
+        part1 = ip_array[i];
+        part2 = ip_array[i+1];
+        ip += part1 == 0? "" : part1.toString(16);
+        ip += (part1 == 0 && part2 == 0)? "" : (part2 < 10 && part1 != 0? "0" + part2.toString(16): part2.toString(16));
+        if (i < ip_array.length-2)
+            ip += ":";
+    }
+    ip = ip.replace(/:{3,}/g, "::");
+    return ip;
+};
 
 BabelHelper.prototype.read_string = function (data) {
     return this.decode_utf8(data.read(this.read_int16(data)))
@@ -112,27 +134,35 @@ BabelHelper.prototype.read_string = function (data) {
 
 BabelHelper.prototype.write_int8 = function (v, out) {
     if (v > 0xFF) // Max 255
-    this.raise_error("Too large int8 number: " + v);
+      this.raise_error("Too large int8 number: " + v);
+    if(v < 0)
+      this.raise_error("a negative number passed  to int8 number: " + v);
     out.writeByte(v);
 }
 
 BabelHelper.prototype.write_int16 = function (v, out) {
     if (v > 0xFFFF) // Max 65.535
-    this.raise_error("Too large int16 number: " + v);
+      this.raise_error("Too large int16 number: " + v);
+    if(v < 0)
+      this.raise_error("a negative number passed  to int16 number: " + v);
     this.write_int8(v >> 8 & 0xFF, out);
     this.write_int8(v & 0xFF, out);
 }
 
 BabelHelper.prototype.write_int24 = function (v, out) {
-    if (v > 0xFFFFFF) // Max 16.777.215
-    this.raise_error("Too large int24 number: " + v);
+    if (v > 0xFFFFFF) 	// Max 16.777.215
+      this.raise_error("Too large int24 number: " + v);
+    if (v < 0)		// In Case added to JavaScript declaration
+      this.raise_error("a negative number passed  to int24 number: " + v);
     this.write_int8(v >> 16 & 0xFF, out);
     this.write_int16(v & 0xFFFF, out);
 }
 
 BabelHelper.prototype.write_int32 = function (v, out) {
     if (v > 0xFFFFFFFF) // Max 4.294.967.295
-    this.raise_error("Too large int32 number: " + v);
+      this.raise_error("Too large int32 number: " + v);
+    if(v < 0)
+      this.raise_error("a negative number passed  to int32 number: " + v);
     this.write_int8(v >> 24 & 0xFF, out);
     this.write_int24(v & 0xFFFFFF, out);
 }
@@ -141,10 +171,6 @@ BabelHelper.prototype.write_bool = function (v, out) {
     this.write_int8(v ? 1 : 0, out)
 }
 
-BabelHelper.prototype.write_bool = function (v, out) {
-    this.write_int8(v ? 1 : 0, out)
-}
-
 BabelHelper.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");
@@ -168,6 +194,21 @@ BabelHelper.prototype.write_binary = function (v, out) {
     }
 }
 
+BabelHelper.prototype.write_16_binary = function (v, out) {
+    if ((v instanceof Array) || (v instanceof Uint8Array)) {
+        if (v.length > 0xFF) this.raise_error("Too large 16 binary: " + v.length*2 + " (" + v.constructor.name + ")");
+        this.write_int8(v.length * 2, out)
+        for (i = 0, len = v.length; i < len; i++) {
+	  this.write_int16(v[i], out);
+        }
+        
+    } else if (v == null) {
+        this.raise_error("Unsupported binary 'null'");
+    } else {
+        this.raise_error("Unsupported binary of type '" + v.constructor.name + "'");
+    }
+}
+
 BabelHelper.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 + ")");
@@ -185,6 +226,24 @@ BabelHelper.prototype.write_short_binary = function (v, out) {
 }
 
 BabelHelper.prototype.write_ip_number = function (v, out) {
+    if ((v instanceof Array) || (v instanceof Uint8Array)){
+      if(v.length == 4){
+         this.write_ipv4_number(v, out);
+      }else{
+         this.write_ipv6_number(v, out);
+      }
+    }else if(v.constructor == String){
+      if(/:/g.test(v)){
+         this.write_ipv6_number(v, out);
+      }else{
+         this.write_ipv4_number(v, out);
+      }
+    }else{
+      this.raise_error("Unknown IP number '" + v + "'");
+    }
+}
+
+BabelHelper.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)
@@ -193,10 +252,40 @@ BabelHelper.prototype.write_ip_number = function (v, out) {
         if (v.length > 0) {
             ss = v.split(".").map(Number);
         }
-        this.write_ip_number(ss, out);
+        this.write_ipv4_number(ss, out);
     } else {
         this.raise_error("Unknown IP number '" + v + "'");
     }
+};
+
+BabelHelper.prototype.write_ipv6_number = function (v, out) {
+    if ((v instanceof Array) || (v instanceof Uint8Array)) {
+        this.write_16_binary(v, out)
+    } else if (v.constructor == String) {
+        var ss = [];
+        var contains_ipv6_letters  = /[0-9a-f]+/gi.test(v);
+        var contains_other_letters = /[^:0-9a-f]+/gi.test(v);
+        if (v.length > 0 && v.split(/:{3,}/g).length == 1 && v.split(/:{2}/g).length <= 2 && !contains_other_letters && 
+            contains_ipv6_letters) {
+            v = v.replace(/ /g, "");
+            ss = v.split(":").map(function (t){
+               if (t.length > 4)
+		 new BabelHelper().raise_error("Unknown IP Group number '" + t + "'");
+               if (t.length == 0)
+                 t = "0";
+               return parseInt(t, 16);
+            });
+        }
+        if (!contains_other_letters &&
+           ( !/::/g.test(v) && ss.length == 0 || ss.length == 8) || ( /::/g.test(v) && ss.length > 2 && ss.length < 8) ) {
+          this.write_ipv6_number(ss, out);
+        } else {
+          this.raise_error("Unknown IP v6 number '" + v + "'");
+        }
+
+    } else {
+        this.raise_error("Unknown IP v6 number '" + v + "'");
+    }
 }
 
 BabelHelper.prototype.encode_utf8 = function (str) {
@@ -495,7 +584,7 @@ EOS2
       # User defined super class?
       toplevel = opts[:parent_class] || nil
       toplevel = " < #{toplevel}" if toplevel 
-      return "#{javascript_get_begin_module(opts)}#{base_template.result({ toplevel_class: toplevel })}\n\n#{src.join("\n\n")}#{javascript_get_end_module(opts)}"
+      return [{file: opts[:file], src: "#{javascript_get_begin_module(opts)}#{base_template.result({ toplevel_class: toplevel })}\n\n#{src.join("\n\n")}#{javascript_get_end_module(opts)}"}]
     end
   
     def javascript_get_begin_module(opts)