--- a/CMakeLists.txt Fri Dec 07 12:53:44 2018 +0100
+++ b/CMakeLists.txt Mon Dec 10 00:06:54 2018 +0100
@@ -14,6 +14,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-project (relpipe-tr-validator.cpp)
+project (relpipe-tr-grep.cpp)
cmake_minimum_required(VERSION 2.8)
add_subdirectory (src)
--- a/nbproject/configurations.xml Fri Dec 07 12:53:44 2018 +0100
+++ b/nbproject/configurations.xml Mon Dec 10 00:06:54 2018 +0100
@@ -42,7 +42,7 @@
<logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
<df root="." name="0">
<df name="src">
- <in>relpipe-tr-validator.cpp</in>
+ <in>relpipe-tr-grep.cpp</in>
</df>
</df>
<logicalFolder name="ExternalFiles"
@@ -76,7 +76,7 @@
<buildCommandWorkingDir>build/Debug</buildCommandWorkingDir>
<buildCommand>${MAKE} -f Makefile</buildCommand>
<cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
- <executablePath>build/Debug/src/relpipe-tr-validator</executablePath>
+ <executablePath>build/Debug/src/relpipe-tr-grep</executablePath>
<ccTool>
<incDir>
<pElem>../relpipe-lib-reader.cpp/include</pElem>
@@ -92,7 +92,7 @@
<preBuildFirst>true</preBuildFirst>
</preBuild>
</makefileType>
- <item path="src/relpipe-tr-validator.cpp" ex="false" tool="1" flavor2="0">
+ <item path="src/relpipe-tr-grep.cpp" ex="false" tool="1" flavor2="0">
<ccTool flags="0">
</ccTool>
</item>
@@ -132,7 +132,7 @@
<preBuildFirst>true</preBuildFirst>
</preBuild>
</makefileType>
- <item path="src/relpipe-tr-validator.cpp" ex="false" tool="1" flavor2="0">
+ <item path="src/relpipe-tr-grep.cpp" ex="false" tool="1" flavor2="0">
<ccTool flags="0">
</ccTool>
</item>
--- a/nbproject/project.xml Fri Dec 07 12:53:44 2018 +0100
+++ b/nbproject/project.xml Mon Dec 10 00:06:54 2018 +0100
@@ -42,7 +42,7 @@
<type>org.netbeans.modules.cnd.makeproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/make-project/1">
- <name>relpipe-tr-validator.cpp</name>
+ <name>relpipe-tr-grep.cpp</name>
<c-extensions/>
<cpp-extensions>cpp</cpp-extensions>
<header-extensions>h</header-extensions>
--- a/src/CMakeLists.txt Fri Dec 07 12:53:44 2018 +0100
+++ b/src/CMakeLists.txt Mon Dec 10 00:06:54 2018 +0100
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-set(EXECUTABLE_FILE "relpipe-tr-validator")
+set(EXECUTABLE_FILE "relpipe-tr-grep")
# Relpipe libraries:
INCLUDE(FindPkgConfig)
@@ -31,7 +31,7 @@
add_executable(
${EXECUTABLE_FILE}
PassthroughHandler.h
- relpipe-tr-validator.cpp
+ relpipe-tr-grep.cpp
)
# Link libraries:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/relpipe-tr-grep.cpp Mon Dec 10 00:06:54 2018 +0100
@@ -0,0 +1,67 @@
+/**
+ * Relational pipes
+ * Copyright © 2018 František Kučera (Frantovo.cz, GlobalCode.info)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <cstdio>
+#include <cstdlib>
+#include <memory>
+
+#include <relpipe/cli/CLI.h>
+#include <relpipe/cli/RelpipeCLIException.h>
+
+#include <relpipe/reader/Factory.h>
+#include <relpipe/reader/RelationalReader.h>
+#include <relpipe/reader/RelpipeReaderException.h>
+
+#include <relpipe/writer/RelationalWriter.h>
+#include <relpipe/writer/RelpipeWriterException.h>
+#include <relpipe/writer/Factory.h>
+#include <relpipe/writer/TypeId.h>
+
+#include "PassthroughHandler.h"
+
+using namespace relpipe::cli;
+using namespace relpipe::reader;
+using namespace relpipe::tr::validator;
+
+int main(int argc, char**argv) {
+ setlocale(LC_ALL, "");
+ CLI::untieStdIO();
+ CLI cli(argc, argv);
+
+ int resultCode = CLI::EXIT_CODE_UNEXPECTED_ERROR;
+
+ try {
+ std::shared_ptr<RelationalReader> reader(Factory::create(std::cin));
+ PassthroughHandler handler(std::cout);
+ reader->addHandler(&handler);
+ reader->process();
+
+ resultCode = CLI::EXIT_CODE_SUCCESS;
+
+ } catch (RelpipeCLIException e) {
+ fwprintf(stderr, L"Caught CLI exception: %ls\n", e.getMessge().c_str());
+ fwprintf(stderr, L"Debug: Input stream: eof=%ls, lastRead=%d\n", (cin.eof() ? L"true" : L"false"), cin.gcount());
+ resultCode = e.getExitCode();
+ } catch (RelpipeReaderException e) {
+ fwprintf(stderr, L"Caught Reader exception: %ls\n", e.getMessge().c_str());
+ fwprintf(stderr, L"Debug: Input stream: eof=%ls, lastRead=%d\n", (cin.eof() ? L"true" : L"false"), cin.gcount());
+ resultCode = CLI::EXIT_CODE_DATA_ERROR;
+ }
+
+ return resultCode;
+}
--- a/src/relpipe-tr-validator.cpp Fri Dec 07 12:53:44 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/**
- * Relational pipes
- * Copyright © 2018 František Kučera (Frantovo.cz, GlobalCode.info)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
-
-#include <relpipe/cli/CLI.h>
-#include <relpipe/cli/RelpipeCLIException.h>
-
-#include <relpipe/reader/Factory.h>
-#include <relpipe/reader/RelationalReader.h>
-#include <relpipe/reader/RelpipeReaderException.h>
-
-#include <relpipe/writer/RelationalWriter.h>
-#include <relpipe/writer/RelpipeWriterException.h>
-#include <relpipe/writer/Factory.h>
-#include <relpipe/writer/TypeId.h>
-
-#include "PassthroughHandler.h"
-
-using namespace relpipe::cli;
-using namespace relpipe::reader;
-using namespace relpipe::tr::validator;
-
-int main(int argc, char**argv) {
- setlocale(LC_ALL, "");
- CLI::untieStdIO();
- CLI cli(argc, argv);
-
- int resultCode = CLI::EXIT_CODE_UNEXPECTED_ERROR;
-
- try {
- std::shared_ptr<RelationalReader> reader(Factory::create(std::cin));
- PassthroughHandler handler(std::cout);
- reader->addHandler(&handler);
- reader->process();
-
- resultCode = CLI::EXIT_CODE_SUCCESS;
-
- } catch (RelpipeCLIException e) {
- fwprintf(stderr, L"Caught CLI exception: %ls\n", e.getMessge().c_str());
- fwprintf(stderr, L"Debug: Input stream: eof=%ls, lastRead=%d\n", (cin.eof() ? L"true" : L"false"), cin.gcount());
- resultCode = e.getExitCode();
- } catch (RelpipeReaderException e) {
- fwprintf(stderr, L"Caught Reader exception: %ls\n", e.getMessge().c_str());
- fwprintf(stderr, L"Debug: Input stream: eof=%ls, lastRead=%d\n", (cin.eof() ? L"true" : L"false"), cin.gcount());
- resultCode = CLI::EXIT_CODE_DATA_ERROR;
- }
-
- return resultCode;
-}