Skip to content
Snippets Groups Projects
Commit 1ffe1b31 authored by vcday's avatar vcday
Browse files

fix compile errors

parent 2f0739e4
Branches parser-2
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 427 additions and 104 deletions
.gitignore
+ 1
− 1
View file @ 1ffe1b31
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
openssl-1.1.0g/* openssl-1.1.0g/*
.vagrant/* .vagrant/*
cmake* cmake*
CMake* CMakeLists.txt
Vagrantfile Vagrantfile
cmake-build-debug* cmake-build-debug*
CMakeCache.txt CMakeCache.txt
......
CMakeLists.txt
+ 27
− 3
View file @ 1ffe1b31
...@@ -5,6 +5,30 @@ set(CMAKE_CXX_STANDARD 11) ...@@ -5,6 +5,30 @@ set(CMAKE_CXX_STANDARD 11)
add_executable(eecs398_search add_executable(eecs398_search
main.cpp main.cpp
ProducerConsumerQueue.cpp shared/ProducerConsumerQueue.cpp
ProducerConsumerQueue.h shared/ProducerConsumerQueue.h
ProducerConsumerQueue_test.cpp Parser.cpp) shared/ProducerConsumerQueue_test.cpp parser/Parser.h
parser/Parser.h
util/Tokenizer.h
util/stringProcessing.h
util/Stemmer.h)
add_executable(StringProcessingTest
util/stringProcessing.h
util/Stemmer.h
util/tests/stringProcessingTest.cpp)
add_executable(TokenizerTest
util/Tokenizer.h
util/tests/tokenizerTest.cpp)
add_executable(StemmerTest
util/Stemmer.h
util/tests/stemmerTest.cpp)
add_executable(ParserEndToEndTest
parser/Parser.h
shared/Document.h
shared/url.h
parser/tests/parserTest.cpp)
cmake-build-debug/CMakeFiles/Makefile.cmake
+ 4
− 0
View file @ 1ffe1b31
...@@ -49,5 +49,9 @@ set(CMAKE_MAKEFILE_PRODUCTS ...@@ -49,5 +49,9 @@ set(CMAKE_MAKEFILE_PRODUCTS
# Dependency information for all targets: # Dependency information for all targets:
set(CMAKE_DEPEND_INFO_FILES set(CMAKE_DEPEND_INFO_FILES
"CMakeFiles/StemmerTest.dir/DependInfo.cmake"
"CMakeFiles/ParserEndToEndTest.dir/DependInfo.cmake"
"CMakeFiles/TokenizerTest.dir/DependInfo.cmake"
"CMakeFiles/StringProcessingTest.dir/DependInfo.cmake"
"CMakeFiles/eecs398_search.dir/DependInfo.cmake" "CMakeFiles/eecs398_search.dir/DependInfo.cmake"
) )
cmake-build-debug/CMakeFiles/Makefile2
+ 150
− 2
View file @ 1ffe1b31
...@@ -59,6 +59,154 @@ CMAKE_SOURCE_DIR = /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-s ...@@ -59,6 +59,154 @@ CMAKE_SOURCE_DIR = /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-s
# The top-level build directory on which CMake was run. # The top-level build directory on which CMake was run.
CMAKE_BINARY_DIR = /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug CMAKE_BINARY_DIR = /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug
#=============================================================================
# Target rules for target CMakeFiles/StemmerTest.dir
# All Build rule for target.
CMakeFiles/StemmerTest.dir/all:
$(MAKE) -f CMakeFiles/StemmerTest.dir/build.make CMakeFiles/StemmerTest.dir/depend
$(MAKE) -f CMakeFiles/StemmerTest.dir/build.make CMakeFiles/StemmerTest.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles --progress-num=3,4 "Built target StemmerTest"
.PHONY : CMakeFiles/StemmerTest.dir/all
# Include target in all.
all: CMakeFiles/StemmerTest.dir/all
.PHONY : all
# Build rule for subdir invocation for target.
CMakeFiles/StemmerTest.dir/rule: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles 2
$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/StemmerTest.dir/all
$(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles 0
.PHONY : CMakeFiles/StemmerTest.dir/rule
# Convenience name for target.
StemmerTest: CMakeFiles/StemmerTest.dir/rule
.PHONY : StemmerTest
# clean rule for target.
CMakeFiles/StemmerTest.dir/clean:
$(MAKE) -f CMakeFiles/StemmerTest.dir/build.make CMakeFiles/StemmerTest.dir/clean
.PHONY : CMakeFiles/StemmerTest.dir/clean
# clean rule for target.
clean: CMakeFiles/StemmerTest.dir/clean
.PHONY : clean
#=============================================================================
# Target rules for target CMakeFiles/ParserEndToEndTest.dir
# All Build rule for target.
CMakeFiles/ParserEndToEndTest.dir/all:
$(MAKE) -f CMakeFiles/ParserEndToEndTest.dir/build.make CMakeFiles/ParserEndToEndTest.dir/depend
$(MAKE) -f CMakeFiles/ParserEndToEndTest.dir/build.make CMakeFiles/ParserEndToEndTest.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles --progress-num=1,2 "Built target ParserEndToEndTest"
.PHONY : CMakeFiles/ParserEndToEndTest.dir/all
# Include target in all.
all: CMakeFiles/ParserEndToEndTest.dir/all
.PHONY : all
# Build rule for subdir invocation for target.
CMakeFiles/ParserEndToEndTest.dir/rule: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles 2
$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/ParserEndToEndTest.dir/all
$(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles 0
.PHONY : CMakeFiles/ParserEndToEndTest.dir/rule
# Convenience name for target.
ParserEndToEndTest: CMakeFiles/ParserEndToEndTest.dir/rule
.PHONY : ParserEndToEndTest
# clean rule for target.
CMakeFiles/ParserEndToEndTest.dir/clean:
$(MAKE) -f CMakeFiles/ParserEndToEndTest.dir/build.make CMakeFiles/ParserEndToEndTest.dir/clean
.PHONY : CMakeFiles/ParserEndToEndTest.dir/clean
# clean rule for target.
clean: CMakeFiles/ParserEndToEndTest.dir/clean
.PHONY : clean
#=============================================================================
# Target rules for target CMakeFiles/TokenizerTest.dir
# All Build rule for target.
CMakeFiles/TokenizerTest.dir/all:
$(MAKE) -f CMakeFiles/TokenizerTest.dir/build.make CMakeFiles/TokenizerTest.dir/depend
$(MAKE) -f CMakeFiles/TokenizerTest.dir/build.make CMakeFiles/TokenizerTest.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles --progress-num=7,8 "Built target TokenizerTest"
.PHONY : CMakeFiles/TokenizerTest.dir/all
# Include target in all.
all: CMakeFiles/TokenizerTest.dir/all
.PHONY : all
# Build rule for subdir invocation for target.
CMakeFiles/TokenizerTest.dir/rule: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles 2
$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/TokenizerTest.dir/all
$(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles 0
.PHONY : CMakeFiles/TokenizerTest.dir/rule
# Convenience name for target.
TokenizerTest: CMakeFiles/TokenizerTest.dir/rule
.PHONY : TokenizerTest
# clean rule for target.
CMakeFiles/TokenizerTest.dir/clean:
$(MAKE) -f CMakeFiles/TokenizerTest.dir/build.make CMakeFiles/TokenizerTest.dir/clean
.PHONY : CMakeFiles/TokenizerTest.dir/clean
# clean rule for target.
clean: CMakeFiles/TokenizerTest.dir/clean
.PHONY : clean
#=============================================================================
# Target rules for target CMakeFiles/StringProcessingTest.dir
# All Build rule for target.
CMakeFiles/StringProcessingTest.dir/all:
$(MAKE) -f CMakeFiles/StringProcessingTest.dir/build.make CMakeFiles/StringProcessingTest.dir/depend
$(MAKE) -f CMakeFiles/StringProcessingTest.dir/build.make CMakeFiles/StringProcessingTest.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles --progress-num=5,6 "Built target StringProcessingTest"
.PHONY : CMakeFiles/StringProcessingTest.dir/all
# Include target in all.
all: CMakeFiles/StringProcessingTest.dir/all
.PHONY : all
# Build rule for subdir invocation for target.
CMakeFiles/StringProcessingTest.dir/rule: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles 2
$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/StringProcessingTest.dir/all
$(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles 0
.PHONY : CMakeFiles/StringProcessingTest.dir/rule
# Convenience name for target.
StringProcessingTest: CMakeFiles/StringProcessingTest.dir/rule
.PHONY : StringProcessingTest
# clean rule for target.
CMakeFiles/StringProcessingTest.dir/clean:
$(MAKE) -f CMakeFiles/StringProcessingTest.dir/build.make CMakeFiles/StringProcessingTest.dir/clean
.PHONY : CMakeFiles/StringProcessingTest.dir/clean
# clean rule for target.
clean: CMakeFiles/StringProcessingTest.dir/clean
.PHONY : clean
#============================================================================= #=============================================================================
# Target rules for target CMakeFiles/eecs398_search.dir # Target rules for target CMakeFiles/eecs398_search.dir
...@@ -66,7 +214,7 @@ CMAKE_BINARY_DIR = /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-s ...@@ -66,7 +214,7 @@ CMAKE_BINARY_DIR = /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-s
CMakeFiles/eecs398_search.dir/all: CMakeFiles/eecs398_search.dir/all:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/depend $(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/depend
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/build $(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles --progress-num=1,2,3,4,5 "Built target eecs398_search" @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles --progress-num=9,10,11,12 "Built target eecs398_search"
.PHONY : CMakeFiles/eecs398_search.dir/all .PHONY : CMakeFiles/eecs398_search.dir/all
# Include target in all. # Include target in all.
...@@ -76,7 +224,7 @@ all: CMakeFiles/eecs398_search.dir/all ...@@ -76,7 +224,7 @@ all: CMakeFiles/eecs398_search.dir/all
# Build rule for subdir invocation for target. # Build rule for subdir invocation for target.
CMakeFiles/eecs398_search.dir/rule: cmake_check_build_system CMakeFiles/eecs398_search.dir/rule: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles 5 $(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles 4
$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/eecs398_search.dir/all $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/eecs398_search.dir/all
$(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles 0 $(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles 0
.PHONY : CMakeFiles/eecs398_search.dir/rule .PHONY : CMakeFiles/eecs398_search.dir/rule
......
cmake-build-debug/CMakeFiles/TargetDirectories.txt
+ 5
− 1
View file @ 1ffe1b31
/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles/rebuild_cache.dir
/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles/edit_cache.dir /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles/edit_cache.dir
/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles/rebuild_cache.dir
/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles/StemmerTest.dir
/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles/ParserEndToEndTest.dir
/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles/TokenizerTest.dir
/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles/StringProcessingTest.dir
/Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles/eecs398_search.dir /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles/eecs398_search.dir
cmake-build-debug/CMakeFiles/eecs398_search.dir/cmake_clean.cmake
+ 2
− 3
View file @ 1ffe1b31
file(REMOVE_RECURSE file(REMOVE_RECURSE
"CMakeFiles/eecs398_search.dir/main.cpp.o" "CMakeFiles/eecs398_search.dir/main.cpp.o"
"CMakeFiles/eecs398_search.dir/ProducerConsumerQueue.cpp.o" "CMakeFiles/eecs398_search.dir/shared/ProducerConsumerQueue.cpp.o"
"CMakeFiles/eecs398_search.dir/ProducerConsumerQueue_test.cpp.o" "CMakeFiles/eecs398_search.dir/shared/ProducerConsumerQueue_test.cpp.o"
"CMakeFiles/eecs398_search.dir/Parser.cpp.o"
"eecs398_search.pdb" "eecs398_search.pdb"
"eecs398_search" "eecs398_search"
) )
......
cmake-build-debug/CMakeFiles/eecs398_search.dir/link.txt
+ 1
− 1
View file @ 1ffe1b31
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ -g -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -Wl,-search_paths_first -Wl,-headerpad_max_install_names CMakeFiles/eecs398_search.dir/main.cpp.o CMakeFiles/eecs398_search.dir/ProducerConsumerQueue.cpp.o CMakeFiles/eecs398_search.dir/ProducerConsumerQueue_test.cpp.o CMakeFiles/eecs398_search.dir/Parser.cpp.o -o eecs398_search /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ -g -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -Wl,-search_paths_first -Wl,-headerpad_max_install_names CMakeFiles/eecs398_search.dir/main.cpp.o CMakeFiles/eecs398_search.dir/shared/ProducerConsumerQueue.cpp.o CMakeFiles/eecs398_search.dir/shared/ProducerConsumerQueue_test.cpp.o -o eecs398_search
cmake-build-debug/CMakeFiles/eecs398_search.dir/progress.make
+ 4
− 5
View file @ 1ffe1b31
CMAKE_PROGRESS_1 = 1 CMAKE_PROGRESS_1 = 9
CMAKE_PROGRESS_2 = 2 CMAKE_PROGRESS_2 = 10
CMAKE_PROGRESS_3 = 3 CMAKE_PROGRESS_3 = 11
CMAKE_PROGRESS_4 = 4 CMAKE_PROGRESS_4 = 12
CMAKE_PROGRESS_5 = 5
cmake-build-debug/CMakeFiles/progress.marks
+ 1
− 1
View file @ 1ffe1b31
5 12
cmake-build-debug/Makefile
+ 227
− 81
View file @ 1ffe1b31
...@@ -56,17 +56,6 @@ CMAKE_BINARY_DIR = /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-s ...@@ -56,17 +56,6 @@ CMAKE_BINARY_DIR = /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-s
#============================================================================= #=============================================================================
# Targets provided globally by CMake. # Targets provided globally by CMake.
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
/Applications/CLion.app/Contents/bin/cmake/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
rebuild_cache/fast: rebuild_cache
.PHONY : rebuild_cache/fast
# Special rule for the target edit_cache # Special rule for the target edit_cache
edit_cache: edit_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..." @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..."
...@@ -78,6 +67,17 @@ edit_cache/fast: edit_cache ...@@ -78,6 +67,17 @@ edit_cache/fast: edit_cache
.PHONY : edit_cache/fast .PHONY : edit_cache/fast
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
/Applications/CLion.app/Contents/bin/cmake/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
rebuild_cache/fast: rebuild_cache
.PHONY : rebuild_cache/fast
# The main all target # The main all target
all: cmake_check_build_system all: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles/progress.marks $(CMAKE_COMMAND) -E cmake_progress_start /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles /Users/veronicaday/Desktop/EECS398/eecs_398/project/eecs398-search/cmake-build-debug/CMakeFiles/progress.marks
...@@ -110,6 +110,58 @@ depend: ...@@ -110,6 +110,58 @@ depend:
$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend .PHONY : depend
#=============================================================================
# Target rules for targets named StemmerTest
# Build rule for target.
StemmerTest: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 StemmerTest
.PHONY : StemmerTest
# fast build rule for target.
StemmerTest/fast:
$(MAKE) -f CMakeFiles/StemmerTest.dir/build.make CMakeFiles/StemmerTest.dir/build
.PHONY : StemmerTest/fast
#=============================================================================
# Target rules for targets named ParserEndToEndTest
# Build rule for target.
ParserEndToEndTest: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 ParserEndToEndTest
.PHONY : ParserEndToEndTest
# fast build rule for target.
ParserEndToEndTest/fast:
$(MAKE) -f CMakeFiles/ParserEndToEndTest.dir/build.make CMakeFiles/ParserEndToEndTest.dir/build
.PHONY : ParserEndToEndTest/fast
#=============================================================================
# Target rules for targets named TokenizerTest
# Build rule for target.
TokenizerTest: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 TokenizerTest
.PHONY : TokenizerTest
# fast build rule for target.
TokenizerTest/fast:
$(MAKE) -f CMakeFiles/TokenizerTest.dir/build.make CMakeFiles/TokenizerTest.dir/build
.PHONY : TokenizerTest/fast
#=============================================================================
# Target rules for targets named StringProcessingTest
# Build rule for target.
StringProcessingTest: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 StringProcessingTest
.PHONY : StringProcessingTest
# fast build rule for target.
StringProcessingTest/fast:
$(MAKE) -f CMakeFiles/StringProcessingTest.dir/build.make CMakeFiles/StringProcessingTest.dir/build
.PHONY : StringProcessingTest/fast
#============================================================================= #=============================================================================
# Target rules for targets named eecs398_search # Target rules for targets named eecs398_search
...@@ -123,113 +175,194 @@ eecs398_search/fast: ...@@ -123,113 +175,194 @@ eecs398_search/fast:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/build $(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/build
.PHONY : eecs398_search/fast .PHONY : eecs398_search/fast
Parser.o: Parser.cpp.o main.o: main.cpp.o
.PHONY : main.o
# target to build an object file
main.cpp.o:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/main.cpp.o
.PHONY : main.cpp.o
main.i: main.cpp.i
.PHONY : main.i
# target to preprocess a source file
main.cpp.i:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/main.cpp.i
.PHONY : main.cpp.i
main.s: main.cpp.s
.PHONY : main.s
# target to generate assembly for a file
main.cpp.s:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/main.cpp.s
.PHONY : main.cpp.s
.PHONY : Parser.o parser/tests/parserTest.o: parser/tests/parserTest.cpp.o
.PHONY : parser/tests/parserTest.o
# target to build an object file # target to build an object file
Parser.cpp.o: parser/tests/parserTest.cpp.o:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/Parser.cpp.o $(MAKE) -f CMakeFiles/ParserEndToEndTest.dir/build.make CMakeFiles/ParserEndToEndTest.dir/parser/tests/parserTest.cpp.o
.PHONY : Parser.cpp.o .PHONY : parser/tests/parserTest.cpp.o
Parser.i: Parser.cpp.i parser/tests/parserTest.i: parser/tests/parserTest.cpp.i
.PHONY : Parser.i .PHONY : parser/tests/parserTest.i
# target to preprocess a source file # target to preprocess a source file
Parser.cpp.i: parser/tests/parserTest.cpp.i:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/Parser.cpp.i $(MAKE) -f CMakeFiles/ParserEndToEndTest.dir/build.make CMakeFiles/ParserEndToEndTest.dir/parser/tests/parserTest.cpp.i
.PHONY : Parser.cpp.i .PHONY : parser/tests/parserTest.cpp.i
Parser.s: Parser.cpp.s parser/tests/parserTest.s: parser/tests/parserTest.cpp.s
.PHONY : Parser.s .PHONY : parser/tests/parserTest.s
# target to generate assembly for a file # target to generate assembly for a file
Parser.cpp.s: parser/tests/parserTest.cpp.s:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/Parser.cpp.s $(MAKE) -f CMakeFiles/ParserEndToEndTest.dir/build.make CMakeFiles/ParserEndToEndTest.dir/parser/tests/parserTest.cpp.s
.PHONY : Parser.cpp.s .PHONY : parser/tests/parserTest.cpp.s
ProducerConsumerQueue.o: ProducerConsumerQueue.cpp.o shared/ProducerConsumerQueue.o: shared/ProducerConsumerQueue.cpp.o
.PHONY : ProducerConsumerQueue.o .PHONY : shared/ProducerConsumerQueue.o
# target to build an object file # target to build an object file
ProducerConsumerQueue.cpp.o: shared/ProducerConsumerQueue.cpp.o:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/ProducerConsumerQueue.cpp.o $(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/shared/ProducerConsumerQueue.cpp.o
.PHONY : ProducerConsumerQueue.cpp.o .PHONY : shared/ProducerConsumerQueue.cpp.o
ProducerConsumerQueue.i: ProducerConsumerQueue.cpp.i shared/ProducerConsumerQueue.i: shared/ProducerConsumerQueue.cpp.i
.PHONY : ProducerConsumerQueue.i .PHONY : shared/ProducerConsumerQueue.i
# target to preprocess a source file # target to preprocess a source file
ProducerConsumerQueue.cpp.i: shared/ProducerConsumerQueue.cpp.i:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/ProducerConsumerQueue.cpp.i $(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/shared/ProducerConsumerQueue.cpp.i
.PHONY : ProducerConsumerQueue.cpp.i .PHONY : shared/ProducerConsumerQueue.cpp.i
ProducerConsumerQueue.s: ProducerConsumerQueue.cpp.s shared/ProducerConsumerQueue.s: shared/ProducerConsumerQueue.cpp.s
.PHONY : ProducerConsumerQueue.s .PHONY : shared/ProducerConsumerQueue.s
# target to generate assembly for a file # target to generate assembly for a file
ProducerConsumerQueue.cpp.s: shared/ProducerConsumerQueue.cpp.s:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/ProducerConsumerQueue.cpp.s $(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/shared/ProducerConsumerQueue.cpp.s
.PHONY : ProducerConsumerQueue.cpp.s .PHONY : shared/ProducerConsumerQueue.cpp.s
ProducerConsumerQueue_test.o: ProducerConsumerQueue_test.cpp.o shared/ProducerConsumerQueue_test.o: shared/ProducerConsumerQueue_test.cpp.o
.PHONY : ProducerConsumerQueue_test.o .PHONY : shared/ProducerConsumerQueue_test.o
# target to build an object file # target to build an object file
ProducerConsumerQueue_test.cpp.o: shared/ProducerConsumerQueue_test.cpp.o:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/ProducerConsumerQueue_test.cpp.o $(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/shared/ProducerConsumerQueue_test.cpp.o
.PHONY : ProducerConsumerQueue_test.cpp.o .PHONY : shared/ProducerConsumerQueue_test.cpp.o
ProducerConsumerQueue_test.i: ProducerConsumerQueue_test.cpp.i shared/ProducerConsumerQueue_test.i: shared/ProducerConsumerQueue_test.cpp.i
.PHONY : ProducerConsumerQueue_test.i .PHONY : shared/ProducerConsumerQueue_test.i
# target to preprocess a source file # target to preprocess a source file
ProducerConsumerQueue_test.cpp.i: shared/ProducerConsumerQueue_test.cpp.i:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/ProducerConsumerQueue_test.cpp.i $(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/shared/ProducerConsumerQueue_test.cpp.i
.PHONY : ProducerConsumerQueue_test.cpp.i .PHONY : shared/ProducerConsumerQueue_test.cpp.i
ProducerConsumerQueue_test.s: ProducerConsumerQueue_test.cpp.s shared/ProducerConsumerQueue_test.s: shared/ProducerConsumerQueue_test.cpp.s
.PHONY : ProducerConsumerQueue_test.s .PHONY : shared/ProducerConsumerQueue_test.s
# target to generate assembly for a file # target to generate assembly for a file
ProducerConsumerQueue_test.cpp.s: shared/ProducerConsumerQueue_test.cpp.s:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/ProducerConsumerQueue_test.cpp.s $(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/shared/ProducerConsumerQueue_test.cpp.s
.PHONY : ProducerConsumerQueue_test.cpp.s .PHONY : shared/ProducerConsumerQueue_test.cpp.s
main.o: main.cpp.o util/tests/stemmerTest.o: util/tests/stemmerTest.cpp.o
.PHONY : main.o .PHONY : util/tests/stemmerTest.o
# target to build an object file # target to build an object file
main.cpp.o: util/tests/stemmerTest.cpp.o:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/main.cpp.o $(MAKE) -f CMakeFiles/StemmerTest.dir/build.make CMakeFiles/StemmerTest.dir/util/tests/stemmerTest.cpp.o
.PHONY : main.cpp.o .PHONY : util/tests/stemmerTest.cpp.o
main.i: main.cpp.i util/tests/stemmerTest.i: util/tests/stemmerTest.cpp.i
.PHONY : main.i .PHONY : util/tests/stemmerTest.i
# target to preprocess a source file # target to preprocess a source file
main.cpp.i: util/tests/stemmerTest.cpp.i:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/main.cpp.i $(MAKE) -f CMakeFiles/StemmerTest.dir/build.make CMakeFiles/StemmerTest.dir/util/tests/stemmerTest.cpp.i
.PHONY : main.cpp.i .PHONY : util/tests/stemmerTest.cpp.i
main.s: main.cpp.s util/tests/stemmerTest.s: util/tests/stemmerTest.cpp.s
.PHONY : main.s .PHONY : util/tests/stemmerTest.s
# target to generate assembly for a file # target to generate assembly for a file
main.cpp.s: util/tests/stemmerTest.cpp.s:
$(MAKE) -f CMakeFiles/eecs398_search.dir/build.make CMakeFiles/eecs398_search.dir/main.cpp.s $(MAKE) -f CMakeFiles/StemmerTest.dir/build.make CMakeFiles/StemmerTest.dir/util/tests/stemmerTest.cpp.s
.PHONY : main.cpp.s .PHONY : util/tests/stemmerTest.cpp.s
util/tests/stringProcessingTest.o: util/tests/stringProcessingTest.cpp.o
.PHONY : util/tests/stringProcessingTest.o
# target to build an object file
util/tests/stringProcessingTest.cpp.o:
$(MAKE) -f CMakeFiles/StringProcessingTest.dir/build.make CMakeFiles/StringProcessingTest.dir/util/tests/stringProcessingTest.cpp.o
.PHONY : util/tests/stringProcessingTest.cpp.o
util/tests/stringProcessingTest.i: util/tests/stringProcessingTest.cpp.i
.PHONY : util/tests/stringProcessingTest.i
# target to preprocess a source file
util/tests/stringProcessingTest.cpp.i:
$(MAKE) -f CMakeFiles/StringProcessingTest.dir/build.make CMakeFiles/StringProcessingTest.dir/util/tests/stringProcessingTest.cpp.i
.PHONY : util/tests/stringProcessingTest.cpp.i
util/tests/stringProcessingTest.s: util/tests/stringProcessingTest.cpp.s
.PHONY : util/tests/stringProcessingTest.s
# target to generate assembly for a file
util/tests/stringProcessingTest.cpp.s:
$(MAKE) -f CMakeFiles/StringProcessingTest.dir/build.make CMakeFiles/StringProcessingTest.dir/util/tests/stringProcessingTest.cpp.s
.PHONY : util/tests/stringProcessingTest.cpp.s
util/tests/tokenizerTest.o: util/tests/tokenizerTest.cpp.o
.PHONY : util/tests/tokenizerTest.o
# target to build an object file
util/tests/tokenizerTest.cpp.o:
$(MAKE) -f CMakeFiles/TokenizerTest.dir/build.make CMakeFiles/TokenizerTest.dir/util/tests/tokenizerTest.cpp.o
.PHONY : util/tests/tokenizerTest.cpp.o
util/tests/tokenizerTest.i: util/tests/tokenizerTest.cpp.i
.PHONY : util/tests/tokenizerTest.i
# target to preprocess a source file
util/tests/tokenizerTest.cpp.i:
$(MAKE) -f CMakeFiles/TokenizerTest.dir/build.make CMakeFiles/TokenizerTest.dir/util/tests/tokenizerTest.cpp.i
.PHONY : util/tests/tokenizerTest.cpp.i
util/tests/tokenizerTest.s: util/tests/tokenizerTest.cpp.s
.PHONY : util/tests/tokenizerTest.s
# target to generate assembly for a file
util/tests/tokenizerTest.cpp.s:
$(MAKE) -f CMakeFiles/TokenizerTest.dir/build.make CMakeFiles/TokenizerTest.dir/util/tests/tokenizerTest.cpp.s
.PHONY : util/tests/tokenizerTest.cpp.s
# Help Target # Help Target
help: help:
...@@ -237,21 +370,34 @@ help: ...@@ -237,21 +370,34 @@ help:
@echo "... all (the default if no target is provided)" @echo "... all (the default if no target is provided)"
@echo "... clean" @echo "... clean"
@echo "... depend" @echo "... depend"
@echo "... rebuild_cache"
@echo "... edit_cache" @echo "... edit_cache"
@echo "... rebuild_cache"
@echo "... StemmerTest"
@echo "... ParserEndToEndTest"
@echo "... TokenizerTest"
@echo "... StringProcessingTest"
@echo "... eecs398_search" @echo "... eecs398_search"
@echo "... Parser.o"
@echo "... Parser.i"
@echo "... Parser.s"
@echo "... ProducerConsumerQueue.o"
@echo "... ProducerConsumerQueue.i"
@echo "... ProducerConsumerQueue.s"
@echo "... ProducerConsumerQueue_test.o"
@echo "... ProducerConsumerQueue_test.i"
@echo "... ProducerConsumerQueue_test.s"
@echo "... main.o" @echo "... main.o"
@echo "... main.i" @echo "... main.i"
@echo "... main.s" @echo "... main.s"
@echo "... parser/tests/parserTest.o"
@echo "... parser/tests/parserTest.i"
@echo "... parser/tests/parserTest.s"
@echo "... shared/ProducerConsumerQueue.o"
@echo "... shared/ProducerConsumerQueue.i"
@echo "... shared/ProducerConsumerQueue.s"
@echo "... shared/ProducerConsumerQueue_test.o"
@echo "... shared/ProducerConsumerQueue_test.i"
@echo "... shared/ProducerConsumerQueue_test.s"
@echo "... util/tests/stemmerTest.o"
@echo "... util/tests/stemmerTest.i"
@echo "... util/tests/stemmerTest.s"
@echo "... util/tests/stringProcessingTest.o"
@echo "... util/tests/stringProcessingTest.i"
@echo "... util/tests/stringProcessingTest.s"
@echo "... util/tests/tokenizerTest.o"
@echo "... util/tests/tokenizerTest.i"
@echo "... util/tests/tokenizerTest.s"
.PHONY : help .PHONY : help
......
parser/Parser.h
+ 5
− 5
View file @ 1ffe1b31
...@@ -94,15 +94,15 @@ private: ...@@ -94,15 +94,15 @@ private:
{ {
string url = ""; string url = "";
if ( findStr ( word, "<a" ) != '\0' ) if ( *findStr ( word, "<a" ) != '\0' )
{ {
auto foundHttp = findStr ( word, "href=http" ); auto foundHttp = findStr ( word, "href=http" );
if ( foundHttp != '\0' ) if ( *foundHttp != '\0' )
{ {
url = "http"; url = "http";
foundHttp += 9; foundHttp += 9;
while ( foundHttp != findStr ( word, "\">" ) ) while ( *foundHttp != *findStr ( word, "\">" ) )
{ {
url += *foundHttp; url += *foundHttp;
++foundHttp; ++foundHttp;
...@@ -122,10 +122,10 @@ private: ...@@ -122,10 +122,10 @@ private:
{ {
string title = ""; string title = "";
auto pos = findStr ( "<title>", word ); auto pos = findStr ( "<title>", word );
if ( pos != '\0') if ( *pos != '\0')
{ {
pos += 6; pos += 6;
while ( pos != findStr ( "</title>", word ) ) while ( *pos != *findStr ( "</title>", word ) )
{ {
++pos; ++pos;
title += *pos; title += *pos;
......
util/tests/stringProcessingTest.cpp
+ 0
− 1
View file @ 1ffe1b31
...@@ -100,7 +100,6 @@ void testToLower ( ) ...@@ -100,7 +100,6 @@ void testToLower ( )
string test5 = toLower ( word5 ); string test5 = toLower ( word5 );
assert ( test == "hello" ); assert ( test == "hello" );
cout << test2 << endl;
assert ( test2 == "hello" ); assert ( test2 == "hello" );
assert ( test3 == "hello goodbye !" ); assert ( test3 == "hello goodbye !" );
assert ( test4 == "" ); assert ( test4 == "" );
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment