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 19:49:15 UTC
[lucy-commits] [1/7] git commit: refs/heads/install-c-library - Fix Charmonizer test
Updated Branches:
refs/heads/install-c-library 27018f3ba -> 7b85c8a34
Fix Charmonizer test
Make sure to employ boolean and integers types.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/66253aa0
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/66253aa0
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/66253aa0
Branch: refs/heads/install-c-library
Commit: 66253aa0a3e1ee22d42b5ab1afa0fcb79a90d251
Parents: 27018f3
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 20 18:28:00 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon May 20 18:28:00 2013 +0200
----------------------------------------------------------------------
charmonizer/src/Charmonizer/Test/TestIntegers.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/66253aa0/charmonizer/src/Charmonizer/Test/TestIntegers.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Test/TestIntegers.c b/charmonizer/src/Charmonizer/Test/TestIntegers.c
index 9f55169..175affe 100644
--- a/charmonizer/src/Charmonizer/Test/TestIntegers.c
+++ b/charmonizer/src/Charmonizer/Test/TestIntegers.c
@@ -15,6 +15,8 @@
*/
#define CHAZ_USE_SHORT_NAMES
+#define CHY_EMPLOY_BOOLEANS
+#define CHY_EMPLOY_INTEGERTYPES
#include "Charmonizer/Test.h"
#include "charmony.h"
[lucy-commits] [4/7] git commit: refs/heads/install-c-library - Make charmonizer.c
C89-compliant
Posted by nw...@apache.org.
Make charmonizer.c C89-compliant
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/1b506fda
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/1b506fda
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/1b506fda
Branch: refs/heads/install-c-library
Commit: 1b506fda56e05167c17896fba3f50d4c7b108d79
Parents: 424fd40
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 20 18:33:00 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon May 20 18:33:00 2013 +0200
----------------------------------------------------------------------
charmonizer/src/Charmonizer/Core/ConfWriterC.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/1b506fda/charmonizer/src/Charmonizer/Core/ConfWriterC.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Core/ConfWriterC.c b/charmonizer/src/Charmonizer/Core/ConfWriterC.c
index d50f779..1b0b7c4 100644
--- a/charmonizer/src/Charmonizer/Core/ConfWriterC.c
+++ b/charmonizer/src/Charmonizer/Core/ConfWriterC.c
@@ -281,10 +281,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:
[lucy-commits] [5/7] git commit: refs/heads/install-c-library - Fix quoting of MSVC
compiler options
Posted by nw...@apache.org.
Fix quoting of MSVC compiler options
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/85c1ee7f
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/85c1ee7f
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/85c1ee7f
Branch: refs/heads/install-c-library
Commit: 85c1ee7fc69d3c31ee5c1b102001a766f4d1695c
Parents: 1b506fd
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 20 18:49:26 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon May 20 19:47:53 2013 +0200
----------------------------------------------------------------------
.../compiler/perl/buildlib/Clownfish/CFC/Build.pm | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/85c1ee7f/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
----------------------------------------------------------------------
diff --git a/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm b/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
index ff8dc36..0b65af9 100644
--- a/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
+++ b/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
@@ -138,8 +138,7 @@ sub ACTION_code {
$self->dispatch('parsers');
$self->extra_compiler_flags(
- '-DCFCPERL',
- $self->split_like_shell($self->charmony("EXTRA_CFLAGS")),
+ join( ' ', '-DCFCPERL', $self->charmony("EXTRA_CFLAGS") ),
);
$self->SUPER::ACTION_code;
[lucy-commits] [3/7] git commit: refs/heads/install-c-library - Make install.sh
POSIX-compliant
Posted by nw...@apache.org.
Make install.sh POSIX-compliant
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/424fd405
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/424fd405
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/424fd405
Branch: refs/heads/install-c-library
Commit: 424fd4057199db76b90519524e34e695ebaa2812
Parents: 2963026
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 20 18:29:48 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon May 20 18:29:48 2013 +0200
----------------------------------------------------------------------
c/install.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/424fd405/c/install.sh
----------------------------------------------------------------------
diff --git a/c/install.sh b/c/install.sh
index 53e11c4..4f59048 100755
--- a/c/install.sh
+++ b/c/install.sh
@@ -4,7 +4,7 @@ set -e
version=0.3.0
major_version=0.3
-function usage()
+usage()
{
echo "Usage: install.sh --prefix path"
}
[lucy-commits] [7/7] git commit: refs/heads/install-c-library - Regenerate
charmonizer.c
Posted by nw...@apache.org.
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/7b85c8a3
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/7b85c8a3
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/7b85c8a3
Branch: refs/heads/install-c-library
Commit: 7b85c8a343b7eeb71a30ad920d79f2b42fb52095
Parents: 6dcd3da
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 19:47:53 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/7b85c8a3/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/7b85c8a3/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/7b85c8a3/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:
[lucy-commits] [6/7] git commit: refs/heads/install-c-library - CFC tests use
integer literals from stdint.h
Posted by nw...@apache.org.
CFC tests use integer literals from stdint.h
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/6dcd3dac
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/6dcd3dac
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/6dcd3dac
Branch: refs/heads/install-c-library
Commit: 6dcd3dac99fd3809c5edd1c4e2e4fcdabacc4d58
Parents: 85c1ee7
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 20 18:51:03 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon May 20 19:47:53 2013 +0200
----------------------------------------------------------------------
clownfish/compiler/common/charmonizer.main | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/6dcd3dac/clownfish/compiler/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/clownfish/compiler/common/charmonizer.main b/clownfish/compiler/common/charmonizer.main
index b08b7d1..eeae5fe 100644
--- a/clownfish/compiler/common/charmonizer.main
+++ b/clownfish/compiler/common/charmonizer.main
@@ -257,6 +257,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();
[lucy-commits] [2/7] git commit: refs/heads/install-c-library - Fix include file
order in lucy_boot.c
Posted by nw...@apache.org.
Fix include file order in lucy_boot.c
lucy_parcel.h must be included early for bool type.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/2963026d
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/2963026d
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/2963026d
Branch: refs/heads/install-c-library
Commit: 2963026d18f7498adcc256a432d4162deddf6203
Parents: 66253aa
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 20 18:28:53 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon May 20 18:28:53 2013 +0200
----------------------------------------------------------------------
clownfish/compiler/src/CFCPerl.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/2963026d/clownfish/compiler/src/CFCPerl.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCPerl.c b/clownfish/compiler/src/CFCPerl.c
index 8efc0a1..80d0c1b 100644
--- a/clownfish/compiler/src/CFCPerl.c
+++ b/clownfish/compiler/src/CFCPerl.c
@@ -284,11 +284,11 @@ S_write_boot_c(CFCPerl *self) {
"%s\n"
"\n"
"#include \"charmony.h\"\n"
+ "#include \"%s\"\n"
"#include \"EXTERN.h\"\n"
"#include \"perl.h\"\n"
"#include \"XSUB.h\"\n"
"#include \"%s\"\n"
- "#include \"%s\"\n"
"#include \"Clownfish/CharBuf.h\"\n"
"#include \"Clownfish/VTable.h\"\n"
"%s\n"
@@ -307,8 +307,8 @@ S_write_boot_c(CFCPerl *self) {
"%s\n"
"\n";
char *content
- = CFCUtil_sprintf(pattern, self->header, self->boot_h_file,
- self->parcel_h_file, pound_includes, self->boot_func,
+ = CFCUtil_sprintf(pattern, self->header, self->parcel_h_file,
+ self->boot_h_file, pound_includes, self->boot_func,
prefix, alias_adds, isa_pushes, self->footer);
CFCUtil_write_file(self->boot_c_path, content, strlen(content));