serpent 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 811c4565b51dd15e5eeb48a256059514f0c0b533
-  data.tar.gz: c1beae6806e7f1b2b814e25faa7ea844d63db767
+  metadata.gz: a7e97b6b271ee3c9ca4451ace9e8bb1115c9d716
+  data.tar.gz: 8de2a46ee639fd1476d86b8d4beaaf96bc25edc9
 SHA512:
-  metadata.gz: b03d4526f59ee065ea878e6e6e7abfb2d68c90a9e3bdf34e887683247e4d272104375da2b2173749f73aedbcee063e6a650358fd7740237d8dca8d459607d6cd
-  data.tar.gz: c1a76b77781c5ec3fdfc5d978dcc71b47895387250310c80f885ba8d9162fc737899ca5d9eafef82b04c37bf8a2ee44c96e0b3d7c83634fe079ebcfdc929a9d4
+  metadata.gz: 5724e2ba8c64c10c43dda924f0927108855633083e09a26097ee89c0c134eaa413670f5efbd5eb6d614d354ca322884e8d7f3716acc85390150534c70cd343c9
+  data.tar.gz: 93f6688b63c71d22a8717a0c6bd10a24dddad0a61dc24c22a1180c1eeac730590872a8165548c17e86775b74df54d13f64d37995508c22170227dc21bc412408

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    serpent (0.2.0)
+    serpent (0.2.1)
 
 GEM
   remote: https://ruby.taobao.org/

data/ext/serpent/serpent_ffi.cpp

@@ -2,6 +2,7 @@
 #include "rice/Array.hpp"
 using namespace Rice;
 
+#include "libserpent/util.h"
 #include "libserpent/parser.h"
 #include "libserpent/funcs.h"
 
@@ -23,6 +24,28 @@ Array serialize_node(Node n) {
 	return a;
 }
 
+Metadata deserialize_metadata(Array o) {
+	return Metadata(from_ruby<std::string>(o[0]),
+			from_ruby<int>(o[1]),
+			from_ruby<int>(o[2]));
+}
+
+Node deserialize_node(Array o) {
+	Node n;
+
+	n.type = from_ruby<int>(o[0]) ? ASTNODE : TOKEN;
+	n.val = from_ruby<std::string>(o[1]);
+	n.metadata = deserialize_metadata(from_ruby<Array>(o[2]));
+
+	std::vector<Node> args;
+	for(unsigned i = 3; i < o.size(); i++) {
+		args.push_back(deserialize_node(from_ruby<Array>(o[i])));
+	}
+	n.args = args;
+
+	return n;
+}
+
 /*
  * Serpent functions
  */
@@ -43,6 +66,11 @@ Array serpent_parse_lll(Object self, std::string code) {
 	return serialize_node(parseLLL(code));
 }
 
+std::string serpent_compile_lll(Object self, Array o) {
+	Node n = deserialize_node(o);
+	return compileLLL(n);
+}
+
 std::string serpent_mk_signature(Object self, std::string input) {
 	return mkSignature(input);
 }
@@ -67,6 +95,7 @@ void Init_serpent_ffi() {
 		.define_module_function("compile", &serpent_compile)
 		.define_module_function("compile_to_lll", &serpent_compile_to_lll)
 		.define_module_function("parse_lll", &serpent_parse_lll)
+		.define_module_function("compile_lll", &serpent_compile_lll)
 		.define_module_function("mk_signature", &serpent_mk_signature)
 		.define_module_function("mk_full_signature", &serpent_mk_full_signature)
 		.define_module_function("mk_contract_info", &serpent_mk_contract_info)

data/lib/serpent.rb

@@ -9,30 +9,15 @@ require 'serpent/caller'
 
 module Serpent
 
-  extend self
-
-  def compile(code, **kwargs)
-    Caller.new.compile code, **kwargs
-  end
-
-  def compile_to_lll(code, **kwargs)
-    Caller.new.compile_to_lll code, **kwargs
-  end
-
-  def get_prefix(signature)
-    FFI.get_prefix signature
-  end
-
-  def mk_signature(s)
-    JSON.parse FFI.mk_signature(s)
-  end
-
-  def mk_full_signature(s)
-    JSON.parse FFI.mk_full_signature(s)
-  end
-
-  def mk_contract_info(s)
-    JSON.parse FFI.mk_contract_info(s)
+  class <<self
+    def method_missing(name, *args)
+      caller = Caller.new
+      if caller.respond_to?(name)
+        caller.send name, *args
+      else
+        super
+      end
+    end
   end
 
 end

data/lib/serpent/caller.rb

@@ -3,6 +3,8 @@
 module Serpent
   class Caller
 
+    N = 2**32
+
     def compile(code, **kwargs)
       FFI.compile pre_transform(code, kwargs)
     end
@@ -11,13 +13,29 @@ module Serpent
       Node.build FFI.compile_to_lll(pre_transform(code, kwargs))
     end
 
-    def parse_to_lll(code)
-      FFI.parse_lll(code)
+    def compile_lll(code)
+      FFI.compile_lll ast(code)
+    end
+
+    def get_prefix(signature)
+      FFI.get_prefix(signature) % N
+    end
+
+    def mk_signature(code, **kwargs)
+      JSON.parse FFI.mk_signature(pre_transform(code, kwargs))
+    end
+
+    def mk_full_signature(code, **kwargs)
+      JSON.parse FFI.mk_full_signature(pre_transform(code, kwargs))
+    end
+
+    def mk_contract_info(code, **kwargs)
+      JSON.parse FFI.mk_contract_info(pre_transform(code, kwargs))
     end
 
     private
 
-    def take(x)
+    def ast(x)
       x.instance_of?(String) ? FFI.parse_lll(x) : x.out
     end
 

data/lib/serpent/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : ascii-8bit -*-
 module Serpent
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/test/serpent_test.rb

@@ -11,6 +11,19 @@ def main(a,b):
   return(a ^ b)
 EOF
 
+  LLL_CODE = <<EOF
+(with 'x 10
+    (with 'y 20
+        (with 'z 30
+            (seq
+                (set 'a (add (mul (get 'y) (get 'z)) (get 'x)))
+                (return (ref 'a) 32)
+            )
+        )
+    )
+)
+EOF
+
   def test_compile
     assert_equal decode_hex('604a80600b6000396055567c0100000000000000000000000000000000000000000000000000000000600035046397d857aa8114156048576004356040526024356060526060516040510a60805260206080f35b505b6000f3'), Serpent.compile(CODE, foo: 1)
   end
@@ -19,6 +32,10 @@ EOF
     assert_match /^\(return 0 \n/, Serpent.compile_to_lll(CODE).to_s
   end
 
+  def test_compile_lll
+    assert_equal "`\n`\x14`\x1e\x82\x81\x83\x02\x01` R` ` \xf3PPP", Serpent.compile_lll(LLL_CODE)
+  end
+
   def test_parse_lll
     assert_equal [0, 'def', ['main', 0, 0]], Serpent::FFI.parse_lll(CODE)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serpent
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jan Xie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby binding to Ethereum Serpent compiler.