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 2006/11/03 23:19:37 UTC
svn commit: r471018 - in /lucene/lucy/trunk/charmonizer: charmonize.c
src/Charmonizer.charm src/Charmonizer.harm src/Charmonizer/Probe.charm
src/Charmonizer/Probe.harm src/Charmonizer/Test/TestHandler.harm
Author: marvin
Date: Fri Nov 3 14:19:36 2006
New Revision: 471018
URL: http://svn.apache.org/viewvc?view=rev&rev=471018
Log:
Move Charmonizer.harm and Charmonizer.charm to Charmonizer/Probe.harm and
Chamonizer/Probe.charm.
Added:
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.charm
- copied, changed from r471009, lucene/lucy/trunk/charmonizer/src/Charmonizer.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.harm
- copied, changed from r471009, lucene/lucy/trunk/charmonizer/src/Charmonizer.harm
Removed:
lucene/lucy/trunk/charmonizer/src/Charmonizer.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer.harm
Modified:
lucene/lucy/trunk/charmonizer/charmonize.c
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHandler.harm
Modified: lucene/lucy/trunk/charmonizer/charmonize.c
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/charmonize.c?view=diff&rev=471018&r1=471017&r2=471018
==============================================================================
--- lucene/lucy/trunk/charmonizer/charmonize.c (original)
+++ lucene/lucy/trunk/charmonizer/charmonize.c Fri Nov 3 14:19:36 2006
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
-#include "Charmonizer.h"
+#include "Charmonizer/Probe.h"
#include "Charmonizer/Probe/FuncMacro.h"
#include "Charmonizer/Probe/Headers.h"
#include "Charmonizer/Probe/Integers.h"
@@ -63,7 +63,7 @@
finish_conf_file(config_fh);
if (fclose(config_fh))
die("Error closing config file: %s", strerror(errno));
- chaz_clean_up();
+ chaz_Probe_clean_up();
return 0;
}
@@ -79,7 +79,7 @@
/* parse the infile */
if (argc != 2)
die("Usage: ./charmonize INFILE");
- infile_str = chaz_slurp_file(argv[1], &infile_len);
+ infile_str = chaz_Probe_slurp_file(argv[1], &infile_len);
cc_command = extract_delim_and_verify(infile_str, infile_len,
"charm_cc_command");
cc_flags = extract_delim_and_verify(infile_str, infile_len,
@@ -99,11 +99,11 @@
/* set up Charmonizer */
if (verbosity_str != NULL) {
const long verbosity = strtol(verbosity_str, NULL, 10);
- chaz_set_verbosity(verbosity);
+ chaz_Probe_set_verbosity(verbosity);
}
- chaz_init(conf_fh, os_name, cc_command, cc_flags);
- chaz_set_prefixes("LUCY_", "Lucy_", "lucy_", "lucy_");
- chaz_write_charm_test_h();
+ chaz_Probe_init(conf_fh, os_name, cc_command, cc_flags);
+ chaz_Probe_set_prefixes("LUCY_", "Lucy_", "lucy_", "lucy_");
+ chaz_Probe_write_charm_test_h();
/* clean up */
free(infile_str);
Copied: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.charm (from r471009, lucene/lucy/trunk/charmonizer/src/Charmonizer.charm)
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.charm?view=diff&rev=471018&p1=lucene/lucy/trunk/charmonizer/src/Charmonizer.charm&r1=471009&p2=lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.charm&r2=471018
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.charm Fri Nov 3 14:19:36 2006
@@ -3,7 +3,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "Charmonizer.h"
+#include "Charmonizer/Probe.h"
#include "Charmonizer/Core/HeadCheck.h"
#include "Charmonizer/Core/ModHandler.h"
#include "Charmonizer/Core/Util.h"
@@ -11,7 +11,7 @@
#include "Charmonizer/Core/OperSys.h"
void
-chaz_init(FILE *conf_fh, const char *osname, const char *cc_command,
+chaz_Probe_init(FILE *conf_fh, const char *osname, const char *cc_command,
const char *cc_flags)
{
(void)conf_fh; /* unused for now */
@@ -21,7 +21,7 @@
compiler = CC_new(os, cc_command, cc_flags);
/* don't write short names unless the user so indicates */
- chaz_set_prefixes("", "", "", "");
+ chaz_Probe_set_prefixes("", "", "", "");
want_short_names = false;
/* dispatch other tasks */
@@ -33,7 +33,7 @@
}
void
-chaz_clean_up()
+chaz_Probe_clean_up()
{
if (verbosity)
printf("Cleaning up...\n");
@@ -49,7 +49,7 @@
}
void
-chaz_set_prefixes(const char *constant_pre, const char *macro_pre,
+chaz_Probe_set_prefixes(const char *constant_pre, const char *macro_pre,
const char* typedef_pre, const char *function_pre)
{
want_short_names = true;
@@ -69,18 +69,18 @@
}
void
-chaz_set_verbosity(int level)
+chaz_Probe_set_verbosity(int level)
{
verbosity = level;
}
char*
-chaz_slurp_file(char* filepath, size_t *len_ptr) {
+chaz_Probe_slurp_file(char* filepath, size_t *len_ptr) {
return slurp_file(filepath, len_ptr);
}
void
-chaz_write_charm_test_h()
+chaz_Probe_write_charm_test_h()
{
ModHand_write_charm_test_h();
}
Copied: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.harm (from r471009, lucene/lucy/trunk/charmonizer/src/Charmonizer.harm)
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.harm?view=diff&rev=471018&p1=lucene/lucy/trunk/charmonizer/src/Charmonizer.harm&r1=471009&p2=lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.harm&r2=471018
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.harm Fri Nov 3 14:19:36 2006
@@ -8,20 +8,20 @@
* else.
*/
void
-chaz_init(FILE *conf_fh, const char *os_name, const char *cc_command,
+chaz_Probe_init(FILE *conf_fh, const char *os_name, const char *cc_command,
const char *cc_flags);
/* Clean up the Charmonizer environment -- deleting tempfiles, etc. This
* should be called only after everything else finishes.
*/
void
-chaz_clean_up();
+chaz_Probe_clean_up();
/* These prefixes will be prepended to every symbol Charmonizer generates.
* By default, they are blank.
*/
void
-chaz_set_prefixes(const char *constant_prefix, const char *macro_prefix,
+chaz_Probe_set_prefixes(const char *constant_prefix, const char *macro_prefix,
const char *typedef_prefix, const char *function_prefix);
/* Determine how much feedback Charmonizer provides.
@@ -30,19 +30,19 @@
* 2 - debugging
*/
void
-chaz_set_verbosity(int level);
+chaz_Probe_set_verbosity(int level);
/* Read an entire file into memory.
*/
char*
-chaz_slurp_file(char* filepath, size_t *len_ptr);
+chaz_Probe_slurp_file(char* filepath, size_t *len_ptr);
/* In addition to the main output, write symbols without prefixes to the file
* _charm_test.h in the current working directory. This file is needed for
* testing Charmonizer's output using the files in Charmonizer/Test.
*/
void
-chaz_write_charm_test_h();
+chaz_Probe_write_charm_test_h();
#endif /* include guard */
Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHandler.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHandler.harm?view=diff&rev=471018&r1=471017&r2=471018
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHandler.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/TestHandler.harm Fri Nov 3 14:19:36 2006
@@ -26,7 +26,7 @@
chaz_TestHand_new_batch(unsigned num_tests);
/* These tests all require the file _charm_test.h. See the documentation for
- * Charmonizer.h for instructions on how to produce it.
+ * Charmonizer/Probe.h for instructions on how to produce it.
*
* No other header files should be included other than _charm_test.h and this
* one.