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.

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

Fix windows #2424

Merged
merged 7 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
2 changes: 1 addition & 1 deletion core/src/main/java/org/lflang/util/ImportUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public class ImportUtil {
* names.
*/
public static String buildPackageURI(String uriStr, Resource resource) {
Path rootPath = Paths.get(resource.getURI().toString()).toAbsolutePath();

Path rootPath = FileUtil.toPath(resource);
Path uriPath = Paths.get(uriStr.trim());

if (uriPath.getNameCount() < 2) {
Expand Down
4 changes: 3 additions & 1 deletion test/C/src/Mutable.lf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ reactor S(width: int = 4) {
}

reactor R(width: int = 4) {
mutable input[width] in: int
// Pathetically, the Windows C compiler doesn't support arrays on the stack with a variable size.
// So we have to give a constant here instead of the parameter width.
mutable input[2] in: int
output[width] out: int

reaction(in) -> out {=
Expand Down
4 changes: 3 additions & 1 deletion test/C/src/token/MutableToken.lf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ preamble {=
=}

reactor R(width: int = 4) {
mutable input[width] in: int_array_t*
// Pathetically, the Windows C compiler doesn't support arrays on the stack with a variable size.
// So we have to give a constant here instead of the parameter width.
mutable input[2] in: int_array_t*
output[width] out: int_array_t*

reaction(in) -> out {=
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Test the new import statement for Lingo downloaded packages with the import path enclosed in angle brackets
# Version 1: The LF file is located in "src".
target Python {
timeout: 2 sec
}
Expand Down
21 changes: 0 additions & 21 deletions test/Python/src/lingo_imports/FederatedTestImportPackages.lf

This file was deleted.

Loading