Еще меньше кода в коллекциях.

Author: Andrey Ovsiankin

src/OneScript.StandardLibrary/Collections/FixedStructureImpl.cs

@@ -120,8 +120,6 @@ public CollectionEnumerator GetManagedIterator()
         {
         	return new CollectionEnumerator(_structure.GetManagedIterator());
         }
-
-        bool IEmptyValueCheck.IsEmpty => Count() == 0;
 
         #endregion
 

src/OneScript.StandardLibrary/Collections/StructureImpl.cs

@@ -196,8 +196,6 @@ public CollectionEnumerator GetManagedIterator()
             return new CollectionEnumerator(GetEnumerator());
         }
 
-        bool IEmptyValueCheck.IsEmpty => Count() == 0;
-
         #endregion
 
         #region IEnumerable<IValue> Members

src/OneScript.StandardLibrary/Collections/ValueTable/ValueTableColumnCollection.cs

@@ -281,7 +281,5 @@ void IDebugPresentationAcceptor.Accept(IDebugValueVisitor visitor)
         {
             visitor.ShowProperties(this);
         }
-        
-        bool IEmptyValueCheck.IsEmpty => Count() == 0;
     }
 }

src/OneScript.StandardLibrary/Collections/ValueTable/ValueTableRow.cs

@@ -31,8 +31,6 @@ public int Count()
             return Owner().Columns.Count();
         }
 
-        bool IEmptyValueCheck.IsEmpty => Count() == 0;
-
         /// <summary>
         /// Владелец строки
         /// </summary>

src/OneScript.StandardLibrary/Collections/ValueTree/ValueTreeColumnCollection.cs

@@ -207,8 +207,6 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
             return GetEnumerator();
         }
 
-        bool IEmptyValueCheck.IsEmpty => _columns.Count == 0;
-
         public CollectionEnumerator GetManagedIterator()
         {
             return new CollectionEnumerator(GetEnumerator());

src/OneScript.StandardLibrary/Collections/ValueTree/ValueTreeRow.cs

@@ -43,8 +43,6 @@ public int Count()
             return _properties.Count + _owner.Columns.Count();
         }
 
-        bool IEmptyValueCheck.IsEmpty => Count() == 0;
-
         [ContextProperty("Родитель", "Parent")]
         public IValue Parent
         {

src/OneScript.StandardLibrary/Regex/MatchCollectionImpl.cs

@@ -36,11 +36,6 @@ public override int Count()
             return _matches.Count;
         }
 
-        public CollectionEnumerator GetManagedIterator()
-        {
-            return new CollectionEnumerator(GetEnumerator());
-        }
-
         #endregion
 
         #region IEnumerable<IRuntimeContextInstance> Members

src/OneScript.StandardLibrary/StandardGlobalContext.cs

@@ -120,12 +120,15 @@ public bool ValueIsFilled(IValue inValue)
                 return false;
             }
 
-            if (value is IEmptyValueCheck emptyHandler)
+            switch (value)
             {
-                return !emptyHandler.IsEmpty;
+                case IEmptyValueCheck emptyHandler:
+                    return !emptyHandler.IsEmpty;
+                case ICollectionContext collection:
+                    return collection.Count() != 0;
+                default:
+                    return true;
             }
-
-            return true;
         }
 
         /// <summary>

src/ScriptEngine/Machine/Contexts/AutoCollectionContext.cs

@@ -24,8 +24,6 @@ protected AutoCollectionContext(TypeDescriptor type) : base(type)
         {
         }
 
-        bool IEmptyValueCheck.IsEmpty => Count() == 0;
-
         public abstract int Count();
 
         public abstract IEnumerator<TItem> GetEnumerator();

src/ScriptEngine/Machine/Contexts/COMWrapperContext.cs

@@ -14,7 +14,12 @@ This Source Code Form is subject to the terms of the
 namespace ScriptEngine.Machine.Contexts
 {
     [ContextClass("COMОбъект", "COMObject", TypeUUID = "5E4FA60E-9724-494A-A5C8-5BB0A4F914E0")]
-    public abstract class COMWrapperContext : PropertyNameIndexAccessor, ICollectionContext, IDisposable, IObjectWrapper, IEnumerable<IValue>
+    public abstract class COMWrapperContext : PropertyNameIndexAccessor, 
+        ICollectionContext,
+        IEmptyValueCheck,
+        IDisposable,
+        IObjectWrapper,
+        IEnumerable<IValue>
     {
         private static readonly DateTime MIN_OLE_DATE = new DateTime(100,1,1);
         protected static readonly TypeDescriptor ComObjectType = typeof(COMWrapperContext).GetTypeFromClassMarkup();