Skip to content

Commit

Permalink
Merge branch '__rultor'
Browse files Browse the repository at this point in the history
  • Loading branch information
rultor committed Mar 13, 2024
2 parents 573b3af + b24a489 commit 74d5bea
Show file tree
Hide file tree
Showing 7 changed files with 278 additions and 31 deletions.
30 changes: 19 additions & 11 deletions src/it/custom-transformations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,25 @@ SOFTWARE.
<printOutputDir>${project.build.directory}/generated-sources/jeo-eo</printOutputDir>
</configuration>
</execution>
<execution>
<id>convert-xmir-to-phi</id>
<phase>process-classes</phase>
<goals>
<goal>xmir-to-phi</goal>
</goals>
<configuration>
<phiInputDir>${project.build.directory}/generated-sources/jeo-xmir</phiInputDir>
<phiOutputDir>${project.build.directory}/generated-sources/jeo-phi</phiOutputDir>
</configuration>
</execution>
<!--
@todo #488:30min Enable the execution of the `xmir-to-phi` goal.
The `xmir-to-phi` goal is currently disabled because it has some bug.
You can read more about it right here:
https://github.com/objectionary/eo/issues/2938
Once it is implemented, this comment should be removed and the goal
should be enabled.
-->
<!-- <execution>-->
<!-- <id>convert-xmir-to-phi</id>-->
<!-- <phase>process-classes</phase>-->
<!-- <goals>-->
<!-- <goal>xmir-to-phi</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <phiInputDir>${project.build.directory}/generated-sources/jeo-xmir</phiInputDir>-->
<!-- <phiOutputDir>${project.build.directory}/generated-sources/jeo-phi</phiOutputDir>-->
<!-- </configuration>-->
<!-- </execution>-->
</executions>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2023 Objectionary.com
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.eolang.inheritance;

class OriginalException extends RuntimeException {

public OriginalException(String message) {
super(message);
}

public OriginalException(String message, Throwable cause) {
super(message, cause);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2023 Objectionary.com
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.eolang.inheritance;

class SomeException extends org.eolang.inheritance.OriginalException {

private static final long serialVersionUID = 12312123123213L;

public SomeException(String s) { super(s); }

public SomeException(String s, Throwable t) { super(s, t); }

}
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,9 @@ public int foo(int x) {
}
return 2;
}

public void sipush() {
short s = 256;
System.out.println(s);
}
}
5 changes: 5 additions & 0 deletions src/it/eo-to-bytecode/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Integration test for the eo-to-bytecode goal
If you need to run only this test, use the following command:
```shell
mvn clean integration-test invoker:run -Dinvoker.test=eo-to-bytecode -DskipTests
```
Loading

1 comment on commit 74d5bea

@0pdd
Copy link

@0pdd 0pdd commented on 74d5bea Mar 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 488-9f6378f7 discovered in src/it/custom-transformations/pom.xml) and submitted as #506. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

Please sign in to comment.