dtr_core 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4f18cef3a0ec84890c70f6e491a206c175173da2fa1afcaa35edbb4f16f389f
-  data.tar.gz: 76733758b94e9e1dfe1a6b048ae97bcde7d8101e5aa377ec8c367146fe533a05
+  metadata.gz: f1d08e671686f002deb8379c32077c2049a81930748cc6a1836c9bea80e8ed39
+  data.tar.gz: adcb40a8999cbbc23ba1ee48da7b29296437012b7dd9fcd4d31aabf70a1532c0
 SHA512:
-  metadata.gz: 9815551cfb8564a2ef71499f4a797ab16c36cabfc22f8e2e0b94fba8e8766ef0d5b36b6d12b73e9cde49bcf3ca44ea45f35e074d8ed93b98537e164370daa340
-  data.tar.gz: 1da1eb0d8df324d693dd66d7f3fa4ff225461768f121ef48e7ef3f07f8aa29da4dfad4e6c6426a00680d839cb0efc37d5ce7c5e75704228a2dd476b9246f2c5f
+  metadata.gz: 062a411d6c59d9e00a86b41059c7dbaccde844f9671259430b27136074c99131922581f58ba99ba0a96e60bd2c1cfe1768178e6d0b7d6c57e2225d4bd4878bea
+  data.tar.gz: a7cb26e036aa3173a595c4ba65bcd6955e196e773af7da95756ef6cbfda0f63237517f06ec4ba7d2fca08d64c39f4ee0ef2ca1bea098d48b7e92364ca7265388

data/lib/dtr_core/common.rb

@@ -20,5 +20,86 @@ module DTRCore
     def clean_name(definition)
       definition.gsub(/[\*\n\[]/, '').strip
     end
+
+    def self.get_input_content(some_string)
+      start_index = some_string.index('input:')
+      return nil if start_index.nil?
+
+      start_parse_parent_index = some_string.index('(', start_index)
+
+      paren_contents(some_string[start_parse_parent_index..])
+    end
+
+    def self.paren_contents(some_string)
+      cur_word = ''
+      index = 0
+      cur_words = []
+      how_many_deep_soft_brackets = 0
+      how_many_deep_hard_brackets = 0
+      how_many_deep_square_brackets = 0
+      in_string = false
+
+      while index < some_string.length
+        char = some_string[index]
+
+        if char == ')' && !in_string
+          how_many_deep_soft_brackets -= 1
+
+          if how_many_deep_soft_brackets.zero?
+            cur_words.push(cur_word.strip) unless cur_word.empty?
+            return cur_words
+          else
+            cur_word += char
+          end
+        elsif char == '[' && !in_string
+          how_many_deep_square_brackets += 1
+          cur_word += char
+        elsif char == ']' && !in_string
+          how_many_deep_square_brackets -= 1
+          cur_word += char
+        elsif char == '{' && !in_string
+          how_many_deep_hard_brackets += 1
+          cur_word += char
+        elsif char == '}' && !in_string
+          how_many_deep_hard_brackets -= 1
+          cur_word += char
+        elsif ['\'', '"'].include?(char)
+          in_string = in_string ? false : true
+          cur_word += char
+        elsif char == '(' && !in_string
+          how_many_deep_soft_brackets += 1
+          cur_word += char if how_many_deep_soft_brackets > 1
+        elsif char == ',' && how_many_deep_soft_brackets == 1 &&
+              how_many_deep_hard_brackets.zero? &&
+              how_many_deep_square_brackets.zero? &&
+              !in_string
+          cur_words.push(cur_word.strip) unless cur_word.empty?
+          cur_word = ''
+        else
+          cur_word += char
+        end
+
+        index += 1
+      end
+
+      raise 'No closing parenthesis found.'
+    end
+
+    def self.nested_array_to_string(array)
+      # Base case: if the element is not an array, return the element as a string
+      return array.to_s unless array.is_a?(Array)
+
+      # Recursively process each element in the array and join them with commas
+      elements = array.map { |element| nested_array_to_string(element) }.join(', ')
+
+      # Wrap the joined elements with parentheses
+      "(#{elements})"
+    end
+
+    def self.parse_instruction_input(instruction)
+      result = get_input_content(instruction)
+
+      result.nil? || result.empty? ? nil : result
+    end
   end
 end

data/lib/dtr_core/function.rb

@@ -96,7 +96,7 @@ module DTRCore
     def parse_function_instruction(instruction)
       instruction = DTRCore::Instruction.new(
         instruction[/instruction:\s*(?<all>[^\s,]+)/, 1],
-        parse_function_instruction_input(instruction),
+        DTRCore::Common.parse_instruction_input(instruction),
         instruction[/\s*assign:\s*\[?(?<all>[^\s\,\]]+)\]?/, 1],
         instruction[/\s*scope:\s*(?<all>[^\s\,]+)/, 1].to_i || 0,
         instruction[/\sid:\s*(?<all>[^\s,]+)/, 1].to_i || 0
@@ -106,42 +106,5 @@ module DTRCore
 
       instruction
     end
-
-    def parse_function_instruction_input(definition)
-      raw_inputs = definition[/\s*input:\s*\((?<all>[^\)]+)\)/, 1]
-      return nil if raw_inputs.nil?
-
-      cur_word = ''
-      inputs_to_return = []
-      in_string = false
-
-      raw_inputs.each_char do |char|
-        if in_string
-          if char == '"'
-            in_string = false
-            inputs_to_return.push("\"#{cur_word}\"")
-            cur_word = ''
-          else
-            cur_word += char
-          end
-        elsif cur_word.empty? && char == '"'
-          in_string = true
-        elsif char == ','
-          inputs_to_return.push(cur_word)
-          cur_word = ''
-          in_string = false
-        elsif char == ' ' && cur_word.empty?
-          next
-        else
-          cur_word += char
-        end
-      end
-
-      inputs_to_return.push(cur_word) unless cur_word.empty?
-
-      inputs_to_return.filter! { |x| !x.empty? }
-
-      inputs_to_return&.map(&:strip)
-    end
   end
 end

data/lib/dtr_core.rb

@@ -12,6 +12,7 @@ module DTRCore
   autoload :InstructionValidator, 'dtr_core/instruction_validator'
   autoload :Instruction, 'dtr_core/instruction'
   autoload :UserDefinedType, 'dtr_core/user_defined_type'
+  autoload :Common, 'dtr_core/common'
 
   # A graph is a collection of nodes and edges representing the structure of a DTR file.
   module Graph

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtr_core
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Rob Durst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-16 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies: []
 description: |+
   Ruby gem serving as the reference implementation for the parsing and consumption of Digicus Textual Representation (DTR). We expect folks to leverage this gem when writing Digicus compiler plugins.