tealrb 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccb46efa84c6dfdf2378ab562eaf2345d947f0a9af9850c05220acfa1b540bc3
-  data.tar.gz: d7bfaa9d68b2fe60adeeb229f54f087a56b73319f0d3f6f8bf8d673b8a103258
+  metadata.gz: def52b90a6225a1e78408d4b4ec6d65c7504d03a5512bcde9b03cad284bf34df
+  data.tar.gz: d4d23914a76b46bdf6ec45a7c9f087262531d26499967770b6965f63508a9e5e
 SHA512:
-  metadata.gz: '0805c1e920c22e3d0fc64975135850a08147b3a3c9f1fb9390868ed60220d504f3fd20c89ea4ecdc96f71068e75b0748f62e502155335007ae0d3530fcbd4af4'
-  data.tar.gz: ec0abbd56e219ea3082200d9fb5bab2cd6ead37957af0c7dccc359e6c94064967cdac907b776bad0d07d9f1ecfb22fa46c37a84322777dfeb1d7fde0d1df57a2
+  metadata.gz: cfbfc5ebd26982b646a8a1d1de65a741a5e5711d9cccf822a3abcf1698b42977fa309d409c95b569521b289a4bf73b334f574bf3fe113c8616b02c662c7da60c
+  data.tar.gz: 7996f80823ca5cdac127207bef2899d42fe6f668b2d0d5a813c9d1d141b5521b703ef177621fe0cc64a12f7b8365bb65c604d8cf0f0158595c952e42be80e135

data/lib/tealrb/cmd_line/teal2tealrb.rb

@@ -11,15 +11,9 @@ module TEALrb
           line.strip!
           next if line[/^#/]
 
-          if line[%r{^//}]
-            line = %(comment("#{line.sub(%r{//}, '')}"))
-            output.puts line
-            next
-          elsif line[%r{//.*}]
-            comment = line[%r{(?<=//).*}]
-            line.sub!(%r{//.*}, '')
-            inline_comment = %(comment("#{comment}", inline: true))
-          end
+          comment = line[%r{//.*}]
+          comment&.sub!('//', '# //')
+          line.sub!(%r{//.*}, '')
 
           opcode = line.split.first
 
@@ -55,8 +49,11 @@ module TEALrb
             line = "#{opcode} #{args.join(', ')}"
           end
 
-          output.puts line
-          output.puts inline_comment if inline_comment
+          if line.empty?
+            output.puts comment
+          else
+            output.puts "#{line} #{comment}"
+          end
         end
 
         output.string

data/lib/tealrb/contract.rb

@@ -70,6 +70,12 @@ module TEALrb
     def initialize
       @teal = TEAL.new ["#pragma version #{self.class.version}"]
 
+      self.class.subroutines.each_key do |name|
+        define_singleton_method(name) do |*_args|
+          callsub(name)
+        end
+      end
+
       self.class.subroutines.each do |name, blk|
         define_subroutine name, blk
       end
@@ -112,6 +118,10 @@ module TEALrb
     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'
 
       label(name) # add teal label
@@ -134,10 +144,6 @@ module TEALrb
       new_source = "#{pre_string.string}#{new_source}retsub"
       eval_tealrb(new_source, debug_context: "subroutine: #{name}")
 
-      define_singleton_method(name) do |*_args|
-        callsub(name)
-      end
-
       nil
     end
 
@@ -145,11 +151,12 @@ module TEALrb
     # @param content [String] content of the comment
     # @param inline [Boolean] whether the comment should be on the previous TEAL line
     def comment(content, inline: false)
+      content = " #{content}" unless content[0] == ' '
       if inline
         last_line = @teal.pop
-        @teal << "#{last_line} // #{content}"
+        @teal << "#{last_line} //#{content}"
       else
-        @teal << "// #{content}"
+        @teal << "//#{content}"
       end
     end
 
@@ -184,7 +191,7 @@ module TEALrb
 
     def rewrite_with_rewriter(string, rewriter)
       process_source = RuboCop::ProcessedSource.new(string, RUBY_VERSION[/\d\.\d/].to_f)
-      rewriter.new.rewrite(process_source.buffer, process_source.ast)
+      rewriter.new.rewrite(process_source)
     end
 
     def rewrite(string, method_rewriter: false)
@@ -194,7 +201,7 @@ module TEALrb
         puts ''
       end
 
-      [ComparisonRewriter, IfRewriter, OpRewriter, AssignRewriter].each do |rw|
+      [CommentRewriter, ComparisonRewriter, IfRewriter, OpRewriter, AssignRewriter].each do |rw|
         string = rewrite_with_rewriter(string, rw)
       end
 

data/lib/tealrb/if_block.rb

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

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}'"
+          TEALrb::TEAL.current[Thread.current] << "int #{type}"
         end
       end
 
@@ -664,6 +664,20 @@ module TEALrb
       end
     end
 
+    class TxnArrayIndex
+      include Opcodes
+      include TxnFields
+
+      def initialize(index)
+        @index = index
+      end
+
+      def opcode(field)
+        @teal = TEALrb::TEAL.current[Thread.current]
+        txna field, @index
+      end
+    end
+
     module Txna
       extend Opcodes
       extend TxnFields
@@ -672,6 +686,10 @@ module TEALrb
         @teal = TEALrb::TEAL.current[Thread.current]
         txna field, index
       end
+
+      def self.[](index)
+        TxnArrayIndex.new(index)
+      end
     end
 
     module Global

data/lib/tealrb/rewriters.rb

@@ -4,6 +4,27 @@ module TEALrb
   module Rewriters
     class Rewriter < Parser::TreeRewriter
       include RuboCop::AST::Traversal
+
+      def rewrite(processed_source)
+        @comments = processed_source.comments
+        super(processed_source.buffer, processed_source.ast)
+      end
+    end
+
+    class CommentRewriter < Rewriter
+      def process(_)
+        @comments.each do |comment|
+          line = @source_rewriter.source_buffer.source_lines[comment.loc.expression.line - 1].strip
+
+          next unless comment.inline? && comment.text[%r{^#\s*//}]
+
+          inline_comment = line[/^#/].nil?
+          content = comment.text.sub('# ', '')
+          content.sub!('//', '')
+
+          replace comment.loc.expression, "; comment(%q(#{content}), inline: #{inline_comment})"
+        end
+      end
     end
 
     class MethodRewriter < Rewriter

metadata

@@ -1,113 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: tealrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Joe Polny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-10 00:00:00.000000000 Z
+date: 2022-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.27'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.27
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.27
 description: 
 email: joepolny+dev@gmail.com
 executables: []
@@ -136,7 +164,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement