You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2012/06/14 19:18:30 UTC
[lucy-commits] svn commit: r1350344 - in /lucy/trunk/charmonizer/src/Charmonizer/Core:
ConfWriter.c ConfWriter.h
Author: marvin
Date: Thu Jun 14 17:18:30 2012
New Revision: 1350344
URL: http://svn.apache.org/viewvc?rev=1350344&view=rev
Log:
Remove shortening API.
All short names are now generated automatically, so remove the API for
generating them manually.
Modified:
lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c
lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h
Modified: lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c
URL: http://svn.apache.org/viewvc/lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c?rev=1350344&r1=1350343&r2=1350344&view=diff
==============================================================================
--- lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c (original)
+++ lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c Thu Jun 14 17:18:30 2012
@@ -175,19 +175,6 @@ S_append_local_include_to_conf(const cha
}
void
-ConfWriter_start_short_names(void) {
- ConfWriter_append_conf(
- "\n#if defined(CHY_USE_SHORT_NAMES) "
- "|| defined(CHAZ_USE_SHORT_NAMES)\n"
- );
-}
-
-void
-ConfWriter_end_short_names(void) {
- ConfWriter_append_conf("#endif /* USE_SHORT_NAMES */\n");
-}
-
-void
ConfWriter_start_module(const char *module_name) {
if (chaz_Util_verbosity > 0) {
printf("Running %s module...\n", module_name);
@@ -254,21 +241,6 @@ ConfWriter_end_module(void) {
S_clear_def_list();
}
-void
-ConfWriter_shorten_macro(const char *sym) {
- ConfWriter_append_conf(" #define %s CHY_%s\n", sym, sym);
-}
-
-void
-ConfWriter_shorten_typedef(const char *sym) {
- ConfWriter_append_conf(" #define %s chy_%s\n", sym, sym);
-}
-
-void
-ConfWriter_shorten_function(const char *sym) {
- ConfWriter_append_conf(" #define %s chy_%s\n", sym, sym);
-}
-
static void
S_push_def_list_item(const char *str1, const char *str2, ConfElemType type) {
if (def_count >= def_cap) {
Modified: lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h
URL: http://svn.apache.org/viewvc/lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h?rev=1350344&r1=1350343&r2=1350344&view=diff
==============================================================================
--- lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h (original)
+++ lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.h Thu Jun 14 17:18:30 2012
@@ -70,31 +70,6 @@ chaz_ConfWriter_add_sys_include(const ch
void
chaz_ConfWriter_add_local_include(const char *header);
-/* Start a short names block.
- */
-void
-chaz_ConfWriter_start_short_names(void);
-
-/* Close a short names block.
- */
-void
-chaz_ConfWriter_end_short_names(void);
-
-/* Define a shortened version of a macro symbol (minus the "CHY_" prefix);
- */
-void
-chaz_ConfWriter_shorten_macro(const char *symbol);
-
-/* Define a shortened version of a typedef symbol (minus the "chy_" prefix);
- */
-void
-chaz_ConfWriter_shorten_typedef(const char *symbol);
-
-/* Define a shortened version of a function symbol (minus the "chy_" prefix);
- */
-void
-chaz_ConfWriter_shorten_function(const char *symbol);
-
/* Print a "chapter heading" comment in the conf file when starting a module.
*/
void
@@ -112,16 +87,11 @@ chaz_ConfWriter_end_module(void);
#define ConfWriter_build_charm_run chaz_ConfWriter_build_charm_run
#define ConfWriter_start_module chaz_ConfWriter_start_module
#define ConfWriter_end_module chaz_ConfWriter_end_module
- #define ConfWriter_start_short_names chaz_ConfWriter_start_short_names
- #define ConfWriter_end_short_names chaz_ConfWriter_end_short_names
#define ConfWriter_append_conf chaz_ConfWriter_append_conf
#define ConfWriter_add_def chaz_ConfWriter_add_def
#define ConfWriter_add_typedef chaz_ConfWriter_add_typedef
#define ConfWriter_add_sys_include chaz_ConfWriter_add_sys_include
#define ConfWriter_add_local_include chaz_ConfWriter_add_local_include
- #define ConfWriter_shorten_macro chaz_ConfWriter_shorten_macro
- #define ConfWriter_shorten_typedef chaz_ConfWriter_shorten_typedef
- #define ConfWriter_shorten_function chaz_ConfWriter_shorten_function
#endif
#ifdef __cplusplus