Fixes to [] notation

Author: aafent

FAST.FBasic.InteractiveConsole/Tests/array.bas

@@ -5,22 +5,19 @@ REM
 coldim arr1, c1, c2
 let [arr1.c1(1)] = "xxx"
 
-INDEXDELETE arr1,1
-print [arr1.c1(1)]
-
 coldim a1, c1, c2, c3  ' define array a1 with 3 columns
 coladd a1, c4  ' add one column
 
 let [a1.c4(2)] = "XXX"
-let index=1
-print "#5.C4=";
+let index=2
+print "#2.C4=";
 print [a1.c4(index)]
 
 print "#2.C4=";
 print [a1.c4(2)]
 
 print "Array length=";
-print count("a1")
+print ubound("a1")
 
 print "#2 Column=";
 'print colname("a1",2)
@@ -29,16 +26,4 @@ print cname("a1",2)
 print "Number of columns=";
 print cnamescount("a1")
 
-Halt
-
-
-'// Statements: 
-'// JADIM name, [ColumnName1], [ColumnName2], ..., [ColumnNameN]
-'// COLNAME array_name, column_number, column_name
-'// ADDCOL array_name, column_name
-'// ASET array_name, column_name, value
-'//
-'// Functions:
-'// count(array_name)
-
 Halt

FAST.FBasic.InteractiveConsole/Tests/wordFreq.bas

@@ -1,7 +1,6 @@
 REM Test program for CALL and GOTO statements
 REM 
 REM
-
 text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do 
 eiusmod tempor incididunt ut labore et dolore magna aliqua. 
 Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip 
@@ -15,17 +14,14 @@ let minWordLength=2
 let minCount=2
 WORDFREQ words, text, minWordLength, minCount
 
-COLNAME words, 1, "a"
-COLNAME words, 2, "b"
-
 let cnt=ubound("words")
 print "Words found: "+cnt
 
 for i=1 To cnt
   print "Word: ";
-  print [words.a(i)];
+  print [words.1(i)];
   print " : ";
-  print [words.b(i)]
+  print [words.2(i)]
 next i
 
 halt

FAST.FBasicInterpreter/Core/IdentifierNotationParser.cs

@@ -49,6 +49,29 @@ public class IdentifierNotationParser
         /// </summary>
         public string DataElement {  get; private set; } = null;
 
+        /// <summary>
+        /// Data element number, convert to number the data element
+        /// </summary>
+        public int DataElementAsNumber
+        {
+            get
+            {
+                return int.Parse(this.DataElement);
+            }
+        }
+
+        /// <summary>
+        /// Check if the data element is a numeric value
+        /// </summary>
+        public bool IsDataElementNumeric
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(this.DataElement)) return false;
+                return int.TryParse(this.DataElement, out _);
+            }
+        }
+
         /// <summary>
         /// The function name if the expression is a function name
         /// </summary>

FAST.FBasicInterpreter/Core/Interpreter_Elements.cs

@@ -151,7 +151,11 @@ public Value GetIdentifierOrCF(bool permitIdentifier = true,
             var parser = new IdentifierNotationParser(lex.Identifier, this);
             if (parser.IsArray)
             {
-                return this.GetArray(parser.DataContainerName)[parser.ArrayIndex, parser.DataElement];
+                return parser.IsDataElementNumeric?
+                    this.GetArray(parser.DataContainerName)[parser.ArrayIndex-1, parser.DataElementAsNumber-1] // 0-base reference
+                    :
+                    this.GetArray(parser.DataContainerName)[parser.ArrayIndex, parser.DataElement] // 1-base reference
+                    ;
             }
             else if (parser.IsCollection)
             {

FAST.FBasicInterpreter/Execution/executionResult.cs

@@ -53,5 +53,7 @@ public class ExecutionResult
         /// The dictionary key is the variable name and the value is the variable Value
         /// </summary>
         public Dictionary<string, Value> variables { get; set; } = null;
+
+
     }
 }