Merge branch 'master' of nlp.pwr.wroc.pl:wccl

libwccl/ops/functions/strset/getlemmas.h

@@ -31,7 +31,7 @@ public:
 
 	/**
 	 * @returns String representation of the function in the form of:
-	 * "base(pos_expr_string)"
+	 * "base(pos_expr_raw_string)"
 	 * @note This version does not require tagset, but may be inclomplete
 	 * and/or contain internal info.
 	 */

libwccl/ops/functions/tset/getsymbols.h

@@ -7,6 +7,9 @@
 
 namespace Wccl {
 
+/**
+ * Operator that gets tagset symbols from a token at given position.
+ */
 class GetSymbols : public Function<TSet> {
 public:
 	typedef boost::shared_ptr<Function<Position> > PosFunctionPtr;
@@ -25,7 +28,7 @@ public:
 
 	/**
 	 * @returns String representation of the function in the form of:
-	 * "attribute_name[pos_expr_string]"
+	 * "raw_attribute_name[pos_expr_raw_string]"
 	 * @note This version does not require tagset, but will be inclomplete
 	 * and/or contain internal info.
 	 */

libwccl/parser/Parser.cpp

@@ -176,7 +176,7 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
 		ANTLRLexer lexer(ss);
 		ANTLRParser parser(lexer);
 		try {
-			result = parser.parse_position_operator(tagset_);
+			result = parser.parse_symset_operator(tagset_);
 		} catch (antlr::ANTLRException& e) {
 			errors << "(as tset) " << e.getMessage() << "\n";
 			// ignore, try another type