Grammar rules changed to take shared_ptr tagset argument

libwccl/parser/grammar.g

@@ -189,7 +189,7 @@ private:
 // Rule for parsing string set operator with scope. 
 // Returns boost::shared_ptr<Operator<StrSet> >
 parse_strset_operator
-	[const Corpus2::Tagset &tagset]
+	[const boost::shared_ptr<const Corpus2::Tagset> tagset]
 	returns [boost::shared_ptr<Operator<StrSet> > res]
 {
 	Lexicons empty_lex;
@@ -203,7 +203,7 @@ parse_strset_operator
 // Rule for parsing bool operator with scope. 
 // Returns boost::shared_ptr<Operator<Bool> > 
 parse_bool_operator 
-	[const Corpus2::Tagset &tagset]
+	[const boost::shared_ptr<const Corpus2::Tagset> tagset]
 	returns [boost::shared_ptr<Operator<Bool> > res]
 {
 	Lexicons empty_lex;
@@ -217,7 +217,7 @@ parse_bool_operator
 // Rule for parsing symbol set operator with scope.
 // Returns boost::shared_ptr<Operator<TSet> >
 parse_symset_operator
-	[const Corpus2::Tagset &tagset]
+	[const boost::shared_ptr<const Corpus2::Tagset> tagset]
 	returns [boost::shared_ptr<Operator<TSet> > res]
 {
 	Lexicons empty_lex;
@@ -231,7 +231,7 @@ parse_symset_operator
 // Rule for parsing position operator with scope.
 // Returns boost::shared_ptr<Operator<Position> >
 parse_position_operator
-	[const Corpus2::Tagset &tagset]
+	[const boost::shared_ptr<const Corpus2::Tagset> tagset]
 	returns [boost::shared_ptr<Operator<Position> > res]
 {	
 	Lexicons empty_lex;
@@ -245,7 +245,7 @@ parse_position_operator
 // Rule for parsing match operator with scope.
 // Returns boost::shared_ptr<Operator<Position> >
 parse_match_operator
-	[const Corpus2::Tagset &tagset]
+	[const boost::shared_ptr<const Corpus2::Tagset> tagset]
 	returns [boost::shared_ptr<Operator<Match> > res]
 {	
 	Lexicons empty_lex;
@@ -260,7 +260,7 @@ parse_match_operator
 // Rule for parsing single WCCL Rule
 // Returns boost::shared_ptr<TagRule>
 parse_single_tag_rule
-	[const Corpus2::Tagset &tagset]
+	[const boost::shared_ptr<const Corpus2::Tagset> tagset]
 	returns [boost::shared_ptr<TagRule> rle]
 {	
 	Lexicons empty_lex;
@@ -272,7 +272,7 @@ parse_single_tag_rule
 // Rule for parsing tag rule section in the wccl file
 // Returns boost::shared_ptr<TagRuleSequence>
 parse_tag_rule_sequence
-	[const Corpus2::Tagset& tagset]
+	[const boost::shared_ptr<const Corpus2::Tagset> tagset]
 	returns [boost::shared_ptr<TagRuleSequence> rule_seq]
 {
 	Lexicons empty_lex;
@@ -286,7 +286,7 @@ parse_tag_rule_sequence
 // Rule for parsing the match rules
 // Returns boost::shared_ptr<Matching::MatchRule>
 parse_match_rule
-	[const Corpus2::Tagset& tagset]
+	[const boost::shared_ptr<const Corpus2::Tagset> tagset]
 	returns [boost::shared_ptr<Matching::MatchRule> ret_match]
 {
 	Lexicons empty_lex;
@@ -299,7 +299,7 @@ parse_match_rule
 // ----------------------------------------------------------------------------
 // Rule for parsing wccl files
 parse_wccl_file
-	[const Corpus2::Tagset& tagset, const std::string search_path]
+	[const boost::shared_ptr<const Corpus2::Tagset> tagset, const std::string search_path]
 	returns [boost::shared_ptr<WcclFile> wccl_file]
 {
 	wccl_file = boost::make_shared<WcclFile>(tagset, search_path);
@@ -359,7 +359,7 @@ strset_value
 // using corresponding tagset. 
 // WARNING! This rule can throw ParserException! Be careful!
 symset_elem
-	[const Corpus2::Tagset& tagset, boost::shared_ptr<TSet>& t_set]
+	[const boost::shared_ptr<const Corpus2::Tagset> tagset, boost::shared_ptr<TSet>& t_set]
 	: s1: SYMBOL {
 		try {
 			t_set->insert_symbol(tagset, str_token_rem_grav(s1));
@@ -376,7 +376,7 @@ symset_elem
 // Parsing symset literal and returning plain symset value.
 // Returns boost::shared_ptr<TSet>
 symset_literal
-	[const Corpus2::Tagset& tagset]
+	[const boost::shared_ptr<const Corpus2::Tagset> tagset]
 	returns [boost::shared_ptr<TSet> t_set]
 {
 	t_set.reset(new TSet());
@@ -391,7 +391,7 @@ symset_literal
 // Symset value, as constant symbol set
 // Returns boost::shared_ptr<Constant<TSet> >
 symset_value 
-	[const Corpus2::Tagset& tagset]
+	[const boost::shared_ptr<const Corpus2::Tagset> tagset]
 	returns [boost::shared_ptr<Constant<TSet> > val]
 {
 	boost::shared_ptr<TSet> set;