Added Install<dot>scr, and more.

ferhatgec · Aug 9, 2020 · f023d7a · f023d7a
1 parent 9186129
commit f023d7a
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 25 deletions.
diff --git a/fla b/fla
diff --git a/flascript/Interpreter/Import.cpp b/flascript/Interpreter/Import.cpp
@@ -38,6 +38,21 @@
 
 bool check = false;
 
+std::string FReadImport(std::string file) {
+	std::string line, text;
+    	std::ifstream readfile(("/usr/include/flascript/" + file).c_str());
+    	if(readfile.is_open()) {
+       		while (std::getline(readfile, line)) {
+        		text.append(line + "\n");
+        	}	
+        	readfile.close();
+		return text;
+    	} else {
+        	printf("Unable to open file\n"); 
+ 	}
+	return "null";
+}
+
 void
 FImport::Import(std::string file, std::string arg) {
 	FInterpreter inp;
@@ -54,6 +69,12 @@ FImport::Import(std::string file, std::string arg) {
 				std::cout << "import(\"" <<
 				assign << "\")" << " : File not found.\n"; 
 			}			
+		} else {
+			inp.GetBtwString(arg, "(<", ">)", assign);
+			if(assign != "error") {
+				type = FReadImport(assign);
+				if(type != "null") { check = true; }
+			}
 		}	
 	} else if(inp.FindObject(arg, "put") == true) {
 		inp.GetBtwString(arg, "[", "]", assign);
@@ -63,32 +84,32 @@ FImport::Import(std::string file, std::string arg) {
 				if(assign != "error") {				
 					type = func.FRead(file);
 					if(type != "null") {
-						inp.GetBtwString(type, "import(\"", "\") -> " + assign, assign);
-						if(assign != "error") {
-							type = func.FRead(assign);
-							if(inp.FindObject(arg, "func ->") == true) {
-								inp.GetBtwString(arg, "[", " -> ", fnc);
-								inp.GetBtwString(arg, fnc + " -> ", " <-", put);
-								if(put != "error") {
-									inp.GetBtwString(type, put + " {", "}", type);									
-									if(type != "error") {
-										inp.FlaScriptInterpreterWithArg(assign, type);
-									}
-								}
-							} else {
-								inp.GetBtwString(arg, " -> ", " <-", put);
-								if(put != "error") {
-									inp.GetBtwString(type, "defin[" + put + "] -> ", "<-", type);
-									if(type != "error") {
-										inp.FlaScriptInterpreterWithArg(assign, type);
-									}
-								}
-							}						
+						std::string file;
+						inp.GetBtwString(type, "import(\"", "\") -> " + assign, file);
+						if(file != "error") {
+							type = func.FRead(file);					
+						} else {
+							inp.GetBtwString(type, "import(<", ">) -> " + assign, file);
+							if(file != "error") type = FReadImport(file);
 						}
+						if(inp.FindObject(arg, "func ->") == true) {
+							inp.GetBtwString(arg, "[", " -> ", fnc);
+							inp.GetBtwString(arg, fnc + " -> ", " <-", put);
+							if(put != "error") {
+								inp.GetBtwString(type, put + " {", "}", type);									
+								if(type != "error") inp.FlaScriptInterpreterWithArg(file, type);
+							}
+						} else {
+							inp.GetBtwString(arg, " -> ", " <-", put);
+							if(put != "error") {
+								inp.GetBtwString(type, "defin[" + put + "] -> ", "<-", type);
+								if(type != "error") inp.FlaScriptInterpreterWithArg(assign, type);
+							}
+						}
+
 					}
 				}
 			}
 		}
 	}
-}
-
+}	
diff --git a/init/install.fls b/init/install.fls
@@ -0,0 +1,4 @@
+main() -> main {
+	executepp("FlaScript Installer", "mkdir /usr/include/flascript")
+	executepp("FlaScript Installer", "cp -r ../stdlib/ /usr/include/flascript/")
+}
diff --git a/install.scr b/install.scr
@@ -0,0 +1,3 @@
+system("g++ -I./include/ ./flascript/Interpreter/Interpreter.cpp ./flascript/Interpreter/Definitions.cpp ./flascript/Interpreter/Exec.cpp ./flascript/Interpreter/Read.cpp ./flascript/Interpreter/Print.cpp ./flascript/Interpreter/String.cpp ./flascript/Interpreter/Function.cpp ./flascript/FlaVersion.cpp ./flascript/FlaScriptMain.cpp  -o fla ");
+system("./fla --b test.fls");
+return
diff --git a/install.sh b/install.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+g++ -I./include/ ./flascript/Interpreter/Interpreter.cpp ./flascript/Interpreter/Definitions.cpp ./flascript/Interpreter/Exec.cpp \
+./flascript/Interpreter/Read.cpp ./flascript/Interpreter/Print.cpp ./flascript/Interpreter/String.cpp \
+./flascript/Interpreter/Function.cpp ./flascript/Interpreter/Import.cpp ./flascript/FlaVersion.cpp \
+./flascript/FlaScriptMain.cpp  -o fla && ./fla --b test.fls
diff --git a/test.fls b/test.fls
@@ -1,5 +1,4 @@
-import("stdlib/output/Colorized.flsh") -> color <-
-
+import(<output/Colorized.flsh>) -> color <-
 
 func -> Test() {
 	return var(string) -> Hello world! <-