From c7b77e3bbbcc9cf8e25bc5926f16fe4fa6d2415e Mon Sep 17 00:00:00 2001 From: hexaredecimal Date: Mon, 19 May 2025 12:44:30 +0200 Subject: [PATCH 1/5] pom: Adds the enforcer plugin --- pom.xml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5f75afa..765603e 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ org.antlr antlr4-runtime - 4.9.3 + 4.13.2 @@ -107,6 +107,32 @@ + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.5.0 + + + enforce-versions + + enforce + + + + + 3.6.3 + + + 21 + + + + + + + From fbc8368ba15ffadc538244b3ffb45bf96862115b Mon Sep 17 00:00:00 2001 From: hexaredecimal Date: Mon, 19 May 2025 14:01:02 +0200 Subject: [PATCH 2/5] editor: Drop the stack frame on error --- src/main/java/org/editor/CanvasFrame.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/editor/CanvasFrame.java b/src/main/java/org/editor/CanvasFrame.java index 9a9d077..52b4b9f 100644 --- a/src/main/java/org/editor/CanvasFrame.java +++ b/src/main/java/org/editor/CanvasFrame.java @@ -105,6 +105,7 @@ protected void paintComponent(Graphics g) { g2.setColor(Color.BLACK); gfx = g2; if (!Compiler.main_loop.isEmpty()) { + Context.top.pushStack(); Context.top.putLocal("dt", new PiccodeNumber(String.format("%s", deltaTime))); try { AccessFrame.msgs.setText(""); @@ -116,6 +117,8 @@ protected void paintComponent(Graphics g) { System.out.println("ERROR: " + e.getMessage()); e.printStackTrace(); Compiler.main_loop.clear(); + } finally { + Context.top.dropStackFrame(); } } From 34fbdf40673e775087ece4b14558a64986a1c44f Mon Sep 17 00:00:00 2001 From: hexaredecimal Date: Mon, 19 May 2025 14:01:28 +0200 Subject: [PATCH 3/5] piccode: Drop the stack frame on error --- src/main/java/org/piccode/backend/Compiler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/piccode/backend/Compiler.java b/src/main/java/org/piccode/backend/Compiler.java index 33986b3..8db9c02 100644 --- a/src/main/java/org/piccode/backend/Compiler.java +++ b/src/main/java/org/piccode/backend/Compiler.java @@ -78,6 +78,8 @@ public static void compile(String code, boolean render) { } catch (Exception rte) { rte.printStackTrace(); AccessFrame.writeError(rte.getMessage()); + } finally { + Context.top.dropStackFrame(); } } From 86aa9cf0514b38fc2f68280d77137f2847a49f8b Mon Sep 17 00:00:00 2001 From: hexaredecimal Date: Mon, 19 May 2025 14:03:01 +0200 Subject: [PATCH 4/5] nb: Config --- nb-configuration.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 nb-configuration.xml diff --git a/nb-configuration.xml b/nb-configuration.xml new file mode 100644 index 0000000..3486bc9 --- /dev/null +++ b/nb-configuration.xml @@ -0,0 +1,18 @@ + + + + + + all + + From 388fe0a0543958efac6f96bc17f0bb231c7449db Mon Sep 17 00:00:00 2001 From: hexaredecimal Date: Mon, 19 May 2025 14:03:23 +0200 Subject: [PATCH 5/5] pom: add Junit as a dependency --- pom.xml | 66 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 765603e..135d92b 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ org.antlr antlr4-runtime - 4.13.2 + 4.9.3 @@ -49,8 +49,28 @@ 3.0.10 + + org.junit.jupiter + junit-jupiter + test + + + + + + org.junit + junit-bom + 5.12.2 + pom + import + + + + + + @@ -110,28 +130,28 @@ - org.apache.maven.plugins - maven-enforcer-plugin - 3.5.0 - - - enforce-versions - - enforce - - - - - 3.6.3 - - - 21 - - - - - - + org.apache.maven.plugins + maven-enforcer-plugin + 3.5.0 + + + enforce-versions + + enforce + + + + + 3.6.3 + + + 21 + + + + + +