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 2013/05/20 21:10:03 UTC

[lucy-commits] [19/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/de657f83
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/de657f83
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/de657f83

Branch: refs/heads/master
Commit: de657f8384f884b7959a0371845116803dc17dc1
Parents: d66864f
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 20 18:33:43 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon May 20 21:01:13 2013 +0200

----------------------------------------------------------------------
 clownfish/compiler/common/charmonizer.c |    3 ++-
 clownfish/runtime/common/charmonizer.c  |    2 +-
 common/charmonizer.c                    |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/de657f83/clownfish/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/common/charmonizer.c b/clownfish/compiler/common/charmonizer.c
index f89aebe..2d1b7c1 100644
--- a/clownfish/compiler/common/charmonizer.c
+++ b/clownfish/compiler/common/charmonizer.c
@@ -2499,10 +2499,10 @@ chaz_ConfWriterC_end_module(void) {
                                                     defs[i].str2);
                 break;
             case CHAZ_CONFELEM_GLOBAL_TYPEDEF: {
-                ++num_globals;
                 char *sym = chaz_ConfWriterC_uppercase_string(defs[i].str1);
                 chaz_ConfWriterC_append_def_to_conf(sym, defs[i].str2);
                 free(sym);
+                ++num_globals;
             }
             /* fall through */
             case CHAZ_CONFELEM_TYPEDEF:
@@ -6094,6 +6094,7 @@ int main(int argc, const char **argv) {
 
     /* Define stdint types in charmony.h. */
     chaz_ConfWriter_append_conf("#define CHY_EMPLOY_INTEGERTYPES\n\n");
+    chaz_ConfWriter_append_conf("#define CHY_EMPLOY_INTEGERLITERALS\n\n");
 
     /* Run probe modules. */
     chaz_BuildEnv_run();

http://git-wip-us.apache.org/repos/asf/lucy/blob/de657f83/clownfish/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/common/charmonizer.c b/clownfish/runtime/common/charmonizer.c
index 0b9bbaf..74a2f98 100644
--- a/clownfish/runtime/common/charmonizer.c
+++ b/clownfish/runtime/common/charmonizer.c
@@ -2693,10 +2693,10 @@ chaz_ConfWriterC_end_module(void) {
                                                     defs[i].str2);
                 break;
             case CHAZ_CONFELEM_GLOBAL_TYPEDEF: {
-                ++num_globals;
                 char *sym = chaz_ConfWriterC_uppercase_string(defs[i].str1);
                 chaz_ConfWriterC_append_def_to_conf(sym, defs[i].str2);
                 free(sym);
+                ++num_globals;
             }
             /* fall through */
             case CHAZ_CONFELEM_TYPEDEF:

http://git-wip-us.apache.org/repos/asf/lucy/blob/de657f83/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 82c3421..99740a8 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -2693,10 +2693,10 @@ chaz_ConfWriterC_end_module(void) {
                                                     defs[i].str2);
                 break;
             case CHAZ_CONFELEM_GLOBAL_TYPEDEF: {
-                ++num_globals;
                 char *sym = chaz_ConfWriterC_uppercase_string(defs[i].str1);
                 chaz_ConfWriterC_append_def_to_conf(sym, defs[i].str2);
                 free(sym);
+                ++num_globals;
             }
             /* fall through */
             case CHAZ_CONFELEM_TYPEDEF: