Merge pull request #225 from tetengo/c17

C17

Author: kaorut

configure.ac

@@ -107,7 +107,7 @@ AX_CXX_COMPILE_STDCXX_17([noext], [mandatory])
 
 #### Program Checks ####
 AC_PROG_CXX
-AC_PROG_CC
+AC_PROG_CC_C99
 AC_PROG_CPP
 AC_PROG_LIBTOOL
 LT_INIT
@@ -123,7 +123,7 @@ AC_CHECK_PROG(IWYU, include-what-you-use, include-what-you-use)
 test -z $IWYU && \
     AC_MSG_WARN([You cannot check the includes for lack of include-what-you-use.])
 AC_SUBST([IWYU_OPTS_CXX], "-Xiwyu --max_line_length=200 -x c++ -std=c++17 -DIWYU")
-AC_SUBST([IWYU_OPTS_C],   "-Xiwyu --max_line_length=200 -x c -std=c89 -DIWYU")
+AC_SUBST([IWYU_OPTS_C],   "-Xiwyu --max_line_length=200 -x c -std=c17 -DIWYU")
 AC_SUBST([IWYU_IMP_PATH], "kogyan/tool/iwyu_mappings.imp")
 
 AC_ARG_WITH(
@@ -199,7 +199,7 @@ AC_SUBST([CPPFLAGS], "${CPPFLAGS} ${BOOST_CPPFLAGS}")
 
 #### Compilation Options ####
 AC_SUBST([CXXFLAGS], "${CXXFLAGS} -Werror -Wall -Wextra -pedantic-errors")
-AC_SUBST([CFLAGS], "${CFLAGS} -std=c89 -Werror -Wall -Wextra -pedantic-errors")
+AC_SUBST([CFLAGS], "${CFLAGS} -std=c17 -Werror -Wall -Wextra -pedantic-errors")
 
 #### Output ####
 AC_OUTPUT

kogyan

@@ -22,7 +22,7 @@ iwyu: ${addsuffix .iwyuout, ${pkg_headers} ${extra_headers}}
 
 %.iwyuout: %
 	mkdir -p ${dir $@}
-	${IWYU} ${IWYU_OPTS_CXX} ${CPPFLAGS} ${iwyu_CPPFLAGS} ${CXXFLAGS} $< 2> ${addsuffix .tmp, $@} || true
+	${IWYU} ${IWYU_OPTS_C} ${CPPFLAGS} ${iwyu_CPPFLAGS} ${CFLAGS} $< 2> ${addsuffix .tmp, $@} || true
 	mv -f ${addsuffix .tmp, $@} $@
 
 .PHONY: clean-iwyu

library/json/c/include/tetengo/Makefile.am

@@ -7,6 +7,7 @@
 #if !defined(TETENGO_JSON_JSONPARSER_H)
 #define TETENGO_JSON_JSONPARSER_H
 
+#include <stdbool.h>
 #include <stddef.h>
 
 #include <tetengo/json/element.h>
@@ -51,14 +52,14 @@ tetengo_json_jsonParser_t* tetengo_json_jsonParser_create(tetengo_json_reader_t*
 void tetengo_json_jsonParser_destroy(const tetengo_json_jsonParser_t* p_parser);
 
 /*!
-    \brief Returns non-zero when the next element exists.
+    \brief Returns true when the next element exists.
 
     \param p_parser A pointer to a perser.
 
-    \retval non-zero When the next element exists.
-    \retval 0        Otherwise.
+    \retval true  When the next element exists.
+    \retval false Otherwise.
 */
-int tetengo_json_jsonParser_hasNext(const tetengo_json_jsonParser_t* p_parser);
+bool tetengo_json_jsonParser_hasNext(const tetengo_json_jsonParser_t* p_parser);
 
 /*!
     \brief Returns the current element.

library/json/c/include/tetengo/json/jsonParser.h

@@ -7,6 +7,7 @@
 #if !defined(TETENGO_JSON_READER_H)
 #define TETENGO_JSON_READER_H
 
+#include <stdbool.h>
 #include <stddef.h>
 
 
@@ -93,24 +94,24 @@ void tetengo_json_reader_destroy(const tetengo_json_reader_t* p_reader);
     \param p_line_counting_reader A pointer to a line counting reader.
     \param p_location             The storage for a location.
 
-    \retval non-zero When a location has been stored.
-    \retval 0        When p_line_counting_reader is NULL or not a line counting reader.
-                     And/or when p_location is NULL.
-                     And/or when current position is beyond the termination point.
+    \retval true  When a location has been stored.
+    \retval false When p_line_counting_reader is NULL or not a line counting reader.
+                  And/or when p_location is NULL.
+                  And/or when current position is beyond the termination point.
 */
-int tetengo_json_reader_getLocation(
+bool tetengo_json_reader_getLocation(
     const tetengo_json_reader_t* p_line_counting_reader,
     tetengo_json_location_t*     p_location);
 
 /*!
-    \brief Returns non-zero when the next character exists.
+    \brief Returns true when the next character exists.
 
     \param p_reader A pointer to a reader.
 
-    \retval non-zero When the next character exists.
-    \retval 0        Otherwise.
+    \retval true  When the next character exists.
+    \retval false    Otherwise.
 */
-int tetengo_json_reader_hasNext(const tetengo_json_reader_t* p_reader);
+bool tetengo_json_reader_hasNext(const tetengo_json_reader_t* p_reader);
 
 /*!
     \brief Returns the current character.

library/json/c/include/tetengo/json/reader.h

@@ -85,7 +85,7 @@ void tetengo_json_jsonParser_destroy(const tetengo_json_jsonParser_t* const p_pa
     {}
 }
 
-int tetengo_json_jsonParser_hasNext(const tetengo_json_jsonParser_t* const p_parser)
+bool tetengo_json_jsonParser_hasNext(const tetengo_json_jsonParser_t* const p_parser)
 {
     try
     {
@@ -94,11 +94,11 @@ int tetengo_json_jsonParser_hasNext(const tetengo_json_jsonParser_t* const p_par
             throw std::invalid_argument{ "p_parser is NULL." };
         }
 
-        return p_parser->p_cpp_parser->has_next() ? 1 : 0;
+        return p_parser->p_cpp_parser->has_next();
     }
     catch (...)
     {
-        return 0;
+        return false;
     }
 }
 

library/json/c/src/tetengo_json_jsonParser.cpp

@@ -131,7 +131,7 @@ void tetengo_json_reader_destroy(const tetengo_json_reader_t* const p_reader)
     {}
 }
 
-int tetengo_json_reader_getLocation(
+bool tetengo_json_reader_getLocation(
     const tetengo_json_reader_t* const p_line_counting_reader,
     tetengo_json_location_t* const     p_location)
 {
@@ -159,15 +159,15 @@ int tetengo_json_reader_getLocation(
         p_location->line_index = cpp_location.line_index();
         p_location->column_index = cpp_location.column_index();
 
-        return 1;
+        return true;
     }
     catch (...)
     {
-        return 0;
+        return false;
     }
 }
 
-int tetengo_json_reader_hasNext(const tetengo_json_reader_t* const p_reader)
+bool tetengo_json_reader_hasNext(const tetengo_json_reader_t* const p_reader)
 {
     try
     {
@@ -176,11 +176,11 @@ int tetengo_json_reader_hasNext(const tetengo_json_reader_t* const p_reader)
             throw std::invalid_argument{ "p_reader is NULL." };
         }
 
-        return p_reader->cpp_reader().has_next() ? 1 : 0;
+        return p_reader->cpp_reader().has_next();
     }
     catch (...)
     {
-        return 0;
+        return false;
     }
 }
 

library/json/c/src/tetengo_json_reader.cpp

@@ -42,7 +42,19 @@ IWYU_OPTS_CXX += -Xiwyu --mapping_file=${top_srcdir}/${IWYU_IMP_PATH}
 
 iwyu: ${addsuffix .iwyuout, ${headers} ${sources}}
 
-%.iwyuout: %
+%.c.iwyuout: %.c
+	${IWYU} ${IWYU_OPTS_C} ${CPPFLAGS} ${test_tetengo_json_CPPFLAGS} ${CFLAGS} $< 2> ${addsuffix .tmp, $@} || true
+	mv -f ${addsuffix .tmp, $@} $@
+
+%.h.iwyuout: %.h
+	${IWYU} ${IWYU_OPTS_C} ${CPPFLAGS} ${test_tetengo_json_CPPFLAGS} ${CFLAGS} $< 2> ${addsuffix .tmp, $@} || true
+	mv -f ${addsuffix .tmp, $@} $@
+
+%.cpp.iwyuout: %.cpp
+	${IWYU} ${IWYU_OPTS_CXX} ${CPPFLAGS} ${test_tetengo_json_CPPFLAGS} ${CXXFLAGS} $< 2> ${addsuffix .tmp, $@} || true
+	mv -f ${addsuffix .tmp, $@} $@
+
+%.hpp.iwyuout: %.hpp
 	${IWYU} ${IWYU_OPTS_CXX} ${CPPFLAGS} ${test_tetengo_json_CPPFLAGS} ${CXXFLAGS} $< 2> ${addsuffix .tmp, $@} || true
 	mv -f ${addsuffix .tmp, $@} $@