dtr_core 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6eb9933172ea48536b0efceffe9e9e222a54e37f214b8041dc5edd40c01f2d6
-  data.tar.gz: 731d58a093c47bfd2b63f4ea884d4422d703b2c2ba47baacbda105bfb02e2264
+  metadata.gz: ad7236ff8c846c7126d0d8e53f3d7cd5d6635eeefbca857dafdf22e85473cbe6
+  data.tar.gz: d8741a66894615c02d59be5ba8884f165acdcfdb045c2243c07c57c3116cb699
 SHA512:
-  metadata.gz: '04824f70c5646161afb24637f614f1ba2431414cc5f98b8847b15f74299ba563957586ba40a88d36847d1cfce649462199a42508a0d276397dbe3f38d1ee7e59'
-  data.tar.gz: 106a92f8de4ca9385d44f510dbb942b05d073bd2584d7dabbfe7d3003d348a121c21765da246e2c450a25df92cfb5151d1b541cf5b28029d96acd6ff1875c423
+  metadata.gz: 83a20837017ec8a60ae948918f6b1947332516248bac6f805bdfc12b7b2a5636d5f01157739c81167113a873218da6cf55b22c297e1903718c9913b29322f2f7
+  data.tar.gz: 42b2bd3b5ef207d88fe3a955a9358ea54270979115df12e10d2318d6d230c80e8d858979d9d91df91bd2158153dd93f0d2e8efd15e0e27c4f261dee6432d660d

data/lib/dtr_core/contract.rb

@@ -55,31 +55,31 @@ 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?
+      return '' if @non_translatables.nil? || @non_translatables.empty?
 
       "[NonTranslatable]:\n#{@non_translatables}\n:[NonTranslatable]"
     end

data/lib/dtr_core/function.rb

@@ -98,7 +98,8 @@ module DTRCore
         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*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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtr_core
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Rob Durst
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-07 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.