From 88d12d0736a1204f9310c01c3d9f11b78b5ce832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20K=C4=99dzia?= <pawel.kedzia@pwr.wroc.pl>
Date: Wed, 8 Dec 2010 14:40:21 +0100
Subject: [PATCH] Removed Wccl:: scope in Parser, because Parser is in Wccl
namespace.
---
libwccl/parser/Parser.cpp | 16 ++++++++--------
libwccl/parser/Parser.h | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/libwccl/parser/Parser.cpp b/libwccl/parser/Parser.cpp
index 976297f..8d6cc0e 100644
--- a/libwccl/parser/Parser.cpp
+++ b/libwccl/parser/Parser.cpp
@@ -26,7 +26,7 @@ Parser::~Parser()
* @arg str operator string
* @return the parsed operator via a shared pointer
*/
-boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> > Parser::parseStringOperator(
+boost::shared_ptr<ANTLRParserResult<StrSet> > Parser::parseStringOperator(
const std::string& str) const
{
std::stringstream ss (std::stringstream::in | std::stringstream::out);
@@ -41,7 +41,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> > Parser::parseStringOperator(
* @arg istr input stream with the operator
* @return the parsed operator via a shared pointer
*/
-boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> > Parser::parseStringOperator(
+boost::shared_ptr<ANTLRParserResult<StrSet> > Parser::parseStringOperator(
std::istream& istr) const
{
ANTLRLexer lexer(istr);
@@ -57,7 +57,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> > Parser::parseStringOperator(
* @arg str operator string
* @return the parsed operator via a shared pointer
*/
-boost::shared_ptr<ANTLRParserResult<Wccl::Bool> > Parser::parsePredicate(
+boost::shared_ptr<ANTLRParserResult<Bool> > Parser::parsePredicate(
const std::string& str) const
{
std::stringstream ss (std::stringstream::in | std::stringstream::out);
@@ -71,7 +71,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::Bool> > Parser::parsePredicate(
* @arg istr input stream with writed predicate
* @return the parsed operator via a shared pointer
*/
-boost::shared_ptr<ANTLRParserResult<Wccl::Bool> > Parser::parsePredicate(
+boost::shared_ptr<ANTLRParserResult<Bool> > Parser::parsePredicate(
std::istream& istr) const
{
ANTLRLexer lexer(istr);
@@ -87,7 +87,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::Bool> > Parser::parsePredicate(
* @arg str operator string
* @return the parsed operator via a shared pointer
*/
-boost::shared_ptr<ANTLRParserResult<Wccl::TSet> > Parser::parseSymSetOperator(
+boost::shared_ptr<ANTLRParserResult<TSet> > Parser::parseSymSetOperator(
const std::string& str) const
{
std::stringstream ss (std::stringstream::in | std::stringstream::out);
@@ -102,7 +102,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::TSet> > Parser::parseSymSetOperator(
* @arg istr input stream with the operator
* @return the parsed operator via a shared pointer
*/
-boost::shared_ptr<ANTLRParserResult<Wccl::TSet> > Parser::parseSymSetOperator(
+boost::shared_ptr<ANTLRParserResult<TSet> > Parser::parseSymSetOperator(
std::istream& istr) const
{
ANTLRLexer lexer(istr);
@@ -117,7 +117,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::TSet> > Parser::parseSymSetOperator(
* @arg str operator string
* @return the parsed operator via a shared pointer
*/
-boost::shared_ptr<ANTLRParserResult<Wccl::Position> > Parser::parsePositionOperator(
+boost::shared_ptr<ANTLRParserResult<Position> > Parser::parsePositionOperator(
const std::string& str) const
{
std::stringstream ss (std::stringstream::in | std::stringstream::out);
@@ -132,7 +132,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::Position> > Parser::parsePositionOpera
* @arg istr input stream with the operator
* @return the parsed operator via a shared pointer
*/
-boost::shared_ptr<ANTLRParserResult<Wccl::Position> > Parser::parsePositionOperator(
+boost::shared_ptr<ANTLRParserResult<Position> > Parser::parsePositionOperator(
std::istream& istr) const
{
ANTLRLexer lexer(istr);
diff --git a/libwccl/parser/Parser.h b/libwccl/parser/Parser.h
index 6e1ae03..988ad73 100644
--- a/libwccl/parser/Parser.h
+++ b/libwccl/parser/Parser.h
@@ -28,30 +28,30 @@ public:
// ---------------------------------------------------------------------------
// methods for parsing string operators
- boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> >
+ boost::shared_ptr<ANTLRParserResult<StrSet> >
parseStringOperator(const std::string&) const;
- boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> >
+ boost::shared_ptr<ANTLRParserResult<StrSet> >
parseStringOperator(std::istream&) const;
// ---------------------------------------------------------------------------
// methods for parsing bool operators
- boost::shared_ptr<ANTLRParserResult<Wccl::Bool> >
+ boost::shared_ptr<ANTLRParserResult<Bool> >
parsePredicate(const std::string&) const;
- boost::shared_ptr<ANTLRParserResult<Wccl::Bool> >
+ boost::shared_ptr<ANTLRParserResult<Bool> >
parsePredicate(std::istream&) const;
// ---------------------------------------------------------------------------
// methods for parsing bool operators
- boost::shared_ptr<ANTLRParserResult<Wccl::TSet> >
+ boost::shared_ptr<ANTLRParserResult<TSet> >
parseSymSetOperator(const std::string&) const;
- boost::shared_ptr<ANTLRParserResult<Wccl::TSet> >
+ boost::shared_ptr<ANTLRParserResult<TSet> >
parseSymSetOperator(std::istream&) const;
// ---------------------------------------------------------------------------
// methods for parsing position operators
- boost::shared_ptr<ANTLRParserResult<Wccl::Position> >
+ boost::shared_ptr<ANTLRParserResult<Position> >
parsePositionOperator(const std::string&) const;
- boost::shared_ptr<ANTLRParserResult<Wccl::Position> >
+ boost::shared_ptr<ANTLRParserResult<Position> >
parsePositionOperator(std::istream&) const;
// ---------------------------------------------------------------------------
--
GitLab