From d6acedae8e429411fc5d9cc7dd07752ec15bf4aa Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Fri, 30 Aug 2024 14:14:01 +0200 Subject: [PATCH 1/5] Using latest rascal and rascal-core typechecker --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c1d7513..eeae811 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ org.rascalmpl rascal-maven-plugin - 0.24.0 + 0.28.1 true false @@ -145,12 +145,12 @@ org.rascalmpl rascal - 0.34.0 + 0.40.7 org.rascalmpl salix-core - 0.2.1 + 0.2.4 From 5f618d84bb09a6da933f61dd3bb61fa7ffdc0460 Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Fri, 30 Aug 2024 16:07:20 +0200 Subject: [PATCH 2/5] Using latest rascal and rascal-core typechecker --- FUNDING => FUNDING.md | 0 LICENSE => LICENSE.md | 0 RELEASE-NOTES => RELEASE-NOTES.md | 0 pom.xml | 2 +- src/analysis/grammars/dramb/Diagnose.rsc | 1 - src/analysis/grammars/dramb/Regression.rsc | 4 ++-- 6 files changed, 3 insertions(+), 4 deletions(-) rename FUNDING => FUNDING.md (100%) rename LICENSE => LICENSE.md (100%) rename RELEASE-NOTES => RELEASE-NOTES.md (100%) diff --git a/FUNDING b/FUNDING.md similarity index 100% rename from FUNDING rename to FUNDING.md diff --git a/LICENSE b/LICENSE.md similarity index 100% rename from LICENSE rename to LICENSE.md diff --git a/RELEASE-NOTES b/RELEASE-NOTES.md similarity index 100% rename from RELEASE-NOTES rename to RELEASE-NOTES.md diff --git a/pom.xml b/pom.xml index eeae811..98a8eb5 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ org.apache.maven.plugins maven-release-plugin - 2.5.3 + 3.1.1 v@{project.version} -Drascal.compile.skip -DskipTests -Drascal.tutor.skip diff --git a/src/analysis/grammars/dramb/Diagnose.rsc b/src/analysis/grammars/dramb/Diagnose.rsc index cd13298..2d98b41 100644 --- a/src/analysis/grammars/dramb/Diagnose.rsc +++ b/src/analysis/grammars/dramb/Diagnose.rsc @@ -474,4 +474,3 @@ void rules(list[Production] rs) { } void rules(set[Production] r) = rules(sort(r)); - diff --git a/src/analysis/grammars/dramb/Regression.rsc b/src/analysis/grammars/dramb/Regression.rsc index 35fc4dd..094fd62 100644 --- a/src/analysis/grammars/dramb/Regression.rsc +++ b/src/analysis/grammars/dramb/Regression.rsc @@ -81,9 +81,9 @@ list[ParsingRegression] runRegressionTests(type[&T <: Tree] newGrammar, Model m) println(" ok!"); } } - catch ParseError(_e) : { + catch ParseError(l) : { println(" parse error!"); - append error(ex, s, _e); + append error(ex, s, l); } catch value v: { println(" unexpected crash!"); From 286ff484d9d09dd75c31be97c569d0346be587cd Mon Sep 17 00:00:00 2001 From: paulklint Date: Fri, 27 Sep 2024 17:48:51 +0200 Subject: [PATCH 3/5] Fixed error spotted by type checker (discussed with @jurgenvinju) --- src/analysis/grammars/dramb/Diagnose.rsc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/analysis/grammars/dramb/Diagnose.rsc b/src/analysis/grammars/dramb/Diagnose.rsc index 2d98b41..59029f1 100644 --- a/src/analysis/grammars/dramb/Diagnose.rsc +++ b/src/analysis/grammars/dramb/Diagnose.rsc @@ -231,8 +231,8 @@ void tokens(Tree x, Tree y) { Words lexX = {t | t <- wordsX, lex(_) := t.cat}; Words lexY = {t | t <- wordsY, lex(_) := t.cat}; - litParentsX = { | /t:appl(p,[*_,l:appl(prod(l,_,_),_),*_]) := x, lit(_) := l || cilit(_) := l}; - litParentsY = { | /t:appl(p,[*_,l:appl(prod(l,_,_),_),*_]) := y, lit(_) := l || cilit(_) := l}; + litParentsX = { | /appl(p,[*_,appl(prod(l,_,_),_),*_]) := x, lit(_) := l || cilit(_) := l}; + litParentsY = { | /appl(p,[*_,appl(prod(l,_,_),_),*_]) := y, lit(_) := l || cilit(_) := l}; unreserved = { | <- litX - litY, <- lexY - lexX, posX.offset == posY.offset, posX.length == posY.length} From 859fde8ac0b42de8fd3e8af65e061c41cc8c910f Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Thu, 17 Oct 2024 15:21:27 +0200 Subject: [PATCH 4/5] Using latest rascal and rascal-core --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 98a8eb5..1fb319e 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ org.rascalmpl rascal-maven-plugin - 0.28.1 + 0.28.5 true false @@ -145,12 +145,12 @@ org.rascalmpl rascal - 0.40.7 + 0.40.11 org.rascalmpl salix-core - 0.2.4 + 0.2.5 From e48e6069f915b7de4d03ffc59d5f605974da0e68 Mon Sep 17 00:00:00 2001 From: "Jurgen J. Vinju" Date: Tue, 22 Oct 2024 10:21:19 +0200 Subject: [PATCH 5/5] errorsAsWarnings off --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3fd9bed..fd05735 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,6 @@ rascal-maven-plugin 0.28.5 - true false ${project.build.outputDirectory}