tealrb 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e87d9c19e3fb930116e5a3a3d598140987feb20a0571b2f2fd70f1beb752b3b
-  data.tar.gz: 67b114fc5e032b9b9f733fb033bc619d209a4b1da4438606064f88306cd0fa2b
+  metadata.gz: 94e31d86149bd0b29c7f7a08f2cabd94866246808315a3f70e8ac8fc35ea4e8e
+  data.tar.gz: e63533e3a902192d6425594109ea5a5e72b92eeea5f45956dc73ad093a05ceee
 SHA512:
-  metadata.gz: 61974eeb0c5454eb434ac0e36308c01ddc4ac51d7dfb8745a7b991e837e208589fbf9d014b47d2b66b876391052b2616ec2e26cffa1f92c0ab2e74db23fd01d4
-  data.tar.gz: 5f35f5248e16f6a684d3a37ab9d4a76f97f32ee24bcee43c1da7dc3082c044da1037da42a1495b3b8a1a3843d46a681f4a905b0d283ace884131b5815c60fe12
+  metadata.gz: 4a5c009da5923b564565b8c78f6e62bd75e17bcac9c19d2ae883d7a789a02ddbefc2e28732b0a278d1b8c868a0728f6ecd81d5cb29eaffc8e2b4a3f808c7acd0
+  data.tar.gz: f9310e249ad33ed5199628483916d7e4299da7dbbf76b294cf8fc22d9c6223a58f63135d7ef24d985c3773d3b89a17acffb59bcf9d1cd89c2984be234afdf4c4

data/lib/tealrb/contract.rb

@@ -69,6 +69,7 @@ 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)
 
       self.class.subroutines.each_key do |name|
         define_singleton_method(name) do |*_args|
@@ -92,18 +93,8 @@ module TEALrb
     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
@@ -130,18 +121,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
@@ -189,6 +171,29 @@ module TEALrb
 
     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)

data/lib/tealrb/if_block.rb

@@ -6,7 +6,7 @@ module TEALrb
       attr_accessor :id
     end
 
-    @id = {}
+    @id = {}.compare_by_identity
 
     def initialize(teal, _cond, &blk)
       self.class.id[teal] ||= 0
@@ -15,7 +15,6 @@ module TEALrb
       @id = self.class.id[@teal]
       @end_label = "if#{@id}_end:"
 
-      @id = self.class.id[@teal]
       self.class.id[@teal] += 1
 
       @teal << "bz if#{@id}_else0"

data/lib/tealrb/opcode_modules.rb

@@ -664,31 +664,40 @@ module TEALrb
       end
     end
 
-    class TxnArrayIndex
+    class TxnaField
       include Opcodes
-      include TxnFields
 
-      def initialize(index)
-        @index = index
+      def initialize(field, index = nil)
+        @field = field
+        @teal = TEALrb::TEAL.current[Thread.current]
+        txna(field, index) if index
       end
 
-      def opcode(field)
+      def [](index)
         @teal = TEALrb::TEAL.current[Thread.current]
-        txna field, @index
+        txna @field, index
       end
     end
 
     module Txna
-      extend Opcodes
-      extend TxnFields
+      def self.application_args(index = nil)
+        TxnaField.new('ApplicationArgs', index)
+      end
 
-      def self.opcode(field, index)
-        @teal = TEALrb::TEAL.current[Thread.current]
-        txna field, index
+      def self.accounts(index = nil)
+        TxnaField.new('Accounts', index)
       end
 
-      def self.[](index)
-        TxnArrayIndex.new(index)
+      def self.assets(index = nil)
+        TxnaField.new('Assets', index)
+      end
+
+      def self.applications(index = nil)
+        TxnaField.new('Applications', index)
+      end
+
+      def self.logs(index = nil)
+        TxnaField.new('Logs', index)
       end
     end
 
@@ -712,7 +721,7 @@ module TEALrb
 
     module AppArgs
       def self.[](index)
-        Txna.application_args index
+        Txna.application_args[index]
       end
     end
   end

data/lib/tealrb/rewriters.rb

@@ -66,7 +66,8 @@ module TEALrb
       end
 
       def on_ivar(node)
-        insert_after(node.loc.name, '.call') unless ['@teal', '@teal_methods', '@subroutines'].include? node.source
+        insert_after(node.loc.name, '.call') unless ['@teal', '@teal_methods', '@subroutines',
+                                                     '@scratch'].include? node.source
         super
       end
     end
@@ -116,6 +117,7 @@ module TEALrb
 
       def on_ivar(node)
         @skips = 2 if node.source == '@teal_methods'
+        @skips = 1 if node.source == '@scratch'
       end
 
       def on_send(node)

data/lib/tealrb/scratch.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module TEALrb
+  class Scratch
+    def initialize(teal)
+      @teal = teal
+      @open_slots = (0..256).to_a
+      @named_slots = {}
+    end
+
+    def [](key)
+      @teal << "load #{@named_slots[key]} // #{key}"
+    end
+
+    def []=(key, _value)
+      store(key)
+    end
+
+    def store(key)
+      @teal << "store #{@named_slots[key] ||= @open_slots.shift} // #{key}"
+    end
+
+    def delete(key)
+      @open_slots << @named_slots.delete(key)
+    end
+
+    def reserve(slot)
+      name = @named_slots.key(slot)
+      raise ArgumentError, "Attempted to reserve a slot (#{slot}) that corresponds to a named slot (#{name})" if name
+
+      @open_slots.delete slot
+    end
+
+    def unreserve(slot)
+      @open_slots << slot
+    end
+  end
+end

data/lib/tealrb.rb

@@ -9,6 +9,7 @@ require_relative 'tealrb/opcodes'
 require_relative 'tealrb/opcode_modules'
 require_relative 'tealrb/rewriters'
 require_relative 'tealrb/if_block'
+require_relative 'tealrb/scratch'
 require_relative 'tealrb/contract'
 require_relative 'tealrb/cmd_line/teal2tealrb'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tealrb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Joe Polny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-15 00:00:00.000000000 Z
+date: 2022-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -152,6 +152,7 @@ files:
 - lib/tealrb/opcodes.rb
 - lib/tealrb/patches.rb
 - lib/tealrb/rewriters.rb
+- lib/tealrb/scratch.rb
 homepage: https://github.com/joe-p/tealrb
 licenses:
 - MIT