проверка типов при установке свойств-перечислений

Mr-Rm · Jun 21, 2024 · b7fbdfe · b7fbdfe
1 parent 80959b8
commit b7fbdfe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/OneScript.Core/Exceptions/TypeConversionException.cs b/src/OneScript.Core/Exceptions/TypeConversionException.cs
@@ -14,5 +14,12 @@ public class TypeConversionException : RuntimeException
         public TypeConversionException(BilingualString message) : base(message)
         {
         }
+
+        public TypeConversionException() 
+            : base(new BilingualString(
+            "Íåñîîòâåòñòâèå òèïîâ",
+            "Type mismatch"))
+        {
+        }
     }
 }
diff --git a/src/OneScript.StandardLibrary/Text/ConsoleContext.cs b/src/OneScript.StandardLibrary/Text/ConsoleContext.cs
@@ -40,7 +40,7 @@ public int XPos
             }
             set
             {
-                Console.CursorLeft = Math.Min(value, Console.WindowWidth-1);
+                    Console.CursorLeft = Math.Min(value, Console.WindowWidth-1);
             }
         }
 
@@ -54,8 +54,8 @@ public int YPos
             set
             {
                 Console.CursorTop = Math.Min(value, Console.WindowHeight-1);
+                }
             }
-        }
 
         [ContextMethod("ПрочитатьСтроку", "ReadLine")]
         public string ReadLine()
@@ -134,6 +134,8 @@ public IValue TextColor
                 {
                     Console.ForegroundColor = typed.UnderlyingValue;
                 }
+                else
+                    throw new TypeConversionException();
             }
         }
 
@@ -144,7 +146,7 @@ public IValue BackgroundColor
             {
                 try
                 {
-                    return (ClrEnumValueWrapper<ConsoleColor>)GlobalsHelper.GetEnum<ConsoleColorEnum>().FromNativeValue(Console.BackgroundColor);
+                    return GlobalsHelper.GetEnum<ConsoleColorEnum>().FromNativeValue(Console.BackgroundColor);
                 }
                 catch (InvalidOperationException)
                 {
@@ -157,6 +159,8 @@ public IValue BackgroundColor
                 {
                     Console.BackgroundColor = typed.UnderlyingValue;
                 }
+                else
+                    throw new TypeConversionException();
             }
         }