aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorjantuomi <jans.tuomi@gmail.com>2016-09-01 11:14:10 +0300
committerjantuomi <jans.tuomi@gmail.com>2016-09-01 11:14:10 +0300
commitbe011366f249b8ebed3905030ce3b7021597ee34 (patch)
tree3b357df175ba1f484d852d73d4cbf3da9c1910df /main.cpp
parentd6b44fb2323b4f6f5e0bd3de33a40d6fd8283c1a (diff)
Add value parsing from stdin, remove value class
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp18
1 files changed, 13 insertions, 5 deletions
diff --git a/main.cpp b/main.cpp
index 9de9ce8..c39e469 100644
--- a/main.cpp
+++ b/main.cpp
@@ -19,14 +19,22 @@ int main(int argc, char** argv) {
}
std::string filename = std::string(argv[1]);
- std::string input = readFile(filename);
- std::cout << input;
+ std::string code = readFile(filename);
- Parser parser(input);
- parser.printTokens();
+ std::string valueString;
+ std::string stdinLine;
+ while (std::cin >> stdinLine) {
+ valueString += stdinLine + " ";
+ }
+
+ Parser parser;
+ std::vector<Token> tokens = parser.parseCode(code);
+ std::vector<int> values = parser.parseValues(valueString);
+ parser.printTokens(tokens);
+ parser.printValues(values);
Runtime runtime;
- runtime.run(parser.getTokens());
+ runtime.run(tokens);
return 0;
}