- Fixed a segfault when commands are registrated but argument list is empty.

- Fixed build process.

Author: stefanpoeter

.vimrc

@@ -1,16 +1,29 @@
 " Plugin 'altercation/vim-colors-solarized'
 
+Plugin 'vhdirk/vim-cmake'
+
+let g:cmake_build_type = 'debug'
+
 let g:solarized_termcolors=256
 syntax enable
 set background=dark
 colorscheme solarized
 
-" syntastic settings
+" Autoformat
 
-set statusline+=%#warningmsg#
-set statusline+=%{SyntasticStatuslineFlag()}
-set statusline+=%*
+au BufWrite * :Autoformat
+
+let g:autoformat_autoindent = 0
+let g:autoformat_retab = 0
+let g:autoformat_remove_trailing_spaces = 0
+let g:formatdef_astyle_google_cpp = '"astyle --style=google"'
+let g:formatters_cpp = ['astyle_google_cpp']
+
+" syntastic settings
 
+"set statusline+=%#warningmsg#
+"set statusline+=%{SyntasticStatuslineFlag()}
+"set statusline+=%*
 
 let g:sytastic_c_checkers = ['gcc']
 let g:syntastic_always_populate_loc_list = 1
@@ -21,7 +34,10 @@ let g:syntastic_check_on_wq = 0
 let g:syntastic_c_include_dirs = [ 'src' ]
 let g:syntastic_c_check_header = 1
 
-let g:syntastic_cpp_include_dirs = [ 'src' ]
+let g:syntastic_cpp_compile = 'cmake'
+let g:syntastic_cpp_checkers = ['gcc']
+let g:syntastic_cpp_include_dirs = [ 'system/include', 'axis/include', 'common/include', 'tools/include', 'Debug/gtest-install/include', 'Debug/sap_1_0_latest-install/include' ]
+let g:syntastic_cpp_compiler_options = '-std=c++11 -Wall'
 let g:syntastic_cpp_check_header = 1
 
 

CMakeLists.txt

@@ -1,16 +1,17 @@
 cmake_minimum_required (VERSION 2.8.7)
 project (SimpleArgumentParser C CXX)
 
-set (SimpleArgumentParser_VERSION_MAJOR 0)
-set (SimpleArgumentParser_VERSION_MINOR 1)
+set (SimpleArgumentParser_VERSION_MAJOR 1)
+set (SimpleArgumentParser_VERSION_MINOR 0)
+set (SimpleArgumentParser_VERSION_PATCH 6)
 
-option(WITH-TESTS "Compile with test cases." OFF)
-option(STATIC "Compile shared/static library." "SHARED")
+option(WITH_TESTS "Compile with test cases." "OFF")
+option(SHARED "Compile shared/static library." "OFF")
 
-IF (STATIC) 
-  add_library(sap STATIC "${CMAKE_SOURCE_DIR}/src/sap.c" "${CMAKE_SOURCE_DIR}/src/sap.h")
-ELSE()
+IF (SHARED) 
   add_library(sap SHARED "${CMAKE_SOURCE_DIR}/src/sap.c" "${CMAKE_SOURCE_DIR}/src/sap.h")
+ELSE()
+  add_library(sap STATIC "${CMAKE_SOURCE_DIR}/src/sap.c" "${CMAKE_SOURCE_DIR}/src/sap.h")
 ENDIF()
 
 set(CMAKE_C_FLAGS "--std=gnu99" ${CMAKE_C_FLAGS})
@@ -19,9 +20,14 @@ option(WITH-TESTS "Compile the test application." OFF)
 
 include_directories(${PROJECT_SOURCE_DIR}/src)
 
-add_executable(example-01 ${CMAKE_SOURCE_DIR}/examples/example_01.c ${CMAKE_SOURCE_DIR}/src/sap.c ${CMAKE_SOURCE_DIR}/src/sap.h)
+add_executable(example-01 
+	${CMAKE_SOURCE_DIR}/examples/example_01.c 
+	${CMAKE_SOURCE_DIR}/src/sap.c 
+	${CMAKE_SOURCE_DIR}/src/sap.h)
 
-IF(WITH-TESTS)
+IF(WITH_TESTS)
+    include(ExternalProject)
+    include(thirdparty/googletest.cmake)
     add_subdirectory(${PROJECT_SOURCE_DIR}/tests)
 endif()
 

examples/example_01.c

@@ -1,42 +1,60 @@
 
 #include "sap.h"
 
+static int test_handler(sap_command_list_t* command, sap_option_list_t* option)
+{
 
-static int default_handler(sap_command_list_t* commands, sap_option_list_t* options) {
+	printf("Executing the test handler\n");
+	return 0;
 
-  sap_command_t* cc = commands->first;
-  while (cc) {
-    printf("Command %s\n", cc->label);
-    cc = cc->next;
-  }
+}
+
+static int default_handler(sap_command_list_t* commands, sap_option_list_t* options)
+{
+
+	printf("Executing the default handler.\n");
 
-  unsigned int curIndex = 0;
-  sap_option_t* co = sap_get_option_by_index(options, curIndex);
-  while (co) {
-    if (co->is_flag) {
-      printf("flag %s\n", co->label);
-    } else {
-      printf("option %s with value %s.\n", co->label, co->value);
-    }
+	sap_command_t* cc = commands->first;
+	while (cc)
+	{
+		printf("Command %s\n", cc->label);
+		cc = cc->next;
+	}
 
-    co = sap_get_option_by_index(options, ++curIndex);
+	unsigned int curIndex = 0;
+	sap_option_t* co = sap_get_option_by_index(options, curIndex);
+	while (co)
+	{
+		if (co->is_flag)
+		{
+			printf("flag %s\n", co->label);
+		}
+		else
+		{
+			printf("option %s with value %s.\n", co->label, co->value);
+		}
 
-  }
+		co = sap_get_option_by_index(options, ++curIndex);
+
+	}
 
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char** argv)
+{
+
+	sap_t parser;
 
-  sap_t parser;
+	sap_init(&parser, argc, argv);
 
-  sap_init(&parser, argc, argv);
+	sap_set_default(&parser, default_handler);
 
-  sap_set_default(&parser, default_handler);
+	sap_add_command(&parser, "test", test_handler);
 
-  int retVal =  sap_execute(&parser);
+	int retVal =  sap_execute(&parser);
 
-  sap_free(&parser);
+	sap_free(&parser);
 
-  return retVal;
+	return retVal;
 
 }