From 005143a54bf0434f4912982415427c80307e126b Mon Sep 17 00:00:00 2001 From: Johannes Mey <johannes.mey@tu-dresden.de> Date: Thu, 6 Oct 2022 10:51:37 +0200 Subject: [PATCH] update dumpast --- gradle.properties | 2 +- src/main/jastadd/common/Tracing.jadd | 2 +- .../de/tudresden/inf/st/mg/common/MotionGrammarParser.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 916cdfc..47cbe93 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ relast_version = 0.3.0-137 -dumpAst_version = 1.2.2 +dumpAst_version = 2.0.2-dev-91 jupyter_version = 5.8.2 assertj_version = 3.22.0 grammar2uml_version = 0.2.5-21 diff --git a/src/main/jastadd/common/Tracing.jadd b/src/main/jastadd/common/Tracing.jadd index 115846d..0c3f711 100644 --- a/src/main/jastadd/common/Tracing.jadd +++ b/src/main/jastadd/common/Tracing.jadd @@ -58,7 +58,7 @@ aspect Tracing { }) .<ASTNode>includeRelationsWhen((sourceNode, targetNode, roleName) -> !roleName.equals("AttachedRobot") && !(sourceNode != null && sourceNode.inDemonstrationTable()) && !(targetNode != null && targetNode.inDemonstrationTable())) // !sourceNode.inDemonstrationTable() .dumpAsSVG(svgPath); - } catch (java.io.IOException e) { + } catch (java.io.IOException | de.tudresden.inf.st.jastadd.dumpAst.ast.TransformationException e) { e.printStackTrace(); } de.tudresden.inf.st.mg.common.Webserver.getInstance().publish(now, 0, step, svgPath, "context"); diff --git a/src/main/java/de/tudresden/inf/st/mg/common/MotionGrammarParser.java b/src/main/java/de/tudresden/inf/st/mg/common/MotionGrammarParser.java index def2e40..70c0f00 100644 --- a/src/main/java/de/tudresden/inf/st/mg/common/MotionGrammarParser.java +++ b/src/main/java/de/tudresden/inf/st/mg/common/MotionGrammarParser.java @@ -3,6 +3,7 @@ package de.tudresden.inf.st.mg.common; import de.tudresden.inf.st.jastadd.dumpAst.ast.Dumper; import de.tudresden.inf.st.jastadd.dumpAst.ast.SkinParamBooleanSetting; import de.tudresden.inf.st.jastadd.dumpAst.ast.SkinParamStringSetting; +import de.tudresden.inf.st.jastadd.dumpAst.ast.TransformationException; import de.tudresden.inf.st.mg.jastadd.model.*; import java.io.IOException; @@ -85,7 +86,7 @@ public abstract class MotionGrammarParser<T extends MotionGrammarElement> { .dumpAsSVG(svgPath); Webserver.getInstance().publish(new Date(), timeStep_, step, svgPath, "ast"); timeStep_++; - } catch (IOException e) { + } catch (IOException | TransformationException e) { e.printStackTrace(); } } -- GitLab