tealrb 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa3ecdb5dd00d5242fc4606722bc6d6c80625f0dd042fe8a64aaec481fe4bb6d
-  data.tar.gz: 59ddc597857e55d7b0d6187325d0ff76e3e049403fcdf1ede00f2b3a9a1c2eaf
+  metadata.gz: 94ca888a944ccee0517d5e543498570af448a9eb3ea1ba74d3d3261ffc4b86f0
+  data.tar.gz: 54ac7826a7af43fb82fa17cf010a2ce869511546067f7a151181b86d3445b0bf
 SHA512:
-  metadata.gz: 3757a7177af88cef08ab3c780fde484210dc5c2a9667a6733815b72b5dfef2e1aeaa176c65ab48be5010cf973c40c1af04b33e3516f14a8bc818a58f5972776b
-  data.tar.gz: b508d5fa005be7eaf3adf738542c38a053240ccfa73d0de0c2b6410a0ad4358d7a31e90d2899d35aeafc1407955ae5f0ab96ae8083ec1b0aabaf7ffbcd937547
+  metadata.gz: 4f986ae5a4e3c37460142951923c3908ec95b58d0d91f695a49a07f8e8eee062499d496b185e1f2eafec8ed2020ca9d83a4c8c50c97531a8a67e26057e7bb794
+  data.tar.gz: c73f78d20f1c76ccc41e42450f713b14dc42049d8d44ee1498c59e38cda3e7699e4f1e655932f5b86c68d707d1a1abba7d59fc5c92244552236bb2a472a3d4c2

data/lib/tealrb/contract.rb

@@ -6,6 +6,7 @@ module TEALrb
     include Opcodes
     include ABI
     include Rewriters
+    include MaybeOps
 
     attr_reader :teal
 
@@ -69,6 +70,8 @@ module TEALrb
     # sets the `#pragma version`, defines teal methods, and defines subroutines
     def initialize
       @teal = TEAL.new ["#pragma version #{self.class.version}"]
+      IfBlock.id = 0
+      @scratch = Scratch.new
 
       self.class.subroutines.each_key do |name|
         define_singleton_method(name) do |*_args|
@@ -85,25 +88,18 @@ module TEALrb
       end
     end
 
+    # return the input without transpiling to TEAL
+    def rb(input)
+      input
+    end
+
     # defines a method that is transpiled to TEAL
     # @param name [Symbol] name of the method
     # @param definition [Lambda, Proc, UnboundMethod] the method definition
     # @return [nil]
     def define_teal_method(name, definition)
-      @teal.set_as_current
-
-      new_source = rewrite(definition.source, method_rewriter: true)
-
-      pre_string = StringIO.new
-
-      definition.parameters.reverse.each_with_index do |param, i|
-        param_name = param.last
-        pre_string.puts "store #{200 + i}"
-        pre_string.puts "comment('#{param_name}', inline: true)"
-        pre_string.puts "#{param_name} = -> { load #{200 + i}; comment('#{param_name}', inline: true) }"
-      end
+      new_source = generate_method_source(name, definition)
 
-      new_source = "#{pre_string.string}#{new_source}"
       define_singleton_method(name) do |*_args|
         eval_tealrb(new_source, debug_context: "teal method: #{name}")
       end
@@ -116,13 +112,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
 
@@ -130,18 +124,9 @@ module TEALrb
       comment_content = "#{name}(#{comment_params})"
       comment(comment_content, inline: true)
 
-      new_source = rewrite(definition.source, method_rewriter: true)
-
-      pre_string = StringIO.new
-
-      definition.parameters.reverse.each_with_index do |param, i|
-        param_name = param.last
-        pre_string.puts "store #{200 + i}"
-        pre_string.puts "comment('#{param_name}', inline: true)"
-        pre_string.puts "#{param_name} = -> { load #{200 + i}; comment('#{param_name}', inline: true) }"
-      end
+      new_source = generate_method_source(name, definition)
+      new_source = "#{new_source}retsub"
 
-      new_source = "#{pre_string.string}#{new_source}retsub"
       eval_tealrb(new_source, debug_context: "subroutine: #{name}")
 
       nil
@@ -153,17 +138,17 @@ 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 << "//#{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
@@ -175,20 +160,41 @@ 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
     def compile
-      @teal.set_as_current
-      @teal << 'main:' if @teal.include? 'b main'
+      TEAL.instance << 'main:' if TEAL.instance.include? 'b main'
       eval_tealrb(rewrite(method(:main).source, method_rewriter: true), debug_context: 'main')
     end
 
     private
 
+    def generate_method_source(name, definition)
+      new_source = rewrite(definition.source, method_rewriter: true)
+
+      pre_string = StringIO.new
+
+      scratch_names = []
+      definition.parameters.reverse.each_with_index do |param, _i|
+        param_name = param.last
+        scratch_name = [name, param_name].map(&:to_s).join(': ')
+        scratch_names << scratch_name
+
+        pre_string.puts "@scratch.store('#{scratch_name}')"
+        pre_string.puts "#{param_name} = -> { @scratch['#{scratch_name}'] }"
+      end
+
+      post_string = StringIO.new
+      scratch_names.each do |n|
+        post_string.puts "@scratch.delete '#{n}'"
+      end
+
+      "#{pre_string.string}#{new_source}#{post_string.string}"
+    end
+
     def rewrite_with_rewriter(string, rewriter)
       process_source = RuboCop::ProcessedSource.new(string, RUBY_VERSION[/\d\.\d/].to_f)
       rewriter.new.rewrite(process_source)
@@ -201,7 +207,7 @@ module TEALrb
         puts ''
       end
 
-      [CommentRewriter, ComparisonRewriter, IfRewriter, OpRewriter, AssignRewriter].each do |rw|
+      [CommentRewriter, ComparisonRewriter, WhileRewriter, IfRewriter, OpRewriter, AssignRewriter].each do |rw|
         string = rewrite_with_rewriter(string, rw)
       end
 
@@ -217,7 +223,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}):"
@@ -229,7 +235,7 @@ 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

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

data/lib/tealrb/opcode_modules.rb

@@ -33,7 +33,7 @@ module TEALrb
         private
 
         def txn_type_int(type)
-          TEALrb::TEAL.current[Thread.current] << "int #{type}"
+          TEAL.instance << "int #{type}"
         end
       end
 
@@ -603,7 +603,6 @@ module TEALrb
       extend AppFields
 
       def self.opcode(field, app_id = nil)
-        @teal = TEALrb::TEAL.current[Thread.current]
         app_params_get field, app_id
       end
     end
@@ -613,7 +612,6 @@ module TEALrb
       extend AssetFields
 
       def self.opcode(field, asset = nil)
-        @teal = TEALrb::TEAL.current[Thread.current]
         asset_params_get field, asset
       end
     end
@@ -623,7 +621,6 @@ module TEALrb
       extend AccountFields
 
       def self.opcode(field, account = nil)
-        @teal = TEALrb::TEAL.current[Thread.current]
         acct_params_get field, account
       end
     end
@@ -642,7 +639,6 @@ module TEALrb
       extend Opcodes
 
       def self.opcode(field, index)
-        @teal = TEALrb::TEAL.current[Thread.current]
         gtxn index, field
       end
 
@@ -667,37 +663,34 @@ module TEALrb
     class TxnaField
       include Opcodes
 
-      def initialize(field, index = nil)
+      def initialize(field)
         @field = field
-        @teal = TEALrb::TEAL.current[Thread.current]
-        txna(field, index) if index
       end
 
       def [](index)
-        @teal = TEALrb::TEAL.current[Thread.current]
         txna @field, index
       end
     end
 
     module Txna
-      def self.application_args(index = nil)
-        TxnaField.new('ApplicationArgs', index)
+      def self.application_args
+        TxnaField.new('ApplicationArgs')
       end
 
-      def self.accounts(index = nil)
-        TxnaField.new('Accounts', index)
+      def self.accounts
+        TxnaField.new('Accounts')
       end
 
-      def self.assets(index = nil)
-        TxnaField.new('Assets', index)
+      def self.assets
+        TxnaField.new('Assets')
       end
 
-      def self.applications(index = nil)
-        TxnaField.new('Applications', index)
+      def self.applications
+        TxnaField.new('Applications')
       end
 
-      def self.logs(index = nil)
-        TxnaField.new('Logs', index)
+      def self.logs
+        TxnaField.new('Logs')
       end
     end
 
@@ -706,7 +699,6 @@ module TEALrb
       extend GlobalFields
 
       def self.opcode(field)
-        @teal = TEALrb::TEAL.current[Thread.current]
         global field
       end
 
@@ -721,7 +713,55 @@ module TEALrb
 
     module AppArgs
       def self.[](index)
-        Txna.application_args index
+        Txna.application_args[index]
+      end
+    end
+
+    module MaybeOps
+      include Opcodes
+
+      def app_param_exists?(field, _app_id = nil)
+        app_params_get field
+        swap
+        pop
+      end
+
+      def app_param_value(field, _app_id = nil)
+        app_params_get field
+        pop
+      end
+
+      def asset_param_exists?(field, _asset_id = nil)
+        asset_params_get field
+        swap
+        pop
+      end
+
+      def asset_param_value(field, _asset_id = nil)
+        asset_params_get field
+        pop
+      end
+
+      def app_local_ex_exists?(_account = nil, _applicaiton = nil, _key = nil)
+        app_local_get_ex
+        swap
+        pop
+      end
+
+      def app_local_ex_value(_account = nil, _applicaiton = nil, _key = nil)
+        app_local_get_ex
+        pop
+      end
+
+      def app_global_ex_exists?(_account = nil, _applicaiton = nil, _key = nil)
+        app_global_get_ex
+        swap
+        pop
+      end
+
+      def app_global_ex_value(_account = nil, _applicaiton = nil, _key = nil)
+        app_global_get_ex
+        pop
       end
     end
   end