tealrb 0.3.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def52b90a6225a1e78408d4b4ec6d65c7504d03a5512bcde9b03cad284bf34df
-  data.tar.gz: d4d23914a76b46bdf6ec45a7c9f087262531d26499967770b6965f63508a9e5e
+  metadata.gz: 4ebe163f8903cf66046698ddfebe36e615359bd568e76be4eb30f368011b1ce0
+  data.tar.gz: 64db7183fe7b170d7b80881cd66272e5016e6a50cb6886a5300df729520d539d
 SHA512:
-  metadata.gz: cfbfc5ebd26982b646a8a1d1de65a741a5e5711d9cccf822a3abcf1698b42977fa309d409c95b569521b289a4bf73b334f574bf3fe113c8616b02c662c7da60c
-  data.tar.gz: 7996f80823ca5cdac127207bef2899d42fe6f668b2d0d5a813c9d1d141b5521b703ef177621fe0cc64a12f7b8365bb65c604d8cf0f0158595c952e42be80e135
+  metadata.gz: 94f4791ca50e11afb7937670b976a87f75aaeaa4b364e5eea104541c571fce4f2b41e73c05c7d743772fb37657cf9dc3690e869d49007b3bd77ea4c5168ff1e5
+  data.tar.gz: f77f3513679a82d255a8a1e10cc51c8e593b66d0faae844df461a36d50b211a62b5cd9761a93c1f34591b375439766eba38238f4670a7205cc00eb72bd553c57

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|
@@ -85,6 +86,11 @@ 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
@@ -92,18 +98,8 @@ module TEALrb
     def define_teal_method(name, definition)
       @teal.set_as_current
 
-      new_source = rewrite(definition.source, method_rewriter: true)
+      new_source = generate_method_source(name, definition)
 
-      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 = "#{pre_string.string}#{new_source}"
       define_singleton_method(name) do |*_args|
         eval_tealrb(new_source, debug_context: "teal method: #{name}")
       end
@@ -130,18 +126,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 +176,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)
@@ -201,7 +211,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
 

data/lib/tealrb/opcode_modules.rb

@@ -664,31 +664,38 @@ module TEALrb
       end
     end
 
-    class TxnArrayIndex
+    class TxnaField
       include Opcodes
-      include TxnFields
 
-      def initialize(index)
-        @index = index
+      def initialize(field)
+        @field = field
       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
+        TxnaField.new('ApplicationArgs')
+      end
 
-      def self.opcode(field, index)
-        @teal = TEALrb::TEAL.current[Thread.current]
-        txna field, index
+      def self.accounts
+        TxnaField.new('Accounts')
       end
 
-      def self.[](index)
-        TxnArrayIndex.new(index)
+      def self.assets
+        TxnaField.new('Assets')
+      end
+
+      def self.applications
+        TxnaField.new('Applications')
+      end
+
+      def self.logs
+        TxnaField.new('Logs')
       end
     end
 
@@ -712,7 +719,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)
@@ -128,8 +130,8 @@ module TEALrb
             params = TEALrb::Opcodes.instance_method(meth_name).parameters
             @skips = params.count { |param| param[0] == :req }
           end
-        elsif %i[comment placeholder].include? meth_name
-          @skips = 1
+        elsif %i[comment placeholder rb].include? meth_name
+          @skips = node.children.last.children.size
         end
         super
       end
@@ -166,5 +168,30 @@ module TEALrb
         super
       end
     end
+
+    class WhileRewriter < Rewriter
+      class << self
+        attr_accessor :while_count
+      end
+
+      def initialize(*args)
+        self.class.while_count = {}
+        self.class.while_count[Thread.current] ||= 0
+        super
+      end
+
+      def while_count
+        self.class.while_count[Thread.current]
+      end
+
+      def on_while(node)
+        cond_node = node.children.first
+        replace(node.loc.keyword, ":while#{while_count}\n#{cond_node.source}\nbz :end_while#{while_count}")
+        replace(node.loc.begin, '') if node.loc.begin
+        replace(node.loc.end, "b :while#{while_count}\n:end_while#{while_count}")
+        replace(cond_node.loc.expression, '')
+        super
+      end
+    end
   end
 end

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.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Joe Polny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-15 00:00:00.000000000 Z
+date: 2022-05-27 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