tealrb 0.6.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ebe163f8903cf66046698ddfebe36e615359bd568e76be4eb30f368011b1ce0
-  data.tar.gz: 64db7183fe7b170d7b80881cd66272e5016e6a50cb6886a5300df729520d539d
+  metadata.gz: d027d915afa0ccb6383791a694d6ca747bd07c14a2803d6ecaa8119b3277ffe9
+  data.tar.gz: e09162d147464ba6a7c0ada5c18bc9884832f164bb43f02a87d6d3f733093ce4
 SHA512:
-  metadata.gz: 94f4791ca50e11afb7937670b976a87f75aaeaa4b364e5eea104541c571fce4f2b41e73c05c7d743772fb37657cf9dc3690e869d49007b3bd77ea4c5168ff1e5
-  data.tar.gz: f77f3513679a82d255a8a1e10cc51c8e593b66d0faae844df461a36d50b211a62b5cd9761a93c1f34591b375439766eba38238f4670a7205cc00eb72bd553c57
+  metadata.gz: e9b80748e7716e45b0bb87efcd0e70560bbb46fde5f6907ca6beaac59cd77ba4518acb41337df2fb5bb0aa6c9c8c86a6cfb28042ae95736028f4bcbdffc30c96
+  data.tar.gz: 791cb92688f986e2807770797c4ba5f61cd20e675c2887169126eb34bbbc40196e9a52ac64ecc79a4a9338ddb37632d20b5e08828a3d5b7cce9a2aa122ee2c57

data/lib/tealrb/contract.rb

@@ -4,13 +4,15 @@ module TEALrb
   class Contract
     include TEALrb
     include Opcodes
+    include Opcodes::AllOpcodes
     include ABI
     include Rewriters
 
     attr_reader :teal
 
     class << self
-      attr_accessor :subroutines, :version, :teal_methods, :abi_method_hash, :abi_description, :debug
+      attr_accessor :subroutines, :version, :teal_methods, :abi_method_hash, :abi_description, :debug,
+                    :disable_abi_routing
 
       private
 
@@ -21,6 +23,7 @@ module TEALrb
         klass.abi_description = ABI::ABIDescription.new
         klass.abi_method_hash = {}
         klass.debug = false
+        klass.disable_abi_routing = false
         super
       end
     end
@@ -69,7 +72,8 @@ module TEALrb
     # sets the `#pragma version`, defines teal methods, and defines subroutines
     def initialize
       @teal = TEAL.new ["#pragma version #{self.class.version}"]
-      @scratch = Scratch.new(@teal)
+      IfBlock.id = 0
+      @scratch = Scratch.new
 
       self.class.subroutines.each_key do |name|
         define_singleton_method(name) do |*_args|
@@ -86,6 +90,25 @@ module TEALrb
       end
     end
 
+    def teal_source
+      teal_lines = []
+
+      @teal.each do |line|
+        ln = line.strip
+
+        if (ln[%r{\S+:($| //)}] && !ln[/^if\d+/]) || ln == 'b main' || ln[/^#/]
+          teal_lines << ln
+        elsif ln == 'retsub'
+          teal_lines << "    #{ln}"
+          teal_lines << ''
+        else
+          teal_lines << "    #{ln}"
+        end
+      end
+
+      teal_lines.join("\n")
+    end
+
     # return the input without transpiling to TEAL
     def rb(input)
       input
@@ -96,8 +119,6 @@ module TEALrb
     # @param definition [Lambda, Proc, UnboundMethod] the method definition
     # @return [nil]
     def define_teal_method(name, definition)
-      @teal.set_as_current
-
       new_source = generate_method_source(name, definition)
 
       define_singleton_method(name) do |*_args|
@@ -112,13 +133,11 @@ module TEALrb
     # @param definition [Lambda, Proc, UnboundMethod] the method definition
     # @return [nil]
     def define_subroutine(name, definition)
-      @teal.set_as_current
-
       define_singleton_method(name) do |*_args|
         callsub(name)
       end
 
-      @teal << 'b main' unless @teal.include? 'b main'
+      TEAL.instance << 'b main' unless TEAL.instance.include? 'b main'
 
       label(name) # add teal label
 
@@ -140,17 +159,18 @@ module TEALrb
     def comment(content, inline: false)
       content = " #{content}" unless content[0] == ' '
       if inline
-        last_line = @teal.pop
-        @teal << "#{last_line} //#{content}"
+        last_line = TEAL.instance.pop
+        TEAL.instance << "#{last_line} //#{content}"
       else
-        @teal << "//#{content}"
+        TEAL.instance << '' unless TEAL.instance.last[%r{^//}]
+        TEAL.instance << "//#{content}"
       end
     end
 
     # inserts a string into TEAL source
     # @param string [String] the string to insert
     def placeholder(string)
-      @teal << string
+      TEAL.instance << string
     end
 
     # the hash of the abi description
@@ -162,20 +182,32 @@ module TEALrb
     # @param string [String] string to transpile
     # @return [nil]
     def compile_string(string)
-      @teal.set_as_current
       eval_tealrb(rewrite(string), debug_context: 'compile_string')
       nil
     end
 
-    # transpiles #main
+    # transpiles #main and routes abi methods. To disable abi routing, set `@disable_abi_routing` to true in your
+    # Contract subclass
     def compile
-      @teal.set_as_current
-      @teal << 'main:' if @teal.include? 'b main'
-      eval_tealrb(rewrite(method(:main).source, method_rewriter: true), debug_context: 'main')
+      TEAL.instance << 'main:' if TEAL.instance.include? 'b main'
+      route_abi_methods unless self.class.disable_abi_routing
+      eval_tealrb(rewrite(method(:main).source, method_rewriter: true), debug_context: 'main') if respond_to? :main
     end
 
     private
 
+    def route_abi_methods
+      self.class.abi_description.methods.each do |meth|
+        signature = "#{meth[:name]}(#{meth[:args].map { _1[:type] }.join(',')})#{meth[:returns][:type]}"
+        selector = OpenSSL::Digest.new('SHA512-256').hexdigest(signature)[..7]
+
+        IfBlock.new(AppArgs[0] == byte(selector)) do
+          callsub(meth[:name])
+          approve
+        end
+      end
+    end
+
     def generate_method_source(name, definition)
       new_source = rewrite(definition.source, method_rewriter: true)
 
@@ -211,7 +243,8 @@ module TEALrb
         puts ''
       end
 
-      [CommentRewriter, ComparisonRewriter, WhileRewriter, IfRewriter, OpRewriter, AssignRewriter].each do |rw|
+      [CommentRewriter, ComparisonRewriter, WhileRewriter, InlineIfRewriter, IfRewriter, OpRewriter,
+       AssignRewriter].each do |rw|
         string = rewrite_with_rewriter(string, rw)
       end
 
@@ -227,7 +260,7 @@ module TEALrb
     end
 
     def eval_tealrb(s, debug_context:)
-      pre_teal = Array.new @teal
+      pre_teal = Array.new TEAL.instance
 
       if self.class.debug
         puts "DEBUG: Evaluating the following code (#{debug_context}):"
@@ -239,13 +272,13 @@ module TEALrb
 
       if self.class.debug
         puts "DEBUG: Resulting TEAL (#{debug_context}):"
-        puts Array.new(@teal) - pre_teal
+        puts Array.new(TEAL.instance) - pre_teal
         puts ''
       end
     rescue SyntaxError, StandardError => e
       @eval_tealrb_rescue_count ||= 0
 
-      eval_locations = e.backtrace.select {_1[/\(eval\)/]}
+      eval_locations = e.backtrace.select { _1[/\(eval\)/] }
       error_line = eval_locations[@eval_tealrb_rescue_count].split(':')[1].to_i
 
       warn "'#{e}' when evaluating transpiled TEALrb source" if @eval_tealrb_rescue_count.zero?

data/lib/tealrb/if_block.rb

@@ -6,39 +6,38 @@ module TEALrb
       attr_accessor :id
     end
 
-    @id = {}.compare_by_identity
+    @id = 0
 
-    def initialize(teal, _cond, &blk)
-      self.class.id[teal] ||= 0
-      @teal = teal
+    def initialize(_cond, &blk)
+      self.class.id ||= 0
       @else_count = 0
-      @id = self.class.id[@teal]
+      @id = self.class.id
       @end_label = "if#{@id}_end:"
 
-      self.class.id[@teal] += 1
+      self.class.id += 1
 
-      @teal << "bz if#{@id}_else0"
+      TEAL.instance << "bz if#{@id}_else0"
       blk.call
-      @teal << "b if#{@id}_end"
-      @teal << "if#{@id}_else0:"
-      @teal << @end_label
+      TEAL.instance << "b if#{@id}_end"
+      TEAL.instance << "if#{@id}_else0:"
+      TEAL.instance << @end_label
     end
 
     def elsif(_cond, &blk)
       @else_count += 1
-      @teal.delete @end_label
-      @teal << "bz if#{@id}_else#{@else_count}"
+      TEAL.instance.delete @end_label
+      TEAL.instance << "bz if#{@id}_else#{@else_count}"
       blk.call
-      @teal << "b if#{@id}_end"
-      @teal << "if#{@id}_else#{@else_count}:"
-      @teal << @end_label
+      TEAL.instance << "b if#{@id}_end"
+      TEAL.instance << "if#{@id}_else#{@else_count}:"
+      TEAL.instance << @end_label
       self
     end
 
     def else(&blk)
-      @teal.delete @end_label
+      TEAL.instance.delete @end_label
       blk.call
-      @teal << @end_label
+      TEAL.instance << @end_label
     end
   end
 end