Skip to content

Commit

Permalink
Merge branch 'main' into proper-stacktrace-for-recursion-overflow
Browse files Browse the repository at this point in the history
  • Loading branch information
@jurgenvinju
jurgenvinju committed Nov 21, 2024
2 parents 6595ea8 + edfb516 commit 63c5169
Show file tree
Hide file tree
Showing 250 changed files with 9,774 additions and 5,489 deletions.
25 changes: 14 additions & 11 deletions .github/workflows/build.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
pull_request:
branches:
- main
- 'feat/*'
env:
MAVEN_OPTS: "-Xmx4G -Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"

Expand All @@ -16,8 +17,8 @@ jobs:
if: ${{ !(github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, '[maven-release-plugin]')) }}
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'temurin'
Expand All @@ -26,10 +27,12 @@ jobs:
- name: Run Tests
run: mvn -B -Drascal.compile.skip -Drascal.tutor.skip -Drascal.test.memory=14 test

- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
continue-on-error: true # sometimes this one fails, that shouldn't stop a build
with:
token: e8b4481a-d178-4148-a4ff-502906390512
fail_ci_if_error: false
verbose: true
token: ${{ secrets.CODECOV_TOKEN }}

- name: Publish Test Report on github action
if: ${{ always() && github.event_name != 'pull_request' }} # to bad this doesn't work nicely with external pull requests
Expand All @@ -49,13 +52,13 @@ jobs:
with:
chrome-version: 1047731 # v107
- run: which chrome
- uses: nanasess/setup-chromedriver@v1
- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: '107.0.5304.62'
- run: which chromedriver

- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'temurin'
Expand Down Expand Up @@ -103,7 +106,7 @@ jobs:
ssh-private-key: ${{ secrets.RELEASE_SSH_PRIVATE_KEY }}

- name: Prepare Draft Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
draft: true
Expand All @@ -122,8 +125,8 @@ jobs:
env:
MAVEN_OPTS: "-Xmx1G -Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'temurin'
Expand All @@ -133,7 +136,7 @@ jobs:
# single quotes to help windows deal with argument splitting
run: mvn -B '-Drascal.compile.skip' '-Drascal.tutor.skip' '-Drascal.test.memory=3' test

- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
continue-on-error: true # sometimes this one fails, that shouldn't stop a build
with:
token: e8b4481a-d178-4148-a4ff-502906390512
Expand Down
130 changes: 101 additions & 29 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

<groupId>org.rascalmpl</groupId>
<artifactId>rascal</artifactId>
<version>0.35.0-RC9-SNAPSHOT</version>
<version>0.40.18-SNAPSHOT</version>
<packaging>jar</packaging>

<scm>
<developerConnection>scm:git:ssh://[email protected]/usethesource/rascal.git</developerConnection>
<tag>SNAPSHOT</tag>
<tag>v0.40.16</tag>
</scm>

<!-- dependency resolution configuration (usethesource) -->
Expand All @@ -32,9 +32,19 @@
<exec.mainClass>org.rascalmpl.shell.RascalShell</exec.mainClass>
<rascal.test.memory>2</rascal.test.memory>
<maven.compiler.release>11</maven.compiler.release>
<rascal-maven.version>0.25.0-RC2-SNAPSHOT</rascal-maven.version>
<rascal-maven.version>0.28.9-BOOT1</rascal-maven.version>
</properties>

<licenses>
<license>
<name>BSD-2-Clause</name>
<url>https://opensource.org/license/BSD-2-Clause</url>
<distribution>repo</distribution>
<!-- we cannot define multiple licenses in this maven block, as it would mean the user can choose either of the licenses -->
<comments>Note, some older files are still licensed under Eclipse v1</comments>
</license>
</licenses>


<build>
<sourceDirectory>src</sourceDirectory>
Expand All @@ -55,6 +65,9 @@
<include>rascal-DEPENDENCIES.txt</include>
</includes>
</resource>
<resource>
<directory>${project.build.directory}/generated-resources</directory>
</resource>
</resources>
<testSourceDirectory>test</testSourceDirectory>
<testResources>
Expand All @@ -77,7 +90,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -90,7 +103,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
<version>3.2.0</version>
<executions>
<execution>
<phase>validate</phase>
Expand All @@ -103,22 +116,22 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.13.0</version>
<configuration>
<compilerArgument>-parameters</compilerArgument> <!-- make sure parameters are compiled by name into the jar -->
</configuration>
</plugin>
<plugin>
<groupId>org.rascalmpl</groupId>
<artifactId>rascal-maven-plugin</artifactId>
<version>0.25.0-RC1</version>
<version>${rascal-maven.version}</version>
<configuration>
<errorsAsWarnings>true</errorsAsWarnings>
<errorsAsWarnings>false</errorsAsWarnings> <!-- only allowed during intermediate bootstrap cycles -->
<bin>${project.build.outputDirectory}</bin>
<srcs>
<src>${project.basedir}/src/org/rascalmpl/library</src>
Expand Down Expand Up @@ -176,12 +189,12 @@
<ignore>${project.basedir}/src/org/rascalmpl/library/lang/rascal</ignore>
</ignores>
</configuration>
</execution>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
<version>3.4.0</version>
<configuration>
<filesets>
<fileset>
Expand All @@ -198,7 +211,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<version>3.3.1</version>
<executions>
<execution>
<id>test</id>
Expand All @@ -218,6 +231,7 @@
</argLine>
<includes>
<include>**/org/rascalmpl/test/AllSuiteParallel.java</include>
<include>**/org/rascalmpl/test/library/LibraryLangPaths.java</include>
<include>**/org/rascalmpl/test/value/AllTests.java</include>
<include>**/org/rascalmpl/*Test.java</include>
</includes>
Expand All @@ -226,7 +240,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<version>0.8.12</version>
<executions>
<execution>
<goals>
Expand All @@ -245,7 +259,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<version>3.7.1</version>
<executions>
<execution>
<goals>
Expand All @@ -261,16 +275,29 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<version>3.1.0</version>
<configuration>
<tagNameFormat>v@{project.version}</tagNameFormat>
<arguments>-Drascal.compile.skip -Drascal.tutor.skip -DskipTests</arguments>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.4.0</version>
<executions>
<execution>
<id>download-licenses</id>
<goals>
<goal>download-licenses</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.1</version>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -291,10 +318,25 @@
<resource>org/rascalmpl/uri/resolvers.config</resource>
<resource>io/usethesource/vallang/type/types.config </resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
<addHeader>false</addHeader>
</transformer>
</transformers>
<!--
http://zhentao-li.blogspot.nl/2012/06/maven-shade-plugin-invalid-signature.html
-->
<relocations>
<relocation>
<pattern>org.fusesource.jansi</pattern>
<shadedPattern>org.rascalmpl.fusesource.jansi</shadedPattern>
<excludes>
<exclude>org.fusesource.jansi.internal.*</exclude>
</excludes>
</relocation>
<relocation>
<pattern>jline</pattern>
<shadedPattern>org.rascalmpl.jline</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>*:*</artifact>
Expand All @@ -309,6 +351,26 @@
</execution>
</executions>
</plugin>
<plugin><!-- make sure users are using recent versions of maven -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>(3.8,)</version> <!-- ideally this would be 3.9+, but GH actions is still on 3.8 -->
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand Down Expand Up @@ -360,7 +422,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>io.usethesource</groupId>
Expand All @@ -370,27 +432,37 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.2</version>
<version>9.6</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>9.2</version>
<version>9.6</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<dependency> <!-- used by the compression uri feature-->
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.26.1</version>
</dependency>
<dependency> <!-- needed by commons-compress for compressed+...://...zst -->
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<version>1.5.5-11</version>
</dependency>
<dependency> <!-- used for base32 encoding in IO and String, needed anyway for commons-compress -->
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.17.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>jline</groupId>
Expand All @@ -400,7 +472,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.32</version>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
Expand Down Expand Up @@ -440,7 +512,7 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>69.1</version>
<version>74.2</version>
</dependency>
</dependencies>
</project>
1 change: 0 additions & 1 deletion src/org/rascalmpl/ast/AbstractAST.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ public List<AbstractAST> breakpoints(int line) {
* Recursively build a back-tracking data-structure, use getBacktracker if you are just a client of IBooleanResult
*/
public IBooleanResult buildBacktracker(IEvaluatorContext eval) {
System.err.println("ambiguity at " + getLocation());
throw new NotYetImplemented(this);
}

Expand Down
2 changes: 1 addition & 1 deletion src/org/rascalmpl/checker/StaticChecker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class StaticChecker {
public StaticChecker(OutputStream stderr, OutputStream stdout) {
GlobalEnvironment heap = new GlobalEnvironment();
ModuleEnvironment root = heap.addModule(new ModuleEnvironment("$staticchecker$", heap));
eval = new Evaluator(ValueFactoryFactory.getValueFactory(), System.in, stderr, stdout, root, heap);
eval = new Evaluator(ValueFactoryFactory.getValueFactory(), System.in, stderr, stdout, root, heap, IRascalMonitor.buildConsoleMonitor(System.in, System.out));
eval.addRascalSearchPathContributor(StandardLibraryContributor.getInstance());
checkerEnabled = false;
initialized = false;
Expand Down
Loading

0 comments on commit 63c5169

Please sign in to comment.