Add array indexing

Author: lucascompython

CritLang/Content/Crit.g4

@@ -20,7 +20,7 @@ assignment: IDENTIFIER '=' expression;
 functionCall: IDENTIFIER '(' (expression (',' expression)*)? ')';
 
 expression
-	: constant	(index)*				#constantExpression
+	: constant							#constantExpression
 	| IDENTIFIER						#identifierExpression
 	| functionCall						#functionCallExpression
 	| '(' expression ')'				#parenthesizedExpression
@@ -41,20 +41,20 @@ boolOp: BOOL_OPERATOR;
 BOOL_OPERATOR: 'and' | 'or' | 'xor';
 
 constant: INTEGER | FLOAT | STRING | BOOL | array | NULL;
-	
+//arrayIndex: constant '[' INTEGER ']';
 INTEGER: [0-9]+;
 FLOAT: [0-9]+ '.' [0-9]+;
 STRING: ('"' ~'"'* '"') | ('\'' ~'\''* '\'');
 BOOL: 'true' | 'false';
 array: '[' (constant (',' constant)*)? ']'; 
-index: '[' INTEGER ']';
+//index: '[' INTEGER ']';
 NULL: 'null';
 
 
 block: '{' line* '}';
 
 WS:  [ \t\r\n]+ -> skip;
-IDENTIFIER: [a-zA-Z_][a-zA-Z0-9_]*;
+IDENTIFIER: [a-zA-Z_][a-zA-Z0-9_]* ('[' IDENTIFIER ']' | '[' INTEGER ']')* ;
 
 Comment
   :  '#' ~( '\r' | '\n' )*

CritLang/Content/test.crit

@@ -1,4 +1,9 @@
-arr = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+ola = [1, "dois", 3.0];
+
+num = 0;
+while num < 2 {
+	WriteLine(ola[num]);
+	num = num + 1;
+}
 
-WriteLine(Sqrt(Sum(arr))) # 7.41619
 

CritLang/CritVisitor.cs

@@ -18,16 +18,30 @@ public CritVisitor()
         Variables["Write"] = new Func<object?[], object?>(Write);
         Variables["WriteLine"] = new Func<object?[], object?>(WriteLine);
         Variables["Sum"] = new Func<object?[], object?>(SumArr);
+        Variables["Add"] = new Func<object?[], object?>(AddArr);
     }
 
 
 
 
 
+    private static object? AddArr(object?[] args)
+    {
+        if (args.Length is not 2)
+            throw new Exception("Add expects 2 argument");
+
+        if (args[0] is object[] objArr)
+        {
+            Console.WriteLine(objArr);
+        }
+
+        return null;
+    }
+
 
     private static object? SumArr(object?[] args)
     {
-        if (args.Length is 0 or not 1)
+        if (args.Length is not 1)
             throw new Exception("Sum expects 1 argument");
 
         if (args[0] is object[] objArr)
@@ -36,7 +50,7 @@ public CritVisitor()
         throw new Exception("Sum: Argument is not a valid array.");
     }
 
-
+    
 
     private static object? Sqrt(object?[] arg)
     {
@@ -92,9 +106,11 @@ public CritVisitor()
 
     //public override object? VisitConstantExpression(CritParser.ConstantExpressionContext context)
     //{
-    //    throw new NotImplementedException("Array indexing is not implemented");
+    //    return base.VisitConstantExpression(context);
     //}
 
+    
+
 
     public override object? VisitFunctionCall(CritParser.FunctionCallContext context)
     {
@@ -106,7 +122,7 @@ public CritVisitor()
 
 
 
-        if (!(Variables[name] is Func<object?[], object?> func))
+        if (Variables[name] is not Func<object?[], object?> func)
             throw new Exception($"Function {name} is not a function");
 
 
@@ -123,8 +139,24 @@ public CritVisitor()
 
         var value = Visit(context.expression());
 
-
-        Variables[varName] = value;
+        if (varName.Contains('[') && varName.Contains(']'))
+        {
+            string varWithoutIndex = varName.Replace("[", string.Empty).Replace("]", string.Empty);
+            char index = varWithoutIndex[^1];
+            //Variables[varWithoutIndex[..^1]]?[int.Parse(index.ToString())] = value;
+            //Console.WriteLine(Variables[varWithoutIndex[..^1]]?[int.Parse(index.ToString())]);
+            var variable = Variables[varWithoutIndex[..^1]];
+            if (variable is not object[] vO) return null;
+            foreach (var ola in vO)
+            {
+                Console.WriteLine(ola);
+            }
+            vO[int.Parse(index.ToString())] = value!;
+        }
+        else
+        {
+            Variables[varName] = value;
+        }
 
 
         return null;
@@ -134,11 +166,36 @@ public CritVisitor()
     public override object? VisitIdentifierExpression(CritParser.IdentifierExpressionContext context)
     {
         var varName = context.IDENTIFIER().GetText();
+        
+        if (varName.Contains('[') && varName.Contains(']'))
+        {
+
+            string[] variableHelper = varName.Replace("]", string.Empty).Split('[');
+            string varWithoutIndex = variableHelper[0];
+            string index = variableHelper[1];
+            
+
+            var variable = Variables[varWithoutIndex];
+            if (int.TryParse(index, out _))
+            {
+                if (variable is object[] vO)
+                    return vO[int.Parse(index)];
+            }
+            else if (Variables.ContainsKey(varWithoutIndex))
+            {
+                var value = Variables[index];
+                if (variable is object[] vO)
+                    return vO[int.Parse(value!.ToString() ?? throw new Exception("Index is not a number"))];
+            }
+            else
+            {
+                throw new Exception($"Variable {varWithoutIndex} not found");
+            }
+        }
 
         if (!Variables.ContainsKey(varName))
-        {
             throw new Exception($"Variable '{varName}' is not defined");
-        }
+        
 
         return Variables[varName];
 
@@ -159,15 +216,22 @@ public CritVisitor()
         if (context.BOOL() is { } b)
             return b.GetText() == "true";
 
+
         if (context.array() is { } a)
         {
             string[] strArr = a.GetText()[1..^1].Split(',');
             object[] anyArr = new object[strArr.Length];
+            //var anyLst = new List<object>
+            //{
+            //    Capacity = strArr.Length
+            //};
             int index = 0;
             foreach (string element in strArr)
             {
                 if (element.StartsWith('"') && element.EndsWith('"'))
                     anyArr[index] = element[1..^1];
+                //anyLst.Add(element[1..^1]);
+
                 //else if (element.StartsWith('[') && element.EndsWith(']'))
                 //    throw new Exception("Array indexing is not implemented");
                 else

CritLang/Program.cs

@@ -10,6 +10,11 @@
         Console.WriteLine("Usage: critlang [file]");
         Environment.Exit(0);
     }
+    else if (new[] { "-v", "--version" }.Contains(arg))
+    {
+        Console.WriteLine("CritLang v0.1.2-beta");
+        Environment.Exit(0);
+    }
     else if (arg.StartsWith("-"))
     {
         Console.WriteLine("Unknown option: " + arg);