fixing bugs and testing

Author: Techcraft7

7Sharp/7sLib/7sLibManager.cs

@@ -15,6 +15,8 @@ internal static void Save(string path)
 		{
 			try
 			{
+				string[] splitPath = path.Split('.');
+				path = string.Join(".", splitPath.Take(splitPath.Length - 1).ToArray()) + ".7slib";
 				using (ZipArchive zip = ZipFile.Open(path, ZipArchiveMode.Update))
 				{
 					ZipArchiveEntry dotText = zip.CreateEntry(".text");
@@ -128,14 +130,12 @@ internal static _7sLibrary Load(string path)
 
 		private static string GetSHA1(Stream s) => BitConverter.ToString(SHA1.Create().ComputeHash(s));
 
-		private static string GetSHA1(string path)
+		private static string GetSHA1(string contents)
 		{
-			string o;
-			using (Stream fs = new FileStream(path, FileMode.Open))
+			using (MemoryStream ms = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
 			{
-				o = BitConverter.ToString(SHA1.Create().ComputeHash(fs)); //dont return here let using exit to close stream			}
+				return BitConverter.ToString(SHA1.Create().ComputeHash(ms));
 			}
-			return o;
 		}
 	}
 }

7Sharp/Intrerpreter/InterpreterState.cs

@@ -103,6 +103,10 @@ public static void Init(ref InterpreterState state)
 			{
 				{ 1, new Action<object>(SysFunctions.WriteRaw) }
 			}));
+			state.Functions.Add(new _7sFunction("read", new Dictionary<int, Delegate>()
+			{
+				{ 0, new Func<string>(SysFunctions.Read) }
+			}));
 			state.Functions.Add(new _7sFunction("getLoopIndex", new Dictionary<int, Delegate>()
 			{
 				{ 0, new Func<int>(state.GetFirstLoopIndex) },
@@ -233,7 +237,9 @@ public void PopScope()
 
 		public void Import(string libPath)
 		{
+#if DEBUG
 			ColorConsoleMethods.WriteLineColor($"Importing: \"{libPath}\"", ConsoleColor.Magenta);
+#endif
 			InterpreterState state = this;
 			SysLibrary[] libs = SysLibrary.GetAllLibraries();
 			if (libs.Any(l => l.GetName() == libPath))

7Sharp/Intrerpreter/Nodes/FunctionDefinitionNode.cs

@@ -36,6 +36,10 @@ public static bool IsFunctionDefinition(List<Token<TokenType>> tokens)
 			bool result = true;
 			result &= tokens.Count >= 4;
 			result &= tokens[0].TokenID == TokenType.FUNCTION;
+			if (!result)
+			{
+				return false;
+			}
 			result &= tokens[1].TokenID == TokenType.IDENTIFIER;
 			result &= tokens[2].TokenID == TokenType.LPAREN;
 

7Sharp/Intrerpreter/Nodes/LoopNode.cs

@@ -36,11 +36,13 @@ public override void Run(ref InterpreterState state)
 				{
 					state.Location = child.linePosition;
 					child.Run(ref state);
+					//continue;
 					if (state.ContinueUsed)
 					{
 						state.ContinueUsed = false;
 						break;
 					}
+					//break;
 					if (state.BreakUsed)
 					{
 						state.BreakUsed = false;

7Sharp/Intrerpreter/Sysfunctions.cs

@@ -44,9 +44,9 @@ public static double Double(object value)
 
 		public static double Tan(double v) => Math.Tan(v);
 
-		public static double Asin(double v) => Math.Asin(v);
+		public static double Asin(double v) => Math.Asin(Utils.CheckRange(v, -1, 1, "asin: Invalid domain!"));
 
-		public static double Acos(double v) => Math.Acos(v);
+		public static double Acos(double v) => Math.Acos(Utils.CheckRange(v, -1, 1, "acos: Invalid domain!"));
 
 		public static double Atan(double v) => Math.Atan(v);
 

7Sharp/Utils.cs

@@ -193,5 +193,14 @@ public static string GetSimpleName(this Type t)
 		}
 
 		public static Dictionary<K, V> Clone<K, V>(this Dictionary<K, V> dict) => dict.AsEnumerable().ToDictionary(kv => kv.Key, kv => kv.Value);
+
+		public static double CheckRange(double v, double min, double max, string message)
+		{
+			if (v < min || v > max)
+			{
+				throw new InterpreterException(message);
+			}
+			return v;
+		}
 	}
 }