Skip to content
Snippets Groups Projects
Commit 61fdd898 authored by Adam Wardynski's avatar Adam Wardynski
Browse files

"$m:_M" -> "_M": names used in Variables class should not be prefixed.

The prefix like "$m:" signifies type in WCCL, but in Variables code it comes from template argument; in this particular example, the <Match> type.
parent 098e8221
Branches
No related merge requests found
...@@ -248,7 +248,7 @@ parse_match_rule ...@@ -248,7 +248,7 @@ parse_match_rule
returns [boost::shared_ptr<Expression> ret_match] returns [boost::shared_ptr<Expression> ret_match]
{ {
Variables vars; Variables vars;
vars.get_put<Match>("$m:_M"); vars.get_put<Match>("_M");
} }
: ret_match = match_rule_operator[tagset, vars] : ret_match = match_rule_operator[tagset, vars]
; ;
...@@ -644,7 +644,7 @@ symset_operator ...@@ -644,7 +644,7 @@ symset_operator
[const Corpus2::Tagset& tagset, Variables& vars] [const Corpus2::Tagset& tagset, Variables& vars]
returns [boost::shared_ptr<Function<TSet> > ret] returns [boost::shared_ptr<Function<TSet> > ret]
: ret = symset_condition [tagset, vars] : ret = symset_condition [tagset, vars]
| (SYMBOL LBRACKET) => (ret = symset_getsymbol [tagset, vars]) | {LA(1)==SYMBOL && LA(2)==LBRACKET}? (ret = symset_getsymbol [tagset, vars])
| ret = symset_var_val [tagset, vars] | ret = symset_var_val [tagset, vars]
| ret = symset_class [tagset, vars] | ret = symset_class [tagset, vars]
| ret = symset_range [tagset, vars] | ret = symset_range [tagset, vars]
...@@ -1718,7 +1718,7 @@ match_apply_operator ...@@ -1718,7 +1718,7 @@ match_apply_operator
[const Corpus2::Tagset& tagset, Variables& vars] [const Corpus2::Tagset& tagset, Variables& vars]
returns [boost::shared_ptr<ApplyOperator> ret_op] returns [boost::shared_ptr<ApplyOperator> ret_op]
{ {
VariableAccessor<Match> matches = vars.create_accessor<Match>("$m:_M");; VariableAccessor<Match> matches = vars.create_accessor<Match>("_M");;
boost::shared_ptr<const MatchOperator> match_op; boost::shared_ptr<const MatchOperator> match_op;
boost::shared_ptr<std::vector<boost::shared_ptr<MatchAction> > > actions; boost::shared_ptr<std::vector<boost::shared_ptr<MatchAction> > > actions;
boost::shared_ptr<std::vector<boost::shared_ptr<Function<Bool> > > > conditions; boost::shared_ptr<std::vector<boost::shared_ptr<Function<Bool> > > > conditions;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment