Merge pull request #2 from oatpp/clean_section

Clean section

Author: lganzzzo

src/oatpp-postgresql/ql_template/Parser.cpp

@@ -24,10 +24,86 @@
 
 #include "Parser.hpp"
 
+#include "oatpp/core/data/stream/BufferStream.hpp"
 #include "oatpp/core/parser/ParsingError.hpp"
 
 namespace oatpp { namespace postgresql { namespace ql_template {
 
+oatpp::String Parser::preprocess(const oatpp::String& text, std::vector<CleanSection>& cleanSections) {
+
+  data::stream::BufferOutputStream ss;
+  parser::Caret caret(text);
+
+  bool writeChar = true;
+
+  v_buff_size sectionStart = -1;
+
+  while(caret.canContinue()) {
+
+    v_char8 c = *caret.getCurrData();
+    writeChar = true;
+
+    switch(c) {
+
+      case '\'': {
+        auto l = caret.putLabel();
+        skipStringInQuotes(caret);
+        ss.writeSimple(l.getData(), l.getSize());
+        writeChar = false;
+        break;
+      }
+      case '$': {
+        auto l = caret.putLabel();
+        skipStringInDollars(caret);
+        ss.writeSimple(l.getData(), l.getSize());
+        writeChar = false;
+        break;
+      }
+
+      case '<': {
+        if(sectionStart == -1) {
+          if(caret.isAtText((p_char8) "<!!", 3, true)) {
+            sectionStart = ss.getCurrentPosition();
+            writeChar = false;
+          } else {
+            caret.inc();
+          }
+        } else {
+          caret.inc();
+        }
+        break;
+      }
+
+      case '!': {
+        if(sectionStart != -1) {
+          if(caret.isAtText((p_char8) "!!>", 3, true)) {
+            cleanSections.emplace_back(CleanSection(sectionStart, ss.getCurrentPosition() - sectionStart));
+            sectionStart = -1;
+            writeChar = false;
+          } else {
+            caret.inc();
+          }
+        } else {
+          caret.inc();
+        }
+        break;
+      }
+
+      default:
+        caret.inc();
+
+    }
+
+    if(writeChar) {
+      ss.writeCharSimple(c);
+    }
+
+  }
+
+  return ss.toString();
+
+}
+
 data::share::StringTemplate::Variable Parser::parseIdentifier(parser::Caret& caret) {
   data::share::StringTemplate::Variable result;
   result.posStart = caret.getPosition();
@@ -99,11 +175,23 @@ void Parser::skipStringInDollars(parser::Caret& caret) {
 
 data::share::StringTemplate Parser::parseTemplate(const oatpp::String& text) {
 
+  std::vector<CleanSection> cleanSections;
+  auto processedText = preprocess(text, cleanSections);
+
+  parser::Caret caret(processedText);
+
   std::vector<data::share::StringTemplate::Variable> variables;
 
-  parser::Caret caret(text);
+  v_buff_size currSection = 0;
+
   while(caret.canContinue()) {
 
+    if(currSection < cleanSections.size() && cleanSections[currSection].position == caret.getPosition()) {
+      caret.inc(cleanSections[currSection].size);
+      currSection ++;
+      continue;
+    }
+
     v_char8 c = *caret.getCurrData();
 
     switch(c) {
@@ -130,7 +218,7 @@ data::share::StringTemplate Parser::parseTemplate(const oatpp::String& text) {
     throw oatpp::parser::ParsingError(caret.getErrorMessage(), caret.getErrorCode(), caret.getPosition());
   }
 
-  return data::share::StringTemplate(text, std::move(variables));
+  return data::share::StringTemplate(processedText, std::move(variables));
 
 }
 

src/oatpp-postgresql/ql_template/Parser.hpp

@@ -65,13 +65,31 @@ class Parser {
 
   };
 
+public:
+
+  struct CleanSection {
+    CleanSection(v_buff_size p, v_buff_size s)
+      : position(p)
+      , size(s)
+    {}
+    v_buff_size position;
+    v_buff_size size;
+  };
 
 private:
   static data::share::StringTemplate::Variable parseIdentifier(parser::Caret& caret);
   static void skipStringInQuotes(parser::Caret& caret);
   static void skipStringInDollars(parser::Caret& caret);
 public:
 
+  /**
+   * Preprocess text.
+   * @param text
+   * @param cleanSections - out vector of clean sections.
+   * @return
+   */
+  static oatpp::String preprocess(const oatpp::String& text, std::vector<CleanSection>& cleanSections);
+
   /**
    * Parse query template.
    * @param text

test/CMakeLists.txt

@@ -12,6 +12,8 @@ add_definitions (
 )
 
 add_executable(module-tests
+        oatpp-postgresql/ql_template/ParserTest.cpp
+        oatpp-postgresql/ql_template/ParserTest.hpp
         oatpp-postgresql/types/FloatTest.cpp
         oatpp-postgresql/types/FloatTest.hpp
         oatpp-postgresql/types/InterpretationTest.cpp