From 7c75303077d456ae19b56206fcaf3319c99c8d71 Mon Sep 17 00:00:00 2001 From: bjh7242 Date: Thu, 17 Mar 2016 14:27:11 -0400 Subject: [PATCH 1/2] added remove_comments_char to address issue #971 --- .../transformations/remove_comments_char.cc | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/actions/transformations/remove_comments_char.cc b/src/actions/transformations/remove_comments_char.cc index c2f6c14662..80088a17d9 100644 --- a/src/actions/transformations/remove_comments_char.cc +++ b/src/actions/transformations/remove_comments_char.cc @@ -37,16 +37,29 @@ RemoveCommentsChar::RemoveCommentsChar(std::string action) std::string RemoveCommentsChar::evaluate(std::string value, Transaction *transaction) { - /** - * @todo Implement the transformation RemoveCommentsChar - */ - if (transaction) { -#ifndef NO_LOGS - transaction->debug(4, "Transformation RemoveCommentsChar " \ - "is not implemented yet."); -#endif + int64_t i; + + i = 0; + while (i < value.size()) { + if (value.at(i) == '/' && (i+1 < value.size()) && value.at(i+1) == '*') { + value.erase(i, 2); + } else if (value.at(i) == '*' && (i+1 < value.size()) && value.at(i+1) == '/') { + value.erase(i, 2); + } else if (value.at(i) == '<' && (i+1 < value.size()) && value.at(i+1) == '!' && + (i+2 < value.size()) && value.at(i+2) == '-' && (i+3 < value.size()) && + value.at(i+3) == '-') { + value.erase(i, 4); + } else if (value.at(i) == '-' && (i+1 < value.size()) && value.at(i+1) == '-' && + (i+2 < value.size()) && value.at(i+2) == '>') { + value.erase(i, 3); + } else if (value.at(i) == '-' && (i+1 < value.size()) && value.at(i+1) == '-') { + value.erase(i, 2); + } else if (value.at(i) == '#') { + value.erase(i, 1); + } else { + i++; + } } - return value; } } // namespace transformations From e41cd9ec91997bf9fb3ce101d368623eb79436b1 Mon Sep 17 00:00:00 2001 From: bjh7242 Date: Thu, 31 Mar 2016 21:24:54 -0400 Subject: [PATCH 2/2] implemented remove_comments_char to address #971 --- src/actions/transformations/remove_comments_char.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/actions/transformations/remove_comments_char.cc b/src/actions/transformations/remove_comments_char.cc index 80088a17d9..6bca6cd08d 100644 --- a/src/actions/transformations/remove_comments_char.cc +++ b/src/actions/transformations/remove_comments_char.cc @@ -60,6 +60,7 @@ std::string RemoveCommentsChar::evaluate(std::string value, i++; } } + return value; } } // namespace transformations