Removed obsolete 're2c::Str' stuff.

diff --git a/re2c/src/codegen/output.cc b/re2c/src/codegen/output.cc
index b59929182d5fb26b2b925bebc1714b1e5883a5e3..9d50ad8c23c7b2e3154ee021be26b81e391f64e3 100644 (file)
--- a/re2c/src/codegen/output.cc
+++ b/re2c/src/codegen/output.cc
@@ -6,7 +6,6 @@
 #include "src/codegen/output.h"
 #include "src/codegen/print.h"
 #include "src/globals.h"
-#include "src/util/substr.h" // operator << for Str
 
 namespace re2c
 {
@@ -140,12 +139,6 @@ OutputFile & operator << (OutputFile & u, const char * s)
        return u;
 }
 
-OutputFile & operator << (OutputFile & u, const Str & s)
-{
-       u.stream () << s;
-       return u;
-}
-
 void OutputFile::insert_code ()
 {
        blocks.back ()->fragments.push_back (new OutputFragment (OutputFragment::CODE, 0));

diff --git a/re2c/src/codegen/output.h b/re2c/src/codegen/output.h
index e7358821ddab83e2c33533261502b0a7be221530..860bae2540b591e2944ba1510b5142c2fcf0190e 100644 (file)
--- a/re2c/src/codegen/output.h
+++ b/re2c/src/codegen/output.h
@@ -12,8 +12,6 @@
 namespace re2c
 {
 
-class Str;
-
 struct OutputFragment
 {
        enum type_t
@@ -69,7 +67,6 @@ struct OutputFile
        friend OutputFile & operator << (OutputFile & o, uint32_t n);
        friend OutputFile & operator << (OutputFile & o, const std::string & s);
        friend OutputFile & operator << (OutputFile & o, const char * s);
-       friend OutputFile & operator << (OutputFile & o, const Str & s);
 
        void insert_line_info ();
        void insert_state_goto (uint32_t ind, uint32_t start_label);

diff --git a/re2c/src/util/substr.cc b/re2c/src/util/substr.cc
index b2cbc0947719f9cbfdb53525f170cd3f5c16257b..9bf4a41df9717554c37b2d91b73e45ef4ff6839b 100644 (file)
--- a/re2c/src/util/substr.cc
+++ b/re2c/src/util/substr.cc
@@ -31,32 +31,4 @@ bool operator==(const SubStr &s1, const SubStr &s2)
        return (bool) (s1.len == s2.len && memcmp(s1.str, s2.str, s1.len) == 0);
 }
 
-Str::Str(const SubStr& s)
-       : SubStr(strndup(s.str, s.len), s.len)
-{
-       ;
-}
-
-Str::Str(const char *s)
-       : SubStr(strdup(s), strlen(s))
-{
-       ;
-}
-
-Str::Str()
-       : SubStr((char*) NULL, 0)
-{
-       ;
-}
-
-
-Str::~Str()
-{
-       if (str) {
-               free((void*)str);
-       }
-       str = NULL;
-       len = 0;
-}
-
 } // end namespace re2c

diff --git a/re2c/src/util/substr.h b/re2c/src/util/substr.h
index c9e9aedbfa4c77bad967e9330e26bb985a2361de..4f6f5683b75c02c1b85832f5b0233b130028bc4d 100644 (file)
--- a/re2c/src/util/substr.h
+++ b/re2c/src/util/substr.h
@@ -34,15 +34,6 @@ private:
        SubStr & operator = (const SubStr &);
 };
 
-class Str: public SubStr
-{
-public:
-       explicit Str(const char*);
-       Str(const SubStr&);
-       Str();
-       virtual ~Str();
-};
-
 inline std::ostream& operator<<(std::ostream& o, const SubStr &s)
 {
        s.out(o);