Name refactory for some classes

Author: aafent

FAST.FBasic.InteractiveConsole/FBasicIC.cs

@@ -9,7 +9,7 @@ internal class FBasicIC
         private string iCommand;
         private string programsFolder;
         private string startupName;
-        private executionEnvironment env = null;
+        private ExecutionEnvironment env = null;
 
         public FBasicIC(IConfiguration config)
         {
@@ -140,7 +140,7 @@ private void internalInfo()
 
         private void runFBasicProgram()
         {
-            executionResult result;
+            ExecutionResult result;
             var basProgramFile = Directory.GetFiles(programsFolder, startupName).FirstOrDefault();
             result = FBasicSource.Run(env, basProgramFile, (interp) =>
             {
@@ -168,7 +168,7 @@ static void spBuilder()
             string cs = "Driver={Adaptive Server Enterprise};NA=alpha.pca.com.gr,5000;Uid=laskaris;Pwd=laskaris;database=LASKARIS;EncryptPassword=2;ServerInitiatedTransactions=0;AnsiNull=0";
             //connectionAdapterForODBC connection = new(cs, dbDialectDetails.sql);
 
-            executionEnvironment env = new();
+            ExecutionEnvironment env = new();
             env.printHandler += Console.WriteLine;
             env.inputHandler += Console.ReadLine;
             env.callHandler += (name) => { var filepath = Path.Combine(folder, name); return File.ReadAllText(filepath); };

FAST.FBasicInterpreter/Builders/fBasicSourceBuilder.cs

@@ -6,9 +6,9 @@ public class fBasicSourceBuilder : sourceCodeBuilderAbstract
     {
         private string source=null;
 
-        protected override programContainer program { get; set; }
+        protected override ProgramContainer program { get; set; }
 
-        public override void Build(programContainer program)
+        public override void Build(ProgramContainer program)
         {
             this.program = program; 
             this.source=toSource();

FAST.FBasicInterpreter/Builders/sourceCodeBuilder.cs

@@ -4,9 +4,9 @@ public abstract class sourceCodeBuilderAbstract : IsourceCodeBuilder
     {
         private Dictionary<Token,int> tokenReferences =new();
 
-        protected abstract programContainer program { get; set; }
+        protected abstract ProgramContainer program { get; set; }
 
-        public abstract void Build(programContainer program);
+        public abstract void Build(ProgramContainer program);
 
         public abstract string GetSource();
 
@@ -29,7 +29,7 @@ public abstract class sourceCodeBuilderAbstract : IsourceCodeBuilder
         /// </summary>
         /// <param name="element">The element</param>
         /// <returns>Readable string</returns>
-        protected string readableElement(programElement element)
+        protected string readableElement(ProgramElement element)
         {
             return $"[{element.token} ({element.identifier}, {element.value})]";
         }
@@ -68,7 +68,7 @@ protected void lineAnalysis(int currentTokenNumber)
                 } 
                 var prevElement = program.elements[prevIndex];
 
-                this.isStatement=Lexer.isStatement(element.token);
+                this.isStatement=Lexer.IsStatement(element.token);
                 if (!this.isStatement) switch (element.token)
                 {
                     case Token.Plus:

FAST.FBasicInterpreter/Builders/storedProcedureBuilder.cs

@@ -5,9 +5,9 @@ namespace FAST.FBasicInterpreter
     public class storedProcedureBuilder : sourceCodeBuilderAbstract
     {
         private string source=null;
-        protected override programContainer program { get; set; }
+        protected override ProgramContainer program { get; set; }
 
-        public override void Build(programContainer program)
+        public override void Build(ProgramContainer program)
         {
             this.program=program;
             this.source=toSource();
@@ -84,7 +84,7 @@ private string toSource()
             // (v) parsing the program
             bool done = false;
             int tokensCount = 0;
-            programElement prevItem = new() {  token= Token.Unknown };
+            ProgramElement prevItem = new() {  token= Token.Unknown };
             foreach (var item in program.elements)
             {
                 tokensCount++;
@@ -93,7 +93,7 @@ private string toSource()
                 {
                 }
 
-                if (Lexer.isStatement(item.token))
+                if (Lexer.IsStatement(item.token))
                 {
                     lineAnalysis(tokensCount);
                     if (hasLogicalOperators) src.Append("LOGICAL: ");
@@ -296,7 +296,7 @@ private string toSource()
 
 
                 // (v) before reloop
-                prevItem.copyFrom(item);
+                prevItem.CopyFrom(item);
             }
 
 

FAST.FBasicInterpreter/Core/Interpreter.cs

@@ -4,7 +4,7 @@ namespace FAST.FBasicInterpreter
     /// <summary>
     /// The interpreter factory of the FBASIC
     /// </summary>
-    public partial class Interpreter : IfbasicError
+    public partial class Interpreter : IFBasicError
     {
         #region (+) Handlers
 
@@ -103,7 +103,7 @@ public partial class Interpreter : IfbasicError
         /// <summary>
         /// Collection objects
         /// </summary>
-        public readonly Dictionary<string, IfbasicCollection> collections = new();
+        public readonly Dictionary<string, IBAasicCollection> collections = new();
         /// <summary>
         /// The result of the execution (statement: RESULT)
         /// </summary>

FAST.FBasicInterpreter/Core/Interpreter_Constructors.cs

@@ -5,7 +5,7 @@ namespace FAST.FBasicInterpreter
     /// The interpreter factory of the FBASIC
     /// Constructors
     /// </summary>
-    public partial class Interpreter : IfbasicError
+    public partial class Interpreter : IFBasicError
     {
         #region (+) Constructors
 
@@ -23,7 +23,7 @@ public Interpreter(bool installBuiltIns, string source)
         /// Constructor with a program container as program
         /// </summary>
         /// <param name="program">the program</param>
-        public Interpreter(bool installBuiltIns, programContainer program)
+        public Interpreter(bool installBuiltIns, ProgramContainer program)
         {
             var source=FBasicSource.ToSource(program);
             constructorCommon(source);

FAST.FBasicInterpreter/Core/Interpreter_Elements.cs

@@ -4,7 +4,7 @@
     /// The interpreter factory of the FBASIC 
     /// Part: THE FBASIC ELEMENTS EXCEPT STATMENTS
     /// </summary>
-    public partial class Interpreter : IfbasicError
+    public partial class Interpreter : IFBasicError
     {
         void Statement()
         {

FAST.FBasicInterpreter/Core/Interpreter_Extensions.cs

@@ -20,9 +20,9 @@ public static void AddLibrary(this Interpreter interpreter, IFBasicLibrary libra
         /// Execute the program and return the results
         /// </summary>
         /// <returns>the results</returns>
-        public static executionResult ExecWithResult(this Interpreter interpreter)
+        public static ExecutionResult ExecWithResult(this Interpreter interpreter)
         {
-            executionResult result = new();
+            ExecutionResult result = new();
             try
             {
                 interpreter.Exec();

FAST.FBasicInterpreter/Core/Interpreter_Methods.cs

@@ -4,7 +4,7 @@ namespace FAST.FBasicInterpreter
     /// The interpreter factory of the FBASIC
     /// Part: THE FBASIC INTERPRETER METHODS
     /// </summary>
-    public partial class Interpreter : IfbasicError
+    public partial class Interpreter : IFBasicError
     {
         #region (+) Add and more for variables
 
@@ -113,7 +113,7 @@ public T GetDataAdapter<T>(string name) where T: IfbasicDataAdapter
         /// </summary>
         /// <param name="name">The collection name</param>
         /// <param name="collection">The collection handler</param>
-        public void AddCollection(string name, IfbasicCollection collection)
+        public void AddCollection(string name, IBAasicCollection collection)
         {
             if (!dataAdapters.ContainsKey(name))
             {    
@@ -261,7 +261,7 @@ public Value GetVar(string name)
         /// </summary>
         public void Exec()
         {
-            lex.setAddonStatements(statements.Keys.ToArray());
+            lex.SetAddonStatements(statements.Keys.ToArray());
             GetNextToken=interpreter_GetNextToken;
             exit = false;
             GetNextToken();
@@ -273,7 +273,7 @@ public void Exec()
         /// </summary>
         public void RestartProgram()
         {
-            this.lex.restartProgram();
+            this.lex.RestartProgram();
             this.Result = new();
             this.instructionStack=new();
             this.ifCounter=0; 
@@ -284,10 +284,10 @@ public void RestartProgram()
         /// Create a program container
         /// </summary>
         /// <returns>The program container</returns>
-        public bool tryParseSourceCode(out programContainer program)
+        public bool tryParseSourceCode(out ProgramContainer program)
         {
             program= new();
-            List<programElement> src = new();
+            List<ProgramElement> src = new();
             program.variables=new();
             try
             {
@@ -301,7 +301,7 @@ public bool tryParseSourceCode(out programContainer program)
                     {
                         if (src.Count > 0) // skip all the first newlines if the program start with them
                         {
-                            src.Add(new programElement() { token = lastToken, value = lex.Value, identifier = lex.Identifier });
+                            src.Add(new ProgramElement() { token = lastToken, value = lex.Value, identifier = lex.Identifier });
                         }
                         while (lastToken == Token.NewLine) GetNextToken();
                     }
@@ -311,14 +311,14 @@ public bool tryParseSourceCode(out programContainer program)
                         break;
                     }
                     lineMarker = lex.TokenMarker; // save current line marker
-                    src.Add(new programElement() { token = lastToken, 
+                    src.Add(new ProgramElement() { token = lastToken, 
                                                    value = lex.Value, 
                                                    identifier = lex.Identifier, 
                                                    isDoted=lex.Identifier.Contains('.') 
                                                   });
                     GetNextToken();
                 }
-                src.Add(new programElement() { token = Token.EOF, value = lex.Value, identifier = "" });
+                src.Add(new ProgramElement() { token = Token.EOF, value = lex.Value, identifier = "" });
             } 
             catch
             {

FAST.FBasicInterpreter/Core/Interpreter_Statements.cs

@@ -4,7 +4,7 @@
     /// The interpreter factory of the FBASIC 
     /// Part: THE FBASIC STATMENTS
     /// </summary>
-    public partial class Interpreter : IfbasicError
+    public partial class Interpreter : IFBasicError
     {
         #region (+) methods to implement the FBASIC Flow statements