dtr_core 0.8.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2457b55c657b17f1c0f69183486c2dbb78ee0c7e68ed1572db089b10e285474b
-  data.tar.gz: e5aafcd885e48bfff0773db4ac961a48970b3f98648b3220abd29e3d34cc614c
+  metadata.gz: ad7236ff8c846c7126d0d8e53f3d7cd5d6635eeefbca857dafdf22e85473cbe6
+  data.tar.gz: d8741a66894615c02d59be5ba8884f165acdcfdb045c2243c07c57c3116cb699
 SHA512:
-  metadata.gz: 1f7cd472023cbfe46625ba9afa0fc8d0146ccbd0b39af87bc4157ba7d58f37760f7b07c50f76e3d2be057d2cc4650312a8ef166d3e12d0a09e9e1f90395abb09
-  data.tar.gz: bd868a7ad8c5526624b925f5f168d828b2bafc66cc62c7d226c4f7cd59c3ff2af04e008fb7d33ecc048f8c167d8c65307b7e4d2318c4cc1df90739a2cf37b223
+  metadata.gz: 83a20837017ec8a60ae948918f6b1947332516248bac6f805bdfc12b7b2a5636d5f01157739c81167113a873218da6cf55b22c297e1903718c9913b29322f2f7
+  data.tar.gz: 42b2bd3b5ef207d88fe3a955a9358ea54270979115df12e10d2318d6d230c80e8d858979d9d91df91bd2158153dd93f0d2e8efd15e0e27c4f261dee6432d660d

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
@@ -53,27 +55,33 @@ module DTRCore
     end
 
     def state_to_s
-      return '' if @state.nil?
+      return '' if @state.nil? || @state.empty?
 
       "[State]:\n#{@state&.map(&:to_s)&.join("\n")}\n:[State]\n"
     end
 
     def interface_to_s
-      return '' if @state.nil?
+      return '' if @interface.nil? || @interface.empty?
 
       "[Interface]:\n#{@interface&.map(&:to_s)&.join("\n")}\n:[Interface]\n"
     end
 
     def user_defined_types_to_s
-      return '' if @user_defined_types.nil?
+      return '' if @user_defined_types.nil? || @user_defined_types.empty?
 
       "[User Defined Types]:\n#{@user_defined_types&.map(&:to_s)&.join("\n")}\n:[User Defined Types]\n"
     end
 
     def helpers_to_s
-      return '' if @helpers.nil?
+      return '' if @helpers.nil? || @helpers.empty?
 
       "[Helpers]:\n#{@helpers&.map(&:to_s)&.join("\n")}\n:[Helpers]\n"
     end
+
+    def non_translatables_to_s
+      return '' if @non_translatables.nil? || @non_translatables.empty?
+
+      "[NonTranslatable]:\n#{@non_translatables}\n:[NonTranslatable]"
+    end
   end
 end

data/lib/dtr_core/function.rb

@@ -97,8 +97,9 @@ 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*scope:\s*(?<all>[^\s\,]+)/, 1].to_i || 0
+        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
       )
 
       raise "Invalid instruction: #{instruction}" unless instruction.valid?

data/lib/dtr_core/instruction.rb

@@ -3,26 +3,29 @@
 module DTRCore
   # Instruction class
   class Instruction
-    attr_reader :instruction, :inputs, :assign, :scope
+    attr_reader :instruction, :inputs, :assign, :scope, :id
 
-    def initialize(instruction, inputs, assign, scope)
+    def initialize(instruction, inputs, assign, scope, id)
       @instruction = instruction
       @inputs = inputs
       @assign = assign
       @scope = scope
+      @id = id
     end
 
     def ==(other)
       instruction == other.instruction &&
         inputs == other.inputs &&
         assign == other.assign &&
-        scope == other.scope
+        scope == other.scope &&
+        id == other.id
     end
 
     def to_s
-      "{ instruction: #{instruction}, " \
+      assignment = @assign.nil? ? '' : "assign: #{@assign}, "
+      "{ id: #{id}, instruction: #{instruction}, " \
         "input: (#{inputs&.join(', ')}), " \
-        "assign: #{assign}, scope: #{scope} }"
+        "#{assignment}scope: #{scope} }"
     end
 
     def to_json(*_args)
@@ -30,7 +33,8 @@ module DTRCore
         instruction:,
         inputs:,
         assign:,
-        scope:
+        scope:,
+        id:
       }.to_json
     end
 

data/lib/dtr_core/parser.rb

@@ -77,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)
 
@@ -91,5 +91,15 @@ module DTRCore
 
       @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

metadata

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