Merge branch 'develop' of https://github.com/EvilBeaver/OneScript into develop

Author: EvilBeaver

src/OneScript.Core/Contexts/ClassBuilder.cs

@@ -111,9 +111,10 @@ private static bool MarkedAsContextMethod(MemberInfo member, bool includeDepreca
                   .Any(x => includeDeprecations || (x as ContextMethodAttribute)?.IsDeprecated == false);
         }
 
-        private static bool MarkedAsContextProperty(MemberInfo member, bool includeDeprecations = false)
+        private static bool MarkedAsContextProperty(PropertyInfo member, bool includeDeprecations = false)
         {
-            return member.GetCustomAttributes(typeof(ContextPropertyAttribute), false).Any();
+            return member.GetCustomAttributes(typeof(ContextPropertyAttribute), false)
+                .Any(x => includeDeprecations || (x as ContextPropertyAttribute)?.IsDeprecated == false);
         }
 
         public ClassBuilder ExportConstructor(MethodInfo info)

src/OneScript.Core/Exceptions/RuntimeException.cs

@@ -175,22 +175,36 @@ public static RuntimeException InvalidEncoding(string encoding)
             return new RuntimeException(
                 $"Неправильное имя кодировки '{encoding}'",
                 $"Invalid encoding name '{encoding}'");
-        }
-
+        }
+
         public static RuntimeException IncorrectOffset()
         {
             return new RuntimeException(
                 "Неправильное смещение внутри коллекции",
                 "Incorrect offset within collection");
-        }
-
+        }
+
         public static RuntimeException IndexOutOfRange()
         {
             return new RuntimeException(
                 "Значение индекса выходит за пределы диапазона",
                 "Index is out of range");
         }
 
+        public static RuntimeException ClosedStream()
+        {
+            return new RuntimeException(
+                "Ошибка обращения к закрытому потоку",
+                "Cannot access a closed stream");
+        }
+  
+        public static RuntimeException NonWritableStream()
+        {
+            return new RuntimeException(
+                "Попытка записи в поток не поддерживающий запись",
+                "Cannot write to a stream that does not support writing");
+        }      
+      
         #endregion
     }
 }

src/OneScript.Language/IdentifiersTrie.cs

@@ -17,26 +17,20 @@ public class IdentifiersTrie<T> : IDictionary<string, T>
 
         private class TrieNode
         {
-            public char charL;
-            public char charU;
-            public TrieNode sibl;
-            public TrieNode next;
+            internal char charL;
+            internal char charU;
+            internal TrieNode sibl;
+            internal TrieNode next;
 
-            private T _value;
+            internal T value;
 
-            public T Value
-            {
-                get => _value;
-                set
-                {
-                    HasValue = true;
-                    _value = value;
-                }
-            }
-            
-            public bool HasValue { get; private set; }
-            
-            public TrieNode Find(char ch)
+            internal bool hasValue;
+
+            internal TrieNode() { }
+            internal TrieNode(char ch)
+                { charL = char.ToLower(ch); charU = char.ToUpper(ch); }
+
+            internal TrieNode Find(char ch)
             {
                 var node = sibl;
                 while (node != null)
@@ -47,47 +41,46 @@ public TrieNode Find(char ch)
                 }
                 return null;
             }
-
-        }
-
+        }
+
         public void Add(string str, T val)
         {
             var node = _root;
+            TrieNode key = node;
             foreach (char ch in str)
             {
-                var key = node.Find(ch);
-                if (key == null)
+                if (node == null)
                 {
-                    key = new TrieNode
+                    node = new TrieNode(ch);
+                    key.next = node;
+                    key = node;
+                    node = null;
+                }
+                else
+                {
+                    TrieNode last = node;
+                    key = node;
+                    while (key != null && key.charL != ch && key.charU != ch)
+                    {
+                        last = key;
+                        key = key.sibl;
+                    }
+                    if (key == null)
                     {
-                        charL = char.ToLower(ch),
-                        charU = char.ToUpper(ch),
-                        Value = default(T),
-                        sibl = node.sibl
-                    };
-                    node.sibl = key;
-                    key.next = new TrieNode();
+                        key = new TrieNode(ch);
+                        last.sibl = key;
+                    }
+                    node = key.next;
                 }
-                node = key.next;
             }
 
-            node.Value = val;
+            key.value = val;
+            key.hasValue = true;
         }
 
-        public bool ContainsKey(string key)
-        {
-            var node = _root;
-            foreach (char ch in key)
-            {
-                var keyNode = node.Find(ch);
-                if (keyNode == null)
-                {
-                    return false;
-                }
-                node = keyNode.next;
-            }
-
-            return node.next == null && node.HasValue;
+        public bool ContainsKey(string str)
+        {
+            return TryGetValue(str, out _);
         }
 
         public bool Remove(string key)
@@ -96,22 +89,10 @@ public bool Remove(string key)
         }
 
         public T Get(string str)
-        {
-            var node = _root;
-            foreach (char ch in str)
-            {
-                TrieNode key = node.Find(ch);
-                if (key == null)
-                    throw new KeyNotFoundException();
-
-                node = key.next;
-            }
-            
-            if (!node.HasValue)
-                throw new KeyNotFoundException();
-
-            return node.Value;
-        }
+        {
+            return TryGetValue(str, out var value) ? value
+                : throw new KeyNotFoundException();
+        }
 
         public T this[string index]
         {
@@ -124,27 +105,34 @@ public T this[string index]
 
         public bool TryGetValue(string str, out T value)
         {
-            var node = _root;
+            TrieNode key = _root;
+            var node = key.sibl;
             foreach (char ch in str)
-            {
-                var key = node.Find(ch);
-                if (key == null)
-                {
-                    value = default;
-                    return false;
-                }
-
+            {
+                while (node != null && node.charL != ch && node.charU != ch)
+                {
+                    node = node.sibl;
+                }
+                if (node == null)
+                {
+                    value = default;
+                    return false;
+                }
+
+                key = node;
                 node = key.next;
             }
 
-            if (!node.HasValue)
-            {
-                value = default;
-                return false;
+            if (key.hasValue)
+            {
+                value = key.value;
+                return true;
+            }
+            else
+            {
+                value = default;
+                return false;
             }
-            
-            value = node.Value;
-            return true;
         }
 
         public IEnumerator<KeyValuePair<string, T>> GetEnumerator()