From e1daea14250bc68ac9a048da6601b06fbf4348f8 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Tue, 25 Apr 2023 14:16:46 +0200
Subject: [PATCH] Update dependencies
With a quick fix for ExtendedDFAdapter to make it work with the current
parser, but we should work on replacing this class as soon as possible,
because it will break unnecessarily for most changes to the B AST.
---
build.gradle | 8 ++++----
.../java/de/tla2b/util/ExtendedDFAdapter.java | 18 +++++++++---------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/build.gradle b/build.gradle
index 2322458..7fe72f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,10 +26,10 @@ configurations.all {
def parser_version
if (isSnapshot) {
- parser_version = '2.9.33-SNAPSHOT'
+ parser_version = '2.12.4-SNAPSHOT'
}
else {
- parser_version = '2.9.32'
+ parser_version = '2.12.3'
}
def tlatools_version = '1.0.2'
@@ -40,7 +40,7 @@ dependencies {
api(group: 'de.hhu.stups', name: 'prologlib', version: parser_version)
api(group: 'de.hhu.stups', name: 'bparser', version: parser_version)
- testImplementation(group: 'junit', name: 'junit', version: '4.12')
+ testImplementation(group: 'junit', name: 'junit', version: '4.13.2')
}
java {
@@ -49,7 +49,7 @@ java {
}
jacoco {
- toolVersion = "0.8.7"
+ toolVersion = "0.8.9"
reportsDirectory = file("$buildDir/customJacocoReportDir")
}
diff --git a/src/main/java/de/tla2b/util/ExtendedDFAdapter.java b/src/main/java/de/tla2b/util/ExtendedDFAdapter.java
index 1161b20..fe500fa 100644
--- a/src/main/java/de/tla2b/util/ExtendedDFAdapter.java
+++ b/src/main/java/de/tla2b/util/ExtendedDFAdapter.java
@@ -262,10 +262,10 @@ public class ExtendedDFAdapter extends DepthFirstAdapter {
public void caseASeesMachineClause(final ASeesMachineClause node) {
inASeesMachineClause(node);
{
- final List<PExpression> copy = new ArrayList<PExpression>(node.getMachineNames());
+ final List<PMachineReferenceNoParams> copy = new ArrayList<PMachineReferenceNoParams>(node.getMachineNames());
beginList(node);
- for (final Iterator< PExpression>iterator = copy.iterator(); iterator.hasNext();) {
- final PExpression e = iterator.next();
+ for (final Iterator< PMachineReferenceNoParams>iterator = copy.iterator(); iterator.hasNext();) {
+ final PMachineReferenceNoParams e = iterator.next();
e.apply(this);
if (iterator.hasNext()) {
@@ -281,10 +281,10 @@ public class ExtendedDFAdapter extends DepthFirstAdapter {
public void caseAPromotesMachineClause(final APromotesMachineClause node) {
inAPromotesMachineClause(node);
{
- final List<PExpression> copy = new ArrayList<PExpression>(node.getOperationNames());
+ final List<POperationReference> copy = new ArrayList<POperationReference>(node.getOperationNames());
beginList(node);
- for (final Iterator< PExpression>iterator = copy.iterator(); iterator.hasNext();) {
- final PExpression e = iterator.next();
+ for (final Iterator< POperationReference>iterator = copy.iterator(); iterator.hasNext();) {
+ final POperationReference e = iterator.next();
e.apply(this);
if (iterator.hasNext()) {
@@ -300,10 +300,10 @@ public class ExtendedDFAdapter extends DepthFirstAdapter {
public void caseAUsesMachineClause(final AUsesMachineClause node) {
inAUsesMachineClause(node);
{
- final List<PExpression> copy = new ArrayList<PExpression>(node.getMachineNames());
+ final List<PMachineReferenceNoParams> copy = new ArrayList<PMachineReferenceNoParams>(node.getMachineNames());
beginList(node);
- for (final Iterator< PExpression>iterator = copy.iterator(); iterator.hasNext();) {
- final PExpression e = iterator.next();
+ for (final Iterator< PMachineReferenceNoParams>iterator = copy.iterator(); iterator.hasNext();) {
+ final PMachineReferenceNoParams e = iterator.next();
e.apply(this);
if (iterator.hasNext()) {
--
GitLab