You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2012/11/22 19:44:02 UTC
[lucy-commits] [9/23] git commit: refs/heads/master - Regenerate charmonizer.c
Regenerate charmonizer.c
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/cb637e6a
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/cb637e6a
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/cb637e6a
Branch: refs/heads/master
Commit: cb637e6a2751e73876e41ac3977bd9273b2f7555
Parents: 64c12d4
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sun Nov 18 02:13:24 2012 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sun Nov 18 16:37:40 2012 +0100
----------------------------------------------------------------------
clownfish/compiler/common/charmonizer.c | 10 ----
clownfish/runtime/common/charmonizer.c | 76 ++++++++++++++++++++++----
common/charmonizer.c | 76 ++++++++++++++++++++++----
3 files changed, 132 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/cb637e6a/clownfish/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/common/charmonizer.c b/clownfish/compiler/common/charmonizer.c
index 1904e00..4ffaeed 100644
--- a/clownfish/compiler/common/charmonizer.c
+++ b/clownfish/compiler/common/charmonizer.c
@@ -2837,16 +2837,6 @@ chaz_Integers_run(void) {
"(double)(int64_t)(num))");
}
- /* True and false. */
- chaz_ConfWriter_append_conf(
- "#ifndef true\n"
- " #define true 1\n"
- "#endif\n"
- "#ifndef false\n"
- " #define false 0\n"
- "#endif\n"
- );
-
chaz_ConfWriter_end_module();
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/cb637e6a/clownfish/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/common/charmonizer.c b/clownfish/runtime/common/charmonizer.c
index ee67ab0..8063439 100644
--- a/clownfish/runtime/common/charmonizer.c
+++ b/clownfish/runtime/common/charmonizer.c
@@ -492,6 +492,36 @@ void chaz_AtomicOps_run(void);
/***************************************************************************/
+#line 21 "src/Charmonizer/Probe/Booleans.h"
+/* Charmonizer/Probe/Booleans.h -- bool type.
+ *
+ * If stdbool.h is is available, it will be pound-included in the configuration
+ * header. If it is not, the following typedef will be defined:
+ *
+ * bool
+ *
+ * These symbols will be defined if they are not already:
+ *
+ * true
+ * false
+ */
+
+#ifndef H_CHAZ_BOOLEANS
+#define H_CHAZ_BOOLEANS
+
+#include <stdio.h>
+
+/* Run the Booleans module.
+ */
+void chaz_Booleans_run(void);
+
+#endif /* H_CHAZ_BOOLEANS */
+
+
+
+
+/***************************************************************************/
+
#line 21 "src/Charmonizer/Probe/DirManip.h"
/* Charmonizer/Probe/DirManip.h
*/
@@ -2866,6 +2896,41 @@ chaz_AtomicOps_run(void) {
/***************************************************************************/
+#line 17 "src/Charmonizer/Probe/Booleans.c"
+/* #include "Charmonizer/Core/HeaderChecker.h" */
+/* #include "Charmonizer/Core/ConfWriter.h" */
+/* #include "Charmonizer/Probe/Booleans.h" */
+
+void
+chaz_Booleans_run(void) {
+ int has_stdbool = chaz_HeadCheck_check_header("stdbool.h");
+
+ chaz_ConfWriter_start_module("Booleans");
+
+ if (has_stdbool) {
+ chaz_ConfWriter_add_def("HAS_STDBOOL_H", NULL);
+ chaz_ConfWriter_add_sys_include("stdbool.h");
+ }
+ else {
+ chaz_ConfWriter_append_conf(
+ "#ifndef __cplusplus\n"
+ " typedef int bool;\n"
+ " #ifndef true\n"
+ " #define true 1\n"
+ " #endif\n"
+ " #ifndef false\n"
+ " #define false 0\n"
+ " #endif\n"
+ "#endif\n");
+ }
+
+ chaz_ConfWriter_end_module();
+}
+
+
+
+/***************************************************************************/
+
#line 17 "src/Charmonizer/Probe/DirManip.c"
/* #include "Charmonizer/Core/ConfWriter.h" */
/* #include "Charmonizer/Core/Compiler.h" */
@@ -3884,16 +3949,6 @@ chaz_Integers_run(void) {
"(double)(int64_t)(num))");
}
- /* True and false. */
- chaz_ConfWriter_append_conf(
- "#ifndef true\n"
- " #define true 1\n"
- "#endif\n"
- "#ifndef false\n"
- " #define false 0\n"
- "#endif\n"
- );
-
chaz_ConfWriter_end_module();
}
@@ -4614,6 +4669,7 @@ int main(int argc, char **argv) {
chaz_Headers_run();
chaz_AtomicOps_run();
chaz_FuncMacro_run();
+ chaz_Booleans_run();
chaz_Integers_run();
chaz_Floats_run();
chaz_LargeFiles_run();
http://git-wip-us.apache.org/repos/asf/lucy/blob/cb637e6a/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index e496ec7..11fe52c 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -492,6 +492,36 @@ void chaz_AtomicOps_run(void);
/***************************************************************************/
+#line 21 "src/Charmonizer/Probe/Booleans.h"
+/* Charmonizer/Probe/Booleans.h -- bool type.
+ *
+ * If stdbool.h is is available, it will be pound-included in the configuration
+ * header. If it is not, the following typedef will be defined:
+ *
+ * bool
+ *
+ * These symbols will be defined if they are not already:
+ *
+ * true
+ * false
+ */
+
+#ifndef H_CHAZ_BOOLEANS
+#define H_CHAZ_BOOLEANS
+
+#include <stdio.h>
+
+/* Run the Booleans module.
+ */
+void chaz_Booleans_run(void);
+
+#endif /* H_CHAZ_BOOLEANS */
+
+
+
+
+/***************************************************************************/
+
#line 21 "src/Charmonizer/Probe/DirManip.h"
/* Charmonizer/Probe/DirManip.h
*/
@@ -2866,6 +2896,41 @@ chaz_AtomicOps_run(void) {
/***************************************************************************/
+#line 17 "src/Charmonizer/Probe/Booleans.c"
+/* #include "Charmonizer/Core/HeaderChecker.h" */
+/* #include "Charmonizer/Core/ConfWriter.h" */
+/* #include "Charmonizer/Probe/Booleans.h" */
+
+void
+chaz_Booleans_run(void) {
+ int has_stdbool = chaz_HeadCheck_check_header("stdbool.h");
+
+ chaz_ConfWriter_start_module("Booleans");
+
+ if (has_stdbool) {
+ chaz_ConfWriter_add_def("HAS_STDBOOL_H", NULL);
+ chaz_ConfWriter_add_sys_include("stdbool.h");
+ }
+ else {
+ chaz_ConfWriter_append_conf(
+ "#ifndef __cplusplus\n"
+ " typedef int bool;\n"
+ " #ifndef true\n"
+ " #define true 1\n"
+ " #endif\n"
+ " #ifndef false\n"
+ " #define false 0\n"
+ " #endif\n"
+ "#endif\n");
+ }
+
+ chaz_ConfWriter_end_module();
+}
+
+
+
+/***************************************************************************/
+
#line 17 "src/Charmonizer/Probe/DirManip.c"
/* #include "Charmonizer/Core/ConfWriter.h" */
/* #include "Charmonizer/Core/Compiler.h" */
@@ -3884,16 +3949,6 @@ chaz_Integers_run(void) {
"(double)(int64_t)(num))");
}
- /* True and false. */
- chaz_ConfWriter_append_conf(
- "#ifndef true\n"
- " #define true 1\n"
- "#endif\n"
- "#ifndef false\n"
- " #define false 0\n"
- "#endif\n"
- );
-
chaz_ConfWriter_end_module();
}
@@ -4614,6 +4669,7 @@ int main(int argc, char **argv) {
chaz_Headers_run();
chaz_AtomicOps_run();
chaz_FuncMacro_run();
+ chaz_Booleans_run();
chaz_Integers_run();
chaz_Floats_run();
chaz_LargeFiles_run();