dtr_core 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4c2bb162b6f7558a066ca08b82146f6934951c8b78a63f1ec2695df3582300c
-  data.tar.gz: e9afc8ec73ecddb50de3684f698aa19eebfcae7c59c236ef18f8785ac69e61e5
+  metadata.gz: 71e3bee98b2e2a2d771fe881f059b1a7a0546bfcedbb26bf299d6b438881ea22
+  data.tar.gz: 6ca9e2267461705e4cfec44be4d18100c1bbbc9d557d81f143fe93974eb6b35a
 SHA512:
-  metadata.gz: f3520c017ed2737f133654425373cf7dfa4f2aebf1e45637b2fa1e5189c48d5bb3ee57ba89c0089f75aa1d55dda0e6eb782d00506aca5b63963288494d05f67f
-  data.tar.gz: d28e1da96a73ac17085ce0b9ac746c4300c206320f24e19e938ac15672f6cc285c6d01840b5d311b2937e888b5f846d9178804120441a7065475c5aec441b171
+  metadata.gz: 87a726b517b10ee0abbfe9e30f9f5361b1da910b43fada3f32733640ddc9d58980c5f00d136c27b3e078a9611dae5181289aae082ee5da78dcf0c25766cf9f92
+  data.tar.gz: 918302834a7156779d967ae6453755eea5d0bb59633f174ed254ec071c025e57dd674ca099805390bf61598952bee67e026dc5108f242ef6f42d1d7d2622c3fa

data/lib/dtr_core/common.rb

@@ -11,8 +11,8 @@ module DTRCore
       some_list&.split("\n")&.map(&:strip)&.select { |x| x.length.positive? }
     end
 
-    def first_match_for_content(patterm)
-      content.match(patterm)&.captures&.first
+    def first_match_for_content(pattern)
+      content.match(pattern)&.captures&.first
     end
 
     def clean_name(definition)

data/lib/dtr_core/contract.rb

@@ -3,30 +3,32 @@
 module DTRCore
   # Represents a contract in a DTR file.
   class Contract
-    attr_reader :functions, :name, :state
+    attr_reader :functions, :name, :state, :user_defined_types
 
-    def initialize(name, state, functions)
+    def initialize(name, state, functions, user_defined_types)
       @name = name
       @state = state
       @functions = functions
+      @user_defined_types = user_defined_types
     end
 
     def self.from_dtr(filepath)
       parser = DTRCore::Parser.new(filepath)
 
-      new(parser.name_section, parser.state_section, parser.function_section)
+      new(parser.name_section, parser.state_section, parser.function_section, parser.user_defined_types_section)
     end
 
     def self.from_dtr_raw(content)
       parser = DTRCore::Parser.new('', content:)
 
-      new(parser.name_section, parser.state_section, parser.function_section)
+      new(parser.name_section, parser.state_section, parser.function_section, parser.user_defined_types_section)
     end
 
     def ==(other)
       name == other.name &&
         state == other.state &&
-        functions == other.functions
+        functions == other.functions &&
+        user_defined_types == other.user_defined_types
     end
   end
 end

data/lib/dtr_core/parser.rb

@@ -63,5 +63,21 @@ module DTRCore
 
       @function_section ||= function_definitions
     end
+
+    def user_defined_types_section
+      return @user_defined_types if @user_defined_types
+
+      user_defined_types_regex = /\[User Defined Types\]:([\s\S]*?)\s*:\[User Defined Types\]/
+      user_defined_types_section_parsed_out = first_match_for_content(user_defined_types_regex)
+
+      return nil if user_defined_types_section_parsed_out.nil?
+
+      user_defined_types = user_defined_types_section_parsed_out
+                           .split(/\n\s*\*\s*\(/).map { |x| "(#{x.strip}" }
+                           .filter { |x| x.length > 1 }
+                           .map { |definition| DTRCore::UserDefinedType.from_definition(definition) }
+
+      @user_defined_types_section ||= user_defined_types
+    end
   end
 end

data/lib/dtr_core/supported_attributes.rb

@@ -32,7 +32,9 @@ module DTRCore
       { name: 'save_state', description: 'Save a value to the state.', category: INSTRUCTION_CATEGORY_STATE },
       # untyped operations
       { name: 'add', description: 'Add two things of unknown types together.', category: INSTRUCTION_CATEGORY_UNTYPED },
-      { name: 'add_and_assign', description: 'Add two things of unknown types together and then assign to the first one.', category: INSTRUCTION_CATEGORY_UNTYPED },
+      { name: 'add_and_assign',
+        description: 'Add two things of unknown types together and then assign to the first one.',
+        category: INSTRUCTION_CATEGORY_UNTYPED },
       # numeric operations
       { name: 'add_numbers', description: 'Add two numbers.', category: INSTRUCTION_CATEGORY_NUMERIC },
       { name: 'subtract_numbers', description: 'Subtract two numbers.', category: INSTRUCTION_CATEGORY_NUMERIC },
@@ -41,9 +43,11 @@ module DTRCore
       # string operations
       { name: 'add_strings', description: 'Concatenate two strings.', category: INSTRUCTION_CATEGORY_STRING },
       # environment operations
-      { name: 'contract_address', description: 'Get the contract address.', category: INSTRUCTION_CATEGORY_ENVIRONMENT }
+      { name: 'contract_address', description: 'Get the contract address.',
+        category: INSTRUCTION_CATEGORY_ENVIRONMENT },
       # method operations
-      { name: 'evaluate', description: 'Evaluate a method. Method name is the first input and arguments follow', category: INSTRUCTION_CATEGORY_METHODS }
+      { name: 'evaluate', description: 'Evaluate a method. Method name is the first input and arguments follow',
+        category: INSTRUCTION_CATEGORY_METHODS },
       # object operations
       { name: 'field', description: 'Reference an object field.', category: INSTRUCTION_CATEGORY_OBJECTS }
     ].freeze

data/lib/dtr_core/user_defined_type.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'dtr_core/common'
+
+module DTRCore
+  # Represents a state in a DTR file.
+  class UserDefinedType
+    include ::DTRCore::Common
+
+    attr_reader :attributes, :name
+
+    def initialize(name, attributes)
+      @name = name
+      @attributes = attributes
+    end
+
+    def self.from_definition(definition)
+      name = capture_name(definition)
+      attributes = capture_attributes(definition)
+
+      new(name, attributes)
+    end
+
+    def self.capture_attributes(definition)
+      captured_definitions = definition.match(/\{(.+?)\}/m)&.captures&.first
+
+      transform_attributes(captured_definitions.split("\n"))
+    end
+
+    def self.transform_attributes(capture_attribute_definition)
+      capture_attribute_definition&.map { |x| x.split(':') }
+                                  &.filter { |x| x.length > 1 }
+                                  &.map { |x| { name: x[0].strip, type: x[1].strip } }
+    end
+
+    def self.capture_name(definition)
+      definition.match(/\((\w+)\)/)&.captures&.first
+    end
+
+    def to_s
+      "#{name} { #{attributes.map { |x| "#{x[:name]}: #{x[:type]}" }.join("\n")} }"
+    end
+
+    def ==(other)
+      name == other.name &&
+        attributes == other.attributes
+    end
+  end
+end

data/lib/dtr_core.rb

@@ -7,6 +7,7 @@ module DTRCore
   autoload :Number, 'dtr_core/number'
   autoload :Parser, 'dtr_core/parser'
   autoload :State, 'dtr_core/state'
-  autoload :TypeValidator, 'dtr_core/type_validator'
   autoload :SupportedAttributes, 'dtr_core/supported_attributes'
+  autoload :TypeValidator, 'dtr_core/type_validator'
+  autoload :UserDefinedType, 'dtr_core/user_defined_type'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtr_core
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Rob Durst
@@ -27,6 +27,7 @@ files:
 - lib/dtr_core/state.rb
 - lib/dtr_core/supported_attributes.rb
 - lib/dtr_core/type_validator.rb
+- lib/dtr_core/user_defined_type.rb
 homepage: https://spaced-out-thoughts-dev-foundation.github.io/digicus/
 licenses:
 - MIT