SCLEAN now is part of Collections Interface

Author: aafent

FAST.FBasicInterpreter/Core/FBasicArray.cs

@@ -314,6 +314,12 @@ public void Reset()
             this.currentRow=0;
         }
 
+        public void ClearCollection()
+        {
+            Reset();
+            ResetArray();
+        }
+
 
         #endregion (+) IFBasicCollection Interface
     }

FAST.FBasicInterpreter/DataProviders/dataReaderCollection.cs

@@ -140,5 +140,9 @@ private static bool isNumericType(Type type)
             }
         }
 
+        public void ClearCollection()
+        {
+            Reset();
+        }
     }
 }

FAST.FBasicInterpreter/DataProviders/staticDataCollection.cs

@@ -65,5 +65,11 @@ public void Reset()
         {
             index= indexInitialValue;
         }
+
+        public void ClearCollection()
+        {
+            Reset();
+            data.Clear();
+        }
     }
 }

FAST.FBasicInterpreter/Interfaces/IfbasicCollection.cs

@@ -19,5 +19,11 @@ public interface IBasicCollection : IEnumerator
         /// <returns>The Value</returns>
         Value getValue(string name);
 
+        /// <summary>
+        /// This method used to clear (empty) the collection
+        /// It is not the same with the Reset() from IEnumerator that it is used to jump to the first of the items.
+        /// </summary>
+        void ClearCollection();
+
     }
 }

FAST.FBasicInterpreter/Libraries/BuiltInsForCollections.cs

@@ -14,7 +14,9 @@ public void InstallAll(Interpreter interpreter)
             interpreter.AddStatement("SSET", SSET);
             interpreter.AddStatement("SCLEAR", SCLEAR);
         }
- 
+
+        #region (+) Statements & Functions for both Collections and Arrays
+
         private static Value EOD(Interpreter interpreter, List<Value> args)
         {
             if (args.Count != 1) throw new ArgumentException();
@@ -61,32 +63,62 @@ private static void RESET(Interpreter interpreter)
             collection.endOfData=false;
         }
 
+        private static void SCLEAR(Interpreter interpreter)
+        {
+            // Syntax: SCLEAR collection
+            //  Used to RESET and then to CLEAR a collection
+            //
+            interpreter.Match(Token.Identifier);
+            string collectionName = interpreter.lex.Identifier;
+
+            interpreter.SetLastTokenToNewLine();
+
+            // (v) implementation
+            if (!interpreter.IsCollectionOrArray(collectionName))
+                interpreter.Error("SCLEAR", $"Collection/Array: ${collectionName} not found.");
+            var collection = interpreter.GetCollectionOrArray(collectionName);
+
+            // (v) reset the collection
+            collection.Reset();
+            collection.ClearCollection();
+            if (collection is staticDataCollection staticCollection)
+            {
+                // (v) clear the data of the collection
+                staticCollection.data.Clear();
+            }
+            collection.endOfData = false;
+        }
+
+        #endregion (+) Statements & Functions for both Collections and Arrays
+
+        #region (+) Statements & Functions for Collections only
+
         private static void SSET(Interpreter interpreter)
         {
             // Syntax: SSET collection index value
             //  Used to SSET a value at a specific index of a static collection
             //
             interpreter.Match(Token.Identifier);
             string collectionName = interpreter.lex.Identifier;
-            
+
             interpreter.GetNextToken();
-            int index=-1;
-            switch(interpreter.lastToken)
+            int index = -1;
+            switch (interpreter.lastToken)
             {
                 case Token.Value:
-                    index=interpreter.lex.Value.ToInt();    
+                    index = interpreter.lex.Value.ToInt();
                     break;
                 case Token.Identifier:
                     var name = interpreter.lex.Identifier;
                     index = interpreter.GetValue(name).ToInt();
                     break;
                 default:
                     interpreter.Match(Token.Value); // will produce error 
-                    return; 
+                    return;
             }
 
             interpreter.GetNextToken();
-            Value value=Value.Empty;
+            Value value = Value.Empty;
             switch (interpreter.lastToken)
             {
                 case Token.Value:
@@ -106,35 +138,9 @@ private static void SSET(Interpreter interpreter)
             if (index < 0)
                 interpreter.Error("SSET", Errors.E130_OutOfRange($"Collection: {collectionName}", $"index={1 + index}"));
 
-            ((staticDataCollection)interpreter.collections[collectionName]).data[index]=value;
+            ((staticDataCollection)interpreter.collections[collectionName]).data[index] = value;
         }
 
-        private static void SCLEAR(Interpreter interpreter)
-        {
-            // Syntax: SCLEAR collection
-            //  Used to RESET and then to CLEAR a collection
-            //
-            interpreter.Match(Token.Identifier);
-            string collectionName = interpreter.lex.Identifier;
-
-            interpreter.SetLastTokenToNewLine();
-
-            // (v) implementation
-            if (!interpreter.collections.ContainsKey(collectionName))
-                interpreter.Error("SCLEAR", $"Collection: ${collectionName} not found.");
-            var collection = interpreter.collections[collectionName];
-
-            // (v) reset the collection
-            collection.Reset();
-            if (collection is staticDataCollection staticCollection)
-            {
-                // (v) clear the data of the collection
-                staticCollection.data.Clear();
-            }
-            collection.endOfData = false;
-        }
-
-
         /// <summary>
         /// SCI() : Static Collection Item
         /// </summary>
@@ -163,6 +169,7 @@ private static Value StaticCollectionItem(Interpreter interpreter, List<Value> a
             return new Value(value);
         }
 
+        #endregion (+) Statements & Functions for Collections only
     }