мелкие подчистки

Author: Mr-Rm

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

@@ -17,7 +17,6 @@ This Source Code Form is subject to the terms of the
 using ScriptEngine.Machine.Contexts;
 using System;
 using System.Collections.Generic;
-using System.Data.Common;
 using System.Linq;
 
 namespace OneScript.StandardLibrary.Collections.ValueTable
@@ -35,8 +34,8 @@ public ValueTable()
         {
             Columns = new ValueTableColumnCollection(this);
             _rows = new List<ValueTableRow>();
-            Indexes = new CollectionIndexes(this);
-    }
+            Indexes = new CollectionIndexes(this);
+        }
 
         /// <summary>
         /// Коллекция колонок
@@ -126,13 +125,13 @@ public void LoadColumn(IValue values, IValue columnIndex)
             var array_iterator = (values as ArrayImpl)?.GetEnumerator()
                 ?? throw RuntimeException.InvalidNthArgumentType(1);
 
-            Indexes.ClearIndexes();
-            
+            Indexes.ClearIndexes();
+
             while (row_iterator.MoveNext() && array_iterator.MoveNext())
             {
                 row_iterator.Current.Set(columnIndex, array_iterator.Current);
-            }
-            
+            }
+
             Indexes.Rebuild();
         }
 
@@ -183,8 +182,8 @@ private List<ValueTableColumn> GetProcessingColumnList(string columnNames, bool
 
                 if (processing_list.Find(x => x.Name == name) == null)
                     processing_list.Add(Column);
-            }
- 
+            }
+
             return processing_list;
         }
 
@@ -249,8 +248,8 @@ public IValue Total(IValue columnIndex)
             if (types.Count() == 1)  // единственный тип
             {
                 return TotalAllAsNumber(column);
-            }
-            
+            }
+
             if (types.Count() == 0 // нет типов
                 || types.Any(x => ((BslTypeValue)x).TypeValue == BasicTypes.Number)) // среди типов есть Число
             {
@@ -343,8 +342,8 @@ public ArrayImpl FindRows(StructureImpl filter)
 
             var mapped = ColumnsMap(filter);
             var suitableIndex = Indexes.FindSuitableIndex(mapped.Keys());
-            var dataToScan = suitableIndex != null ? suitableIndex.GetData(mapped) : _rows; 
-
+            var dataToScan = suitableIndex != null ? suitableIndex.GetData(mapped) : _rows;
+
             foreach (var element in dataToScan)
             {
                 var row = (ValueTableRow)element;
@@ -440,8 +439,8 @@ public void GroupBy(IBslProcess process, string groupColumnNames, string aggrega
 
         private static void CheckMixedColumns(List<ValueTableColumn> groupColumns, List<ValueTableColumn> aggregateColumns)
         {
-            foreach (var groupColumn in groupColumns )
-                if ( aggregateColumns.Find(x => x.Name==groupColumn.Name)!=null )
+            foreach (var groupColumn in groupColumns)
+                if (aggregateColumns.Find(x => x.Name == groupColumn.Name) != null)
                     throw ColumnException.ColumnsMixed(groupColumn.Name);
         }
 
@@ -451,7 +450,7 @@ private static void CopyRowData(ValueTableRow source, ValueTableRow dest, IEnume
                 dest.Set(column, source.Get(column));
         }
 
-        private void AppendRowData(ValueTableRow source, ValueTableRow dest, IEnumerable<ValueTableColumn> columns)
+        private static void AppendRowData(ValueTableRow source, ValueTableRow dest, IEnumerable<ValueTableColumn> columns)
         {
             foreach (var column in columns)
             {
@@ -592,8 +591,8 @@ public ValueTable CopyColumns(string columnNames = null)
         public ValueTable Copy(IValue rows = null, string columnNames = null)
         {
             var result = CopyColumns(columnNames);
-            var columns = GetProcessingColumnList(columnNames);
-            
+            var columns = GetProcessingColumnList(columnNames);
+
             IEnumerable<ValueTableRow> requestedRows = rows switch
             {
                 null => _rows,
@@ -678,8 +677,8 @@ public RowComparator(IBslProcess process, List<ValueTableSortRule> Rules)
                 if (Rules.Count == 0)
                     throw RuntimeException.InvalidArgumentValue();
 
-                this.Rules = Rules;
-                 _comparer = new GenericIValueComparer(process);
+                this.Rules = Rules;
+                _comparer = new GenericIValueComparer(process);
             }
 
             private int OneCompare(ValueTableRow x, ValueTableRow y, ValueTableSortRule Rule)
@@ -741,8 +740,8 @@ public override IEnumerator<ValueTableRow> GetEnumerator()
             {
                 yield return item;
             }
-        }
-        
+        }
+
         public override IValue GetIndexedValue(IValue index)
         {
             return Get((int)index.AsNumber());

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

@@ -7,7 +7,6 @@ This Source Code Form is subject to the terms of the
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using OneScript.Commons;
 using OneScript.Contexts;
 using OneScript.Exceptions;
@@ -140,7 +139,7 @@ public void Delete(IValue column)
         [ContextMethod("Очистить", "Clear")]
         public void Clear()
         {
-            while (_columns.Any())
+            while (_columns.Count != 0)
             {
                 Delete(_columns[0]);
             }