summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2024-03-18 00:15:45 +0100
committerAki <please@ignore.pl>2024-03-18 00:15:45 +0100
commit5b1ce74b74a47f8812470efe9c56e03bcb0e456d (patch)
treede505cf13ab438bfa40995b485d7b124b28f09d6
parentc784978aa038df7b3777a4c3ce3e6da6dc8cc6a1 (diff)
downloadstarshatter-5b1ce74b74a47f8812470efe9c56e03bcb0e456d.zip
starshatter-5b1ce74b74a47f8812470efe9c56e03bcb0e456d.tar.gz
starshatter-5b1ce74b74a47f8812470efe9c56e03bcb0e456d.tar.bz2
Removed ConsoleReader
-rw-r--r--DefinitionEx/Parser_ss.cpp2
-rw-r--r--FoundationEx/include/Reader.h14
-rw-r--r--FoundationEx/src/Reader.cpp30
3 files changed, 1 insertions, 45 deletions
diff --git a/DefinitionEx/Parser_ss.cpp b/DefinitionEx/Parser_ss.cpp
index 1c07146..d02b7ee 100644
--- a/DefinitionEx/Parser_ss.cpp
+++ b/DefinitionEx/Parser_ss.cpp
@@ -36,7 +36,7 @@ Term* error(char* msg, const Token& token)
Parser::Parser(Reader* r)
{
- reader = r ? r : new ConsoleReader;
+ reader = r;
lexer = new Scanner(reader);
Token::addKey("true", KEY_TRUE);
diff --git a/FoundationEx/include/Reader.h b/FoundationEx/include/Reader.h
index 42d5cc0..a89be01 100644
--- a/FoundationEx/include/Reader.h
+++ b/FoundationEx/include/Reader.h
@@ -27,20 +27,6 @@ public:
};
-class ConsoleReader : public Reader
-{
-public:
- virtual Text more() override;
-
- void printPrimaryPrompt();
- void fillInputBuffer();
-
-private:
- char buffer[1000];
- char* p;
-};
-
-
class FileReader : public Reader
{
public:
diff --git a/FoundationEx/src/Reader.cpp b/FoundationEx/src/Reader.cpp
index fec967e..c3e33d5 100644
--- a/FoundationEx/src/Reader.cpp
+++ b/FoundationEx/src/Reader.cpp
@@ -13,42 +13,12 @@
#include <Reader.h>
-#include <cctype>
#include <cstdio>
#include <fstream>
#include <Utils.h>
-Text
-ConsoleReader::more()
-{
- // loop until the user types something
- do {
- printPrimaryPrompt();
- fillInputBuffer();
- } while (! *p);
-
- return Text(p);
-}
-
-
-void
-ConsoleReader::printPrimaryPrompt()
-{
- std::printf("- ");
-}
-
-
-void
-ConsoleReader::fillInputBuffer()
-{
- std::fgets(buffer, 980, stdin);
- p = buffer;
- while (std::isspace(*p)) p++;
-}
-
-
FileReader::FileReader(const char* fname) :
filename(fname),
done(0)