Upgrade googleJavaFormat to 1.35

Author: danijelaskov

.github/workflows/build.yml

@@ -38,4 +38,4 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
 
       - name: Build and Test with Gradle
-        run: ./gradlew build -x spotlessCheck
+        run: ./gradlew build

build.gradle.kts

@@ -42,7 +42,7 @@ spotless {
     java {
         target("src/*/java/**/*.java")
 
-        googleJavaFormat("1.25.0")
+        googleJavaFormat("1.35.0")
 
         removeUnusedImports()
         trimTrailingWhitespace()

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

@@ -695,7 +695,7 @@ public void generateMethodInvocationCode(Obj overriddenMethod) {
     }
   }
 
-  private class ThisParameterLoader extends CodeGenerator {
+  private class ThisParameterLoader extends VisitorAdaptor {
 
     @Override
     public void visit(IdentDesignator identDesignator) {

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

@@ -41,12 +41,12 @@ public class MJCompiler {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(MJCompiler.class);
 
-  public static void tsdump() {
+  public static void dumpSymbolTable() {
     MJTab.dump(LOGGER);
   }
 
   public static void main(String[] args) throws Exception {
-    if (args.length != 2) {
+    if (args.length < 2) {
       LOGGER.error("Too few arguments. Usage: MJCompiler <source-file> <obj-file>");
       return;
     }
@@ -72,7 +72,7 @@ public static void main(String[] args) throws Exception {
         var semanticAnalyzer = new SemanticAnalyzer();
         program.traverseBottomUp(semanticAnalyzer);
 
-        tsdump();
+        dumpSymbolTable();
 
         if (!semanticAnalyzer.semanticErrorDetected()) {
 

src/main/java/dev/askov/mjcompiler/mjsymboltable/MJTab.java

@@ -36,7 +36,12 @@
 public class MJTab extends Tab {
 
   public static final Struct BOOL_TYPE = new Struct(Struct.Bool);
-  public static final String MAIN = "main", TRUE = "true", FALSE = "false";
+  public static final Struct INT_ARRAY_TYPE = new Struct(Struct.Array, Tab.intType);
+
+  public static final String MAIN = "main";
+  public static final String TRUE = "true";
+  public static final String FALSE = "false";
+
   public static Obj lenMethod;
   public static Obj ordMethod;
   public static Obj chrMethod;
@@ -46,15 +51,21 @@ public class MJTab extends Tab {
   public static Obj vecTimesScalarMethod;
   public static Obj scalarTimesVecMethod;
   public static Obj vecPlusVecMethod;
-  public static final Struct INT_ARRAY_TYPE = new Struct(Struct.Array, Tab.intType);
 
-  private static final String PRINT_BOOL = "$printBool", READ_BOOL = "$readBool";
-  private static final String VEC_TIMES_VEC = "$vecTimesVec",
-      VEC_PLUS_VEC = "$vecPlusVec",
-      VEC_TIMES_SCALAR = "$vecTimesScalar",
-      SCALAR_TIMES_VEC = "$scalarTimesVecMethod";
-  private static final String LEN = "len", ORD = "ord", CHR = "chr";
+  private static final String PRINT_BOOL = "$printBool";
+  private static final String READ_BOOL = "$readBool";
+
+  private static final String VEC_TIMES_VEC = "$vecTimesVec";
+  private static final String VEC_PLUS_VEC = "$vecPlusVec";
+  private static final String VEC_TIMES_SCALAR = "$vecTimesScalar";
+  private static final String SCALAR_TIMES_VEC = "$scalarTimesVecMethod";
+
+  private static final String LEN = "len";
+  private static final String ORD = "ord";
+  private static final String CHR = "chr";
+
   private static final Map<Struct, Obj> CLASS_OBJS = new HashMap<>();
+
   private static int classId = 0;
 
   public static void init() {