jaina 0.5.0 → 0.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +7 -0
- data/lib/jaina/parser/code_converter/to_postfix_form.rb +0 -1
- data/lib/jaina/parser/expression/operator/abstract/dsl.rb +13 -41
- data/lib/jaina/parser/tokenizer/token.rb +1 -1
- data/lib/jaina/parser/tokenizer/token_builder.rb +10 -14
- data/lib/jaina/parser/tokenizer.rb +1 -1
- data/lib/jaina/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0f175d89fcc7f3abb8f1c7583273fa909f6026059e3cd77a1a6c4ec5a4c6b9a8
|
4
|
+
data.tar.gz: 3fbc8716d947b5f760e5a1b766d130d51fbb2a9da6fc9de441ae49cf5fc1aaa6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 86527dab36b24534feb23200fa97c2c42762be632693bf41268b0b624be951c8f5e9e27cce68c10c29282212a02bbb49a467d3b489560cce626a769578483000
|
7
|
+
data.tar.gz: '0628d3f9dc415a0c638c84df22e2fd3d83015db71d4702373d6d38f34221ec689a01805c145efefe8532b84ed7be0bcbcdfdcb933a7664967d5d656000d02707'
|
data/CHANGELOG.md
CHANGED
@@ -1,6 +1,13 @@
|
|
1
1
|
# Changelog
|
2
2
|
All notable changes to this project will be documented in this file.
|
3
3
|
|
4
|
+
## [0.6.0] - 2019-06-28
|
5
|
+
### Added
|
6
|
+
- New token symbols (`-`, `=`, `>`, `<`): you can use these in your operands and operators;
|
7
|
+
|
8
|
+
### Fixed
|
9
|
+
- Expression inheritance (internal state of the child of child isnt copied but should);
|
10
|
+
|
4
11
|
## [0.5.0] - 2019-06-27
|
5
12
|
### Added
|
6
13
|
- An ability to redefine existing expressions (`Jaina.redefine(expression_klass)`);
|
@@ -37,47 +37,19 @@ module Jaina::Parser::Expression::Operator::Abstract::DSL
|
|
37
37
|
base_klass.instance_variable_set(:@acts_as_binary_term, false)
|
38
38
|
base_klass.instance_variable_set(:@acts_as_unary_term, false)
|
39
39
|
|
40
|
-
base_klass.extend
|
41
|
-
base_klass.include
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
# @since 0.1.0
|
54
|
-
def inherited(child_klass)
|
55
|
-
child_klass.instance_variable_set(
|
56
|
-
:@token,
|
57
|
-
instance_variable_get(:@token)
|
58
|
-
)
|
59
|
-
|
60
|
-
child_klass.instance_variable_set(
|
61
|
-
:@precedence_level,
|
62
|
-
instance_variable_get(:@precedence_level)
|
63
|
-
)
|
64
|
-
|
65
|
-
child_klass.instance_variable_set(
|
66
|
-
:@associativity_direction,
|
67
|
-
instance_variable_get(:@associativity_direction)
|
68
|
-
)
|
69
|
-
|
70
|
-
child_klass.instance_variable_set(
|
71
|
-
:@acts_as_binary_term,
|
72
|
-
instance_variable_get(:@acts_as_binary_term)
|
73
|
-
)
|
74
|
-
|
75
|
-
child_klass.instance_variable_set(
|
76
|
-
:@acts_as_unary_term,
|
77
|
-
instance_variable_get(:@acts_as_unary_term)
|
78
|
-
)
|
79
|
-
|
80
|
-
super
|
40
|
+
base_klass.extend(ClassMethods)
|
41
|
+
base_klass.include(InstanceMethods)
|
42
|
+
|
43
|
+
# NOTE: inheritance
|
44
|
+
base_klass.singleton_class.prepend(Module.new do
|
45
|
+
def inherited(child_klass)
|
46
|
+
child_klass.instance_variable_set(:@token, @token)
|
47
|
+
child_klass.instance_variable_set(:@precedence_level, @precedence_level)
|
48
|
+
child_klass.instance_variable_set(:@associativity_direction, @associativity_direction)
|
49
|
+
child_klass.instance_variable_set(:@acts_as_binary_term, @acts_as_binary_term)
|
50
|
+
child_klass.instance_variable_set(:@acts_as_unary_term, @acts_as_unary_term)
|
51
|
+
end
|
52
|
+
end)
|
81
53
|
end
|
82
54
|
end
|
83
55
|
|
@@ -57,7 +57,7 @@ class Jaina::Parser::Tokenizer::TokenBuilder
|
|
57
57
|
check_for_correctness!
|
58
58
|
|
59
59
|
# NOTE:
|
60
|
-
# format: token
|
60
|
+
# format: token[attr1,attr2,attr3]
|
61
61
|
# TOKEN => parts[0]
|
62
62
|
# OPENING BRAKET => parts[1]
|
63
63
|
# CLOSING BRAKET => parts[-1]
|
@@ -95,7 +95,7 @@ class Jaina::Parser::Tokenizer::TokenBuilder
|
|
95
95
|
raise(
|
96
96
|
IncorrectTokenDefinitionError,
|
97
97
|
"Incorrect token definition `#{raw_token}`: " \
|
98
|
-
"token should contain `[` and `]` if `[` is provided
|
98
|
+
"token should contain `[` and `]` if `[` is provided"
|
99
99
|
) if parts.count < 3
|
100
100
|
|
101
101
|
# NOTE:
|
@@ -110,19 +110,15 @@ class Jaina::Parser::Tokenizer::TokenBuilder
|
|
110
110
|
arguments = parts[2..-2]
|
111
111
|
|
112
112
|
# rubocop:disable Metrics/LineLength
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
)
|
118
|
-
end
|
113
|
+
raise(
|
114
|
+
IncorrectTokenDefinitionError,
|
115
|
+
"Incorrect token definition `#{raw_token}`: `[` should be the first arguments opening symbol."
|
116
|
+
) if arguments.include?(OPENING_ATTRIBUTE_GROUP_SYMBOL) || opening_corner != OPENING_ATTRIBUTE_GROUP_SYMBOL
|
119
117
|
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
)
|
125
|
-
end
|
118
|
+
raise(
|
119
|
+
IncorrectTokenDefinitionError,
|
120
|
+
"Incorrect token definition `#{raw_token}`: `]` should be the last arguments closing symbol."
|
121
|
+
) if arguments.include?(CLOSING_ATTRIBUTE_GROUP_SYMBOL) || closing_corner != CLOSING_ATTRIBUTE_GROUP_SYMBOL
|
126
122
|
# rubocop:enable Metrics/LineLength
|
127
123
|
end
|
128
124
|
end
|
data/lib/jaina/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jaina
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.6.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Rustam Ibragimov
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-06-
|
11
|
+
date: 2019-06-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: coveralls
|