dtr_to_rust 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75a4155b6f5e591a764deb02cca02bd05cb781481ae4d5602f2b784219d90837
-  data.tar.gz: 111292133a70c1c1b81b402d263837b271655445262cc62c26ebbead2bdfb398
+  metadata.gz: 9c1b886c52baf81105bc299619682bcca98bc31e80fae633241bd5fabfcc9df4
+  data.tar.gz: 59d69ab207c8c293ea91ada01691e9282eafc62274846cb78cba76d3ef5323a8
 SHA512:
-  metadata.gz: 3dd217b90fd5aa4480c8932ddc95abf57630837aaf0f870248911233e23c093216c131eb18f431e5e65aaa48558c2fb051d480009048fb98bbd1aee7cb916d63
-  data.tar.gz: 12a427b6a3f01d2afd76886168a8078d8cf9c7c090830f0e97250e9df71ae923e65b04f3bd43988c53027d147c560398764ea7a9d9882f37686e2874f902a1f9
+  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/instruction/evaluate.rb

@@ -5,13 +5,37 @@ module DTRToRust
     # This class is responsible for generating Rust code for the Evaluate instruction.
     class Evaluate < Handler
       def handle
-        rust_string = if @instruction[:assign].nil?
-          "#{@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
-          "let mut #{@instruction[:assign]} = #{@instruction[:inputs][0]}(#{@instruction[:inputs][1..].join(', ')});"
+          decorated_input[:value]
         end
+      end
 
-        form_rust_string(rust_string, @instruction[:scope])
+      def variable?(input)
+        !input.contains?('"') && !input.contains?("'") && !input.match?(/$\d+/)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtr_to_rust
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Rob Durst
@@ -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