refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index 47023cb582ed50b9bdaedabb5c3eff93441b561f..89b07547abd1e918e0cb2f532b4a96d2627a4674 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -6202,7 +6202,7 @@ onig_transfer(regex_t* to, regex_t* from)
 #ifdef ONIG_DEBUG_COMPILE
 static void print_compiled_byte_code_list P_((FILE* f, regex_t* reg));
 #endif
-#ifdef ONIG_DEBUG_PARSE_TREE
+#ifdef ONIG_DEBUG_PARSE
 static void print_tree P_((FILE* f, Node* node));
 #endif
 
@@ -6287,7 +6287,7 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
   r = setup_tree(root, reg, 0, &scan_env);
   if (r != 0) goto err_unset;
 
-#ifdef ONIG_DEBUG_PARSE_TREE
+#ifdef ONIG_DEBUG_PARSE
   print_tree(stderr, root);
 #endif
 
@@ -7082,7 +7082,7 @@ print_compiled_byte_code_list(FILE* f, regex_t* reg)
 }
 #endif
 
-#ifdef ONIG_DEBUG_PARSE_TREE
+#ifdef ONIG_DEBUG_PARSE
 
 static void
 Indent(FILE* f, int indent)

diff --git a/src/regint.h b/src/regint.h
index 185f4b6d3e59ee305a09af74b6191a6524fd229b..c6de8dc431678b2f3e15984f15e8df66726fa8ae 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -30,7 +30,7 @@
  */
 
 /* for debug */
-/* #define ONIG_DEBUG_PARSE_TREE */
+/* #define ONIG_DEBUG_PARSE */
 /* #define ONIG_DEBUG_COMPILE */
 /* #define ONIG_DEBUG_SEARCH */
 /* #define ONIG_DEBUG_MATCH */
@@ -39,7 +39,7 @@
 /* for byte-code statistical data. */
 /* #define ONIG_DEBUG_STATISTICS */
 
-#if defined(ONIG_DEBUG_PARSE_TREE) || defined(ONIG_DEBUG_MATCH) || \
+#if defined(ONIG_DEBUG_PARSE) || defined(ONIG_DEBUG_MATCH) || \
     defined(ONIG_DEBUG_SEARCH) || defined(ONIG_DEBUG_COMPILE) || \
     defined(ONIG_DEBUG_STATISTICS)
 #ifndef ONIG_DEBUG