Unified macro names in header guards.

Inspired by sudden collision with '__COUNTER__' I occasionally got
while guarding 'src/util/counter.h'.

Now all headers use guards of the form '_RE2C_PATH_TO_HEADER_BASENAME_'.
Some compilers (e.g. clang++) would warn about [-Wreserved-id-macro],
but their reasonong about reserved macro names is quite crude and re2c
is not able to confirm their standards anyway (e.g. autoconf-generated
macro name 'SIZEOF___INT64').

diff --git a/re2c/src/codegen/bitmap.h b/re2c/src/codegen/bitmap.h
index 70d4de720ee5e4372e9268482292b533dd853ce6..3c87bfe78af76f5cd7245358e03465ceeb9e899b 100644 (file)
--- a/re2c/src/codegen/bitmap.h
+++ b/re2c/src/codegen/bitmap.h
@@ -1,5 +1,5 @@
-#ifndef _bitmap_h
-#define _bitmap_h
+#ifndef _RE2C_CODEGEN_BITMAP_
+#define _RE2C_CODEGEN_BITMAP_
 
 #include "src/codegen/output.h"
 #include "src/util/c99_stdint.h"
@@ -41,4 +41,4 @@ bool matches(const Span * b1, uint32_t n1, const State * s1, const Span * b2, ui
 
 } // end namespace re2c
 
-#endif // _bitmap_h
+#endif // _RE2C_CODEGEN_BITMAP_

diff --git a/re2c/src/codegen/code_names.h b/re2c/src/codegen/code_names.h
index 00b30b07a94d22bb6f039ef9772de3a6cef1afd1..75979a66f8554c3f9bb17bdaaf0230f7725d491e 100644 (file)
--- a/re2c/src/codegen/code_names.h
+++ b/re2c/src/codegen/code_names.h
@@ -1,6 +1,5 @@
-/* $Id: token.h 547 2006-05-25 13:40:35Z helly $ */
-#ifndef _code_names_h
-#define        _code_names_h
+#ifndef _RE2C_CODEGEN_CODE_NAMES_
+#define _RE2C_CODEGEN_CODE_NAMES_
 
 #include <string>
 #include <map>
@@ -16,4 +15,4 @@ public:
 
 } // end namespace re2c
 
-#endif
+#endif // _RE2C_CODEGEN_CODE_NAMES_

diff --git a/re2c/src/codegen/emit.h b/re2c/src/codegen/emit.h
index 96ea5439936f434fd59c0eeb84561afc3fbb4402..c616175eed4efcd32f25ba7ad1f8a040f81e6afc 100644 (file)
--- a/re2c/src/codegen/emit.h
+++ b/re2c/src/codegen/emit.h
@@ -1,5 +1,5 @@
-#ifndef __EMIT__
-#define __EMIT__
+#ifndef _RE2C_CODEGEN_EMIT_
+#define _RE2C_CODEGEN_EMIT_
 
 #include "src/codegen/output.h"
 #include "src/dfa/dfa.h"
@@ -38,4 +38,4 @@ template<typename _Ty> std::string replaceParam (std::string str, const std::str
 
 } // namespace re2c
 
-#endif // __EMIT__
+#endif // _RE2C_CODEGEN_EMIT_

diff --git a/re2c/src/codegen/go.h b/re2c/src/codegen/go.h
index 7bd04d6914163d793a6875cddd2bc41bb5ac3f0a..6bc8a245f0d3d7d65cec57a342ce88439c2da3d6 100644 (file)
--- a/re2c/src/codegen/go.h
+++ b/re2c/src/codegen/go.h
@@ -1,5 +1,5 @@
-#ifndef _go_h
-#define _go_h
+#ifndef _RE2C_CODEGEN_GO_
+#define _RE2C_CODEGEN_GO_
 
 #include <iostream>
 #include <set>
@@ -214,4 +214,4 @@ struct Go
 
 } // namespace re2c
 
-#endif // _go_h
+#endif // _RE2C_CODEGEN_GO_

diff --git a/re2c/src/codegen/indent.h b/re2c/src/codegen/indent.h
index 1fdc6842c29cea30ddb25938d592e9295eb40ce2..da6b209a82daa3f433108bc00b9e0e0955d08b2f 100644 (file)
--- a/re2c/src/codegen/indent.h
+++ b/re2c/src/codegen/indent.h
@@ -1,5 +1,5 @@
-#ifndef _indent_h
-#define _indent_h
+#ifndef _RE2C_CODEGEN_INDENT_
+#define _RE2C_CODEGEN_INDENT_
 
 #include <string>
 
@@ -21,4 +21,4 @@ inline std::string indent (uint32_t ind)
 
 } // end namespace re2c
 
-#endif // _indent_h
+#endif // _RE2C_CODEGEN_INDENT_

diff --git a/re2c/src/codegen/input_api.h b/re2c/src/codegen/input_api.h
index 44036d3da07056b59c37d734bbc2ebf1d15dcedd..cd3fac8c8d4420f5f4345d55748029a1ae952ac1 100644 (file)
--- a/re2c/src/codegen/input_api.h
+++ b/re2c/src/codegen/input_api.h
@@ -1,5 +1,5 @@
-#ifndef _input_api_h
-#define _input_api_h
+#ifndef _RE2C_CODEGEN_INPUT_API_
+#define _RE2C_CODEGEN_INPUT_API_
 
 #include <map>
 #include <string>
@@ -40,4 +40,4 @@ public:
 
 } // end namespace re2c
 
-#endif // _input_api_h
+#endif // _RE2C_CODEGEN_INPUT_API_

diff --git a/re2c/src/codegen/label.h b/re2c/src/codegen/label.h
index edc6484420817ebf50079a4eebc1ded498439e21..1026aafefc05ffd1e61740c45c53b1162afc4abf 100644 (file)
--- a/re2c/src/codegen/label.h
+++ b/re2c/src/codegen/label.h
@@ -1,5 +1,5 @@
-#ifndef __LABEL__
-#define __LABEL__
+#ifndef _RE2C_CODEGEN_LABEL_
+#define _RE2C_CODEGEN_LABEL_
 
 #include <iosfwd>
 
@@ -35,4 +35,4 @@ public:
 
 } // namespace re2c
 
-#endif // __LABEL__
+#endif // _RE2C_CODEGEN_LABEL_

diff --git a/re2c/src/codegen/output.h b/re2c/src/codegen/output.h
index 0cd4b7feaff23d5304d01ece76bacaa4ffa1cb49..4daacf2503776151917329fc503a264c8a6dd717 100644 (file)
--- a/re2c/src/codegen/output.h
+++ b/re2c/src/codegen/output.h
@@ -1,5 +1,5 @@
-#ifndef _output_h
-#define _output_h
+#ifndef _RE2C_CODEGEN_OUTPUT_
+#define _RE2C_CODEGEN_OUTPUT_
 
 #include <fstream>
 #include <sstream>
@@ -148,4 +148,4 @@ std::string output_get_state ();
 
 } // namespace re2c
 
-#endif // _output_h
+#endif // _RE2C_CODEGEN_OUTPUT_

diff --git a/re2c/src/codegen/print.h b/re2c/src/codegen/print.h
index 53c0a28a6116521e58f866d52c0edd2c35de1af0..3d8483acb7e3d13ffc248cfa116e1d2d02c88269 100644 (file)
--- a/re2c/src/codegen/print.h
+++ b/re2c/src/codegen/print.h
@@ -1,5 +1,5 @@
-#ifndef _print_h
-#define _print_h
+#ifndef _RE2C_CODEGEN_PRINT_
+#define _RE2C_CODEGEN_PRINT_
 
 #include <iosfwd>
 
@@ -17,4 +17,4 @@ void printSpan(std::ostream&, uint32_t, uint32_t);
 
 } // end namespace re2c
 
-#endif
+#endif // _RE2C_CODEGEN_PRINT_

diff --git a/re2c/src/codegen/scc.h b/re2c/src/codegen/scc.h
index 7d2bd1c34e562dd1f774da68e95f75858b86ec29..dc2055cb6be10cec43f65a74aa0dc68efe7854c6 100644 (file)
--- a/re2c/src/codegen/scc.h
+++ b/re2c/src/codegen/scc.h
@@ -1,5 +1,5 @@
-#ifndef __SCC__
-#define __SCC__
+#ifndef _RE2C_CODEGEN_SCC_
+#define _RE2C_CODEGEN_SCC_
 
 #include "src/util/c99_stdint.h"
 #include "src/util/forbid_copy.h"
@@ -29,4 +29,4 @@ void calcDepth (State * head);
 
 } // namespace re2c
 
-#endif // __SCC__
+#endif // _RE2C_CODEGEN_SCC_

diff --git a/re2c/src/codegen/skeleton/path.h b/re2c/src/codegen/skeleton/path.h
index 1d38af3b3a2fedf2d228df228743fd46b7f4a8c0..097e2c9f282468ce9fa76c623ea6d3cd7fb80aae 100644 (file)
--- a/re2c/src/codegen/skeleton/path.h
+++ b/re2c/src/codegen/skeleton/path.h
@@ -1,5 +1,5 @@
-#ifndef __PATH__
-#define __PATH__
+#ifndef _RE2C_CODEGEN_SKELETON_PATH_
+#define _RE2C_CODEGEN_SKELETON_PATH_
 
 #include <vector>
 
@@ -30,4 +30,4 @@ struct Path
 
 } // namespace re2c
 
-#endif // __PATH__
+#endif // _RE2C_CODEGEN_SKELETON_PATH_

diff --git a/re2c/src/codegen/skeleton/skeleton.h b/re2c/src/codegen/skeleton/skeleton.h
index b283dbf979ab8e0757290936afeff825df7ba189..41af35d36e0e777c20b90b67f2d810953c57d745 100644 (file)
--- a/re2c/src/codegen/skeleton/skeleton.h
+++ b/re2c/src/codegen/skeleton/skeleton.h
@@ -1,5 +1,5 @@
-#ifndef __SKELETON__
-#define __SKELETON__
+#ifndef _RE2C_CODEGEN_SKELETON_SKELETON_
+#define _RE2C_CODEGEN_SKELETON_SKELETON_
 
 #include <map>
 
@@ -70,4 +70,4 @@ void emit_epilog (OutputFile & o, uint32_t ind);
 
 } // namespace re2c
 
-#endif // __SKELETON__
+#endif // _RE2C_CODEGEN_SKELETON_SKELETON_

diff --git a/re2c/src/dfa/action.h b/re2c/src/dfa/action.h
index d5914817f0e138cc567a55bbf0b1367ea1fe2fa5..a188913d814df60dee32d9d962708b50ea84de1f 100644 (file)
--- a/re2c/src/dfa/action.h
+++ b/re2c/src/dfa/action.h
@@ -1,5 +1,5 @@
-#ifndef __ACTION__
-#define __ACTION__
+#ifndef _RE2C_DFA_ACTION_
+#define _RE2C_DFA_ACTION_
 
 #include <vector>
 
@@ -106,4 +106,4 @@ private:
 
 } // namespace re2c
 
-#endif // __ACTION__
+#endif // _RE2C_DFA_ACTION_

diff --git a/re2c/src/dfa/dfa.h b/re2c/src/dfa/dfa.h
index addfb22019bcce5a8cf9fb0466b869bd34fce7a6..fd00cecf04020bad5fbda2c616e5d9d8e63a5a5e 100644 (file)
--- a/re2c/src/dfa/dfa.h
+++ b/re2c/src/dfa/dfa.h
@@ -1,5 +1,5 @@
-#ifndef __DFA__
-#define __DFA__
+#ifndef _RE2C_DFA_DFA_
+#define _RE2C_DFA_DFA_
 
 #include "src/dfa/action.h"
 #include "src/dfa/state.h"
@@ -48,4 +48,4 @@ smart_ptr<DFA> genCode (RegExp *, Output &, uint32_t);
 
 } // namespace re2c
 
-#endif // __DFA__
+#endif // _RE2C_DFA_DFA_

diff --git a/re2c/src/dfa/encoding/enc.h b/re2c/src/dfa/encoding/enc.h
index 2bbbee5405515b245f96b9bec8d0ae5a93f50d77..f54997f3d8fb9782cb824734066b3ab053e7c43c 100644 (file)
--- a/re2c/src/dfa/encoding/enc.h
+++ b/re2c/src/dfa/encoding/enc.h
@@ -1,5 +1,5 @@
-#ifndef _enc_h
-#define _enc_h
+#ifndef _RE2C_DFA_ENCODING_ENC_
+#define _RE2C_DFA_ENCODING_ENC_
 
 #include "src/util/c99_stdint.h"
 #include "src/util/range.h"
@@ -172,4 +172,4 @@ inline void Enc::setPolicy(policy_t t)
 
 } // namespace re2c
 
-#endif // _enc_h
+#endif // _RE2C_DFA_ENCODING_ENC_

diff --git a/re2c/src/dfa/encoding/range_suffix.h b/re2c/src/dfa/encoding/range_suffix.h
index 26640e856e0e226b5435c18a32d8ac6baff6ee05..770c0bc66812cbf423556f25d58a74bf3a878c20 100644 (file)
--- a/re2c/src/dfa/encoding/range_suffix.h
+++ b/re2c/src/dfa/encoding/range_suffix.h
@@ -1,5 +1,5 @@
-#ifndef _range_suffix_h
-#define _range_suffix_h
+#ifndef _RE2C_DFA_ENCODING_RANGE_SUFFIX_
+#define _RE2C_DFA_ENCODING_RANGE_SUFFIX_
 
 #include <stddef.h> // NULL
 
@@ -37,4 +37,4 @@ RegExp * emit(RangeSuffix * p, RegExp * re);
 
 } // namespace re2c
 
-#endif // _range_suffix_h
+#endif // _RE2C_DFA_ENCODING_RANGE_SUFFIX_

diff --git a/re2c/src/dfa/encoding/utf16/utf16.h b/re2c/src/dfa/encoding/utf16/utf16.h
index e9b6bae7388aab735ff87844cc89f7306d0cb430..c6389d263c0522e97063bce4703b79c1af65cae3 100644 (file)
--- a/re2c/src/dfa/encoding/utf16/utf16.h
+++ b/re2c/src/dfa/encoding/utf16/utf16.h
@@ -1,5 +1,5 @@
-#ifndef _re2c_utf16_h
-#define _re2c_utf16_h
+#ifndef _RE2C_DFA_ENCODING_UTF16_UTF16_
+#define _RE2C_DFA_ENCODING_UTF16_UTF16_
 
 #include "src/util/c99_stdint.h"
 
@@ -34,4 +34,4 @@ inline uint16_t utf16::trail_surr(rune r)
 
 }  // namespace re2c
 
-#endif // _re2c_utf16_h
+#endif // _RE2C_DFA_ENCODING_UTF16_UTF16_

diff --git a/re2c/src/dfa/encoding/utf16/utf16_range.h b/re2c/src/dfa/encoding/utf16/utf16_range.h
index e98bba7fcc6cf53b0946eacd652033724688a3f1..66cf3b9139aa57e98205d88bf3f042777cfef730 100644 (file)
--- a/re2c/src/dfa/encoding/utf16/utf16_range.h
+++ b/re2c/src/dfa/encoding/utf16/utf16_range.h
@@ -1,5 +1,5 @@
-#ifndef _utf16_range_h
-#define _utf16_range_h
+#ifndef _RE2C_DFA_ENCODING_UTF16_RANGE_
+#define _RE2C_DFA_ENCODING_UTF16_RANGE_
 
 #include "src/dfa/encoding/range_suffix.h"
 #include "src/dfa/encoding/utf16/utf16.h"
@@ -13,4 +13,4 @@ void UTF16splitByRuneLength(RangeSuffix * & root, utf16::rune l, utf16::rune h);
 
 } // namespace re2c
 
-#endif // _utf16_range_h
+#endif // _RE2C_DFA_ENCODING_UTF16_RANGE_

diff --git a/re2c/src/dfa/encoding/utf16/utf16_regexp.h b/re2c/src/dfa/encoding/utf16/utf16_regexp.h
index 7757ae8d07e3ea3566b1d168e6ee6605da005b50..14e4fde0f551c9a3bf6b11888289656dff723e7b 100644 (file)
--- a/re2c/src/dfa/encoding/utf16/utf16_regexp.h
+++ b/re2c/src/dfa/encoding/utf16/utf16_regexp.h
@@ -1,5 +1,5 @@
-#ifndef _utf16_regexp_h
-#define _utf16_regexp_h
+#ifndef _RE2C_DFA_ENCODING_UTF16_REGEXP_
+#define _RE2C_DFA_ENCODING_UTF16_REGEXP_
 
 #include "src/dfa/encoding/utf16/utf16.h"
 #include "src/util/range.h"
@@ -13,4 +13,4 @@ RegExp * UTF16Range(const Range * r);
 
 } // namespace re2c
 
-#endif // _utf16_regexp_h
+#endif // _RE2C_DFA_ENCODING_UTF16_REGEXP_

diff --git a/re2c/src/dfa/encoding/utf8/utf8.h b/re2c/src/dfa/encoding/utf8/utf8.h
index f40a585305f78d477261d287ed3d9818c0de6573..9c049a500202a410548ab4f6e6e77092cfab3508 100644 (file)
--- a/re2c/src/dfa/encoding/utf8/utf8.h
+++ b/re2c/src/dfa/encoding/utf8/utf8.h
@@ -1,5 +1,5 @@
-#ifndef _re2c_utf8_h
-#define _re2c_utf8_h
+#ifndef _RE2C_DFA_ENCODING_UTF8_UTF8_
+#define _RE2C_DFA_ENCODING_UTF8_UTF8_
 
 #include "src/util/c99_stdint.h"
 
@@ -43,4 +43,4 @@ public:
 
 }  // namespace re2c
 
-#endif // _re2c_utf8_h
+#endif // _RE2C_DFA_ENCODING_UTF8_UTF8_

diff --git a/re2c/src/dfa/encoding/utf8/utf8_range.h b/re2c/src/dfa/encoding/utf8/utf8_range.h
index 9dce075dc3dbe7c06959d49a1692d5ea8258c581..e4f91da34557cd22fd4e29dc8da6316d97921189 100644 (file)
--- a/re2c/src/dfa/encoding/utf8/utf8_range.h
+++ b/re2c/src/dfa/encoding/utf8/utf8_range.h
@@ -1,5 +1,5 @@
-#ifndef _utf8_range_h
-#define _utf8_range_h
+#ifndef _RE2C_DFA_ENCODING_UTF8_RANGE_
+#define _RE2C_DFA_ENCODING_UTF8_RANGE_
 
 #include "src/dfa/encoding/range_suffix.h"
 #include "src/dfa/encoding/utf8/utf8.h"
@@ -12,4 +12,4 @@ void UTF8splitByRuneLength(RangeSuffix * & p, utf8::rune l, utf8::rune h);
 
 } // namespace re2c
 
-#endif // _utf8_range_h
+#endif // _RE2C_DFA_ENCODING_UTF8_RANGE_

diff --git a/re2c/src/dfa/encoding/utf8/utf8_regexp.h b/re2c/src/dfa/encoding/utf8/utf8_regexp.h
index a32a5b2fe6b4eab82c843c8dcfc41fc392c8a9bf..ccfaab0e78a3e955fe92d6d70d4a1b1132992876 100644 (file)
--- a/re2c/src/dfa/encoding/utf8/utf8_regexp.h
+++ b/re2c/src/dfa/encoding/utf8/utf8_regexp.h
@@ -1,5 +1,5 @@
-#ifndef _utf8_regexp_h
-#define _utf8_regexp_h
+#ifndef _RE2C_DFA_ENCODING_UTF8_REGEXP_
+#define _RE2C_DFA_ENCODING_UTF8_REGEXP_
 
 #include "src/dfa/encoding/utf8/utf8.h"
 #include "src/util/range.h"
@@ -13,4 +13,4 @@ RegExp * UTF8Range(const Range * r);
 
 } // namespace re2c
 
-#endif // _utf8_regexp_h
+#endif // _RE2C_DFA_ENCODING_UTF8_REGEXP_

diff --git a/re2c/src/dfa/ins.h b/re2c/src/dfa/ins.h
index 6c935ae7ef6702bb33f6667e5f4f2838ca8cb5cb..1e1170c76c424334276ebb330b0f78b5ba787bf6 100644 (file)
--- a/re2c/src/dfa/ins.h
+++ b/re2c/src/dfa/ins.h
@@ -1,5 +1,5 @@
-#ifndef _ins_h
-#define _ins_h
+#ifndef _RE2C_DFA_INS_
+#define _RE2C_DFA_INS_
 
 #include "src/util/c99_stdint.h"
 
@@ -52,4 +52,4 @@ inline void unmark(Ins *i)
 
 } // end namespace re2c
 
-#endif
+#endif // _RE2C_DFA_INS_

diff --git a/re2c/src/dfa/re.h b/re2c/src/dfa/re.h
index f6c73c6839ad11e2fe5d7bada262c877cdfa1b01..efb3c70fc07d583fd5033dd5184b781f47988418 100644 (file)
--- a/re2c/src/dfa/re.h
+++ b/re2c/src/dfa/re.h
@@ -1,5 +1,5 @@
-#ifndef _re_h
-#define _re_h
+#ifndef _RE2C_DFA_RE_
+#define _RE2C_DFA_RE_
 
 #include <iostream>
 #include <set>
@@ -307,4 +307,4 @@ extern RegExp *mkAlt(RegExp*, RegExp*);
 
 } // end namespace re2c
 
-#endif
+#endif // _RE2C_DFA_RE_

diff --git a/re2c/src/dfa/rule_rank.h b/re2c/src/dfa/rule_rank.h
index 1c461365079d2b86449aae9f3864c999bb255815..f3e49ebd8e65ba87d57dec9351c14e44370d0ccf 100644 (file)
--- a/re2c/src/dfa/rule_rank.h
+++ b/re2c/src/dfa/rule_rank.h
@@ -1,5 +1,5 @@
-#ifndef __RULE_RANK__
-#define __RULE_RANK__
+#ifndef _RE2C_DFA_RULE_RANK_
+#define _RE2C_DFA_RULE_RANK_
 
 #include <iosfwd>
 
@@ -36,4 +36,4 @@ public:
 
 } // namespace re2c
 
-#endif // __RULE_RANK__
+#endif // _RE2C_DFA_RULE_RANK_

diff --git a/re2c/src/dfa/state.h b/re2c/src/dfa/state.h
index 0261ed60389d78757f64707815e9b1133583af39..720135017d0c566c79a6b52a115ed9d5c3642e0d 100644 (file)
--- a/re2c/src/dfa/state.h
+++ b/re2c/src/dfa/state.h
@@ -1,5 +1,5 @@
-#ifndef __STATE__
-#define __STATE__
+#ifndef _RE2C_DFA_STATE_
+#define _RE2C_DFA_STATE_
 
 #include "src/codegen/go.h"
 #include "src/dfa/action.h"
@@ -49,4 +49,4 @@ public:
 
 } // namespace re2c
 
-#endif // __STATE__
+#endif // _RE2C_DFA_STATE_

diff --git a/re2c/src/globals.h b/re2c/src/globals.h
index 771a8a5c7ef7b2aa8bba98feabce2bbabe74d5b9..e77bcf8ddb4e2ceb76b459750fbeea39d9079812 100644 (file)
--- a/re2c/src/globals.h
+++ b/re2c/src/globals.h
@@ -1,5 +1,5 @@
-#ifndef        _globals_h
-#define        _globals_h
+#ifndef _RE2C_GLOBALS_
+#define _RE2C_GLOBALS_
 
 #include <string>
 
@@ -76,4 +76,4 @@ extern InputAPI input_api;
 
 } // end namespace re2c
 
-#endif
+#endif // _RE2C_GLOBALS_

diff --git a/re2c/src/mbo_getopt.h b/re2c/src/mbo_getopt.h
index 915fdcc0a26275ea1dc1fb6bc985b6369470fbd9..7d1b23bc00166f89ac9f2cd7c6e9ee379074f743 100644 (file)
--- a/re2c/src/mbo_getopt.h
+++ b/re2c/src/mbo_getopt.h
@@ -6,8 +6,8 @@
  * If short_open is '-' this is the last option.
  */
 
-#ifndef RE2C_MBO_GETOPT_H_INCLUDE_GUARD_
-#define RE2C_MBO_GETOPT_H_INCLUDE_GUARD_
+#ifndef _RE2C_MBO_GETOPT_
+#define _RE2C_MBO_GETOPT_
 
 namespace re2c
 {
@@ -28,5 +28,5 @@ int mbo_getopt(int argc, char* const *argv, const mbo_opt_struct *opts, char **o
 
 } // end namespace re2c
 
-#endif
+#endif // _RE2C_MBO_GETOPT_
 

diff --git a/re2c/src/parse/input.h b/re2c/src/parse/input.h
index 910bed1c43eaca1e4ebf980dc0f1be1305e59fba..f58e189e6510ecddad84eedeac1dfdcc9c73d824 100644 (file)
--- a/re2c/src/parse/input.h
+++ b/re2c/src/parse/input.h
@@ -1,5 +1,5 @@
-#ifndef _input_h
-#define _input_h
+#ifndef _RE2C_PARSE_INPUT_
+#define _RE2C_PARSE_INPUT_
 
 #include <stdio.h>
 #include <string>
@@ -22,4 +22,4 @@ struct Input
 
 } // namespace re2c
 
-#endif // _input_h
+#endif // _RE2C_PARSE_INPUT_

diff --git a/re2c/src/parse/parser.h b/re2c/src/parse/parser.h
index 70f32200e937a5123cb894e1964558cacae0d95f..f4b3f295901923b26b0e1735b2cbd9c5b2a00d37 100644 (file)
--- a/re2c/src/parse/parser.h
+++ b/re2c/src/parse/parser.h
@@ -1,5 +1,5 @@
-#ifndef __PARSER__
-#define __PARSER__
+#ifndef _RE2C_PARSE_PARSER_
+#define _RE2C_PARSE_PARSER_
 
 #include <string>
 
@@ -21,4 +21,4 @@ typedef std::map<std::string, RegExp *> symbol_table_t;
 
 } // namespace re2c
 
-#endif // __PARSER__
+#endif // _RE2C_PARSE_PARSER_

diff --git a/re2c/src/parse/scanner.h b/re2c/src/parse/scanner.h
index bdf342c34869f7ec18b00857cc916eb59c17ef82..1475dd702eea2e8906244db0a28ca6ca68419751 100644 (file)
--- a/re2c/src/parse/scanner.h
+++ b/re2c/src/parse/scanner.h
@@ -1,5 +1,5 @@
-#ifndef _scanner_h
-#define        _scanner_h
+#ifndef _RE2C_PARSE_SCANNER_
+#define _RE2C_PARSE_SCANNER_
 
 #include <string>
 
@@ -126,4 +126,4 @@ inline void Scanner::fatal(const char *msg) const
 
 } // end namespace re2c
 
-#endif
+#endif // _RE2C_PARSE_SCANNER_

diff --git a/re2c/src/parse/token.h b/re2c/src/parse/token.h
index 87482133c7c4429ff35f6daf61d514e4726bb60c..4d92685d3abbfbf4db819d087145daa6a0adb0a9 100644 (file)
--- a/re2c/src/parse/token.h
+++ b/re2c/src/parse/token.h
@@ -1,5 +1,5 @@
-#ifndef __TOKEN__
-#define __TOKEN__
+#ifndef _RE2C_PARSE_TOKEN_
+#define _RE2C_PARSE_TOKEN_
 
 #include "src/util/c99_stdint.h"
 #include "src/util/forbid_copy.h"
@@ -48,4 +48,4 @@ inline Token::Token (const Token & t)
 
 } // namespace re2c
 
-#endif // __TOKEN__
+#endif // _RE2C_PARSE_TOKEN_

diff --git a/re2c/src/util/allocate.h b/re2c/src/util/allocate.h
index f667ea013f6a5b36e946614c5a0c8fa8ea2b94bd..7f89b1af8ff96ca17dcb07fbf6b8ac38863575cb 100644 (file)
--- a/re2c/src/util/allocate.h
+++ b/re2c/src/util/allocate.h
@@ -1,5 +1,5 @@
-#ifndef __ALLOCATE__
-#define __ALLOCATE__
+#ifndef _RE2C_UTIL_ALLOCATE_
+#define _RE2C_UTIL_ALLOCATE_
 
 namespace re2c {
 
@@ -14,4 +14,4 @@ template <typename T> T * allocate (size_t n)
 
 } // namespace re2c
 
-#endif // __ALLOCATE__
+#endif // _RE2C_UTIL_ALLOCATE_

diff --git a/re2c/src/util/c99_stdint.h b/re2c/src/util/c99_stdint.h
index 33d7fa91a19118b7c7ce210be94f3e639d9f7f5e..772ffd514ef2193d455064da4b794520d12d722b 100644 (file)
--- a/re2c/src/util/c99_stdint.h
+++ b/re2c/src/util/c99_stdint.h
@@ -1,5 +1,5 @@
-#ifndef __C99_STDINT__
-#define __C99_STDINT__
+#ifndef _RE2C_UTIL_C99_STDINT_
+#define _RE2C_UTIL_C99_STDINT_
 
 #include "config.h"
 
@@ -256,4 +256,4 @@ typedef uint64_t uintmax_t;
 
 #endif // HAVE_STDINT_H
 
-#endif // __C99_STDINT__
+#endif // _RE2C_UTIL_C99_STDINT_

diff --git a/re2c/src/util/counter.h b/re2c/src/util/counter.h
index 4047f8446cb5cedbf41be117d1f6ed7e65bcd264..f4f5839449621154c15cb05737e52b1e300bd798 100644 (file)
--- a/re2c/src/util/counter.h
+++ b/re2c/src/util/counter.h
@@ -1,5 +1,5 @@
-#ifndef __RE2C_UTIL_COUNTER__
-#define __RE2C_UTIL_COUNTER__
+#ifndef _RE2C_UTIL_COUNTER_
+#define _RE2C_UTIL_COUNTER_
 
 namespace re2c {
 
@@ -26,4 +26,4 @@ public:
 
 } // namespace re2c
 
-#endif // __RE2C_UTIL_COUNTER__
+#endif // _RE2C_UTIL_COUNTER_

diff --git a/re2c/src/util/forbid_copy.h b/re2c/src/util/forbid_copy.h
index bef26ed4149e770cef77355ee923895a054c658c..9c5701d7d2eb8b29436752ebc7b2e3a29c2ec39b 100644 (file)
--- a/re2c/src/util/forbid_copy.h
+++ b/re2c/src/util/forbid_copy.h
@@ -1,5 +1,5 @@
-#ifndef __FORBID_COPY__
-#define __FORBID_COPY__
+#ifndef _RE2C_UTIL_FORBID_COPY_
+#define _RE2C_UTIL_FORBID_COPY_
 
 // must be used at the end of class definition
 // (since this macro changes scope to private)
@@ -8,4 +8,4 @@
                type (const type &); \
                type & operator = (const type &)
 
-#endif // __FORBID_COPY__
+#endif // _RE2C_UTIL_FORBID_COPY_

diff --git a/re2c/src/util/free_list.h b/re2c/src/util/free_list.h
index 2e0f85f804db29893af3ec4f5724f6a451961372..8d3ac6546cf77ac063044b00d3e59b1e00950c95 100644 (file)
--- a/re2c/src/util/free_list.h
+++ b/re2c/src/util/free_list.h
@@ -1,5 +1,5 @@
-#ifndef _free_list_h
-#define _free_list_h
+#ifndef _RE2C_UTIL_FREE_LIST_
+#define _RE2C_UTIL_FREE_LIST_
 
 #include <set>
 
@@ -53,4 +53,4 @@ protected:
 
 } // end namespace re2c
 
-#endif // _free_list_h
+#endif // _RE2C_UTIL_FREE_LIST_

diff --git a/re2c/src/util/local_increment.h b/re2c/src/util/local_increment.h
index 6435083b4ffbc657b7ed842fbbb5c22a9f92b3ca..799ced43bd93e7a88e1270a0f5507cfd247647b2 100644 (file)
--- a/re2c/src/util/local_increment.h
+++ b/re2c/src/util/local_increment.h
@@ -1,5 +1,5 @@
-#ifndef __LOCAL_INCREMENT__
-#define __LOCAL_INCREMENT__
+#ifndef _RE2C_UTIL_LOCAL_INCREMENT_
+#define _RE2C_UTIL_LOCAL_INCREMENT_
 
 namespace re2c
 {
@@ -19,4 +19,4 @@ struct local_increment_t
 
 } // namespace re2c
 
-#endif // __LOCAL_INCREMENT__
+#endif // _RE2C_UTIL_LOCAL_INCREMENT_

diff --git a/re2c/src/util/range.h b/re2c/src/util/range.h
index 7b85f4bdca027f89c29e7684013d6a7a7f22ce6b..cef0dadbd4616973ffab1608b045b3949b45d74a 100644 (file)
--- a/re2c/src/util/range.h
+++ b/re2c/src/util/range.h
@@ -1,5 +1,5 @@
-#ifndef _range_h
-#define _range_h
+#ifndef _RE2C_UTIL_RANGE_
+#define _RE2C_UTIL_RANGE_
 
 #include <iostream>
 
@@ -43,4 +43,4 @@ Range *doDiff(Range *r1, Range *r2);
 
 } // end namespace re2c
 
-#endif
+#endif // _RE2C_UTIL_RANGE_

diff --git a/re2c/src/util/smart_ptr.h b/re2c/src/util/smart_ptr.h
index aad8cbdc941843eef9c32aa29f48ddd2a2a7028d..c138cf5547339a0db2fb90320b294100bb6d3438 100644 (file)
--- a/re2c/src/util/smart_ptr.h
+++ b/re2c/src/util/smart_ptr.h
@@ -1,5 +1,5 @@
-#ifndef SMART_PTR_HPP_INCLUDE_GUARD
-#define SMART_PTR_HPP_INCLUDE_GUARD
+#ifndef _RE2C_UTIL_SMART_PTR_
+#define _RE2C_UTIL_SMART_PTR_
 
 namespace re2c 
 {
@@ -66,4 +66,4 @@ namespace re2c
        }
 }
 
-#endif
+#endif // _RE2C_UTIL_SMART_PTR_

diff --git a/re2c/src/util/substr.h b/re2c/src/util/substr.h
index 7e6ca64fbea0fccc461404b7f065269ff6bc802e..7907285006106e6c2fbf27d2222a0133012efe3c 100644 (file)
--- a/re2c/src/util/substr.h
+++ b/re2c/src/util/substr.h
@@ -1,5 +1,5 @@
-#ifndef __SUBSTR__
-#define __SUBSTR__
+#ifndef _RE2C_UTIL_SUBSTR_
+#define _RE2C_UTIL_SUBSTR_
 
 #include "src/util/c99_stdint.h"
 #include "src/util/forbid_copy.h"
@@ -29,4 +29,4 @@ public:
 
 } // namespace re2c
 
-#endif // __SUBSTR__
+#endif // _RE2C_UTIL_SUBSTR_

diff --git a/re2c/src/util/uniq_vector.h b/re2c/src/util/uniq_vector.h
index 0e003a83c46185f424060d54e00156d8c1e69800..bb8c291892b513a4ce77411c97585e4639c14add 100644 (file)
--- a/re2c/src/util/uniq_vector.h
+++ b/re2c/src/util/uniq_vector.h
@@ -1,5 +1,5 @@
-#ifndef __UNIQ_VECTOR__
-#define __UNIQ_VECTOR__
+#ifndef _RE2C_UTIL_UNIQ_VECTOR_
+#define _RE2C_UTIL_UNIQ_VECTOR_
 
 #include <vector>
 
@@ -45,4 +45,4 @@ public:
 
 } // namespace re2c
 
-#endif // __UNIQ_VECTOR__
+#endif // _RE2C_UTIL_UNIQ_VECTOR_

diff --git a/re2c/src/util/wrap_iterator.h b/re2c/src/util/wrap_iterator.h
index 16166833d0442f16b6957c62094e50dba0a7eb96..9f67bc71eed9b1711c9eb942d4920c9aca666387 100644 (file)
--- a/re2c/src/util/wrap_iterator.h
+++ b/re2c/src/util/wrap_iterator.h
@@ -1,5 +1,5 @@
-#ifndef __WRAP_ITERATOR__
-#define __WRAP_ITERATOR__
+#ifndef _RE2C_UTIL_WRAP_ITERATOR_
+#define _RE2C_UTIL_WRAP_ITERATOR_
 
 namespace re2c
 {
@@ -38,4 +38,4 @@ public:
 
 } // namespace re2c
 
-#endif // __WRAP_ITERATOR__
+#endif // _RE2C_UTIL_WRAP_ITERATOR_