diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2014-02-08 15:09:25 -0800 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-02-08 16:18:22 -0800 |
commit | 730e5dde39333cb2f63c72a7d7152bee5c4dbb05 (patch) | |
tree | 510ef3e0ad46ecf1f2bee1fa42f26e6377b51686 /src/io/line.hpp | |
parent | 7a15a3efe85837d52d950cc9f895eadcc9eb6be1 (diff) | |
download | tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.tar.gz tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.tar.bz2 tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.tar.xz tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.zip |
Implement AString
Diffstat (limited to 'src/io/line.hpp')
-rw-r--r-- | src/io/line.hpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/io/line.hpp b/src/io/line.hpp index 00f0a11..bdff1bb 100644 --- a/src/io/line.hpp +++ b/src/io/line.hpp @@ -21,7 +21,8 @@ # include "../sanity.hpp" -# include "../strings/fstring.hpp" +# include "../strings/rstring.hpp" +# include "../strings/astring.hpp" # include "../strings/zstring.hpp" # include "fd.hpp" @@ -30,15 +31,16 @@ namespace io { + // TODO split this out struct Line { - FString text; + RString text; - FString filename; + RString filename; // 1-based uint16_t line, column; - FString message_str(ZString cat, ZString msg); + AString message_str(ZString cat, ZString msg); void message(ZString cat, ZString msg); void note(ZString msg) { message("note", msg); } void warning(ZString msg) { message("warning", msg); } @@ -60,7 +62,7 @@ namespace io class LineReader { protected: - FString filename; + RString filename; uint16_t line, column; ReadFile rf; public: @@ -77,7 +79,7 @@ namespace io class LineCharReader : private LineReader { - FString line_text; + RString line_text; public: explicit LineCharReader(ZString name); |