tealrb 0.6.0 → 0.9.0

data/lib/tealrb/rewriters.rb

@@ -66,8 +66,7 @@ module TEALrb
       end
 
       def on_ivar(node)
-        insert_after(node.loc.name, '.call') unless ['@teal', '@teal_methods', '@subroutines',
-                                                     '@scratch'].include? node.source
+        insert_after(node.loc.name, '.call') unless ['@teal_methods', '@subroutines', '@scratch'].include? node.source
         super
       end
     end
@@ -83,7 +82,7 @@ module TEALrb
 
     class OpRewriter < Rewriter
       def initialize
-        @skips = 0
+        @skips = []
         super
       end
 
@@ -108,46 +107,77 @@ module TEALrb
         super
       end
 
-      OPCODE_METHODS = TEALrb::Opcodes.instance_methods.freeze
-
-      def on_const(node)
-        @skips = 1 if %w[Txna Gtxn AppArgs].include? node.loc.name.source
-        super
-      end
-
-      def on_ivar(node)
-        @skips = 2 if node.source == '@teal_methods'
-        @skips = 1 if node.source == '@scratch'
-      end
+      OPCODE_METHODS = TEALrb::Opcodes::AllOpcodes.instance_methods.freeze
 
       def on_send(node)
-        meth_name = node.loc.selector.source.to_sym
+        meth_name = node.children[1]
 
         if OPCODE_METHODS.include? meth_name
           if meth_name[/(byte|int)cblock/]
-            @skips = node.children.size - 2
+            @skips += node.children[2..]
           else
-            params = TEALrb::Opcodes.instance_method(meth_name).parameters
-            @skips = params.count { |param| param[0] == :req }
+            params = TEALrb::Opcodes::AllOpcodes.instance_method(meth_name).parameters
+            req_params = params.count { |param| param[0] == :req }
+            @skips += node.children[2..(1 + req_params.size)] unless req_params.zero?
           end
-        elsif %i[comment placeholder rb].include? meth_name
-          @skips = node.children.last.children.size
+        elsif %i[comment placeholder rb].include?(meth_name) ||
+              (%i[[] []=].include?(meth_name) &&
+                  (
+                    %i[@scratch @teal_methods Gtxn
+                       AppArgs].include?(node.children[0].children.last) ||
+                    node.children[0].children.first&.children&.last == :Txna
+                  ))
+
+          @skips << node.children[2]
+        elsif node.children.first&.children&.last == :@scratch && meth_name[/=$/]
+          nil
+        elsif %i[@scratch Gtxn Accounts ApplicationArgs Assets Apps Logs].include? node.children.first&.children&.last
+          @skips << node.children.last
         end
+
         super
       end
 
       def on_int(node)
-        wrap(node.source_range, 'int(', ')') if (@skips -= 1).negative?
+        if @skips.include? node
+          @skips.delete(node)
+        else
+          wrap(node.source_range, 'int(', ')')
+        end
+
         super
       end
 
       def on_str(node)
-        wrap(node.source_range, 'byte(', ')') if (@skips -= 1).negative?
+        if @skips.include? node
+          @skips.delete(node)
+        else
+          wrap(node.source_range, 'byte(', ')')
+        end
+
         super
       end
 
       def on_sym(node)
-        wrap(node.source_range, 'label(', ')') if node.source_range.source[/^:/] && (@skips -= 1).negative?
+        if @skips.include? node
+          @skips.delete(node)
+        elsif node.source_range.source[/^:/]
+          wrap(node.source_range, 'label(', ')')
+        end
+
+        super
+      end
+    end
+
+    class InlineIfRewriter < Rewriter
+      def on_if(node)
+        unless node.loc.respond_to? :else
+          conditional = node.children[0].source
+          if_blk = node.children[1].source
+
+          replace(node.loc.expression, "if(#{conditional})\n#{if_blk}\nend")
+        end
+
         super
       end
     end
@@ -156,7 +186,7 @@ module TEALrb
       def on_if(node)
         case node.loc.keyword.source
         when 'if'
-          replace(node.loc.keyword, 'IfBlock.new(@teal, ')
+          replace(node.loc.keyword, 'IfBlock.new(')
         when 'elsif'
           replace(node.loc.keyword, 'end.elsif(')
         end

data/lib/tealrb/scratch.rb

@@ -2,14 +2,13 @@
 
 module TEALrb
   class Scratch
-    def initialize(teal)
-      @teal = teal
+    def initialize
       @open_slots = (0..256).to_a
       @named_slots = {}
     end
 
     def [](key)
-      @teal << "load #{@named_slots[key]} // #{key}"
+      TEAL.instance << "load #{@named_slots[key]} // #{key}"
     end
 
     def []=(key, _value)
@@ -17,7 +16,7 @@ module TEALrb
     end
 
     def store(key)
-      @teal << "store #{@named_slots[key] ||= @open_slots.shift} // #{key}"
+      TEAL.instance << "store #{@named_slots[key] ||= @open_slots.shift} // #{key}"
     end
 
     def delete(key)

data/lib/tealrb.rb

@@ -16,13 +16,18 @@ require_relative 'tealrb/cmd_line/teal2tealrb'
 module TEALrb
   class TEAL < Array
     class << self
-      attr_accessor :current
-    end
+      attr_writer :instance
+
+      def instance
+        raise 'TEALrb does not support multi-threading' if Thread.current != Thread.main
 
-    @current = {}
+        @instance
+      end
+    end
 
-    def set_as_current
-      self.class.current[Thread.current] = self
+    def initialize(teal_array)
+      self.class.instance = self
+      super
     end
 
     def teal
@@ -39,13 +44,13 @@ module TEALrb
 
     TEALrb::Opcodes::BINARY_OPCODE_METHOD_MAPPING.each do |meth, opcode|
       define_method(meth) do |other|
-        ExtendedOpcodes.send(opcode, self, other)
+        TEALrb::Opcodes::ExtendedOpcodes.send(opcode, self, other)
       end
     end
 
     TEALrb::Opcodes::UNARY_OPCODE_METHOD_MAPPING.each do |meth, opcode|
       define_method(meth) do
-        ExtendedOpcodes.send(opcode, self)
+        TEALrb::Opcodes::ExtendedOpcodes.send(opcode, self)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tealrb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Joe Polny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-27 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.27'
+        version: '1.36'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.27'
+        version: '1.36'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -177,5 +191,5 @@ requirements: []
 rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
-summary: A DSL for building Algorand applications
+summary: A DSL for building Algorand smart contracts
 test_files: []