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/11 07:12:15 UTC

svn commit: r473648 - in /lucene/lucy/trunk/charmonizer/src/Charmonizer: Probe/FuncMacro.charm Probe/FuncMacro.harm Probe/UnusedVars.charm Probe/UnusedVars.harm Test/FuncMacro.charm Test/UnusedVars.charm

Author: marvin
Date: Fri Nov 10 22:12:14 2006
New Revision: 473648

URL: http://svn.apache.org/viewvc?view=rev&rev=473648
Log:
Change macros to all caps.

Modified:
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.harm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.charm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.harm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/FuncMacro.charm
    lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/UnusedVars.charm

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm?view=diff&rev=473648&r1=473647&r2=473648
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm Fri Nov 10 22:12:14 2006
@@ -64,7 +64,7 @@
             : "__FUNCTION__";
         append_conf(
 			"#define %sHAS_FUNC_MACRO\n"
-            "#define %sFunc_Macro %s\n",
+            "#define %sFUNC_MACRO %s\n",
             constant_prefix, macro_prefix, macro_text);
     }
 
@@ -85,7 +85,7 @@
             shorten_constant("HAS_GNUC_FUNC_MACRO");
         if (has_iso_funcmac || has_gnuc_funcmac) {
             shorten_constant("HAS_FUNC_MACRO");
-            shorten_macro("Func_Macro");
+            shorten_macro("FUNC_MACRO");
         }
         END_SHORT_NAMES;
     }

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.harm?view=diff&rev=473648&r1=473647&r2=473648
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.harm Fri Nov 10 22:12:14 2006
@@ -19,7 +19,7 @@
  * If one or the other succeeds, these will be defined:
  * 
  * HAS_FUNC_MACRO
- * Func_Macro
+ * FUNC_MACRO
  */
 void chaz_FuncMacro_run(void);
 

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.charm?view=diff&rev=473648&r1=473647&r2=473648
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.charm Fri Nov 10 22:12:14 2006
@@ -14,16 +14,16 @@
     
     /* write the macros (no test, these are the same everywhere) */
     append_conf(
-        "#define %sUnused_Var(x) ((void)x)\n"
-        "#define %sUnreachable_Return(type) return (type)0\n",
+        "#define %sUNUSED_VAR(x) ((void)x)\n"
+        "#define %sUNREACHABLE_RETURN(type) return (type)0\n",
         macro_prefix, macro_prefix 
     );
 
     /* shorten */
     if (want_short_names) {
         START_SHORT_NAMES;
-        shorten_macro("Unused_Var");
-        shorten_macro("Unreachable_Return");
+        shorten_macro("UNUSED_VAR");
+        shorten_macro("UNREACHABLE_RETURN");
         END_SHORT_NAMES;
     }
 

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.harm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.harm?view=diff&rev=473648&r1=473647&r2=473648
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.harm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.harm Fri Nov 10 22:12:14 2006
@@ -10,8 +10,8 @@
  *
  * These symbols are exported:
  * 
- * Unused_Var(var)
- * Unreachable_Return(type)
+ * UNUSED_VAR(var)
+ * UNREACHABLE_RETURN(type)
  * 
  */
 void chaz_UnusedVars_run(void);

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/FuncMacro.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/FuncMacro.charm?view=diff&rev=473648&r1=473647&r2=473648
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/FuncMacro.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/FuncMacro.charm Fri Nov 10 22:12:14 2006
@@ -16,8 +16,8 @@
 {
 
 #ifdef HAS_FUNC_MACRO
-    ASSERT_STR_EQ(batch, Func_Macro, "chaz_TFuncMacro_run", 
-        "Func_Macro");
+    ASSERT_STR_EQ(batch, FUNC_MACRO, "chaz_TFuncMacro_run", 
+        "FUNC_MACRO");
 #endif
 
 #ifdef HAS_ISO_FUNC_MACRO

Modified: lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/UnusedVars.charm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/UnusedVars.charm?view=diff&rev=473648&r1=473647&r2=473648
==============================================================================
--- lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/UnusedVars.charm (original)
+++ lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/UnusedVars.charm Fri Nov 10 22:12:14 2006
@@ -12,16 +12,16 @@
 void
 chaz_TUnusedVars_run(TestBatch *batch)
 {
-#ifdef Unused_Var
-    PASS(batch, "Unused_Var macro is defined");
+#ifdef UNUSED_VAR
+    PASS(batch, "UNUSED_VAR macro is defined");
 #else
-    FAIL(batch, "Unused_Var macro is defined");
+    FAIL(batch, "UNUSED_VAR macro is defined");
 #endif
 
-#ifdef Unreachable_Return
-    PASS(batch, "Unreachable_Return macro is defined");
+#ifdef UNREACHABLE_RETURN
+    PASS(batch, "UNREACHABLE_RETURN macro is defined");
 #else
-    FAIL(batch, "Unreachable_Return macro is defined");
+    FAIL(batch, "UNREACHABLE_RETURN macro is defined");
 #endif
 }