tealrb 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94e31d86149bd0b29c7f7a08f2cabd94866246808315a3f70e8ac8fc35ea4e8e
-  data.tar.gz: e63533e3a902192d6425594109ea5a5e72b92eeea5f45956dc73ad093a05ceee
+  metadata.gz: 4ebe163f8903cf66046698ddfebe36e615359bd568e76be4eb30f368011b1ce0
+  data.tar.gz: 64db7183fe7b170d7b80881cd66272e5016e6a50cb6886a5300df729520d539d
 SHA512:
-  metadata.gz: 4a5c009da5923b564565b8c78f6e62bd75e17bcac9c19d2ae883d7a789a02ddbefc2e28732b0a278d1b8c868a0728f6ecd81d5cb29eaffc8e2b4a3f808c7acd0
-  data.tar.gz: f9310e249ad33ed5199628483916d7e4299da7dbbf76b294cf8fc22d9c6223a58f63135d7ef24d985c3773d3b89a17acffb59bcf9d1cd89c2984be234afdf4c4
+  metadata.gz: 94f4791ca50e11afb7937670b976a87f75aaeaa4b364e5eea104541c571fce4f2b41e73c05c7d743772fb37657cf9dc3690e869d49007b3bd77ea4c5168ff1e5
+  data.tar.gz: f77f3513679a82d255a8a1e10cc51c8e593b66d0faae844df461a36d50b211a62b5cd9761a93c1f34591b375439766eba38238f4670a7205cc00eb72bd553c57

data/lib/tealrb/contract.rb

@@ -86,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
@@ -206,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

@@ -667,10 +667,8 @@ 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)
@@ -680,24 +678,24 @@ module TEALrb
     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
 

data/lib/tealrb/rewriters.rb

@@ -130,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
@@ -168,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tealrb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Joe Polny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-22 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source