dtr_core 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfbb64221cf4951c057d70eebcfb02cfb6c26930db47e47e8b56b2d02619631b
-  data.tar.gz: 99df8b3da4826433ceddb12930209c8bc0d55b91db84086a4485d13324a6c60f
+  metadata.gz: b6eb9933172ea48536b0efceffe9e9e222a54e37f214b8041dc5edd40c01f2d6
+  data.tar.gz: 731d58a093c47bfd2b63f4ea884d4422d703b2c2ba47baacbda105bfb02e2264
 SHA512:
-  metadata.gz: e158a6bdc13ea1ccd1923828b4c073c88412e7b515950c4a77bcf96d851bb0ea217c31fc68161b5a2d04cbbad49b19c76b1e7888294792eb01e1d84a1c0db7ed
-  data.tar.gz: 64e797566826df76b489829408a3865de303e50481558844c0d51b718ae80d93ac6fb162393249d81a317b60a4963ed78c7f2b3d80cd57c1825df0890b48806c
+  metadata.gz: '04824f70c5646161afb24637f614f1ba2431414cc5f98b8847b15f74299ba563957586ba40a88d36847d1cfce649462199a42508a0d276397dbe3f38d1ee7e59'
+  data.tar.gz: 106a92f8de4ca9385d44f510dbb942b05d073bd2584d7dabbfe7d3003d348a121c21765da246e2c450a25df92cfb5151d1b541cf5b28029d96acd6ff1875c423

data/lib/dtr_core/contract.rb

@@ -3,28 +3,29 @@
 module DTRCore
   # Represents a contract in a DTR file.
   class Contract
-    attr_reader :helpers, :interface, :name, :state, :user_defined_types
+    attr_reader :helpers, :interface, :name, :state, :user_defined_types, :non_translatables
 
-    def initialize(name, state, interface, user_defined_types, helpers)
+    def initialize(name, state, interface, user_defined_types, helpers, non_translatables)
       @name = name
       @state = state
       @interface = interface
       @user_defined_types = user_defined_types
       @helpers = helpers
+      @non_translatables = non_translatables
     end
 
     def self.from_dtr(filepath)
       parser = DTRCore::Parser.new(filepath)
 
       new(parser.name_section, parser.state_section, parser.interface_section, parser.user_defined_types_section,
-          parser.helpers_section)
+          parser.helpers_section, parser.non_translatable_section)
     end
 
     def self.from_dtr_raw(content)
       parser = DTRCore::Parser.new('', content:)
 
       new(parser.name_section, parser.state_section, parser.interface_section, parser.user_defined_types_section,
-          parser.helpers_section)
+          parser.helpers_section, parser.non_translatable_section)
     end
 
     def ==(other)
@@ -42,6 +43,7 @@ module DTRCore
       return_string += interface_to_s
       return_string += user_defined_types_to_s
       return_string += helpers_to_s
+      return_string += non_translatables_to_s
 
       return_string
     end
@@ -75,5 +77,11 @@ module DTRCore
 
       "[Helpers]:\n#{@helpers&.map(&:to_s)&.join("\n")}\n:[Helpers]\n"
     end
+
+    def non_translatables_to_s
+      return '' if @non_translatables.nil?
+
+      "[NonTranslatable]:\n#{@non_translatables}\n:[NonTranslatable]"
+    end
   end
 end

data/lib/dtr_core/function.rb

@@ -97,7 +97,7 @@ module DTRCore
       instruction = DTRCore::Instruction.new(
         instruction[/instruction:\s*(?<all>[^\s,]+)/, 1],
         parse_function_instruction_input(instruction),
-        instruction[/\s*assign:\s*(?<all>[^\s\,]+)/, 1],
+        instruction[/\s*assign:\s*\[?(?<all>[^\s\,\]]+)\]?/, 1],
         instruction[/\s*scope:\s*(?<all>[^\s\,]+)/, 1].to_i || 0
       )
 

data/lib/dtr_core/parser.rb

@@ -41,8 +41,6 @@ module DTRCore
                           .split(/\n\s*\*\s*\[/).map { |x| "[#{x.strip}" }
                           .map { |definition| DTRCore::State.from_definition(definition) }
 
-      raise 'Empty state section.' if state_definitions.empty?
-
       @state_section ||= state_definitions
     end
 
@@ -59,8 +57,6 @@ module DTRCore
 
       function_definitions.reject! { |x| x.name.nil? }
 
-      raise 'Empty interface section.' if function_definitions.empty?
-
       @interface_section ||= function_definitions
     end
 
@@ -81,7 +77,7 @@ module DTRCore
     end
 
     def helpers_section
-      return @function_definitions if @function_definitions
+      return @helpers_section if @helpers_section
 
       helpers_section = capture_section(/\[Helpers\]:(?<all>.*)\s*:\[Helpers\]/m)
 
@@ -93,9 +89,17 @@ module DTRCore
 
       function_definitions.reject! { |x| x.name.nil? }
 
-      raise 'Empty helpers section.' if function_definitions.empty?
-
       @helpers_section ||= function_definitions
     end
+
+    def non_translatable_section
+      return @non_translatable_section if @non_translatable_section
+
+      non_translatable_section = capture_section(/\[NonTranslatable\]:(?<all>.*)\s*:\[NonTranslatable\]/m)
+
+      return nil if non_translatable_section.nil?
+
+      @non_translatable_section = non_translatable_section
+    end
   end
 end

data/lib/dtr_core/user_defined_type.rb

@@ -33,7 +33,7 @@ module DTRCore
         next { name: splitted[0].strip, type: splitted[1].strip } if splitted.length > 1
 
         splitted = x.split('=')
-        next { name: splitted[0].strip, value: splitted[1].strip } if splitted.length > 1
+        next { name: splitted[0].strip, type: splitted[1].strip } if splitted.length > 1
 
         nil
       end&.compact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtr_core
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Rob Durst
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-23 00:00:00.000000000 Z
+date: 2024-07-07 00:00:00.000000000 Z
 dependencies: []
 description: Core smart contract intermediate language (Digicus Textual Representation)
   parser.