serpent 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e064fffc2cbbd7c57f6a9f8c8b0a4cf326ec73b
-  data.tar.gz: d7403a3c974afdac5933e4c6d960fdc642c9c25e
+  metadata.gz: 811c4565b51dd15e5eeb48a256059514f0c0b533
+  data.tar.gz: c1beae6806e7f1b2b814e25faa7ea844d63db767
 SHA512:
-  metadata.gz: 676765556e178545eac61b86590d55e9b6885897cbbb959df28b8e6a4c1c376665e164491c256e0ac856049df8c3d1e9fbdb605d8e18875bdd7a68bf296673fa
-  data.tar.gz: e5c93ddca6f6dcd41979f7aa4e0a4e6731292df4665d2b477548d3cdfe63df26517fd38caa8cbb201a5cf17aa1d88be649371ae909e6bac5b916fa113d8d2ffa
+  metadata.gz: b03d4526f59ee065ea878e6e6e7abfb2d68c90a9e3bdf34e887683247e4d272104375da2b2173749f73aedbcee063e6a650358fd7740237d8dca8d459607d6cd
+  data.tar.gz: c1a76b77781c5ec3fdfc5d978dcc71b47895387250310c80f885ba8d9162fc737899ca5d9eafef82b04c37bf8a2ee44c96e0b3d7c83634fe079ebcfdc929a9d4

data/.gitignore

@@ -1,4 +1,4 @@
 tags
 tmp
-lib/serpent/serpent.so
+lib/serpent/serpent_ffi.so
 .bundle

data/Gemfile.lock

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

data/README.md

@@ -22,6 +22,9 @@ cd ..
 
 # compile extension
 rake compile
+
+# run test
+rake
 ```
 
 ## Usage

data/Rakefile

@@ -3,7 +3,8 @@ require 'rake/testtask'
 
 require 'fileutils'
 
-Rake::ExtensionTask.new "serpent" do |ext|
+Rake::ExtensionTask.new "serpent_ffi" do |ext|
+  ext.ext_dir = 'ext/serpent'
   ext.lib_dir = 'lib/serpent'
 end
 

data/ext/serpent/extconf.rb

@@ -1,3 +1,4 @@
+# -*- encoding : ascii-8bit -*-
 require 'mkmf-rice'
 
 #include_dir = File.expand_path('../../../include', __FILE__)
@@ -7,4 +8,4 @@ require 'mkmf-rice'
 
 abort "missing libserpent.so" unless have_library "serpent"
 
-create_makefile('serpent/serpent')
+create_makefile('serpent/serpent_ffi')

data/ext/serpent/serpent_ffi.cpp

@@ -0,0 +1,74 @@
+#include "rice/Module.hpp"
+#include "rice/Array.hpp"
+using namespace Rice;
+
+#include "libserpent/parser.h"
+#include "libserpent/funcs.h"
+
+Array serialize_metadata(Metadata m) {
+	Array a;
+	a.push(m.file);
+	a.push(m.ln);
+	a.push(m.ch);
+	return a;
+}
+
+Array serialize_node(Node n) {
+	Array a;
+	a.push(n.type);
+	a.push(n.val);
+	a.push(serialize_metadata(n.metadata));
+	for(unsigned i = 0; i < n.args.size(); i++)
+		a.push(serialize_node(n.args[i]));
+	return a;
+}
+
+/*
+ * Serpent functions
+ */
+
+std::string serpent_compile(Object self, std::string code) {
+	return compile(code);
+}
+
+//std::string serpent_compile_lll(Object self, Node program) {
+	//return compileLLL(program);
+//}
+
+Array serpent_compile_to_lll(Object self, std::string code) {
+	return serialize_node(compileToLLL(code));
+}
+
+Array serpent_parse_lll(Object self, std::string code) {
+	return serialize_node(parseLLL(code));
+}
+
+std::string serpent_mk_signature(Object self, std::string input) {
+	return mkSignature(input);
+}
+
+std::string serpent_mk_full_signature(Object self, std::string input) {
+	return mkFullSignature(input);
+}
+
+std::string serpent_mk_contract_info(Object self, std::string input) {
+	return mkContractInfoDecl(input);
+}
+
+unsigned int serpent_get_prefix(Object self, std::string signature) {
+	return getPrefix(signature);
+}
+
+extern "C"
+void Init_serpent_ffi() {
+	Module rb_mSerpent = define_module("Serpent");
+
+	Module rb_mSerpentFFI = define_module_under(rb_mSerpent, "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("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)
+		.define_module_function("get_prefix", &serpent_get_prefix);
+}

data/lib/serpent.rb

@@ -1,20 +1,38 @@
+# -*- encoding : ascii-8bit -*-
+
 require 'json'
 
 require 'serpent/version'
-require 'serpent/serpent'
+require 'serpent/serpent_ffi'
+require 'serpent/node'
+require 'serpent/caller'
 
 module Serpent
-  class <<self
-    def mk_signature(s)
-      JSON.parse mk_raw_signature(s)
-    end
-
-    def mk_full_signature(s)
-      JSON.parse mk_raw_full_signature(s)
-    end
-
-    def mk_contract_info(s)
-      JSON.parse mk_raw_contract_info(s)
-    end
+
+  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)
+  end
+
 end

data/lib/serpent/caller.rb

@@ -0,0 +1,39 @@
+# -*- encoding : ascii-8bit -*-
+
+module Serpent
+  class Caller
+
+    def compile(code, **kwargs)
+      FFI.compile pre_transform(code, kwargs)
+    end
+
+    def compile_to_lll(code, **kwargs)
+      Node.build FFI.compile_to_lll(pre_transform(code, kwargs))
+    end
+
+    def parse_to_lll(code)
+      FFI.parse_lll(code)
+    end
+
+    private
+
+    def take(x)
+      x.instance_of?(String) ? FFI.parse_lll(x) : x.out
+    end
+
+    def pre_transform(code, params)
+      code2 = ''
+      params.each do |k, v|
+        v = %{"#{v}"} if v.instance_of?(String)
+        code2 += "macro $#{k}:\n  #{v}\n"
+      end
+
+      if File.exist?(code)
+        code2 + "inset('#{code}')"
+      else
+        code2 + code
+      end
+    end
+
+  end
+end

data/lib/serpent/node.rb

@@ -0,0 +1,80 @@
+# -*- encoding : ascii-8bit -*-
+
+module Serpent
+  module Node
+
+    class Metadata
+      def initialize(ary)
+        @file = ary[0]
+        @ln = ary[1]
+        @ch = ary[2]
+      end
+
+      def out
+        [@file, @ln, @ch]
+      end
+    end
+
+    class Token
+      def initialize(val, metadata)
+        @val = val
+        @metadata = metadata
+      end
+
+      def out
+        [0, @val, @metadata.out]
+      end
+
+      def to_s
+        @val.to_s
+      end
+      alias :inspect :to_s
+    end
+
+    class Astnode
+      def initialize(val, args, metadata)
+        @val = val
+        @args = args.map {|arg| Node.build arg }
+        @metadata = Metadata.new(metadata)
+      end
+
+      def out
+        [1, @val, @metadata.out] + @args.map(&:out)
+      end
+
+      def to_s
+        o = "(#{@val}"
+        subs = @args.map(&:to_s)
+
+        k = 0
+        out = " "
+        while k < subs.size && o != "(seq"
+          break if subs[k].include?("\n") || (out + subs[k]).size >= 80
+          out += subs[k] + " "
+          k += 1
+        end
+
+        if k < subs.size
+          o += out + "\n  "
+          o += subs[k..-1].join("\n").split("\n").join("\n  ")
+          o += "\n)"
+        else
+          o += out[0...-1] + ')'
+        end
+
+        o
+      end
+      alias :inspect :to_s
+    end
+
+    def self.build(ary)
+      if ary[0] == 0
+        Token.new ary[1], ary[2]
+      else
+        args = ary.size > 3 ? ary[3..-1] : []
+        Astnode.new ary[1], args, ary[2]
+      end
+    end
+
+  end
+end

data/lib/serpent/version.rb

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

data/test/serpent_test.rb

@@ -1,3 +1,4 @@
+# -*- encoding : ascii-8bit -*-
 $:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'minitest/autorun'
@@ -11,7 +12,15 @@ def main(a,b):
 EOF
 
   def test_compile
-    assert_equal decode_hex('604a80600b6000396055567c0100000000000000000000000000000000000000000000000000000000600035046397d857aa8114156048576004356040526024356060526060516040510a60805260206080f35b505b6000f3'), Serpent.compile(CODE)
+    assert_equal decode_hex('604a80600b6000396055567c0100000000000000000000000000000000000000000000000000000000600035046397d857aa8114156048576004356040526024356060526060516040510a60805260206080f35b505b6000f3'), Serpent.compile(CODE, foo: 1)
+  end
+
+  def test_compile_to_lll
+    assert_match /^\(return 0 \n/, Serpent.compile_to_lll(CODE).to_s
+  end
+
+  def test_parse_lll
+    assert_equal [0, 'def', ['main', 0, 0]], Serpent::FFI.parse_lll(CODE)
   end
 
   def test_mk_full_signature

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serpent
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jan Xie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,8 +96,10 @@ files:
 - README.md
 - Rakefile
 - ext/serpent/extconf.rb
-- ext/serpent/serpent.cpp
+- ext/serpent/serpent_ffi.cpp
 - lib/serpent.rb
+- lib/serpent/caller.rb
+- lib/serpent/node.rb
 - lib/serpent/version.rb
 - serpent.gemspec
 - test/serpent_test.rb
@@ -121,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby binding to Ethereum Serpent compiler.

data/ext/serpent/serpent.cpp

@@ -1,34 +0,0 @@
-#include "rice/Module.hpp"
-using namespace Rice;
-
-#include "libserpent/funcs.h"
-
-std::string serpent_compile(Object self, std::string code) {
-	return compile(code);
-}
-
-std::string serpent_mk_raw_signature(Object self, std::string input) {
-	return mkSignature(input);
-}
-
-std::string serpent_mk_raw_full_signature(Object self, std::string input) {
-	return mkFullSignature(input);
-}
-
-std::string serpent_mk_raw_contract_info(Object self, std::string input) {
-	return mkContractInfoDecl(input);
-}
-
-unsigned int serpent_get_prefix(Object self, std::string signature) {
-	return getPrefix(signature);
-}
-
-extern "C"
-void Init_serpent() {
-	Module rb_mSerpent = define_module("Serpent")
-		.define_module_function("compile", &serpent_compile)
-		.define_module_function("mk_raw_signature", &serpent_mk_raw_signature)
-		.define_module_function("mk_raw_full_signature", &serpent_mk_raw_full_signature)
-		.define_module_function("mk_raw_contract_info", &serpent_mk_raw_contract_info)
-		.define_module_function("get_prefix", &serpent_get_prefix);
-}