Add input

add input
sriharivishnu · Oct 10, 2020 · b9e53ae · b9e53ae
2 parents 4f4900d + 8eccc70
commit b9e53ae
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/examples/fibonacci.nov b/examples/fibonacci.nov
@@ -13,6 +13,7 @@ fun getFibonacci(n) {
 	}
 	return arr;
 };
-
-print (getFibonacci(10));
+print("Please enter a valid integer: ");
+var n = getnum();
+print (getFibonacci(n));
 
diff --git a/src/shell.cpp b/src/shell.cpp
@@ -34,8 +34,9 @@ int main(int arg_count, char * arg_list[]) {
             myfile.close();
         } else {
             std::cout << "Could not open file " << arg_list[1] << std::endl;
+            return 1;
         }
-        nova::run(toRun, global, false);
+        nova::run(toRun, global, false, arg_list[1]);
     }
     return 0;
 }
diff --git a/src/stdfuncs.cpp b/src/stdfuncs.cpp
@@ -29,6 +29,24 @@ void addStdFunctions(const Context& context) {
     context.symbols->addFunction("str", [&](std::vector<shared_obj> arg) {
         return arg[0]->toString();
     }, 1);
+    context.symbols->addFunction("input", [&](std::vector<shared_obj> arg) {
+        std::string line;
+        std::getline(std::cin, line);
+        return line;
+    }, 0);
+    context.symbols->addFunction("getnum", [&](std::vector<shared_obj> arg) {
+        int num;
+        if (!scanf("%d", &num)) {
+            throw Error("Conversion Exception", "Cannot convert string to integer");
+        };
+        return num;
+    }, 0);
+    context.symbols->addFunction("getword", [&](std::vector<shared_obj> arg) {
+        std::string s;
+        std::cin >> s;
+        return s;
+    }, 0);
+
     context.symbols->addFunction("int", [&](std::vector<shared_obj> arg) {
         if (arg[0]->value.isType<std::string>()) {
             try {