From cee27d09d9acefdb1b470ebaa0ddb7e6ebcf6095 Mon Sep 17 00:00:00 2001
From: Adam Wardynski <award@.(win7-laptop)>
Date: Sat, 4 Dec 2010 14:52:48 +0100
Subject: [PATCH] Remove unused code in formatters.
---
libwccl/ops/formatters.cpp | 21 ---------
libwccl/ops/formatters.h | 96 --------------------------------------
2 files changed, 117 deletions(-)
diff --git a/libwccl/ops/formatters.cpp b/libwccl/ops/formatters.cpp
index 122bc8e..556e8ab 100644
--- a/libwccl/ops/formatters.cpp
+++ b/libwccl/ops/formatters.cpp
@@ -5,17 +5,6 @@ namespace Wccl {
// ------ UnaryFunctionFormatter -----
-std::string UnaryFunctionFormatter::to_raw_string(
- const FunctionBase& f,
- const std::string& arg_str,
- const char* open_bracket,
- const char* close_bracket)
-{
- std::stringstream ss;
- ss << f.raw_name() << open_bracket << arg_str << close_bracket;
- return ss.str();
-}
-
std::string UnaryFunctionFormatter::to_string(
const Corpus2::Tagset& tagset,
const FunctionBase& f,
@@ -41,14 +30,4 @@ std::string BinaryFunctionFormatter::to_string(
return ss.str();
}
-std::string BinaryFunctionFormatter::to_raw_string(
- const FunctionBase& f,
- const std::string& arg1_str,
- const std::string& arg2_str)
-{
- std::stringstream ss;
- ss << f.raw_name() << "(" << arg1_str << ", " << arg2_str << ")";
- return ss.str();
-}
-
} /* end ns Wccl */
diff --git a/libwccl/ops/formatters.h b/libwccl/ops/formatters.h
index 60270a6..5c2bd3b 100644
--- a/libwccl/ops/formatters.h
+++ b/libwccl/ops/formatters.h
@@ -44,40 +44,6 @@ struct UnaryFunctionFormatter
arg_expr.to_string(tagset),
open_bracket, close_bracket);
}
- /**
- * @returns Raw string representation of an unary function.
- * Does not require tagset, may contain internal info
- * and/or be incomplete. It is in form of
- * raw_operator_name(arg_str)
- * although the open and close brackets can be changed
- * (some operators use [])
- */
- static std::string to_raw_string(
- const FunctionBase& f,
- const std::string& arg_str,
- const char* open_bracket = "(",
- const char* close_bracket = ")");
-
- /**
- * @returns Raw string representation of an unary function.
- * Does not require tagset, may contain internal info
- * and/or be incomplete. It is in form of
- * raw_operator_name(raw_argument_expression_string)
- * although the open and close brackets can be changed
- * (some operators use [])
- */
- static std::string to_raw_string(
- const FunctionBase& f,
- const FunctionBase& arg_expr,
- const char* open_bracket = "(",
- const char* close_bracket = ")")
- {
- return to_raw_string(
- f,
- arg_expr.to_raw_string(),
- open_bracket,
- close_bracket);
- }
};
/**
@@ -148,68 +114,6 @@ struct BinaryFunctionFormatter
arg1_expr.to_string(tagset),
arg2_expr.to_string(tagset));
}
-
- /**
- * @returns Raw string representation of a binary function.
- * Does not require tagset, may contain internal info
- * and/or be incomplete. It is in form of
- * raw_op_name(arg1_str, arg2_str)
- */
- static std::string to_raw_string(
- const FunctionBase& f,
- const std::string& arg1_str,
- const std::string& arg2_str);
-
- /**
- * @returns Raw string representation of a binary function.
- * Does not require tagset, may contain internal info
- * and/or be incomplete. It is in form of
- * raw_op_name(arg1_str, raw_arg2_expr_string)
- */
- static std::string to_raw_string(
- const FunctionBase& f,
- const std::string& arg1_str,
- const FunctionBase& arg2_expr)
- {
- return to_raw_string(
- f,
- arg1_str,
- arg2_expr.to_raw_string());
- }
-
- /**
- * @returns Raw string representation of a binary function.
- * Does not require tagset, may contain internal info
- * and/or be incomplete. It is in form of
- * raw_op_name(raw_arg1_expr_string, arg1_str)
- */
- static std::string to_raw_string(
- const FunctionBase& f,
- const FunctionBase& arg1_expr,
- const std::string& arg2_str)
- {
- return to_raw_string(
- f,
- arg1_expr.to_raw_string(),
- arg2_str);
- }
-
- /**
- * @returns Raw string representation of a binary function.
- * Does not require tagset, may contain internal info
- * and/or be incomplete. It is in form of
- * raw_op_name(raw_arg1_expr_string, raw_arg2_expr_string)
- */
- static std::string to_raw_string(
- const FunctionBase& f,
- const FunctionBase& arg1_expr,
- const FunctionBase& arg2_expr)
- {
- return to_raw_string(
- f,
- arg1_expr.to_raw_string(),
- arg2_expr.to_raw_string());
- }
};
} /* end ns Wccl */
--
GitLab