Merged 'src/codegen/translate.cc' into 'src/codegen/print.cc'.

diff --git a/re2c/Makefile.am b/re2c/Makefile.am
index c3efd9d07c023a4270bfb8f572cc5f415d11c3d3..fcb52133bf8bc04e9b9c5d484936c7c0676612ea 100644 (file)
--- a/re2c/Makefile.am
+++ b/re2c/Makefile.am
@@ -74,7 +74,6 @@ SRC = \
        $(srcdir)/src/codegen/print.cc \
        $(srcdir)/src/codegen/scc.cc \
        $(srcdir)/src/codegen/skeleton/skeleton.cc \
-       $(srcdir)/src/codegen/translate.cc \
        $(srcdir)/src/dfa/encoding/enc.cc \
        $(srcdir)/src/dfa/encoding/range_suffix.cc \
        $(srcdir)/src/dfa/encoding/utf16/utf16.cc \

diff --git a/re2c/src/codegen/print.cc b/re2c/src/codegen/print.cc
index 15362349eb61f70ec17db2e2e9f068f486c8edc6..09d0a1a8f6cb344d5f09ac9ebb8ac7f536c3e1e5 100644 (file)
--- a/re2c/src/codegen/print.cc
+++ b/re2c/src/codegen/print.cc
@@ -6,6 +6,17 @@
 namespace re2c
 {
 
+char octCh(uint32_t c)
+{
+       return '0' + c % 8;
+}
+
+char hexCh(uint32_t c)
+{
+       static const char * sHex = "0123456789ABCDEF";
+       return sHex[c & 0x0F];
+}
+
 void prtChOrHex(std::ostream& o, uint32_t c)
 {
        if (!encoding.is(Enc::EBCDIC) && (c < 256u) && (isprint(c) || isspace(c)))

diff --git a/re2c/src/codegen/print.h b/re2c/src/codegen/print.h
index 4d3a5a61697e28346fe9850348340249ec7bc210..53c0a28a6116521e58f866d52c0edd2c35de1af0 100644 (file)
--- a/re2c/src/codegen/print.h
+++ b/re2c/src/codegen/print.h
@@ -8,6 +8,8 @@
 namespace re2c
 {
 
+char octCh(uint32_t c);
+char hexCh(uint32_t c);
 void prtCh(std::ostream&, uint32_t);
 void prtHex(std::ostream&, uint32_t);
 void prtChOrHex(std::ostream&, uint32_t);

diff --git a/re2c/src/codegen/translate.cc b/re2c/src/codegen/translate.cc
deleted file mode 100644 (file)
index f4110ef..0000000
--- a/re2c/src/codegen/translate.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $Id$ */
-#include "src/globals.h"
-
-namespace re2c
-{
-
-char octCh(uint32_t c)
-{
-       return '0' + c % 8;
-}
-
-static const char * sHex = "0123456789ABCDEF";
-
-char hexCh(uint32_t c)
-{
-       return sHex[c & 0x0F];
-}
-
-} // end namespace re2c

diff --git a/re2c/src/globals.h b/re2c/src/globals.h
index dbaf3d58819d5759beed070885b4d42b6b96814f..8c8d038ee232c0f8d36f0c4a009175acc0521aec 100644 (file)
--- a/re2c/src/globals.h
+++ b/re2c/src/globals.h
@@ -83,9 +83,6 @@ extern CodeNames mapCodeName;
 extern Enc encoding;
 extern InputAPI input_api;
 
-extern char octCh(uint32_t c);
-extern char hexCh(uint32_t c);
-
 } // end namespace re2c
 
 #endif