dtr_core 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daf7d4ee7b08b952fd8fe687e0dd6edbfa09bd576d35cb1b50d24528a411dc2b
-  data.tar.gz: d65462fe604c303f6be6317170582ee0e98bc2ccc459cdde0b2dbd8cf5024e23
+  metadata.gz: 149908b637a12363b2de8ef8432c5348bb303756bf619e09ecd3530ca070973d
+  data.tar.gz: a4d642766c5e1bc759e87520de1f35288b6ef6920409a15238a4cdde60040a78
 SHA512:
-  metadata.gz: 014bd2182a685a04e2acf4349055431102fd48a96f4a0a8928603279af66f4059175d8fe7ed8f9c39d93c8e0388e5e41ca0417ab0539b693e67621f59bab0c78
-  data.tar.gz: a650d2cb77f65292991eabe585d771a0a797b26cab9c30f5b46cb34137365499edb02c80235388240d982c9c1825bdd0fa2d78207b67e77aa49c19b0a1d92144
+  metadata.gz: 4d81497276755f5d3921c40256864936be3d2b105091bf268a7f483e183668cb959c14d386672d8aad1118c1fc0c6564589893564e6eab203eadf4ac17f9ce62
+  data.tar.gz: 83771252da2ebc9d7cbdd15315aeaae226044de99be1cae842dc237db22cded37e027196f6eb57135fa34a67757dd451cf2de4bd53ff0e3e846d795248d99209

data/lib/dtr_core/instruction_validator.rb

@@ -19,21 +19,17 @@ module DTRCore
       return false unless scope_valid?
 
       case @instruction.instruction
-      when 'assign', 'evaluate', 'log_string'
+      when 'assign', 'evaluate', 'print'
         validate_basic_operation!
       when 'exit_with_message', 'return'
         validate_terminating_operation!
       when 'and', 'or'
         validate_logical_operation!
-      when 'conditional_goto', 'conditional_jump', 'end_of_iteration_check', 'label', 'unconditional_goto', 'unconditional_jump'
-        validate_unconditional_jump_operation!
-      when 'contract_address'
-        validate_smart_contract_specific_operation!
-      when 'create_dictionary', 'create_list', 'create_range', 'create_tuple',
-        'field', 'initialize_udt'
+      when 'goto', 'jump', 'end_of_iteration_check', 'label'
+        validate_control_flow_operation!
+      when 'field', 'instantiate_object'
         validate_object_operation!
-      when 'add', 'subtract', 'multiply', 'divide',
-        'add_and_assign', 'subtract_and_assign', 'multiply_and_assign', 'divide_and_assign'
+      when 'add', 'subtract', 'multiply', 'divide'
         validate_binary_operation!
       else
         false
@@ -66,11 +62,7 @@ module DTRCore
       @instruction.inputs&.length == 2
     end
 
-    def validate_unconditional_jump_operation!
-      true
-    end
-
-    def validate_smart_contract_specific_operation!
+    def validate_control_flow_operation!
       true
     end
 

data/lib/dtr_core/supported_attributes.rb

@@ -1,86 +1,81 @@
 # frozen_string_literal: true
 
+# rubocop:disable Layout/LineLength
 module DTRCore
   module SupportedAttributes
     # Supported Instructions for DTR.
     ## Instruction Categories ##
     INSTRUCTION_CATEGORY_BASIC = 'basic'
-    INSTRUCTION_CATEGORY_STATE = 'state'
-    INSTRUCTION_CATEGORY_UNTYPED = 'untyped'
-    INSTRUCTION_CATEGORY_NUMERIC = 'numeric'
-    INSTRUCTION_CATEGORY_STRING = 'string'
-    INSTRUCTION_CATEGORY_ENVIRONMENT = 'environment'
-    INSTRUCTION_CATEGORY_METHODS = 'methods'
-    INSTRUCTION_CATEGORY_OBJECTS = 'objects'
-    INSTRUCTION_CATEGORY_CONDITIONAL = 'conditional'
+    INSTRUCTION_CATEGORY_BINARY = 'binary'
+    INSTRUCTION_CATEGORY_CONTROL_FLOW = 'control_flow'
+    INSTRUCTION_CATEGORY_TERMINATING = 'terminating'
     INSTRUCTION_CATEGORY_LOGICAL = 'logical'
+    INSTRUCTION_CATEGORY_OBJECT = 'object'
     INSTRUCTION_CATEGORIES = [
       INSTRUCTION_CATEGORY_BASIC,
-      INSTRUCTION_CATEGORY_STATE,
-      INSTRUCTION_CATEGORY_UNTYPED,
-      INSTRUCTION_CATEGORY_NUMERIC,
-      INSTRUCTION_CATEGORY_STRING,
-      INSTRUCTION_CATEGORY_ENVIRONMENT,
-      INSTRUCTION_CATEGORY_METHODS,
-      INSTRUCTION_CATEGORY_OBJECTS,
-      INSTRUCTION_CATEGORY_CONDITIONAL,
-      INSTRUCTION_CATEGORY_LOGICAL
+      INSTRUCTION_CATEGORY_BINARY,
+      INSTRUCTION_CATEGORY_CONTROL_FLOW,
+      INSTRUCTION_CATEGORY_TERMINATING,
+      INSTRUCTION_CATEGORY_LOGICAL,
+      INSTRUCTION_CATEGORY_OBJECT
     ].freeze
     ## Instructions ##
     INSTRUCTIONS = [
-      # basic operations
-      { name: 'return', description: 'return a value from a function.', category: INSTRUCTION_CATEGORY_BASIC },
-      { name: 'assign', description: 'Assign a value to a variable.', category: INSTRUCTION_CATEGORY_BASIC },
-      { name: 'panic', description: 'Exit, quickly, and loudly.', category: INSTRUCTION_CATEGORY_BASIC },
-      { 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: 'subtract', description: 'Subtract two things of unknown types together.',
-        category: INSTRUCTION_CATEGORY_UNTYPED },
-      { name: 'divide', description: 'Divide two things of unknown types together.',
-        category: INSTRUCTION_CATEGORY_UNTYPED },
-      { name: 'multiply', description: 'Multiply two things of unknown types together.',
-        category: INSTRUCTION_CATEGORY_UNTYPED },
-      # environment operations
-      { 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 },
-      # object operations
-      { name: 'field', description: 'Reference an object field.', category: INSTRUCTION_CATEGORY_OBJECTS },
-      { name: 'initialize_udt', description: 'Instantiate UDT object.', category: INSTRUCTION_CATEGORY_OBJECTS },
-      # conditional operations
-      { name: 'conditional_unconditional_jump', description: 'unconditional_jump to a label if first input is true.',
-        category: INSTRUCTION_CATEGORY_CONDITIONAL },
-      { name: 'unconditional_unconditional_jump', description: 'unconditional_jump to a no matter what.',
-        category: INSTRUCTION_CATEGORY_CONDITIONAL },
-      # logical operations
-      { name: 'and', description: 'Logical AND.', category: INSTRUCTION_CATEGORY_LOGICAL },
-      { name: 'or', description: 'Logical OR.', category: INSTRUCTION_CATEGORY_LOGICAL }
+      { name: 'assign', description: 'given some input value, assign to ASSIGN_NAME',
+        category: INSTRUCTION_CATEGORY_BASIC },
+      { name: 'evaluate',
+        description: 'given a method name and 0 or more inputs, execute method. At this time, evaluate is a fairly loose catch-all for not explicitly defined operations', category: INSTRUCTION_CATEGORY_BASIC },
+      { name: 'print', description: 'given some value, print it to standard out',
+        category: INSTRUCTION_CATEGORY_BASIC },
+
+      { name: 'exit_with_message', description: 'immediately end execution, returning message',
+        category: INSTRUCTION_CATEGORY_TERMINATING },
+      { name: 'return', description: 'return from function with input value',
+        category: INSTRUCTION_CATEGORY_TERMINATING },
+
+      { name: 'and', description: 'lassign to ASSIGN_NAME result of “and-ing” two values',
+        category: INSTRUCTION_CATEGORY_LOGICAL },
+      { name: 'or', description: 'assign to ASSIGN_NAME result of “or-ing” two values',
+        category: INSTRUCTION_CATEGORY_LOGICAL },
+
+      { name: 'goto',
+        description: 'conditional if two inputs. In this case, first input is the condition to evaluate. If that is true, or there is only one input, move in code to the first input (a label name)', category: INSTRUCTION_CATEGORY_CONTROL_FLOW },
+      { name: 'jump',
+        description: 'conditional if two inputs. In this case, first input is the condition to evaluate. If that is true, or there is only one input, jump to scope level', category: INSTRUCTION_CATEGORY_CONTROL_FLOW },
+      { name: 'end_of_iteration_check',
+        description: 'check on input to see if at end of iteration. Return result to ASSIGN_NAME', category: INSTRUCTION_CATEGORY_CONTROL_FLOW },
+      { name: 'label', description: 'a named location within the instruction set for a given function',
+        category: INSTRUCTION_CATEGORY_CONTROL_FLOW },
+
+      { name: 'field', description: 'access a field on an object and assign result to ASSIGN_NAME',
+        category: INSTRUCTION_CATEGORY_OBJECT },
+      { name: 'instantiate_object',
+        description: 'initialize an object by first passing in the type of object and the passing in each initial values for its fields. Supported types here include: Dictionary, List, Range, Tuple, and UDT. For UDTs, the second input is the name of the UDT.', category: INSTRUCTION_CATEGORY_OBJECT },
+
+      { name: 'add', description: 'assign to ASSIGN_NAME result of adding two value',
+        category: INSTRUCTION_CATEGORY_BINARY },
+      { name: 'subtract', description: 'assign to ASSIGN_NAME result of subtracting two value',
+        category: INSTRUCTION_CATEGORY_BINARY },
+      { name: 'multiply', description: 'assign to ASSIGN_NAME result of multiplying two value',
+        category: INSTRUCTION_CATEGORY_BINARY },
+      { name: 'divide', description: 'assign to ASSIGN_NAME result of dividing two value',
+        category: INSTRUCTION_CATEGORY_BINARY }
     ].freeze
 
     # Supported Types for DTR.
-    TYPES = [
-      # basic types
-      'address',
-      'boolean',
-      # string types
-      'String',
-      # collection types
-      'array',
-      'map',
-      # numeric types
-      ## signed
-      'Integer',
-      'i64',
-      'BigInteger',
-      'BigInteger',
-      ## unsigned
-      'Integer',
-      'Integer',
-      'u128',
-      'BigInteger'
+    TYPES = %w[
+      Dictionary
+      List
+      Range
+      Tuple
+      UDT
+      Address
+      BigInteger
+      Boolean
+      Float
+      Integer
+      String
     ].freeze
   end
 end
+# rubocop:enable Layout/LineLength

data/lib/dtr_core/type_validator.rb

@@ -18,6 +18,7 @@ module DTRCore
       return validate_integer! if %w[Integer BigInteger Float].include?(@type_name)
       return validate_string! if ['String'].include?(@type_name)
       return validate_address! if ['Address'].include?(@type_name)
+      return validate_boolean! if ['Boolean'].include?(@type_name)
 
       raise 'Missing Invalid Type Name.'
     end
@@ -45,6 +46,15 @@ module DTRCore
       @initial_value.strip
     end
 
+    def validate_boolean!
+      unless %w[true
+                false].include?(@initial_value)
+        raise "Invalid initial value for Boolean: #{@initial_value}. Wrong type."
+      end
+
+      @initial_value == 'true'
+    end
+
     def validate_integer!
       unless @initial_value =~ (/^[\-\.\d]\d*(\.?\d*)*/)
         raise "Invalid initial value for #{@type_name}: #{@initial_value}. Wrong type."

metadata

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