dtr_to_rust 0.0.9 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c1b886c52baf81105bc299619682bcca98bc31e80fae633241bd5fabfcc9df4
-  data.tar.gz: 59d69ab207c8c293ea91ada01691e9282eafc62274846cb78cba76d3ef5323a8
+  metadata.gz: '09b756bf37e167df02e974971834a123d3b438c5a5768e7e805bfae856025b09'
+  data.tar.gz: 47cc9f7c44c6243d7a94c25078dd0e0a0f61f04d0a5e61457456a83b3a7cd376
 SHA512:
-  metadata.gz: ee8323788b1676913b11cab4c24076ad0bfe09a7327fd48b7754d4beaa13b2b18b9eb9ba72faa82e1c7bc8405bf633b87652535c3c068e04fc1b6e66cf94444b
-  data.tar.gz: 3a6df6377e896aeb61b14ccea0ed7425eab24aa92db8ae37b632224a7688da4db369fda4bc4545bc2d46eaa7a3b68d98e6c64f9807520ed928901767e25b1756
+  metadata.gz: fa41aa6b0c38c4e7b281a9608cfed8a23a1138ac95ab005d0c003091d7c55f542090611cf19d0e8dcbdd8f718beb15b605ca8ae7a0f59659f2c393e68aaf146e
+  data.tar.gz: b8faac69f6f1bd65b19ce199fad3a085eaa4f04aff2db10d48f4340a459ceece6cd80265deb54382609351b6507367499fe1826e5a6f7026a8d92103cb1af9a7

data/lib/common/input_interpreter.rb

@@ -13,12 +13,12 @@ module DTRToRust
       end
 
       def interpret
-        if variable?(@input)
-          variable_return(@input)
+        if number?(@input)
+          number_return(@input)
         elsif string?(@input)
           string_return(@input)
-        elsif number?(@input)
-          number_return(@input)
+        else
+          variable_return(@input)
         end
       end
 
@@ -44,11 +44,19 @@ module DTRToRust
 
       ## Number ##
       def number?(input)
-        input.is_a?(Numeric)
+        input.is_a?(Numeric) || input&.match?(/^\s*\d+\.?\d*\s*$/)
       end
 
       def number_return(_input)
-        { value: @input, type: 'number', needs_reference: false }
+        { value: contains_decimal?(@input.to_s) ? @input.to_f : @input.to_i, type: 'number', needs_reference: false }
+      end
+
+      def contains_decimal?(str)
+        # Define a regular expression pattern for a decimal number
+        decimal_pattern = /\d+\.\d+/
+
+        # Check if the string matches the pattern
+        !!(str =~ decimal_pattern)
       end
     end
   end

data/lib/generator.rb

@@ -44,11 +44,13 @@ module DTRToRust
     def generate_state
       return if dtr_contract.state.nil?
 
-      @content += 'pub struct State {'
-      dtr_contract.state.each do |state|
-        @content += "  pub #{state.name}: #{state.type},"
+      dtr_contract.state.each do |state_value|
+        if state_value.type == 'String'
+          @content += "const #{state_value.name}: Symbol = symbol_short!(\"#{state_value.initial_value}\");\n"
+        end
       end
-      @content += "}\n\n"
+
+      @content += "\n"
     end
 
     def generate_functions

data/lib/instruction/evaluate.rb

@@ -33,10 +33,6 @@ module DTRToRust
           decorated_input[:value]
         end
       end
-
-      def variable?(input)
-        !input.contains?('"') && !input.contains?("'") && !input.match?(/$\d+/)
-      end
     end
   end
 end

data/lib/instruction/log_string.rb

@@ -5,7 +5,23 @@ module DTRToRust
     # This class is responsible for generating Rust code for the LogString instruction.
     class LogString < Handler
       def handle
-        form_rust_string("log!(#{@instruction[:inputs].join(',')});", @instruction[:scope])
+        form_rust_string("log!(#{inputs_to_rust_string(@instruction[:inputs])});", @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
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtr_to_rust
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.1
 platform: ruby
 authors:
 - Rob Durst