Improve naming in SemanticAnalyzer and SemanticErrorMJLogger

Author: danijelaskov

src/main/java/dev/askov/mjcompiler/SemanticAnalyzer.java

@@ -767,7 +767,7 @@ public void visit(MethodCallDesignatorStatement methodCallDesignatorStatement) {
             detectSemanticError(
                 null,
                 methodCallDesignatorStatement,
-                SemanticErrorKind.UNINVOKABLE_METHOD,
+                SemanticErrorKind.NON_INVOCABLE_METHOD,
                 invokedMethodSignatureGenerator.getMethodSignature(),
                 classMethodSignature.getThisParameterType());
           } else {
@@ -1173,7 +1173,7 @@ public void visit(MethodCallFactor methodCallFactor) {
             detectSemanticError(
                 null,
                 methodCallFactor,
-                SemanticErrorKind.UNINVOKABLE_METHOD,
+                SemanticErrorKind.NON_INVOCABLE_METHOD,
                 invokedMethodSignatureGenerator.getMethodSignature(),
                 classMethodSignature.getThisParameterType());
           } else {
@@ -1306,33 +1306,33 @@ public void visit(IdentDesignator identDesignator) {
   }
 
   @Override
-  public void visit(ArrayElemAccessDesignator arrayElemAcessDesignator) {
-    var array = arrayElemAcessDesignator.getDesignatorStart().obj;
+  public void visit(ArrayElemAccessDesignator arrayElemAccessDesignator) {
+    var array = arrayElemAccessDesignator.getDesignatorStart().obj;
     if (array.getType().getKind() != Struct.Array) {
       if (!array.getType().equals(MJTab.noType)) {
         detectSemanticError(
-            null, arrayElemAcessDesignator, SemanticErrorKind.INDEXING_NON_ARRAY, array.getType());
+            null, arrayElemAccessDesignator, SemanticErrorKind.INDEXING_NON_ARRAY, array.getType());
       } else {
         detectSemanticError();
       }
-      arrayElemAcessDesignator.obj = MJTab.noObj;
+      arrayElemAccessDesignator.obj = MJTab.noObj;
     } else {
-      var indexType = arrayElemAcessDesignator.getExpr().obj.getType();
+      var indexType = arrayElemAccessDesignator.getExpr().obj.getType();
       if (!indexType.equals(MJTab.intType)) {
         detectSemanticError(
             null,
-            arrayElemAcessDesignator,
+            arrayElemAccessDesignator,
             SemanticErrorKind.TYPE_MISMATCH,
             indexType,
             MJTab.intType);
       }
-      arrayElemAcessDesignator.obj =
+      arrayElemAccessDesignator.obj =
           new Obj(
               Obj.Elem,
               "",
               array.getType().getElemType() != null ? array.getType().getElemType() : MJTab.noType);
     }
-    symbolUsageMJLogger.log(array, arrayElemAcessDesignator.getLine(), null, array);
+    symbolUsageMJLogger.log(array, arrayElemAccessDesignator.getLine(), null, array);
   }
 
   @Override
@@ -1396,36 +1396,36 @@ public void visit(IdentDesignatorStart identDesignatorStart) {
   }
 
   @Override
-  public void visit(ArrayElemAccessDesignatorStart arrayElemAcessDesignatorStart) {
-    var array = arrayElemAcessDesignatorStart.getDesignatorStart().obj;
+  public void visit(ArrayElemAccessDesignatorStart arrayElemAccessDesignatorStart) {
+    var array = arrayElemAccessDesignatorStart.getDesignatorStart().obj;
     if (array.getType().getKind() != Struct.Array) {
       if (!array.getType().equals(MJTab.noType)) {
         detectSemanticError(
             null,
-            arrayElemAcessDesignatorStart,
+            arrayElemAccessDesignatorStart,
             SemanticErrorKind.INDEXING_NON_ARRAY,
             array.getType());
       } else {
         detectSemanticError();
       }
-      arrayElemAcessDesignatorStart.obj = MJTab.noObj;
+      arrayElemAccessDesignatorStart.obj = MJTab.noObj;
     } else {
-      var indexType = arrayElemAcessDesignatorStart.getExpr().obj.getType();
+      var indexType = arrayElemAccessDesignatorStart.getExpr().obj.getType();
       if (!indexType.equals(MJTab.intType)) {
         detectSemanticError(
             null,
-            arrayElemAcessDesignatorStart,
+            arrayElemAccessDesignatorStart,
             SemanticErrorKind.TYPE_MISMATCH,
             indexType,
             MJTab.intType);
       }
-      arrayElemAcessDesignatorStart.obj =
+      arrayElemAccessDesignatorStart.obj =
           new Obj(
               Obj.Elem,
               "",
               array.getType().getElemType() != null ? array.getType().getElemType() : MJTab.noType);
     }
-    symbolUsageMJLogger.log(array, arrayElemAcessDesignatorStart.getLine(), null, array);
+    symbolUsageMJLogger.log(array, arrayElemAccessDesignatorStart.getLine(), null, array);
   }
 
   @Override

src/main/java/dev/askov/mjcompiler/loggers/SemanticErrorMJLogger.java

@@ -57,7 +57,7 @@ public enum SemanticErrorKind {
     ACCESSING_MEMBER_OF_NON_OBJECT,
     UNRESOLVED_MEMBER,
     INCOMPATIBLE_RET_TYPE,
-    UNINVOKABLE_METHOD,
+    NON_INVOCABLE_METHOD,
   }
 
   public SemanticErrorMJLogger() {
@@ -119,19 +119,19 @@ protected String messageBody(Obj obj, Object... context) {
                   + MJUtils.typeToString((Struct) ((Object[]) (context[1]))[1])
                   + "\"";
       case UNDEF_METHOD -> {
-        var cntx1 = (Object[]) context[1];
-        var overriddenMethodSignature1 = (MethodSignature) cntx1[0];
-        message = "The method \"" + overriddenMethodSignature1.toString() + "\" is undefined";
+        var args = (Object[]) context[1];
+        var methodSignature = (MethodSignature) args[0];
+        message = "The method \"" + methodSignature.toString() + "\" is undefined";
       }
       case MISPLACED_BREAK -> message = "break cannot be used outside of a loop";
       case MISPLACED_CONTINUE -> message = "continue cannot be used outside of a loop";
       case UNDEF_OP -> {
-        var cntx2 = (Object[]) context[1];
-        var operator = (String) cntx2[cntx2.length - 1];
+        var args = (Object[]) context[1];
+        var operator = (String) args[args.length - 1];
         var operandTypes = new StringBuilder();
-        for (var i = 0; i < cntx2.length - 1; i++) {
-          operandTypes.append("\"").append(MJUtils.typeToString((Struct) cntx2[i])).append("\"");
-          if (i < cntx2.length - 2) {
+        for (var i = 0; i < args.length - 1; i++) {
+          operandTypes.append("\"").append(MJUtils.typeToString((Struct) args[i])).append("\"");
+          if (i < args.length - 2) {
             operandTypes.append(", ");
           }
         }
@@ -154,22 +154,19 @@ protected String messageBody(Obj obj, Object... context) {
       case UNRESOLVED_MEMBER ->
           message = "\"" + obj.getName() + "\" cannot be resolved to a class member";
       case INCOMPATIBLE_RET_TYPE -> {
-        var cntx3 = (Object[]) context[1];
-        var overriddenMethodSignature2 = (ClassMethodSignature) cntx3[0];
-        message =
-            "The return type is incompatible with \""
-                + overriddenMethodSignature2.toString()
-                + "\"";
+        var args = (Object[]) context[1];
+        var methodSignature = (ClassMethodSignature) args[0];
+        message = "The return type is incompatible with \"" + methodSignature.toString() + "\"";
       }
-      case UNINVOKABLE_METHOD -> {
-        var cntx4 = (Object[]) context[1];
-        var overriddenMethodSignature3 = (MethodSignature) cntx4[0];
-        var type = (Struct) cntx4[1];
+      case NON_INVOCABLE_METHOD -> {
+        var args = (Object[]) context[1];
+        var methodSignature = (MethodSignature) args[0];
+        var type = (Struct) args[1];
         message =
             "Cannot invoke \""
-                + overriddenMethodSignature3.getMethodName()
+                + methodSignature.getMethodName()
                 + " "
-                + overriddenMethodSignature3.getParameterList()
+                + methodSignature.getParameterList()
                 + "\" on the type \""
                 + MJUtils.typeToString(type)
                 + "\"";