From 085236fb6221d221ba5037dd54e90b3fbd391ff7 Mon Sep 17 00:00:00 2001 From: Cameron Reed Date: Sat, 13 Jul 2024 19:09:58 -0600 Subject: [PATCH] Fix whitespace --- Inc/argparser.h | 10 +++++----- Makefile | 38 +++++++++++++++++++------------------- test.cpp | 36 ++++++++++++++++++------------------ 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Inc/argparser.h b/Inc/argparser.h index bd53d26..7350382 100644 --- a/Inc/argparser.h +++ b/Inc/argparser.h @@ -6,13 +6,13 @@ namespace Arguments { enum ERROR { - NO_ERROR = 0, + NO_ERROR = 0, - ERROR_UNKNOWN_ARGUMENT, - ERROR_UNKNOWN_POSITIONAL_ARGUMENT, + ERROR_UNKNOWN_ARGUMENT, + ERROR_UNKNOWN_POSITIONAL_ARGUMENT, - ERROR_MISSING_VALUE, - ERROR_MISSING_POSITIONAL_ARGUMENT, + ERROR_MISSING_VALUE, + ERROR_MISSING_POSITIONAL_ARGUMENT, ERROR_INVALID_INT, }; diff --git a/Makefile b/Makefile index ad44ed9..39bc59e 100644 --- a/Makefile +++ b/Makefile @@ -45,59 +45,59 @@ all: $(BUILD_DIR)/$(LIB_FILE_NAME) ifneq ($(TYPE), $(SHARED_TYPE)) shared: clean - @sed -i -e "s/^TYPE = .*$$/TYPE = $(SHARED_TYPE)/" Makefile + @sed -i -e "s/^TYPE = .*$$/TYPE = $(SHARED_TYPE)/" Makefile .PHONY: shared endif ifneq ($(TYPE), $(STATIC_TYPE)) static: clean - @sed -i -e "s/^TYPE = .*$$/TYPE = $(STATIC_TYPE)/" Makefile + @sed -i -e "s/^TYPE = .*$$/TYPE = $(STATIC_TYPE)/" Makefile .PHONY: static endif $(BUILD_DIR)/$(LIB_FILE_NAME): $(OBJECTS) ifeq ($(TYPE), $(SHARED_TYPE)) - $(CXX) $^ $(CXXFLAGS) -shared -o $@ + $(CXX) $^ $(CXXFLAGS) -shared -o $@ else - $(AR) $(ARFLAGS) $@ $^ + $(AR) $(ARFLAGS) $@ $^ endif $(BUILD_DIR)/%.o: $(SOURCE_DIR)/%.c | $(BUILD_DIR) - $(CC) -c $< $(CFLAGS) -o $@ + $(CC) -c $< $(CFLAGS) -o $@ $(BUILD_DIR)/%.o: $(SOURCE_DIR)/%.cpp | $(BUILD_DIR) - $(CXX) -c $< $(CXXFLAGS) -o $@ + $(CXX) -c $< $(CXXFLAGS) -o $@ $(BUILD_DIR): - mkdir -p $@ + mkdir -p $@ test: test.cpp all | $(BUILD_DIR) - $(CXX) $< $(CXXFLAGS) -l$(LIB_NAME) -L$(BUILD_DIR) $(TESTFLAGS) -o $(BUILD_DIR)/test - -$(BUILD_DIR)/test + $(CXX) $< $(CXXFLAGS) -l$(LIB_NAME) -L$(BUILD_DIR) $(TESTFLAGS) -o $(BUILD_DIR)/test + -$(BUILD_DIR)/test test_installed: test.cpp | $(BUILD_DIR) - $(CXX) $< $(CXXFLAGS) -l$(LIB_NAME) -o $(BUILD_DIR)/test - -$(BUILD_DIR)/test + $(CXX) $< $(CXXFLAGS) -l$(LIB_NAME) -o $(BUILD_DIR)/test + -$(BUILD_DIR)/test install: all - cp $(BUILD_DIR)/$(LIB_FILE_NAME) $(INSTALL_DIR) - cp $(HEADERS) $(HEADER_INSTALL_DIR) - @chmod 0755 $(INSTALL_DIR)/$(LIB_FILE_NAME) + cp $(BUILD_DIR)/$(LIB_FILE_NAME) $(INSTALL_DIR) + cp $(HEADERS) $(HEADER_INSTALL_DIR) + @chmod 0755 $(INSTALL_DIR)/$(LIB_FILE_NAME) ifeq ($(TYPE), $(SHARED_TYPE)) - @ldconfig + @ldconfig endif uninstall: - $(RM) $(INSTALL_DIR)/$(LIB_FILE_NAME) - $(RM) $(addprefix $(HEADER_INSTALL_DIR)/, $(notdir $(HEADERS))) + $(RM) $(INSTALL_DIR)/$(LIB_FILE_NAME) + $(RM) $(addprefix $(HEADER_INSTALL_DIR)/, $(notdir $(HEADERS))) ifeq ($(TYPE), $(SHARED_TYPE)) - @ldconfig + @ldconfig endif clean: - $(RM) -r $(BUILD_DIR) + $(RM) -r $(BUILD_DIR) .PHONY: all test install uninstall clean diff --git a/test.cpp b/test.cpp index e077044..7258af4 100644 --- a/test.cpp +++ b/test.cpp @@ -7,31 +7,31 @@ int main(int argc, char** argv) { Arguments::String first('f', "none"); first.alias("first"); - Arguments::Int second("second", 0); + Arguments::Int second("second", 0); second.alias('s'); - Arguments::Bool third("third"); + Arguments::Bool third("third"); third.alias("abc").alias('t'); - Arguments::PositionalString name("", true); - Arguments::PositionalInt age(0, false); + Arguments::PositionalString name("", true); + Arguments::PositionalInt age(0, false); - if (Arguments::parse(argc, argv) != Arguments::NO_ERROR) { - return 0; - } + if (Arguments::parse(argc, argv) != Arguments::NO_ERROR) { + return 0; + } - std::cout << "Found:" << std::endl; - std::cout << "\tFirst: " << first.found << std::endl; - std::cout << "\tSecond: " << second.found << std::endl; - std::cout << "\tThird: " << third.found << std::endl; - std::cout << "\tName: " << name.found << std::endl; - std::cout << "\tAge: " << age.found << std::endl; + std::cout << "Found:" << std::endl; + std::cout << "\tFirst: " << first.found << std::endl; + std::cout << "\tSecond: " << second.found << std::endl; + std::cout << "\tThird: " << third.found << std::endl; + std::cout << "\tName: " << name.found << std::endl; + std::cout << "\tAge: " << age.found << std::endl; - std::cout << std::endl << "Values:" << std::endl; - std::cout << "\tFirst: " << first.value << std::endl; - std::cout << "\tSecond: " << second.value << std::endl; - std::cout << "\tName: " << name.value << std::endl; - std::cout << "\tAge: " << age.value << std::endl; + std::cout << std::endl << "Values:" << std::endl; + std::cout << "\tFirst: " << first.value << std::endl; + std::cout << "\tSecond: " << second.value << std::endl; + std::cout << "\tName: " << name.value << std::endl; + std::cout << "\tAge: " << age.value << std::endl; return 0; }