Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumped to latest rascal release #2

Merged
merged 4 commits into from
Oct 17, 2024
Merged

Bumped to latest rascal release #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a9b0b4
Bumped to latest rascal release
DavyLandman Jun 14, 2024
d807366
Using latest rascal and rascal-core typechecker
DavyLandman Aug 30, 2024
5c7d174
Fixed errors found by typechecker
DavyLandman Aug 30, 2024
5058c53
Moved to latest version of rascal-core and rascal
DavyLandman Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 CITATION → CITATION.md
View file
Open in desktop
File renamed without changes.
0 FUNDING → FUNDING.md
View file
Open in desktop
File renamed without changes.
0 LICENSE → LICENSE.md
View file
Open in desktop
File renamed without changes.
0 RELEASE-NOTES → RELEASE-NOTES.md
View file
Open in desktop
File renamed without changes.
13 changes: 6 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<scm>
<developerConnection>scm:git:ssh://[email protected]/usethesource/salix-contrib.git</developerConnection>
<tag>v0.2.1</tag>
<tag>head</tag>
</scm>

<repositories>
Expand All @@ -33,12 +33,12 @@
<dependency>
<groupId>org.rascalmpl</groupId>
<artifactId>rascal</artifactId>
<version>0.34.0</version>
<version>0.40.11</version>
</dependency>
<dependency>
<groupId>org.rascalmpl</groupId>
<artifactId>salix-core</artifactId>
<version>0.2.3</version>
<version>0.2.5</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -68,7 +68,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.11.0</version>
<configuration>
<compilerArgument>-parameters</compilerArgument>
<release>11</release>
Expand All @@ -77,7 +77,7 @@
<plugin>
<groupId>org.rascalmpl</groupId>
<artifactId>rascal-maven-plugin</artifactId>
<version>0.23.1</version>
<version>0.28.5</version>
<configuration>
<errorsAsWarnings>true</errorsAsWarnings>
<bin>${project.build.outputDirectory}</bin>
Expand Down Expand Up @@ -110,7 +110,6 @@
<enableStandardLibrary>true</enableStandardLibrary>
<errorsAsWarnings>false</errorsAsWarnings>
<bin>${project.build.outputDirectory}</bin>
<license>${project.basedir}/LICENSE</license>
<sources>|http://github.com/usethesource/salix-contrib|</sources>
<issues>|http://github.com/usethesource/salix-contrib/issues|</issues>
<srcs>
Expand All @@ -125,7 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<version>3.1.1</version>
<configuration>
<tagNameFormat>v@{project.version}</tagNameFormat>
<arguments>-Drascal.compile.skip -DskipTests -Drascal.tutor.skip</arguments>
Expand Down
1 change: 0 additions & 1 deletion src/main/rascal/salix/canvas/Canvas.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ data CanvasRenderingContext2DSettings = ctxSettings(
bool willReadFrequently = false
);


alias Path2D = list[Move];

// https://developer.mozilla.org/en-US/docs/Web/SVG/Tutorial/Paths
Expand Down
2 changes: 1 addition & 1 deletion src/main/rascal/salix/canvas/Heart.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ data Msg = flipColor();
Model update(flipColor(), Model m) = m[color = m.color == "green" ? "red" : "green"];

void view(Model m) {
myCanvas("love", 300, 300, (GC ctx) {
myCanvas("love", 300, 300, [], (GC ctx) {
real x = 150.0;
real y = 100.0;
real w = 150.0;
Expand Down
11 changes: 6 additions & 5 deletions src/main/rascal/salix/jsplumb/JSPlumb.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,22 @@ data Connector
| stateMachine(int margin = 5, int curviness = 10, int proximityLimit = 80)
;

data Face = top() | left() | right() | bottom();

// https://docs.jsplumbtoolkit.com/community/lib/anchors
data Anchor
= top() | topRight() | right() | bottomRight() | bottom() | bottomLeft() | left() | topLeft() | center()
| autoDefault()
| perimeter(Shape shape, int anchorCount = 60, int rotation = 0)
| continuous(list[Face] faces = [salix::jsplumb::JSPlumb::Face::top(),
salix::jsplumb::JSPlumb::Face::left(),
salix::jsplumb::JSPlumb::Face::right(),
salix::jsplumb::JSPlumb::Face::bottom()])
| continuous(list[Face] faces = [Face::top(),
Face::left(),
Face::right(),
Face::bottom()])
;

data Shape
= circle() | ellipse() | triangle() | diamond() | rectangle() | square();

data Face = top() | left() | right() | bottom();

//https://docs.jsplumbtoolkit.com/community/lib/endpoints
data Endpoint
Expand Down
Loading