From 1751b7baad5a96a260d1b6d047f8aea2c7a9b4c5 Mon Sep 17 00:00:00 2001 From: Zane Dunnings <zldunn@umich.edu> Date: Sat, 7 Apr 2018 17:11:45 -0400 Subject: [PATCH] HOTFIX for the extra space bug --- CMakeLists.txt | 4 ++-- query/queryLanguage/QueryParser.cpp | 6 +++++- util/DataStructureLib/tuple.cpp | 5 +++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ba63b3..4eaabcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -299,8 +299,8 @@ add_executable(testISRQueryTuple add_executable(query-queryLanguage-tests query/queryLanguage/QueryParser.cpp - - + query/queryLanguage/QueryParser.h + util/DataStructureLib/tuple.cpp ) diff --git a/query/queryLanguage/QueryParser.cpp b/query/queryLanguage/QueryParser.cpp index a89c5fc..525b63f 100644 --- a/query/queryLanguage/QueryParser.cpp +++ b/query/queryLanguage/QueryParser.cpp @@ -4,7 +4,7 @@ #include "QueryParser.h" #include<unordered_set> -#include "../../util/stringProcessing.h" +//#include "../../util/stringProcessing.h" #include<iostream> /*** * QUERY PARSER CLASS @@ -47,6 +47,10 @@ Token QueryParser::FindNextToken( int &index ){ } else if ( stopChars.count( query[ start + size ] ) > 0) { + while( query[start] == ' ') + { + ++start; + } index = start + size; string text = query.substr ( start, size ); cout << "horse" << text; diff --git a/util/DataStructureLib/tuple.cpp b/util/DataStructureLib/tuple.cpp index 4b95ab4..bd1336f 100644 --- a/util/DataStructureLib/tuple.cpp +++ b/util/DataStructureLib/tuple.cpp @@ -76,4 +76,9 @@ public: } } + int getNumberOfChildren() + { + return Next.size(); + } + }; \ No newline at end of file -- GitLab