Skip to content
Snippets Groups Projects
Commit 027e6d24 authored by Paweł Kędzia's avatar Paweł Kędzia
Browse files

Added parentheses for all "general" operator rules (string_operator,...

Added parentheses for all "general" operator rules (string_operator, bool_operator, symset_operator and position_operator).
parent fe88d21a
No related branches found
No related tags found
No related merge requests found
...@@ -198,8 +198,8 @@ parse_position_operator ...@@ -198,8 +198,8 @@ parse_position_operator
// 'a' "a" [] ['a'] ['a', 'b'] ["a"] ["a", "b"] ['a', "b"] // 'a' "a" [] ['a'] ['a', 'b'] ["a"] ["a", "b"] ['a', "b"]
// Parsing strset literal and returning plain strset value. // Parsing strset literal and returning plain strset value.
// Returns boost::shared_ptr<StrSet> // Returns boost::shared_ptr<StrSet>
strset_literal returns strset_literal
[boost::shared_ptr<StrSet> s_set] returns [boost::shared_ptr<StrSet> s_set]
{ {
s_set.reset(new StrSet()); s_set.reset(new StrSet());
} }
...@@ -488,7 +488,8 @@ symset_operator ...@@ -488,7 +488,8 @@ symset_operator
returns [boost::shared_ptr<Function<TSet> > ret] returns [boost::shared_ptr<Function<TSet> > ret]
: ret = symset_var_val [tagset, vars] : ret = symset_var_val [tagset, vars]
| ret = symset_condition [tagset, vars] | ret = symset_condition [tagset, vars]
//
| LPAREN ret = symset_operator [tagset, vars] RPAREN
; ;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
...@@ -540,6 +541,8 @@ position_operator ...@@ -540,6 +541,8 @@ position_operator
: ret = position_var_val [vars] : ret = position_var_val [vars]
| ret = position_relpos [tagset, vars] | ret = position_relpos [tagset, vars]
| ret = position_condition [tagset, vars] | ret = position_condition [tagset, vars]
//
| LPAREN ret = position_operator [tagset, vars] RPAREN
; ;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
...@@ -609,6 +612,8 @@ string_operator [const Corpus2::Tagset& tagset, Variables& vars] ...@@ -609,6 +612,8 @@ string_operator [const Corpus2::Tagset& tagset, Variables& vars]
| ret = strset_affix [tagset, vars] | ret = strset_affix [tagset, vars]
| ret = strset_var_val [tagset, vars] | ret = strset_var_val [tagset, vars]
| ret = strset_condition [tagset, vars] | ret = strset_condition [tagset, vars]
//
| LPAREN ret = string_operator [tagset, vars] RPAREN
; ;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
...@@ -738,6 +743,8 @@ bool_operator ...@@ -738,6 +743,8 @@ bool_operator
| ret = equal_operator [tagset, vars] | ret = equal_operator [tagset, vars]
| ret = in_operator [tagset, vars] | ret = in_operator [tagset, vars]
| ret = inter_operator [tagset, vars] | ret = inter_operator [tagset, vars]
//
| LPAREN ret = bool_operator [tagset, vars] RPAREN
; ;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment