From ffc57ff9745596715e3e96b60fb651fba07cc333 Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Fri, 14 Jun 2024 14:28:15 +0200 Subject: [PATCH 1/8] Updating salix-core to the latest version of rascal --- CITATION => CITATION.md | 0 FUNDING => FUNDING.md | 0 LICENSE => LICENSE.md | 0 RELEASE-NOTES => RELEASE-NOTES.md | 0 pom.xml | 7 ++----- 5 files changed, 2 insertions(+), 5 deletions(-) rename CITATION => CITATION.md (100%) rename FUNDING => FUNDING.md (100%) rename LICENSE => LICENSE.md (100%) rename RELEASE-NOTES => RELEASE-NOTES.md (100%) diff --git a/CITATION b/CITATION.md similarity index 100% rename from CITATION rename to CITATION.md 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 d9f2cb3..e39819a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.rascalmpl rascal - 0.34.0 + 0.40.2 @@ -71,7 +71,7 @@ org.rascalmpl rascal-maven-plugin - 0.23.1 + 0.27.3 true ${project.build.outputDirectory} @@ -104,9 +104,6 @@ true false ${project.build.outputDirectory} - ${project.basedir}/LICENSE - ${project.basedir}/FUNDING - ${project.basedir}/RELEASE-NOTES |http://github.com/usethesource/salix-core| |http://github.com/usethesource/salix-core/issues| From 32c2d9ee5f656ab7cf16c31fc6624d1aeca660ce Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Fri, 14 Jun 2024 14:28:33 +0200 Subject: [PATCH 2/8] Removed 2 clones found by the typechecker --- src/main/rascal/salix/HTML.rsc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/rascal/salix/HTML.rsc b/src/main/rascal/salix/HTML.rsc index 72c3fd7..5e2aa48 100644 --- a/src/main/rascal/salix/HTML.rsc +++ b/src/main/rascal/salix/HTML.rsc @@ -225,7 +225,6 @@ Attr seamless(bool val) = attr("seamless", ""); Attr srcdoc(str val) = attr("srcdoc", val); Attr reversed(bool val) = attr("reversed", ""); Attr \start(int val) = attr("start", ""); -Attr align(str val) = attr("align", val); Attr colspan(int val) = attr("colspan", ""); Attr rowspan(int val) = attr("rowspan", ""); Attr headers(str val) = attr("headers", val); @@ -254,7 +253,6 @@ Attr \datetime(str val) = attr("datetime", val); Attr pubdate(str val) = attr("pubdate", val); Attr manifest(str val) = attr("manifest", val); -Attr valign(str val) = attr("valign", val); Attr cellpadding(str val) = attr("cellpadding", val); Attr cellspacing(str val) = attr("cellspacing", val); From c1b95a6693a9c1f02f7fb29adcc48cdd225174ad Mon Sep 17 00:00:00 2001 From: "Jurgen J. Vinju" Date: Fri, 14 Jun 2024 22:44:09 +0200 Subject: [PATCH 3/8] Update pom.xml Let's see how many errors we can solve. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e39819a..c7068dd 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ rascal-maven-plugin 0.27.3 - true + false ${project.build.outputDirectory} ${project.basedir}/src/main/rascal From eb40c573beefd6d9b489a802868b9b12a2673b31 Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Tue, 2 Jul 2024 16:49:44 +0200 Subject: [PATCH 4/8] Updated to latest rascal-maven plugin --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c7068dd..9e13da5 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.rascalmpl rascal - 0.40.2 + 0.40.3-RC2 @@ -71,7 +71,7 @@ org.rascalmpl rascal-maven-plugin - 0.27.3 + 0.27.4-RC4 false ${project.build.outputDirectory} From 0b733109092b5aed946bb1688e282a33a373e181 Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Fri, 5 Jul 2024 09:44:14 +0200 Subject: [PATCH 5/8] Updated to non-rc version of new rascal release --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9e13da5..49b473c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.rascalmpl rascal - 0.40.3-RC2 + 0.40.4 @@ -71,7 +71,7 @@ org.rascalmpl rascal-maven-plugin - 0.27.4-RC4 + 0.27.5 false ${project.build.outputDirectory} From 148255c24f3c35ab9ac9228a34e820040582e464 Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Mon, 15 Jul 2024 17:13:00 +0200 Subject: [PATCH 6/8] Using latest versions of rascal and rascal-core --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 49b473c..b243f2f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.rascalmpl rascal - 0.40.4 + 0.40.6 @@ -71,7 +71,7 @@ org.rascalmpl rascal-maven-plugin - 0.27.5 + 0.28.0-RC1 false ${project.build.outputDirectory} From d474347f8a9e760987909b7d150fa13a4b580f0e Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Mon, 15 Jul 2024 17:31:26 +0200 Subject: [PATCH 7/8] Fixing code clone @tvdstorm please review if correct. --- src/main/rascal/salix/HTML.rsc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/rascal/salix/HTML.rsc b/src/main/rascal/salix/HTML.rsc index 5e2aa48..e95a284 100644 --- a/src/main/rascal/salix/HTML.rsc +++ b/src/main/rascal/salix/HTML.rsc @@ -286,7 +286,7 @@ Attr onSubmit(Msg msg) = event("submit", succeed(msg)); Attr onBlur(Msg msg) = event("blur", succeed(msg)); Attr onFocus(Msg msg) = event("focus", succeed(msg)); -Attr onCheck(Msg(bool) f) = event("change", targetChecked(f)); +Attr onCheck(Msg(bool) f) = event("check", targetChecked(f)); Attr onInput(Msg(str) f) = event("input", targetValue(f)); Attr onInput(Msg(int) f) = event("input", targetInt(f)); @@ -296,7 +296,7 @@ Attr onChange(Msg(int) f) = event("change", targetInt(f)); Attr onChange(Msg(real) f) = event("change", targetReal(f)); Attr onChange(Msg(str) f) = event("change", targetValue(f)); -Attr onCheck(Msg(bool) f) = event("check", targetChecked(f)); +Attr onChange(Msg(bool) f) = event("change", targetChecked(f)); @doc{Smart constructors for constructing encoded event decoders.} Hnd succeed(Msg msg) = handler("succeed", encode(msg)); From 80cb7366957f8b7708e57905a3aee354f8a058a9 Mon Sep 17 00:00:00 2001 From: Davy Landman Date: Mon, 22 Jul 2024 14:51:25 +0200 Subject: [PATCH 8/8] Using latest rascal-core maven plugin --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b243f2f..bbd3b23 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ org.rascalmpl rascal - 0.40.6 + 0.40.7 @@ -71,7 +71,7 @@ org.rascalmpl rascal-maven-plugin - 0.28.0-RC1 + 0.28.1 false ${project.build.outputDirectory}