tealrb 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d027d915afa0ccb6383791a694d6ca747bd07c14a2803d6ecaa8119b3277ffe9
-  data.tar.gz: e09162d147464ba6a7c0ada5c18bc9884832f164bb43f02a87d6d3f733093ce4
+  metadata.gz: 96c56f8bbc18ac1b7fa42f8ad6b553f72296c30a89973d1e95a663f6776c559c
+  data.tar.gz: c7cd2a73fa00da112e0d420224955dc5a9b1a41a0ec23978250f48ac49a2fc59
 SHA512:
-  metadata.gz: e9b80748e7716e45b0bb87efcd0e70560bbb46fde5f6907ca6beaac59cd77ba4518acb41337df2fb5bb0aa6c9c8c86a6cfb28042ae95736028f4bcbdffc30c96
-  data.tar.gz: 791cb92688f986e2807770797c4ba5f61cd20e675c2887169126eb34bbbc40196e9a52ac64ecc79a4a9338ddb37632d20b5e08828a3d5b7cce9a2aa122ee2c57
+  metadata.gz: b93a01c924cefb65075160e306436b54a560f2ac5a40465a28dac436a589b252f71d2130dfe39f0f4cf127136223392a0fab9f013acc01c5c4161099732b8bfe
+  data.tar.gz: 1316ccad828bf8a1682f55987dbffaa9dee942f3e11dfe04d54c31432143732b93de31d6c4bed596509a92e3744a667716acc4cae8b326793efd263d6c1e9354

data/lib/tealrb/contract.rb

@@ -90,12 +90,18 @@ module TEALrb
       end
     end
 
+    VOID_OPS = %w[assert err return app_global_put b bnz bz store
+                  stores app_local_put app_global_del app_local_del callsub retsub
+                  log itxn_submit itxn_next].freeze
+
     def teal_source
       teal_lines = []
 
-      @teal.each do |line|
+      @teal.each_with_index do |line, i|
         ln = line.strip
 
+        teal_lines << '' if VOID_OPS.include? @teal[i - 1][/\S+/]
+
         if (ln[%r{\S+:($| //)}] && !ln[/^if\d+/]) || ln == 'b main' || ln[/^#/]
           teal_lines << ln
         elsif ln == 'retsub'
@@ -106,6 +112,10 @@ module TEALrb
         end
       end
 
+      teal_lines.delete_if.with_index do |t, i|
+        t.empty? && teal_lines[i - 1].empty?
+      end
+
       teal_lines.join("\n")
     end
 

data/lib/tealrb/rewriters.rb

@@ -69,6 +69,24 @@ module TEALrb
         insert_after(node.loc.name, '.call') unless ['@teal_methods', '@subroutines', '@scratch'].include? node.source
         super
       end
+
+      def on_gvasgn(node)
+        unless RuboCop::Cop::Style::GlobalVars::BUILT_IN_VARS.include? node.loc.name.source.to_sym
+          var_name = node.loc.name.source[1..]
+          replace(node.loc.name, "@scratch[:#{var_name}]")
+        end
+
+        super
+      end
+
+      def on_gvar(node)
+        unless RuboCop::Cop::Style::GlobalVars::BUILT_IN_VARS.include? node.loc.name.source.to_sym
+          var_name = node.loc.name.source[1..]
+          replace(node.loc.name, "@scratch[:#{var_name}]")
+        end
+
+        super
+      end
     end
 
     class ComparisonRewriter < Rewriter

data/lib/tealrb/scratch.rb

@@ -5,21 +5,25 @@ module TEALrb
     def initialize
       @open_slots = (0..256).to_a
       @named_slots = {}
+      @values = {}
     end
 
     def [](key)
       TEAL.instance << "load #{@named_slots[key]} // #{key}"
+      @values[key]
     end
 
-    def []=(key, _value)
-      store(key)
+    def []=(key, value)
+      store(key, value)
     end
 
-    def store(key)
+    def store(key, value = TEAL.instance)
+      @values[key] = value
       TEAL.instance << "store #{@named_slots[key] ||= @open_slots.shift} // #{key}"
     end
 
     def delete(key)
+      @values.delete(key)
       @open_slots << @named_slots.delete(key)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tealrb
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Joe Polny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source