fix #1115: беззнаковые типы для ЧтениеДанных/ЗаписьДанных

Author: Mr-Rm

src/ScriptEngine.HostedScript/Library/Binary/DataReader.cs

@@ -472,10 +472,10 @@ private T FromBytes<T>(byte[] bytes, Func<byte[], int, T> leConverter, Func<byte
         /// <returns name="Number"/>
         ///
         [ContextMethod("ПрочитатьЦелое16", "ReadInt16")]
-        public int ReadInt16(IValue byteOrder = null)
+        public uint ReadInt16(IValue byteOrder = null)
         {
-            var bytes = _reader.ReadBytes(sizeof(short));
-            return FromBytes(bytes, BitConversionFacility.LittleEndian.ToInt16, BitConversionFacility.BigEndian.ToInt16, byteOrder);
+            var bytes = _reader.ReadBytes(sizeof(ushort));
+            return FromBytes(bytes, BitConversionFacility.LittleEndian.ToUInt16, BitConversionFacility.BigEndian.ToUInt16, byteOrder);
         }
 
 

src/ScriptEngine.HostedScript/Library/Binary/DataWriter.cs

@@ -379,7 +379,7 @@ private byte[] GetBytes<T>(T value, Converter<T, byte[]> leConverter, Converter<
         /// Значение по умолчанию: Неопределено. </param>
         ///
         [ContextMethod("ЗаписатьЦелое16", "WriteInt16")]
-        public void WriteInt16(short number, IValue byteOrder = null)
+        public void WriteInt16(ushort number, IValue byteOrder = null)
         {
             var buffer = GetBytes(number, BitConversionFacility.LittleEndian.GetBytes, BitConversionFacility.BigEndian.GetBytes, byteOrder);
             _binaryWriter.Write(buffer, 0, buffer.Length);
@@ -397,7 +397,7 @@ public void WriteInt16(short number, IValue byteOrder = null)
         /// Значение по умолчанию: Неопределено. </param>
         ///
         [ContextMethod("ЗаписатьЦелое32", "WriteInt32")]
-        public void WriteInt32(int number, IValue byteOrder = null)
+        public void WriteInt32(uint number, IValue byteOrder = null)
         {
             var buffer = GetBytes(number, BitConversionFacility.LittleEndian.GetBytes, BitConversionFacility.BigEndian.GetBytes, byteOrder);
             _binaryWriter.Write(buffer, 0, buffer.Length);
@@ -406,7 +406,7 @@ public void WriteInt32(int number, IValue byteOrder = null)
 
         /// <summary>
         /// 
-        /// Записывает целое 16-битное число в целевой поток.
+        /// Записывает целое 64-битное число в целевой поток.
         /// </summary>
         ///
         /// <param name="number">
@@ -416,7 +416,7 @@ public void WriteInt32(int number, IValue byteOrder = null)
         /// Значение по умолчанию: Неопределено. </param>
         ///
         [ContextMethod("ЗаписатьЦелое64", "WriteInt64")]
-        public void WriteInt64(long number, IValue byteOrder = null)
+        public void WriteInt64(ulong number, IValue byteOrder = null)
         {
             var buffer = GetBytes(number, BitConversionFacility.LittleEndian.GetBytes, BitConversionFacility.BigEndian.GetBytes, byteOrder);
             _binaryWriter.Write(buffer, 0, buffer.Length);

src/ScriptEngine/Machine/Contexts/ContextValuesMarshaller.cs

@@ -14,42 +14,36 @@ public static class ContextValuesMarshaller
     {
         public static T ConvertParam<T>(IValue value)
         {
-            var type = typeof(T);
-            object valueObj = ConvertParam(value, type);
-            if (valueObj == null)
-            {
-                return default(T);
-            }
-            
             try
             {
-                return (T)valueObj;
+                object valueObj = ConvertParam(value, typeof(T));
+                return valueObj != null ? (T)valueObj : default;
             }
             catch (InvalidCastException)
             {
                 throw RuntimeException.InvalidArgumentType();
             }
-           
+            catch (OverflowException)
+            {
+                throw RuntimeException.InvalidArgumentValue();
+            }
         }
 
         public static T ConvertParam<T>(IValue value, T defaultValue)
         {
-            var type = typeof(T);
-            object valueObj = ConvertParam(value, type);
-            if (valueObj == null)
-            {
-                return defaultValue;
-            }
-            
             try
             {
-                return (T)valueObj;
+                object valueObj = ConvertParam(value, typeof(T));
+                return valueObj != null ? (T)valueObj : defaultValue;
             }
             catch (InvalidCastException)
             {
                 throw RuntimeException.InvalidArgumentType();
             }
-           
+            catch (OverflowException)
+            {
+                throw RuntimeException.InvalidArgumentValue();
+            }
         }
 
         public static object ConvertParam(IValue value, Type type)