Moved utility class to a separate file in 'src/util/'.

diff --git a/re2c/Makefile.am b/re2c/Makefile.am
index ba935e04719a17a0a57944fd03ef4b8b1342f025..6bebdbca921781458f68176c0c69663440ec00b1 100644 (file)
--- a/re2c/Makefile.am
+++ b/re2c/Makefile.am
@@ -61,6 +61,7 @@ SRC_HDR = \
        $(srcdir)/src/util/c99_stdint.h \
        $(srcdir)/src/util/forbid_copy.h \
        $(srcdir)/src/util/free_list.h \
+       $(srcdir)/src/util/local_increment.h \
        $(srcdir)/src/util/range.h \
        $(srcdir)/src/util/smart_ptr.h \
        $(srcdir)/src/util/substr.h

diff --git a/re2c/src/codegen/skeleton/skeleton.h b/re2c/src/codegen/skeleton/skeleton.h
index 8ad67877f2bbbaf878e3a81de08265d228e39824..f0680410c14f449677ee5063a030aed28735b107 100644 (file)
--- a/re2c/src/codegen/skeleton/skeleton.h
+++ b/re2c/src/codegen/skeleton/skeleton.h
@@ -7,6 +7,7 @@
 #include "src/dfa/dfa.h"
 #include "src/util/c99_stdint.h"
 #include "src/util/forbid_copy.h"
+#include "src/util/local_increment.h"
 
 namespace re2c
 {
@@ -30,19 +31,6 @@ struct Path
        void append (const Path * p);
 };
 
-template <typename counter_t>
-struct local_increment_t
-{
-       counter_t & counter;
-       inline explicit local_increment_t (counter_t & c)
-               : counter (++c)
-       {}
-       inline ~local_increment_t ()
-       {
-               --counter;
-       }
-};
-
 template <typename container_t>
 class wrap_iter_t
 {

diff --git a/re2c/src/util/local_increment.h b/re2c/src/util/local_increment.h
new file mode 100644 (file)
index 0000000..6435083
--- /dev/null
+++ b/re2c/src/util/local_increment.h
@@ -0,0 +1,22 @@
+#ifndef __LOCAL_INCREMENT__
+#define __LOCAL_INCREMENT__
+
+namespace re2c
+{
+
+template <typename counter_t>
+struct local_increment_t
+{
+       counter_t & counter;
+       inline explicit local_increment_t (counter_t & c)
+               : counter (++c)
+       {}
+       inline ~local_increment_t ()
+       {
+               --counter;
+       }
+};
+
+} // namespace re2c
+
+#endif // __LOCAL_INCREMENT__