From c1eef57c97687b63687fa4992eec12c2e72760e5 Mon Sep 17 00:00:00 2001
From: quirinecker <quirin.ecker@bajupa.com>
Date: Sat, 8 Nov 2025 17:16:16 +0100
Subject: [PATCH] finished exercise

---
 .idea/.gitignore                              |  15 ++-
 .idea/MicroJava.iml                           | 104 ++++++++++++++++++
 .idea/codeStyles/Project.xml                  |  10 ++
 .idea/codeStyles/codeStyleConfig.xml          |   5 +
 .idea/{exercise05.iml => exercise02.iml}      |   0
 .idea/inspectionProfiles/Project_Default.xml  |   8 ++
 .../libraries/{lib2.xml => junit_jupiter.xml} |  33 +++---
 .idea/libraries/lib.xml                       |  18 ---
 .idea/misc.xml                                |   9 +-
 .idea/modules.xml                             |  18 ++-
 .idea/runConfigurations/UE_P_1.xml            |  19 ++++
 .idea/runConfigurations/UE_P_2.xml            |  16 +++
 .idea/runConfigurations/UE_P_3.xml            |  17 +++
 .idea/runConfigurations/UE_P_4.xml            |  18 +++
 .idea/runConfigurations/UE_P_5.xml            |  19 ++++
 .idea/runConfigurations/UE_P_6.xml            |  13 +++
 .../_for_lecturers__Run_verbose_tracing.xml   |  13 +++
 .idea/vcs.xml                                 |   6 +
 MicroJava Compiler/MicroJava Compiler.iml     |  13 ---
 .../src/ssw/mj/impl/Parser.java               |  74 +++++++++++--
 MicroJava Tests/MicroJava Tests2.iml          |  15 ---
 21 files changed, 348 insertions(+), 95 deletions(-)
 create mode 100644 .idea/MicroJava.iml
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 rename .idea/{exercise05.iml => exercise02.iml} (100%)
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 rename .idea/libraries/{lib2.xml => junit_jupiter.xml} (83%)
 delete mode 100644 .idea/libraries/lib.xml
 create mode 100644 .idea/runConfigurations/UE_P_1.xml
 create mode 100644 .idea/runConfigurations/UE_P_2.xml
 create mode 100644 .idea/runConfigurations/UE_P_3.xml
 create mode 100644 .idea/runConfigurations/UE_P_4.xml
 create mode 100644 .idea/runConfigurations/UE_P_5.xml
 create mode 100644 .idea/runConfigurations/UE_P_6.xml
 create mode 100644 .idea/runConfigurations/_for_lecturers__Run_verbose_tracing.xml
 create mode 100644 .idea/vcs.xml
 delete mode 100644 MicroJava Compiler/MicroJava Compiler.iml
 delete mode 100644 MicroJava Tests/MicroJava Tests2.iml

diff --git a/.idea/.gitignore b/.idea/.gitignore
index b58b603..052f916 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,5 +1,10 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# GitHub Copilot persisted chat sessions
+/copilot/chatSessions
diff --git a/.idea/MicroJava.iml b/.idea/MicroJava.iml
new file mode 100644
index 0000000..275245e
--- /dev/null
+++ b/.idea/MicroJava.iml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/MicroJava Compiler/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/MicroJava Tests/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/MicroJava Tests/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/MicroJava VM Tests/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/gson-2.10.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/javassist.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/apiguardian-api-1.1.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/junit-jupiter-5.12.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/junit-jupiter-api-5.12.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/junit-jupiter-engine-5.12.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/junit-jupiter-params-5.12.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/junit-platform-commons-1.12.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/junit-platform-engine-1.12.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/opentest4j-1.3.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..7c86e17
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,10 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="JAVA">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..307554b
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/exercise05.iml b/.idea/exercise02.iml
similarity index 100%
rename from .idea/exercise05.iml
rename to .idea/exercise02.iml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..e8079f7
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,8 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.net.http.HttpClient,newHttpClient" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/lib2.xml b/.idea/libraries/junit_jupiter.xml
similarity index 83%
rename from .idea/libraries/lib2.xml
rename to .idea/libraries/junit_jupiter.xml
index 48a1569..631884c 100644
--- a/.idea/libraries/lib2.xml
+++ b/.idea/libraries/junit_jupiter.xml
@@ -1,18 +1,17 @@
-<component name="libraryTable">
-  <library name="lib2">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/junit-jupiter-engine-5.12.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/junit-jupiter-api-5.12.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/junit-jupiter-5.12.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/apiguardian-api-1.1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/junit-platform-engine-1.12.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/opentest4j-1.3.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/junit-platform-commons-1.12.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/javassist.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gson-2.10.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/junit-jupiter-params-5.12.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
+<component name="libraryTable">
+  <library name="junit.jupiter" type="repository">
+    <properties maven-id="org.junit.jupiter:junit-jupiter:5.12.2" />
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/junit-jupiter-5.12.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/junit-jupiter-api-5.12.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/opentest4j-1.3.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/junit-platform-commons-1.12.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/apiguardian-api-1.1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/junit-jupiter-params-5.12.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/junit-jupiter-engine-5.12.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/junit-platform-engine-1.12.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
deleted file mode 100644
index 0277ad2..0000000
--- a/.idea/libraries/lib.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<component name="libraryTable">
-  <library name="lib">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/out/lib/junit-jupiter-5.12.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/out/lib/apiguardian-api-1.1.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/out/lib/javassist.jar!/" />
-      <root url="jar://$PROJECT_DIR$/out/lib/junit-jupiter-api-5.12.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/out/lib/junit-jupiter-params-5.12.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/out/lib/junit-jupiter-engine-5.12.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/out/lib/gson-2.10.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/out/lib/opentest4j-1.3.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/out/lib/junit-platform-engine-1.12.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/out/lib/junit-platform-commons-1.12.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6f29fee..357a5d4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="openjdk-21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index bec10bb..4cd36c0 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/MicroJava Compiler/MicroJava Compiler.iml" filepath="$PROJECT_DIR$/MicroJava Compiler/MicroJava Compiler.iml" />
-      <module fileurl="file://$PROJECT_DIR$/out/MicroJava Compiler/MicroJava Compiler2.iml" filepath="$PROJECT_DIR$/out/MicroJava Compiler/MicroJava Compiler2.iml" />
-      <module fileurl="file://$PROJECT_DIR$/out/MicroJava Tests/MicroJava Tests.iml" filepath="$PROJECT_DIR$/out/MicroJava Tests/MicroJava Tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/MicroJava Tests/MicroJava Tests2.iml" filepath="$PROJECT_DIR$/MicroJava Tests/MicroJava Tests2.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/exercise05.iml" filepath="$PROJECT_DIR$/.idea/exercise05.iml" />
-    </modules>
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/MicroJava.iml" filepath="$PROJECT_DIR$/.idea/MicroJava.iml" />
+    </modules>
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/UE_P_1.xml b/.idea/runConfigurations/UE_P_1.xml
new file mode 100644
index 0000000..6da5284
--- /dev/null
+++ b/.idea/runConfigurations/UE_P_1.xml
@@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="UE-P-1" type="JUnit" factoryName="JUnit">
+    <module name="MicroJava" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="ssw.mj.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <option name="PACKAGE_NAME" value="ssw.mj.test" />
+    <option name="MAIN_CLASS_NAME" value="ssw.mj.test.ScannerTest" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="class" />
+    <option name="VM_PARAMETERS" value="-ea -Djava.system.class.loader=ssw.mj.TracingClassLoader" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/UE_P_2.xml b/.idea/runConfigurations/UE_P_2.xml
new file mode 100644
index 0000000..32e7d97
--- /dev/null
+++ b/.idea/runConfigurations/UE_P_2.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="UE-P-2" type="JUnit" factoryName="JUnit">
+    <module name="MicroJava" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="pattern" />
+    <option name="VM_PARAMETERS" value="-ea -Djava.system.class.loader=ssw.mj.TracingClassLoader" />
+    <patterns>
+      <pattern testClass="ssw.mj.test.ScannerTest" />
+      <pattern testClass="ssw.mj.test.ParserTest" />
+    </patterns>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/UE_P_3.xml b/.idea/runConfigurations/UE_P_3.xml
new file mode 100644
index 0000000..18d61ee
--- /dev/null
+++ b/.idea/runConfigurations/UE_P_3.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="UE-P-3" type="JUnit" factoryName="JUnit">
+    <module name="MicroJava" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="pattern" />
+    <option name="VM_PARAMETERS" value="-ea -Djava.system.class.loader=ssw.mj.TracingClassLoader" />
+    <patterns>
+      <pattern testClass="ssw.mj.test.ScannerTest" />
+      <pattern testClass="ssw.mj.test.ParserTest" />
+      <pattern testClass="ssw.mj.test.RecoverTest" />
+    </patterns>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/UE_P_4.xml b/.idea/runConfigurations/UE_P_4.xml
new file mode 100644
index 0000000..a137536
--- /dev/null
+++ b/.idea/runConfigurations/UE_P_4.xml
@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="UE-P-4" type="JUnit" factoryName="JUnit">
+    <module name="MicroJava" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="pattern" />
+    <option name="VM_PARAMETERS" value="-ea -Djava.system.class.loader=ssw.mj.TracingClassLoader" />
+    <patterns>
+      <pattern testClass="ssw.mj.test.ScannerTest" />
+      <pattern testClass="ssw.mj.test.ParserTest" />
+      <pattern testClass="ssw.mj.test.RecoverTest" />
+      <pattern testClass="ssw.mj.test.SymbolTableTest" />
+    </patterns>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/UE_P_5.xml b/.idea/runConfigurations/UE_P_5.xml
new file mode 100644
index 0000000..ff69013
--- /dev/null
+++ b/.idea/runConfigurations/UE_P_5.xml
@@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="UE-P-5" type="JUnit" factoryName="JUnit">
+    <module name="MicroJava" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="pattern" />
+    <option name="VM_PARAMETERS" value="-ea -Djava.system.class.loader=ssw.mj.TracingClassLoader" />
+    <patterns>
+      <pattern testClass="ssw.mj.test.ScannerTest" />
+      <pattern testClass="ssw.mj.test.ParserTest" />
+      <pattern testClass="ssw.mj.test.RecoverTest" />
+      <pattern testClass="ssw.mj.test.SymbolTableTest" />
+      <pattern testClass="ssw.mj.test.SimpleCodeGenerationTest" />
+    </patterns>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/UE_P_6.xml b/.idea/runConfigurations/UE_P_6.xml
new file mode 100644
index 0000000..60a4a5f
--- /dev/null
+++ b/.idea/runConfigurations/UE_P_6.xml
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="UE-P-6" type="JUnit" factoryName="JUnit">
+    <module name="MicroJava" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="directory" />
+    <option name="VM_PARAMETERS" value="-ea -Djava.system.class.loader=ssw.mj.TracingClassLoader" />
+    <dir value="$PROJECT_DIR$/MicroJava Tests/tests" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/_for_lecturers__Run_verbose_tracing.xml b/.idea/runConfigurations/_for_lecturers__Run_verbose_tracing.xml
new file mode 100644
index 0000000..578f3e0
--- /dev/null
+++ b/.idea/runConfigurations/_for_lecturers__Run_verbose_tracing.xml
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="(for lecturers) Run verbose tracing" type="JUnit" factoryName="JUnit">
+    <module name="MicroJava" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="directory" />
+    <option name="VM_PARAMETERS" value="-ea -verbose:class -verbose:dynload -Djava.system.class.loader=ssw.mj.TracingClassLoader" />
+    <dir value="$PROJECT_DIR$/MicroJava Tests/tests" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/MicroJava Compiler/MicroJava Compiler.iml b/MicroJava Compiler/MicroJava Compiler.iml
deleted file mode 100644
index 228f0a9..0000000
--- a/MicroJava Compiler/MicroJava Compiler.iml	
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="lib2" level="project" />
-    <orderEntry type="library" name="lib" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/MicroJava Compiler/src/ssw/mj/impl/Parser.java b/MicroJava Compiler/src/ssw/mj/impl/Parser.java
index 4bf19b9..f260f0e 100644
--- a/MicroJava Compiler/src/ssw/mj/impl/Parser.java	
+++ b/MicroJava Compiler/src/ssw/mj/impl/Parser.java	
@@ -9,8 +9,7 @@ import ssw.mj.scanner.Token;
 import javax.xml.stream.FactoryConfigurationError;
 import java.util.EnumSet;
 
-import static ssw.mj.Errors.Message.TOKEN_EXPECTED;
-import static ssw.mj.Errors.Message.UNDEFINED_ESCAPE;
+import static ssw.mj.Errors.Message.*;
 import static ssw.mj.scanner.Token.Kind.*;
 
 public final class Parser {
@@ -60,6 +59,10 @@ public final class Parser {
 	 */
 	public final Tab tab;
 
+	private static int MIN_ERROR_DIST = 3;
+
+	private int errorDist = MIN_ERROR_DIST;
+
 	public Parser(Scanner scanner) {
 		this.scanner = scanner;
 		tab = new Tab(this);
@@ -76,6 +79,7 @@ public final class Parser {
 		t = la;
 		la = scanner.next();
 		sym = la.kind;
+		errorDist++;
 	}
 
 	/**
@@ -95,8 +99,12 @@ public final class Parser {
 	public void error(Message msg, Object... msgParams) {
 		// TODO Exercise UE-P-3: Replace panic mode with error recovery (i.e., keep track of error distance)
 		// TODO Exercise UE-P-3: Hint: Replacing panic mode also affects scan() method
-		scanner.errors.error(la.line, la.col, msg, msgParams);
-		throw new Errors.PanicMode();
+
+		if (errorDist >= MIN_ERROR_DIST) {
+			scanner.errors.error(la.line, la.col, msg, msgParams);
+		}
+
+		errorDist = 0;
 	}
 
 	/**
@@ -124,10 +132,15 @@ public final class Parser {
 	static final EnumSet<Token.Kind> firstConstDecl = EnumSet.of(Token.Kind.final_);
 	static final EnumSet<Token.Kind> firstVarDecl = EnumSet.of(Token.Kind.ident);
 	static final EnumSet<Token.Kind> firstClassDecl = EnumSet.of(Token.Kind.class_);
+	static final EnumSet<Token.Kind> breakDecl = EnumSet.of(lbrace, eof);
 	static final EnumSet<Token.Kind> firstStatement = EnumSet.of(ident, if_, while_, break_, return_, read, print, lbrace, semicolon);
+	static final EnumSet<Token.Kind> breakStatement = EnumSet.of(rbrace, else_, eof);
 	static final EnumSet<Token.Kind> firstAsignop = EnumSet.of(assign, plusas, minusas, timesas, slashas, remas);
 	static final EnumSet<Token.Kind> firstFactor = EnumSet.of(ident, number, charConst, new_, lpar);
 	static final EnumSet<Token.Kind> firstMulop = EnumSet.of(times, slash, rem);
+	static final EnumSet<Token.Kind> firstMethodDecl = EnumSet.of(ident, void_);
+	static final EnumSet<Token.Kind> breakMethodDecl = EnumSet.of(rbrace, eof);
+
 
 	static <T extends Enum<T>> EnumSet<T> enumUnion(EnumSet<T> first, EnumSet<T> ...sets) {
 		final var copy = EnumSet.copyOf(first);
@@ -154,22 +167,26 @@ public final class Parser {
 		check(Token.Kind.program);
 		check(Token.Kind.ident);
 
-		final var firstDeclarationUnion = enumUnion(firstConstDecl, firstVarDecl, firstClassDecl);
-
-		while (firstDeclarationUnion.contains(sym)) {
+		while (!breakDecl.contains(sym)) {
 			if (firstVarDecl.contains(sym)) {
 				VarDecl();
 			} else if (firstClassDecl.contains(sym)) {
 				ClassDecl();
-			} else {
+			} else if (firstConstDecl.contains(sym)){
 				ConstDecl();
+			} else {
+				recoverDecl();
 			}
 		}
 
 		check(lbrace);
 
-		while (sym == ident || sym == void_) {
-			MethodDecl();
+		while (!breakMethodDecl.contains(sym)) {
+			if (firstMethodDecl.contains(sym)) {
+				MethodDecl();
+			} else {
+				recoverMethodDecl();
+			}
 		}
 
 		check(rbrace);
@@ -266,7 +283,7 @@ public final class Parser {
 	}
 
 	private void Statement() {
-		while (firstStatement.contains(sym)) {
+		while (!breakStatement.contains(sym)) {
 			switch (sym) {
 				case ident -> {
 					Designator();
@@ -340,6 +357,7 @@ public final class Parser {
 				}
 				case lbrace -> Block();
 				case semicolon -> scan();
+				default -> recoverStatement();
 			};
 		}
 	}
@@ -504,6 +522,40 @@ public final class Parser {
 
 	// TODO Exercise UE-P-3: Error recovery methods: recoverDecl, recoverMethodDecl and recoverStat (+ TODO Exercise UE-P-5: Check idents for Type kind)
 
+	private void recoverDecl() {
+		final var firstDeclarationUnion = enumUnion(firstConstDecl, firstVarDecl, firstClassDecl);
+		final var recoverDeclSet = enumUnion(breakDecl, firstDeclarationUnion);
+		error(DECLARATION_RECOVERY);
+
+		do {
+			scan();
+		} while (!recoverDeclSet.contains(sym));
+		errorDist = 0;
+	}
+
+	private void recoverMethodDecl() {
+		error(METHOD_DECL_RECOVERY);
+
+		final var recoveryMethoDeclSet = enumUnion(breakMethodDecl, firstMethodDecl);
+		do {
+			scan();
+		} while (!recoveryMethoDeclSet.contains(sym));
+		errorDist = 0;
+	}
+
+	private void recoverStatement() {
+		error(STATEMENT_RECOVERY);
+
+		var recoveryStatementSet = enumUnion(breakStatement, firstStatement);
+		recoveryStatementSet.remove(ident);
+		recoveryStatementSet.remove(lbrace);
+
+		do {
+			scan();
+		} while (!recoveryStatementSet.contains(sym));
+		errorDist = 0;
+	}
+
 	// ====================================
 	// ====================================
 }
diff --git a/MicroJava Tests/MicroJava Tests2.iml b/MicroJava Tests/MicroJava Tests2.iml
deleted file mode 100644
index 9d2e8a7..0000000
--- a/MicroJava Tests/MicroJava Tests2.iml	
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="lib2" level="project" />
-    <orderEntry type="library" name="lib" level="project" />
-    <orderEntry type="module" module-name="MicroJava Compiler" />
-    <orderEntry type="module" module-name="MicroJava Compiler2" />
-  </component>
-</module>
\ No newline at end of file