dtr_to_rust 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b601b1a9ea3ca3f47651dbd2cfd90d563244994bdccb0aa7b44ec2882219067
-  data.tar.gz: a480b70e8c6bfb2421900f5b82db3c2f8c83d1194954a78683b30db78a67a860
+  metadata.gz: 9c1b886c52baf81105bc299619682bcca98bc31e80fae633241bd5fabfcc9df4
+  data.tar.gz: 59d69ab207c8c293ea91ada01691e9282eafc62274846cb78cba76d3ef5323a8
 SHA512:
-  metadata.gz: d2497d871d595c64552926cde73f20dc574e342ba769de4961baef8c595c31d78f2b9080d3c6793b8ecc28aa981d4ced0c00fa9ff7f1ebbc6335765e4983309d
-  data.tar.gz: 5c2eb5673bff37de5fe02a64456eae6b60a2b89182b75fc4a22489e29c016d0fd9f1e3f1fe8ebb30888efa2f4f89f308da9942276d3e4bc1bccd461cdc167654
+  metadata.gz: ee8323788b1676913b11cab4c24076ad0bfe09a7327fd48b7754d4beaa13b2b18b9eb9ba72faa82e1c7bc8405bf633b87652535c3c068e04fc1b6e66cf94444b
+  data.tar.gz: 3a6df6377e896aeb61b14ccea0ed7425eab24aa92db8ae37b632224a7688da4db369fda4bc4545bc2d46eaa7a3b68d98e6c64f9807520ed928901767e25b1756

data/lib/common/input_interpreter.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module DTRToRust
+  module Common
+    # This class is responsible for interpreting the input string.
+    class InputInterpreter
+      def initialize(input)
+        @input = input
+      end
+
+      def self.interpret(input)
+        new(input).interpret
+      end
+
+      def interpret
+        if variable?(@input)
+          variable_return(@input)
+        elsif string?(@input)
+          string_return(@input)
+        elsif number?(@input)
+          number_return(@input)
+        end
+      end
+
+      private
+
+      ## Variable ##
+      def variable?(input)
+        !string?(input) && !number?(input)
+      end
+
+      def variable_return(_input)
+        { value: @input, type: 'variable', needs_reference: true }
+      end
+
+      ## String ##
+      def string?(input)
+        input.is_a?(String) && (input.match?(/".*"/) || input.match?(/'.*'/))
+      end
+
+      def string_return(_input)
+        { value: @input, type: 'string', needs_reference: false }
+      end
+
+      ## Number ##
+      def number?(input)
+        input.is_a?(Numeric)
+      end
+
+      def number_return(_input)
+        { value: @input, type: 'number', needs_reference: false }
+      end
+    end
+  end
+end

data/lib/dtr_to_rust.rb

@@ -13,4 +13,9 @@ module DTRToRust
     autoload :LogString, 'instruction/log_string'
     autoload :AddAndAssign, 'instruction/add_and_assign'
   end
+
+  # This module contains all the classes that handle common logic.
+  module Common
+    autoload :InputInterpreter, 'common/input_interpreter'
+  end
 end

data/lib/generator.rb

@@ -34,7 +34,7 @@ module DTRToRust
 
     def generate_contract_header
       # TODO: don't hardcode imports
-      @content += "#![no_std]\nuse soroban_sdk::{contract, contractimpl, symbol_short, vec, Env, Symbol, Vec};\n\n"
+      @content += "#![no_std]\nuse soroban_sdk::{contract, contractimpl, symbol_short, vec, Env, Symbol, Vec, log};\n\n"
     end
 
     def generate_contract_name

data/lib/instruction/evaluate.rb

@@ -5,10 +5,38 @@ module DTRToRust
     # This class is responsible for generating Rust code for the Evaluate instruction.
     class Evaluate < Handler
       def handle
-        rust_string = "#{@instruction[:assign]} = #{@instruction[:inputs][0]}(#{@instruction[:inputs][1..].join(', ')});"
+        inputs = @instruction[:inputs][1..]
+        evaluated_method_name = @instruction[:inputs][0]
+        assignment = @instruction[:assign]
+
+        rust_string = if assignment.nil?
+                        "#{evaluated_method_name}(#{inputs_to_rust_string(inputs)});"
+                      else
+                        "let mut #{assignment} = #{evaluated_method_name}(#{inputs_to_rust_string(inputs)});"
+                      end
 
         form_rust_string(rust_string, @instruction[:scope])
       end
+
+      private
+
+      def inputs_to_rust_string(inputs)
+        inputs.map { |input| ref_appender(input) }.join(', ')
+      end
+
+      def ref_appender(input)
+        decorated_input = Common::InputInterpreter.interpret(input)
+
+        if decorated_input[:needs_reference]
+          "&#{decorated_input[:value]}"
+        else
+          decorated_input[:value]
+        end
+      end
+
+      def variable?(input)
+        !input.contains?('"') && !input.contains?("'") && !input.match?(/$\d+/)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtr_to_rust
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Rob Durst
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-02 00:00:00.000000000 Z
+date: 2024-06-03 00:00:00.000000000 Z
 dependencies: []
 description: Rust to DTR translator (Digicus Textual Representation).
 email:
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/common/input_interpreter.rb
 - lib/dtr_to_rust.rb
 - lib/generator.rb
 - lib/instruction/add_and_assign.rb