jaina 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9a98b33875e25f9b5133548da379b6a4af1886c09cb1a942a4b600c7841014d
-  data.tar.gz: 8ca16e944faa24ef61e2467a63718a75fd9e7d87f176e320d63f2247b9814497
+  metadata.gz: 0f175d89fcc7f3abb8f1c7583273fa909f6026059e3cd77a1a6c4ec5a4c6b9a8
+  data.tar.gz: 3fbc8716d947b5f760e5a1b766d130d51fbb2a9da6fc9de441ae49cf5fc1aaa6
 SHA512:
-  metadata.gz: fb36863a52b5dcae3af2852710d4208d40942305a8fa296b32b92615afa1b3fae94629aea2f28185dfa99c2c02e1dd836b7da6177549f04d3ad6e54b977e3f35
-  data.tar.gz: 8caac2e609dcbe5973dd0e61c031b21d0bed24ae43ae5f69ed8450f23ecdea9f7befd38eaabe9f9a9ff97ba1b34e25bced17dbcffac2dcfef1fb4f2ba59c8fa9
+  metadata.gz: 86527dab36b24534feb23200fa97c2c42762be632693bf41268b0b624be951c8f5e9e27cce68c10c29282212a02bbb49a467d3b489560cce626a769578483000
+  data.tar.gz: '0628d3f9dc415a0c638c84df22e2fd3d83015db71d4702373d6d38f34221ec689a01805c145efefe8532b84ed7be0bcbcdfdcb933a7664967d5d656000d02707'

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.6.0] - 2019-06-28
+### Added
+- New token symbols (`-`, `=`, `>`, `<`): you can use these in your operands and operators;
+
+### Fixed
+- Expression inheritance (internal state of the child of child isnt copied but should);
+
 ## [0.5.0] - 2019-06-27
 ### Added
 - An ability to redefine existing expressions (`Jaina.redefine(expression_klass)`);

data/lib/jaina/parser/code_converter/to_postfix_form.rb

@@ -3,7 +3,6 @@
 # @api private
 # @since 0.1.0
 class Jaina::Parser::CodeConverter::ToPostfixForm
-  # @api private
   # @since 0.1.0
   extend Forwardable
 

data/lib/jaina/parser/expression/operator/abstract/dsl.rb

@@ -37,47 +37,19 @@ module Jaina::Parser::Expression::Operator::Abstract::DSL
       base_klass.instance_variable_set(:@acts_as_binary_term, false)
       base_klass.instance_variable_set(:@acts_as_unary_term, false)
 
-      base_klass.extend ClassMethods
-      base_klass.include InstanceMethods
-      base_klass.singleton_class.prepend(ClassInheritance)
-    end
-  end
-
-  # @api private
-  # @since 0.1.0
-  module ClassInheritance
-    # @param child_klass [Class]
-    # @return [void]
-    #
-    # @api private
-    # @since 0.1.0
-    def inherited(child_klass)
-      child_klass.instance_variable_set(
-        :@token,
-        instance_variable_get(:@token)
-      )
-
-      child_klass.instance_variable_set(
-        :@precedence_level,
-        instance_variable_get(:@precedence_level)
-      )
-
-      child_klass.instance_variable_set(
-        :@associativity_direction,
-        instance_variable_get(:@associativity_direction)
-      )
-
-      child_klass.instance_variable_set(
-        :@acts_as_binary_term,
-        instance_variable_get(:@acts_as_binary_term)
-      )
-
-      child_klass.instance_variable_set(
-        :@acts_as_unary_term,
-        instance_variable_get(:@acts_as_unary_term)
-      )
-
-      super
+      base_klass.extend(ClassMethods)
+      base_klass.include(InstanceMethods)
+
+      # NOTE: inheritance
+      base_klass.singleton_class.prepend(Module.new do
+        def inherited(child_klass)
+          child_klass.instance_variable_set(:@token, @token)
+          child_klass.instance_variable_set(:@precedence_level, @precedence_level)
+          child_klass.instance_variable_set(:@associativity_direction, @associativity_direction)
+          child_klass.instance_variable_set(:@acts_as_binary_term, @acts_as_binary_term)
+          child_klass.instance_variable_set(:@acts_as_unary_term, @acts_as_unary_term)
+        end
+      end)
     end
   end
 

data/lib/jaina/parser/tokenizer/token.rb

@@ -39,7 +39,7 @@ class Jaina::Parser::Tokenizer::Token
   # @api private
   # @since 0.4.0
   def dup
-    self.class.new(raw_token.dup, token.dup, *arguments)
+    self.class.new(raw_token.dup, token.dup, *arguments.dup)
   end
 
   # @return [String]

data/lib/jaina/parser/tokenizer/token_builder.rb

@@ -57,7 +57,7 @@ class Jaina::Parser::Tokenizer::TokenBuilder
     check_for_correctness!
 
     # NOTE:
-    #   format: token [ attr1, attr2, attr3 ]
+    #   format: token[attr1,attr2,attr3]
     #     TOKEN => parts[0]
     #     OPENING BRAKET => parts[1]
     #     CLOSING BRAKET => parts[-1]
@@ -95,7 +95,7 @@ class Jaina::Parser::Tokenizer::TokenBuilder
     raise(
       IncorrectTokenDefinitionError,
       "Incorrect token definition `#{raw_token}`: " \
-      "token should contain `[` and `]` if `[` is provided)"
+      "token should contain `[` and `]` if `[` is provided"
     ) if parts.count < 3
 
     # NOTE:
@@ -110,19 +110,15 @@ class Jaina::Parser::Tokenizer::TokenBuilder
     arguments       = parts[2..-2]
 
     # rubocop:disable Metrics/LineLength
-    if arguments.include?(OPENING_ATTRIBUTE_GROUP_SYMBOL) || opening_corner != OPENING_ATTRIBUTE_GROUP_SYMBOL
-      raise(
-        IncorrectTokenDefinitionError,
-        "Incorrect token definition `#{raw_token}`: `[` should be the first arguments opening symbol."
-      )
-    end
+    raise(
+      IncorrectTokenDefinitionError,
+      "Incorrect token definition `#{raw_token}`: `[` should be the first arguments opening symbol."
+    ) if arguments.include?(OPENING_ATTRIBUTE_GROUP_SYMBOL) || opening_corner != OPENING_ATTRIBUTE_GROUP_SYMBOL
 
-    if arguments.include?(CLOSING_ATTRIBUTE_GROUP_SYMBOL) || closing_corner != CLOSING_ATTRIBUTE_GROUP_SYMBOL
-      raise(
-        IncorrectTokenDefinitionError,
-        "Incorrect token definition `#{raw_token}`: `]` should be the last arguments closing symbol."
-      )
-    end
+    raise(
+      IncorrectTokenDefinitionError,
+      "Incorrect token definition `#{raw_token}`: `]` should be the last arguments closing symbol."
+    ) if arguments.include?(CLOSING_ATTRIBUTE_GROUP_SYMBOL) || closing_corner != CLOSING_ATTRIBUTE_GROUP_SYMBOL
     # rubocop:enable Metrics/LineLength
   end
 end

data/lib/jaina/parser/tokenizer.rb

@@ -10,7 +10,7 @@ module Jaina::Parser::Tokenizer
   #
   # @api private
   # @since 0.1.0
-  TOKEN_SCAN_PATTERN = /\(|\)|[\"\'\.\,\w\[\]]+/.freeze
+  TOKEN_SCAN_PATTERN = /\(|\)|[\<\=\-\>\:\"\'\.\,\w\[\]]+/.freeze
 
   # @return [String]
   #

data/lib/jaina/version.rb

@@ -5,5 +5,5 @@ module Jaina
   #
   # @api public
   # @since 0.0.0
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jaina
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Rustam Ibragimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls