dtr_to_rust 0.5.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b758e2693dba6f08986542c9a49c6d15f285529cbb172d3a29bb171ec95536b1
-  data.tar.gz: 3d4ef34c8dfd29ff2124fe8c3b0c8ac194872729bbd9443b633a0e5e973aafb6
+  metadata.gz: 002e00efbc75ccf74ff3383c9027901e390186aaa8c40d1c415f0c88610972c6
+  data.tar.gz: 24a42f407043cd7273d651626f6e7d9f0cac095b0023a37459198dc775b5481e
 SHA512:
-  metadata.gz: 40cd10cc460cae31a4a596a28e10d9ede4af898effbc4cd14037394ed6d3930cb47420c88f6716c253c3f33b732ed2474cb99f6af5a1d0048d3c71bfea80f9c5
-  data.tar.gz: b4dda97391b69c4eefa43916514d8185564ba98b2d86b461b8e45b2f94e2e578cc360de5c84a5768df99494c295a9c708db0500a4db9582d5ccacb80fc5d967c
+  metadata.gz: c752d59d3a79a59ee1e0e46858cdf46539e0db4ecc1c4cfef6de53b368a5f493e4be37d0febf0f553d64393fd831226c926e415f5adeee2d217372d1c439ac1c
+  data.tar.gz: d52b67210ae2d46ed11f3b21d9873687f08251f15879343742f2fc2d8a066f0869e845970fc0b60f015f9f230ad794ed0595f47aab33f3497f898ca7df5f5dbc

data/lib/generator.rb

@@ -107,8 +107,12 @@ module DTRToRust
 
         return_string = "\n#{is_helper ? '' : '    '}pub fn #{function.name}(#{generate_function_args(function)}) "
         return_string += generate_function_output(function)
-        return_string += " {\n#{generate_instructions_for_blocks(instruction_blocks, function_names,
-                                                                 is_helper)}"
+        return_string += " {\n"
+        if function.output
+          return_string += "        let Thing_to_return: #{Common::TypeTranslator.translate_type(function.output)};\n"
+        end
+        return_string += "#{generate_instructions_for_blocks(instruction_blocks, function_names,
+                                                             is_helper)}"
 
         if @last_scope.positive?
           while @last_scope.positive?

data/lib/instruction/assign.rb

@@ -5,7 +5,7 @@ module DTRToRust
     # This class handles the assign instruction.
     class Assign < Handler
       def handle
-        if @instruction.assign.include?('.')
+        if @instruction.assign.include?('.') || @instruction.assign == 'Thing_to_return'
           form_rust_string("#{@instruction.assign} = #{@instruction.inputs[0]};")
         else
           form_rust_string("let mut #{@instruction.assign} = #{@instruction.inputs[0]};")

data/lib/instruction/evaluate.rb

@@ -14,13 +14,19 @@ module DTRToRust
       def handle_keyword_method_invocation
         case @instruction.inputs[0]
         when 'equal_to'
-          handle_equal_to
+          handle_binary('==')
         when '!'
           handle_unary_negation
         when 'less_than'
-          handle_less_than
+          handle_binary('<')
         when 'less_than_or_equal_to'
-          handle_less_than_or_equal_to
+          handle_binary('<=')
+        when 'greater_than'
+          handle_binary('>')
+        when 'greater_than_or_equal_to'
+          handle_binary('>=')
+        when 'not_equal_to'
+          handle_binary('!=')
         else
           handle_non_keyword_method_invocation
         end
@@ -35,44 +41,22 @@ module DTRToRust
         # TODO: make this less hacky evaluated_method_name.end_with?('set')
         body_rust = "#{invocation_name(evaluated_method_name)}(#{inputs_to_rust_string(inputs,
                                                                                        append_ref_to_num?, try_append_ref_to_var?)});"
-        "#{assignment.nil? ? '' : assignment_rust}#{body_rust}"
-      end
-
-      def handle_equal_to
-        inputs = @instruction.inputs[1..]
-        @instruction.inputs[0]
-        assignment = @instruction.assign
-
-        assignment_rust = "let #{assignment} = "
-        lhs = Common::ReferenceAppender.call(inputs[0])
-        rhs = Common::ReferenceAppender.call(inputs[1])
-        body_rust = "#{lhs} == #{rhs};"
-
-        "#{assignment.nil? ? '' : assignment_rust}#{body_rust}"
-      end
-
-      def handle_less_than
-        inputs = @instruction.inputs[1..]
-        @instruction.inputs[0]
-        assignment = @instruction.assign
-
-        assignment_rust = "let #{assignment} = "
-        lhs = Common::ReferenceAppender.call(inputs[0])
-        rhs = Common::ReferenceAppender.call(inputs[1])
-        body_rust = "#{lhs} < #{rhs};"
-
-        "#{assignment.nil? ? '' : assignment_rust}#{body_rust}"
+        "#{if assignment.nil?
+             ''
+           else
+             assignment == 'Thing_to_return' ? assignment + ' = ' : assignment_rust
+           end}#{body_rust}"
       end
 
-      def handle_less_than_or_equal_to
+      def handle_binary(operation)
         inputs = @instruction.inputs[1..]
         @instruction.inputs[0]
         assignment = @instruction.assign
 
         assignment_rust = "let #{assignment} = "
-        lhs = Common::ReferenceAppender.call(inputs[0])
-        rhs = Common::ReferenceAppender.call(inputs[1])
-        body_rust = "#{lhs} <= #{rhs};"
+        lhs = inputs[0]
+        rhs = inputs[1]
+        body_rust = "#{lhs} #{operation} #{rhs};"
 
         "#{assignment.nil? ? '' : assignment_rust}#{body_rust}"
       end
@@ -94,7 +78,11 @@ module DTRToRust
 
       def try_append_ref_to_var?
         # SO HACKY - Refs are hard man
-        !(@instruction.inputs[0].end_with?('unwrap_or') || @instruction.inputs[0].end_with?('publish'))
+        !(@instruction.inputs[0].end_with?('unwrap_or') ||
+        @instruction.inputs[0].end_with?('publish') ||
+        @instruction.inputs[0].end_with?('Err') ||
+        @instruction.inputs[0].end_with?('Ok')
+         )
       end
 
       def invocation_name(evaluated_method_name)

data/lib/user_defined_types/handler.rb

@@ -37,6 +37,17 @@ module DTRToRust
         @user_defined_type.attributes.map do |x|
           if x[:value]
             "    #{x[:name]} = #{x[:value]},"
+          elsif x[:type] && x[:type].start_with?('(') && x[:type].end_with?(')')
+            inner_types = x[:type].gsub('(', '').gsub(')', '').split(',').map do |x|
+              Common::TypeTranslator.translate_type(x)
+            end
+            if inner_types.size == 0 || x[:type] == '()'
+              "    #{x[:name]},"
+            else
+              "    #{x[:name]}(#{inner_types.join(', ')}),"
+            end
+          elsif x[:type] && x[:type].match(/\d+/)
+            "    #{x[:name]} = #{x[:type]},"
           elsif x[:type] && x[:type] != '()'
             "    #{x[:name]}(#{Common::TypeTranslator.translate_type(x[:type])}),"
           else
@@ -47,7 +58,7 @@ module DTRToRust
 
       def derives
         base = if error? && enum?
-                 "#[contracterror]\n#[derive(Clone, Debug, Eq, PartialEq)]\n"
+                 "#[contracterror]\n#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]\n"
                else
                  "#[contracttype]\n#[derive(Clone, Debug, Eq, PartialEq)]\n"
                end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtr_to_rust
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Rob Durst
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-23 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies: []
 description: Rust to DTR translator (Digicus Textual Representation).
 email: