Merge pull request #164 from tetengo/multiple_typedef

kaorut · kaorut · commit 078f3fb9eab8 · 2021-07-25T15:38:06.000+09:00
Multiple typedef (cherry picked from commit 5ba45a9)
diff --git a/library/json/c/include/tetengo/json/element.h b/library/json/c/include/tetengo/json/element.h
@@ -15,11 +15,8 @@ extern "C" {
 #endif
 
 #if !defined(DOCUMENTATION)
-#if !defined(TYPEDEF_TETENGO_JSON_ELEMENT_T)
-#define TYPEDEF_TETENGO_JSON_ELEMENT_T
 typedef struct tetengo_json_element_tag tetengo_json_element_t;
 #endif
-#endif
 
 
 /*!
diff --git a/library/json/c/include/tetengo/json/jsonParser.h b/library/json/c/include/tetengo/json/jsonParser.h
@@ -9,25 +9,17 @@
 
 #include <stddef.h>
 
+#include <tetengo/json/element.h>
+#include <tetengo/json/reader.h>
+
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
 #if !defined(DOCUMENTATION)
-#if !defined(TYPEDEF_TETENGO_JSON_ELEMENT_T)
-#define TYPEDEF_TETENGO_JSON_ELEMENT_T
-typedef struct tetengo_json_element_tag tetengo_json_element_t;
-#endif
-#if !defined(TYPEDEF_TETENGO_JSON_JSONPARSER_T)
-#define TYPEDEF_TETENGO_JSON_JSONPARSER_T
 typedef struct tetengo_json_jsonParser_tag tetengo_json_jsonParser_t;
 #endif
-#if !defined(TYPEDEF_TETENGO_JSON_READER_T)
-#define TYPEDEF_TETENGO_JSON_READER_T
-typedef struct tetengo_json_reader_tag tetengo_json_reader_t;
-#endif
-#endif
 
 
 /*!
diff --git a/library/json/c/include/tetengo/json/reader.h b/library/json/c/include/tetengo/json/reader.h
@@ -15,11 +15,8 @@ extern "C" {
 #endif
 
 #if !defined(DOCUMENTATION)
-#if !defined(TYPEDEF_TETENGO_JSON_READER_T)
-#define TYPEDEF_TETENGO_JSON_READER_T
 typedef struct tetengo_json_reader_tag tetengo_json_reader_t;
 #endif
-#endif
 
 
 /*!
diff --git a/library/lattice/c/include/tetengo/lattice/connection.h b/library/lattice/c/include/tetengo/lattice/connection.h
@@ -7,18 +7,13 @@
 #if !defined(TETENGO_LATTICE_CONNECTION_H)
 #define TETENGO_LATTICE_CONNECTION_H
 
+#include <tetengo/lattice/entry.h>
+
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
-#if !defined(DOCUMENTATION)
-#if !defined(TYPEDEF_TETENGO_LATTICE_ENTRY_T)
-#define TYPEDEF_TETENGO_LATTICE_ENTRY_T
-typedef struct tetengo_lattice_entry_tag tetengo_lattice_entry_t;
-#endif
-#endif
-
 
 /*!
     \brief A connection.
diff --git a/library/lattice/c/include/tetengo/lattice/constraint.h b/library/lattice/c/include/tetengo/lattice/constraint.h
@@ -9,25 +9,17 @@
 
 #include <stddef.h>
 
+#include <tetengo/lattice/constraintElement.h>
+#include <tetengo/lattice/node.h>
+
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
 #if !defined(DOCUMENTATION)
-#if !defined(TYPEDEF_TETENGO_LATTICE_CONSTRAINT_T)
-#define TYPEDEF_TETENGO_LATTICE_CONSTRAINT_T
 typedef struct tetengo_lattice_constraint_tag tetengo_lattice_constraint_t;
 #endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_CONSTRAINTELEMENT_T)
-#define TYPEDEF_TETENGO_LATTICE_CONSTRAINTELEMENT_T
-typedef struct tetengo_lattice_constraintElement_tag tetengo_lattice_constraintElement_t;
-#endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_NODE_T)
-#define TYPEDEF_TETENGO_LATTICE_NODE_T
-typedef struct tetengo_lattice_node_tag tetengo_lattice_node_t;
-#endif
-#endif
 
 
 /*!
diff --git a/library/lattice/c/include/tetengo/lattice/constraintElement.h b/library/lattice/c/include/tetengo/lattice/constraintElement.h
@@ -9,21 +9,16 @@
 
 #include <stddef.h>
 
+#include <tetengo/lattice/node.h>
+
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
 #if !defined(DOCUMENTATION)
-#if !defined(TYPEDEF_TETENGO_LATTICE_CONSTRAINTELEMENT_T)
-#define TYPEDEF_TETENGO_LATTICE_CONSTRAINTELEMENT_T
 typedef struct tetengo_lattice_constraintElement_tag tetengo_lattice_constraintElement_t;
 #endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_NODE_T)
-#define TYPEDEF_TETENGO_LATTICE_NODE_T
-typedef struct tetengo_lattice_node_tag tetengo_lattice_node_t;
-#endif
-#endif
 
 
 /*!
diff --git a/library/lattice/c/include/tetengo/lattice/entry.h b/library/lattice/c/include/tetengo/lattice/entry.h
@@ -16,13 +16,10 @@
 extern "C" {
 #endif
 
-#if !defined(TYPEDEF_TETENGO_LATTICE_ENTRY_VALUEHANDLE_T)
-#define TYPEDEF_TETENGO_LATTICE_ENTRY_VALUEHANDLE_T
 /*!
     \brief An entry value handle.
 */
 typedef const struct tetengo_lattice_entry_valueHandle_tag* tetengo_lattice_entry_valueHandle_t;
-#endif
 
 
 /*!
diff --git a/library/lattice/c/include/tetengo/lattice/lattice.h b/library/lattice/c/include/tetengo/lattice/lattice.h
@@ -9,25 +9,17 @@
 
 #include <stddef.h>
 
+#include <tetengo/lattice/node.h>
+#include <tetengo/lattice/vocabulary.h>
+
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
 #if !defined(DOCUMENTATION)
-#if !defined(TYPEDEF_TETENGO_LATTICE_LATTICE_T)
-#define TYPEDEF_TETENGO_LATTICE_LATTICE_T
 typedef struct tetengo_lattice_lattice_tag tetengo_lattice_lattice_t;
 #endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_NODE_T)
-#define TYPEDEF_TETENGO_LATTICE_NODE_T
-typedef struct tetengo_lattice_node_tag tetengo_lattice_node_t;
-#endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_VOCABULARY_T)
-#define TYPEDEF_TETENGO_LATTICE_VOCABULARY_T
-typedef struct tetengo_lattice_vocabulary_tag tetengo_lattice_vocabulary_t;
-#endif
-#endif
 
 
 /*!
diff --git a/library/lattice/c/include/tetengo/lattice/nBestIterator.h b/library/lattice/c/include/tetengo/lattice/nBestIterator.h
@@ -8,32 +8,19 @@
 #define TETENGO_LATTICE_NBESTITERATOR_H
 
 
+#include <tetengo/lattice/constraint.h>
+#include <tetengo/lattice/lattice.h>
+#include <tetengo/lattice/node.h>
+#include <tetengo/lattice/path.h>
+
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
 #if !defined(DOCUMENTATION)
-#if !defined(TYPEDEF_TETENGO_LATTICE_CONSTRAINT_T)
-#define TYPEDEF_TETENGO_LATTICE_CONSTRAINT_T
-typedef struct tetengo_lattice_constraint_tag tetengo_lattice_constraint_t;
-#endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_LATTICE_T)
-#define TYPEDEF_TETENGO_LATTICE_LATTICE_T
-typedef struct tetengo_lattice_lattice_tag tetengo_lattice_lattice_t;
-#endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_NBESTITERATOR_T)
-#define TYPEDEF_TETENGO_LATTICE_NBESTITERATOR_T
 typedef struct tetengo_lattice_nBestIterator_tag tetengo_lattice_nBestIterator_t;
 #endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_NODE_T)
-#define TYPEDEF_TETENGO_LATTICE_NODE_T
-typedef struct tetengo_lattice_node_tag tetengo_lattice_node_t;
-#endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_PATH_T)
-#define TYPEDEF_TETENGO_LATTICE_PATH_T
-typedef struct tetengo_lattice_path_tag tetengo_lattice_path_t;
-#endif
-#endif
 
 
 /*!
diff --git a/library/lattice/c/include/tetengo/lattice/node.h b/library/lattice/c/include/tetengo/lattice/node.h
@@ -9,24 +9,14 @@
 
 #include <stddef.h>
 
+#include <tetengo/lattice/entry.h>
 #include <tetengo/lattice/stringView.h>
 
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
-#if !defined(DOCUMENTATION)
-#if !defined(TYPEDEF_TETENGO_LATTICE_ENTRYVIEW_T)
-#define TYPEDEF_TETENGO_LATTICE_ENTRYVIEW_T
-typedef struct tetengo_lattice_entryView_tag tetengo_lattice_entryView_t;
-#endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_ENTRY_VALUEHANDLE_T)
-#define TYPEDEF_TETENGO_LATTICE_ENTRY_VALUEHANDLE_T
-typedef const struct tetengo_lattice_entry_valueHandle_tag* tetengo_lattice_entry_valueHandle_t;
-#endif
-#endif
-
 
 /*!
     \brief A node.
diff --git a/library/lattice/c/include/tetengo/lattice/path.h b/library/lattice/c/include/tetengo/lattice/path.h
@@ -9,21 +9,16 @@
 
 #include <stddef.h>
 
+#include <tetengo/lattice/node.h>
+
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
 #if !defined(DOCUMENTATION)
-#if !defined(TYPEDEF_TETENGO_LATTICE_NODE_T)
-#define TYPEDEF_TETENGO_LATTICE_NODE_T
-typedef struct tetengo_lattice_node_tag tetengo_lattice_node_t;
-#endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_PATH_T)
-#define TYPEDEF_TETENGO_LATTICE_PATH_T
 typedef struct tetengo_lattice_path_tag tetengo_lattice_path_t;
 #endif
-#endif
 
 
 /*!
diff --git a/library/lattice/c/include/tetengo/lattice/vocabulary.h b/library/lattice/c/include/tetengo/lattice/vocabulary.h
@@ -9,37 +9,18 @@
 
 #include <stddef.h>
 
+#include <tetengo/lattice/connection.h>
+#include <tetengo/lattice/entry.h>
+#include <tetengo/lattice/node.h>
+
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
 #if !defined(DOCUMENTATION)
-#if !defined(TYPEDEF_TETENGO_LATTICE_CONNECTION_T)
-#define TYPEDEF_TETENGO_LATTICE_CONNECTION_T
-typedef struct tetengo_lattice_connection_tag tetengo_lattice_connection_t;
-#endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_ENTRIESCONNECTIONCOSTPAIR_T)
-#define TYPEDEF_TETENGO_LATTICE_ENTRIESCONNECTIONCOSTPAIR_T
-typedef struct tetengo_lattice_entriesConnectionCostPair_tag tetengo_lattice_entriesConnectionCostPair_t;
-#endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_ENTRYVIEW_T)
-#define TYPEDEF_TETENGO_LATTICE_ENTRYVIEW_T
-typedef struct tetengo_lattice_entryView_tag tetengo_lattice_entryView_t;
-#endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_KEYENTRIESPAIR_T)
-#define TYPEDEF_TETENGO_LATTICE_KEYENTRIESPAIR_T
-typedef struct tetengo_lattice_keyEntriesPair_tag tetengo_lattice_keyEntriesPair_t;
-#endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_NODE_T)
-#define TYPEDEF_TETENGO_LATTICE_NODE_T
-typedef struct tetengo_lattice_node_tag tetengo_lattice_node_t;
-#endif
-#if !defined(TYPEDEF_TETENGO_LATTICE_VOCABULARY_T)
-#define TYPEDEF_TETENGO_LATTICE_VOCABULARY_T
 typedef struct tetengo_lattice_vocabulary_tag tetengo_lattice_vocabulary_t;
 #endif
-#endif
 
 
 /*!
diff --git a/library/lattice/c/src/tetengo_lattice_lattice.cpp b/library/lattice/c/src/tetengo_lattice_lattice.cpp
@@ -17,11 +17,13 @@
 
 #include <stddef.h>
 
+#include <tetengo/lattice/entry.h>
 #include <tetengo/lattice/lattice.h>
 #include <tetengo/lattice/lattice.hpp>
 #include <tetengo/lattice/node.h> // IWYU pragma: keep
 #include <tetengo/lattice/node.hpp>
 #include <tetengo/lattice/stringView.h>
+#include <tetengo/lattice/vocabulary.h>
 
 #include "tetengo_lattice_lattice.hpp"
 #include "tetengo_lattice_vocabulary.hpp" // IWYU pragma: keep
diff --git a/library/lattice/c/src/tetengo_lattice_lattice.hpp b/library/lattice/c/src/tetengo_lattice_lattice.hpp
@@ -10,8 +10,8 @@
 #include <memory>
 #include <utility>
 
-#include <tetengo/lattice/lattice.h>
 #include <tetengo/lattice/lattice.hpp>
+#include <tetengo/lattice/vocabulary.h>
 
 #include "tetengo_lattice_vocabulary.hpp" // IWYU pragma: keep
 
diff --git a/library/lattice/c/src/tetengo_lattice_nBestIterator.cpp b/library/lattice/c/src/tetengo_lattice_nBestIterator.cpp
@@ -17,6 +17,8 @@
 #include <boost/stl_interfaces/iterator_interface.hpp>
 
 #include <tetengo/lattice/constraint.h>
+#include <tetengo/lattice/entry.h>
+#include <tetengo/lattice/lattice.h>
 #include <tetengo/lattice/nBestIterator.h>
 #include <tetengo/lattice/n_best_iterator.hpp>
 #include <tetengo/lattice/node.h> // IWYU pragma: keep
diff --git a/library/lattice/c/src/tetengo_lattice_path.cpp b/library/lattice/c/src/tetengo_lattice_path.cpp
@@ -16,6 +16,7 @@
 
 #include <stddef.h>
 
+#include <tetengo/lattice/entry.h>
 #include <tetengo/lattice/node.h>
 #include <tetengo/lattice/node.hpp>
 #include <tetengo/lattice/path.h>
diff --git a/library/lattice/test/src/test_tetengo.lattice.constraint.cpp b/library/lattice/test/src/test_tetengo.lattice.constraint.cpp
@@ -22,6 +22,7 @@
 #include <tetengo/lattice/constraint.hpp>
 #include <tetengo/lattice/constraintElement.h>
 #include <tetengo/lattice/constraint_element.hpp>
+#include <tetengo/lattice/entry.h>
 #include <tetengo/lattice/node.h>
 #include <tetengo/lattice/node.hpp>
 #include <tetengo/lattice/node_constraint_element.hpp>
diff --git a/library/lattice/test/src/test_tetengo.lattice.node_constraint_element.cpp b/library/lattice/test/src/test_tetengo.lattice.node_constraint_element.cpp
@@ -15,6 +15,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <tetengo/lattice/constraintElement.h>
+#include <tetengo/lattice/entry.h>
 #include <tetengo/lattice/node.h>
 #include <tetengo/lattice/node.hpp>
 #include <tetengo/lattice/node_constraint_element.hpp>
diff --git a/library/lattice/test/src/test_tetengo.lattice.path.cpp b/library/lattice/test/src/test_tetengo.lattice.path.cpp
@@ -15,6 +15,7 @@
 #include <boost/scope_exit.hpp>
 #include <boost/test/unit_test.hpp>
 
+#include <tetengo/lattice/entry.h>
 #include <tetengo/lattice/node.h>
 #include <tetengo/lattice/node.hpp>
 #include <tetengo/lattice/path.h>
diff --git a/library/lattice/test/src/test_tetengo.lattice.wildcard_constraint_element.cpp b/library/lattice/test/src/test_tetengo.lattice.wildcard_constraint_element.cpp
@@ -16,6 +16,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <tetengo/lattice/constraintElement.h>
+#include <tetengo/lattice/entry.h>
 #include <tetengo/lattice/node.h>
 #include <tetengo/lattice/node.hpp>
 #include <tetengo/lattice/wildcard_constraint_element.hpp>
diff --git a/library/property/c/include/tetengo/property/propertySet.h b/library/property/c/include/tetengo/property/propertySet.h
@@ -13,21 +13,16 @@
 #include <cstdint> // Just silencing IWYU
 #endif
 
+#include <tetengo/property/storage.h>
+
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
 #if !defined(DOCUMENTATION)
-#if !defined(TYPEDEF_TETENGO_PROPERTY_PROPERTYSET_T)
-#define TYPEDEF_TETENGO_PROPERTY_PROPERTYSET_T
 typedef struct tetengo_property_propertySet_tag tetengo_property_propertySet_t;
 #endif
-#if !defined(TYPEDEF_TETENGO_PROPERTY_STORAGELOADER_T)
-#define TYPEDEF_TETENGO_PROPERTY_STORAGELOADER_T
-typedef struct tetengo_property_storageLoader_tag tetengo_property_storageLoader_t;
-#endif
-#endif
 
 
 /*!
diff --git a/library/property/c/include/tetengo/property/storage.h b/library/property/c/include/tetengo/property/storage.h
diff --git a/library/text/c/include/tetengo/text/encoder.h b/library/text/c/include/tetengo/text/encoder.h
diff --git a/library/text/c/include/tetengo/text/graphemeSplitter.h b/library/text/c/include/tetengo/text/graphemeSplitter.h
diff --git a/library/trie/c/src/tetengo_trie_trie.cpp b/library/trie/c/src/tetengo_trie_trie.cpp
