lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [1/3] git commit: refs/heads/charmony-fixes - Switch from CHY_UNUSED_VAR to CFISH_UNUSED_VAR
Date Wed, 09 Jul 2014 18:27:19 GMT
Repository: lucy
Updated Branches:
  refs/heads/charmony-fixes [created] 9f622dc4a


Switch from CHY_UNUSED_VAR to CFISH_UNUSED_VAR


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/3254b3a5
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/3254b3a5
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/3254b3a5

Branch: refs/heads/charmony-fixes
Commit: 3254b3a59c5284a05edc864f227212360d2e8370
Parents: f095229
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Wed Jul 9 18:38:29 2014 +0200
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Wed Jul 9 18:42:39 2014 +0200

----------------------------------------------------------------------
 c/src/Lucy/Analysis/RegexTokenizer.c |  3 ---
 c/src/Lucy/Document/Doc.c            |  3 ---
 c/src/Lucy/Index/DocReader.c         |  1 -
 c/src/Lucy/Index/Inverter.c          |  1 -
 common/charmonizer.c                 | 20 ++++++++++++++++----
 common/charmonizer.main              |  2 --
 core/Lucy/Analysis/Analyzer.c        |  2 +-
 core/Lucy/Search/Query.c             |  2 +-
 perl/xs/Lucy/Document/Doc.c          |  3 +--
 9 files changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/3254b3a5/c/src/Lucy/Analysis/RegexTokenizer.c
----------------------------------------------------------------------
diff --git a/c/src/Lucy/Analysis/RegexTokenizer.c b/c/src/Lucy/Analysis/RegexTokenizer.c
index b3d7a6a..09f20aa 100644
--- a/c/src/Lucy/Analysis/RegexTokenizer.c
+++ b/c/src/Lucy/Analysis/RegexTokenizer.c
@@ -15,12 +15,9 @@
  */
 
 #define C_LUCY_REGEXTOKENIZER
-#define CHY_USE_SHORT_NAMES
 #define CFISH_USE_SHORT_NAMES
 #define LUCY_USE_SHORT_NAMES
 
-#include "charmony.h"
-
 #include <string.h>
 
 #include "Lucy/Analysis/RegexTokenizer.h"

http://git-wip-us.apache.org/repos/asf/lucy/blob/3254b3a5/c/src/Lucy/Document/Doc.c
----------------------------------------------------------------------
diff --git a/c/src/Lucy/Document/Doc.c b/c/src/Lucy/Document/Doc.c
index 9c73303..3b832d5 100644
--- a/c/src/Lucy/Document/Doc.c
+++ b/c/src/Lucy/Document/Doc.c
@@ -15,12 +15,9 @@
  */
 
 #define C_LUCY_DOC
-#define CHY_USE_SHORT_NAMES
 #define CFISH_USE_SHORT_NAMES
 #define LUCY_USE_SHORT_NAMES
 
-#include "charmony.h"
-
 #include "Lucy/Document/Doc.h"
 #include "Clownfish/String.h"
 #include "Clownfish/Err.h"

http://git-wip-us.apache.org/repos/asf/lucy/blob/3254b3a5/c/src/Lucy/Index/DocReader.c
----------------------------------------------------------------------
diff --git a/c/src/Lucy/Index/DocReader.c b/c/src/Lucy/Index/DocReader.c
index a887fea..0e97ecf 100644
--- a/c/src/Lucy/Index/DocReader.c
+++ b/c/src/Lucy/Index/DocReader.c
@@ -16,7 +16,6 @@
 
 #define C_LUCY_DOCREADER
 #define C_LUCY_DEFAULTDOCREADER
-#define CHY_USE_SHORT_NAMES
 #define CFISH_USE_SHORT_NAMES
 #define LUCY_USE_SHORT_NAMES
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/3254b3a5/c/src/Lucy/Index/Inverter.c
----------------------------------------------------------------------
diff --git a/c/src/Lucy/Index/Inverter.c b/c/src/Lucy/Index/Inverter.c
index b5882c2..c235a66 100644
--- a/c/src/Lucy/Index/Inverter.c
+++ b/c/src/Lucy/Index/Inverter.c
@@ -16,7 +16,6 @@
 
 #define C_LUCY_INVERTER
 #define C_LUCY_INVERTERENTRY
-#define CHY_USE_SHORT_NAMES
 #define CFISH_USE_SHORT_NAMES
 #define LUCY_USE_SHORT_NAMES
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/3254b3a5/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 2be5f43..441f752 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -89,6 +89,8 @@ chaz_SharedLib_export_filename(chaz_SharedLib *lib);
 #ifndef H_CHAZ_CFLAGS
 #define H_CHAZ_CFLAGS
 
+/* #include "Charmonizer/Core/SharedLibrary.h" */
+
 #define CHAZ_CFLAGS_STYLE_POSIX  1
 #define CHAZ_CFLAGS_STYLE_GNU    2
 #define CHAZ_CFLAGS_STYLE_MSVC   3
@@ -490,7 +492,7 @@ chaz_HeadCheck_contains_member(const char *struct_name, const char *member,
 #define H_CHAZ_MAKE
 
 /* #include "Charmonizer/Core/CFlags.h" */
-/* #include "Charmonizer/Core/SharedLib.h" */
+/* #include "Charmonizer/Core/SharedLibrary.h" */
 
 typedef struct chaz_MakeFile chaz_MakeFile;
 typedef struct chaz_MakeVar chaz_MakeVar;
@@ -1537,7 +1539,7 @@ void chaz_VariadicMacros_run(void);
 #line 17 "src/Charmonizer/Core/SharedLibrary.c"
 #include <string.h>
 #include <stdlib.h>
-/* #include "Charmonizer/Core/SharedLib.h" */
+/* #include "Charmonizer/Core/SharedLibrary.h" */
 /* #include "Charmonizer/Core/Compiler.h" */
 /* #include "Charmonizer/Core/Util.h" */
 /* #include "Charmonizer/Core/OperatingSystem.h" */
@@ -1661,6 +1663,7 @@ S_get_prefix() {
 #include <string.h>
 #include <stdlib.h>
 /* #include "Charmonizer/Core/CFlags.h" */
+/* #include "Charmonizer/Core/Compiler.h" */
 /* #include "Charmonizer/Core/Util.h" */
 /* #include "Charmonizer/Core/OperatingSystem.h" */
 /* #include "Charmonizer/Core/SharedLibrary.h" */
@@ -3696,6 +3699,7 @@ chaz_HeadCheck_maybe_add_to_cache(const char *header_name, int exists)
{
 
 #line 17 "src/Charmonizer/Core/Make.c"
 #include <ctype.h>
+#include <stdlib.h>
 #include <string.h>
 /* #include "Charmonizer/Core/Make.h" */
 /* #include "Charmonizer/Core/Compiler.h" */
@@ -4686,6 +4690,7 @@ chaz_OS_rmdir(const char *filepath) {
 #include <stdlib.h>
 #include <string.h>
 /* #include "Charmonizer/Core/Util.h" */
+/* #include "Charmonizer/Core/OperatingSystem.h" */
 
 /* Global verbosity setting. */
 int chaz_Util_verbosity = 1;
@@ -4894,6 +4899,7 @@ chaz_Util_can_open_file(const char *file_path) {
 /* #include "Charmonizer/Core/ConfWriterRuby.h" */
 /* #include "Charmonizer/Core/Util.h" */
 /* #include "Charmonizer/Core/Compiler.h" */
+/* #include "Charmonizer/Core/Make.h" */
 /* #include "Charmonizer/Core/OperatingSystem.h" */
 
 int
@@ -5146,6 +5152,8 @@ chaz_Booleans_run(void) {
 
 #line 17 "src/Charmonizer/Probe/BuildEnv.c"
 /* #include "Charmonizer/Core/HeaderChecker.h" */
+/* #include "Charmonizer/Core/CFlags.h" */
+/* #include "Charmonizer/Core/Compiler.h" */
 /* #include "Charmonizer/Core/ConfWriter.h" */
 /* #include "Charmonizer/Probe/BuildEnv.h" */
 
@@ -5361,6 +5369,8 @@ chaz_DirManip_run(void) {
 
 #line 17 "src/Charmonizer/Probe/Floats.c"
 /* #include "Charmonizer/Core/HeaderChecker.h" */
+/* #include "Charmonizer/Core/CFlags.h" */
+/* #include "Charmonizer/Core/Compiler.h" */
 /* #include "Charmonizer/Core/ConfWriter.h" */
 /* #include "Charmonizer/Core/Util.h" */
 /* #include "Charmonizer/Probe/Floats.h" */
@@ -6716,6 +6726,7 @@ chaz_Memory_probe_alloca(void) {
 
 #line 17 "src/Charmonizer/Probe/RegularExpressions.c"
 /* #include "Charmonizer/Core/HeaderChecker.h" */
+/* #include "Charmonizer/Core/Compiler.h" */
 /* #include "Charmonizer/Core/ConfWriter.h" */
 /* #include "Charmonizer/Probe/RegularExpressions.h" */
 
@@ -6764,6 +6775,8 @@ chaz_RegularExpressions_run(void) {
 /* #include "Charmonizer/Core/ConfWriter.h" */
 /* #include "Charmonizer/Probe/Strings.h" */
 
+#include <stdlib.h>
+
 /* Check for C99-compatible snprintf and possible replacements.
  */
 static void
@@ -6936,6 +6949,7 @@ chaz_UnusedVars_run(void) {
 /* #include "Charmonizer/Probe/VariadicMacros.h" */
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 
 /* Code for verifying ISO-style variadic macros. */
@@ -7028,7 +7042,6 @@ chaz_VariadicMacros_run(void) {
 /* #include "Charmonizer/Probe/LargeFiles.h" */
 /* #include "Charmonizer/Probe/Memory.h" */
 /* #include "Charmonizer/Probe/SymbolVisibility.h" */
-/* #include "Charmonizer/Probe/UnusedVars.h" */
 /* #include "Charmonizer/Probe/VariadicMacros.h" */
 /* #include "Charmonizer/Core/HeaderChecker.h" */
 /* #include "Charmonizer/Core/ConfWriter.h" */
@@ -7465,7 +7478,6 @@ int main(int argc, const char **argv) {
     chaz_LargeFiles_run();
     chaz_Memory_run();
     chaz_RegularExpressions_run();
-    chaz_UnusedVars_run();
     chaz_VariadicMacros_run();
 
     /* Write custom postamble. */

http://git-wip-us.apache.org/repos/asf/lucy/blob/3254b3a5/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/common/charmonizer.main b/common/charmonizer.main
index 1263de0..fd3d0f3 100644
--- a/common/charmonizer.main
+++ b/common/charmonizer.main
@@ -30,7 +30,6 @@
 #include "Charmonizer/Probe/LargeFiles.h"
 #include "Charmonizer/Probe/Memory.h"
 #include "Charmonizer/Probe/SymbolVisibility.h"
-#include "Charmonizer/Probe/UnusedVars.h"
 #include "Charmonizer/Probe/VariadicMacros.h"
 #include "Charmonizer/Core/HeaderChecker.h"
 #include "Charmonizer/Core/ConfWriter.h"
@@ -467,7 +466,6 @@ int main(int argc, const char **argv) {
     chaz_LargeFiles_run();
     chaz_Memory_run();
     chaz_RegularExpressions_run();
-    chaz_UnusedVars_run();
     chaz_VariadicMacros_run();
 
     /* Write custom postamble. */

http://git-wip-us.apache.org/repos/asf/lucy/blob/3254b3a5/core/Lucy/Analysis/Analyzer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/Analyzer.c b/core/Lucy/Analysis/Analyzer.c
index 281d13b..ca37005 100644
--- a/core/Lucy/Analysis/Analyzer.c
+++ b/core/Lucy/Analysis/Analyzer.c
@@ -68,7 +68,7 @@ Analyzer_Dump_IMP(Analyzer *self) {
 
 Obj*
 Analyzer_Load_IMP(Analyzer *self, Obj *dump) {
-    CHY_UNUSED_VAR(self);
+    UNUSED_VAR(self);
     Hash *source = (Hash*)CERTIFY(dump, HASH);
     String *class_name
         = (String*)CERTIFY(Hash_Fetch_Utf8(source, "_class", 6), STRING);

http://git-wip-us.apache.org/repos/asf/lucy/blob/3254b3a5/core/Lucy/Search/Query.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/Query.c b/core/Lucy/Search/Query.c
index 889a822..49b41cb 100644
--- a/core/Lucy/Search/Query.c
+++ b/core/Lucy/Search/Query.c
@@ -64,7 +64,7 @@ Query_Dump_IMP(Query *self) {
 
 Obj*
 Query_Load_IMP(Query *self, Obj *dump) {
-    CHY_UNUSED_VAR(self);
+    UNUSED_VAR(self);
     Hash *source = (Hash*)CERTIFY(dump, HASH);
     String *class_name
         = (String*)CERTIFY(Hash_Fetch_Utf8(source, "_class", 6), STRING);

http://git-wip-us.apache.org/repos/asf/lucy/blob/3254b3a5/perl/xs/Lucy/Document/Doc.c
----------------------------------------------------------------------
diff --git a/perl/xs/Lucy/Document/Doc.c b/perl/xs/Lucy/Document/Doc.c
index 987f293..398bcd8 100644
--- a/perl/xs/Lucy/Document/Doc.c
+++ b/perl/xs/Lucy/Document/Doc.c
@@ -15,7 +15,6 @@
  */
 
 #define C_LUCY_DOC
-#include "charmony.h"
 #include "XSBind.h"
 #include "Lucy/Document/Doc.h"
 #include "Lucy/Store/InStream.h"
@@ -202,7 +201,7 @@ LUCY_Doc_Load_IMP(lucy_Doc *self, cfish_Obj *dump) {
                             CFISH_Hash_Fetch_Utf8(source, "fields", 6),
                             CFISH_HASH);
     SV *fields_sv = XSBind_cfish_to_perl((cfish_Obj*)fields);
-    CHY_UNUSED_VAR(self);
+    CFISH_UNUSED_VAR(self);
 
     lucy_DocIVARS *const loaded_ivars = lucy_Doc_IVARS(loaded);
     loaded_ivars->doc_id = (int32_t)CFISH_Obj_To_I64(doc_id);


Mime
View raw message