Angular bracket imports for reusable reactor modules #2404

vinzbarbuto · 2024-09-09T02:10:14Z

This PR proposes a new import statement syntax to distinguish between user-defined reactors import and reusable reactors imports. The new syntax for importing reusable reactors will use angular brackets, as shown: import Reactor from <path/to/lib/Reusables.lf>.

lhstrh

Looks like a good start! I left some questions. The major concern I have is that there are not tests. Please add one.

core/src/main/java/org/lflang/LinguaFranca.xtext

core/src/main/java/org/lflang/ast/IsEqual.java

core/src/main/java/org/lflang/ast/ToLf.java

core/src/main/java/org/lflang/ast/ToSExpr.java

…d test case for federated LF program using new imports

…inal; Refined importPackage management across affected files

…s in federated LF programs

test/Python/src/FederatedImportLibrary.lf

core/src/main/java/org/lflang/LinguaFranca.xtext

…d test case for federated LF program using new imports

…inal; Refined importPackage management across affected files

…s in federated LF programs

…into extending

…ibraries (‘<lingo_library/File.lf>’)

lhstrh

The way you're dealing with paths is too brittle and needs work. Please see my comments.

core/src/main/java/org/lflang/util/ImportUtil.java

…ead of a String

test/Python/target/lfc_include/library-test/src/lib/Import.lf

…clude'

Added angular bracket import for reusable reactors module

f58ee50

vinzbarbuto requested a review from lhstrh September 9, 2024 02:10

lhstrh requested changes Sep 9, 2024

View reviewed changes

Added angular bracket import for reusable reactors module

4319ead

lhstrh force-pushed the extending branch from f58ee50 to 4319ead Compare September 9, 2024 05:02

lhstrh added the feature New feature label Sep 9, 2024

lhstrh changed the title ~~Added angular bracket import for reusable reactors module~~ Angular bracket imports for reusable reactor modules Sep 9, 2024

vinzbarbuto and others added 14 commits September 9, 2024 09:57

Merge with 'origin/extending'

526ee72

Update core/src/main/java/org/lflang/ast/ToSExpr.java

e6f4cbc

Fix bug in ToLf.java; Added test for new import statement

c25b2f3

Fix bug in the LinguaFranca.text file

6576267

Extend support for new import statements in federated LF programs; Ad…

781a552

…d test case for federated LF program using new imports

Add the new terminal LIB_PATH to Token

d8c0ac6

Add the new terminal LIB_PATH to Token

88070a2

Resolved conflict in LunguaFranca.xtext by removing the LIB_PATH term…

6dafb85

…inal; Refined importPackage management across affected files

Corrected formatting and updated import statements for generated file…

5c8dd4e

…s in federated LF programs

Solved formatting error

e3ce6cf

Removed quotes in setImportPackage

f05c567

Fix format

ab4391b

Enhanced tests for new import statement

c36bf05

Enhanced tests for new import statement; Fix formatting

3da89fc

lhstrh reviewed Sep 18, 2024

View reviewed changes

test/Python/src/FederatedImportLibrary.lf Outdated Show resolved Hide resolved

lhstrh reviewed Sep 18, 2024

View reviewed changes

core/src/main/java/org/lflang/LinguaFranca.xtext Show resolved Hide resolved

vinzbarbuto and others added 7 commits September 18, 2024 15:59

Added angular bracket import for reusable reactors module

9af3158

Update core/src/main/java/org/lflang/ast/ToSExpr.java

5ec9422

Fix bug in ToLf.java; Added test for new import statement

95366ab

Fix bug in the LinguaFranca.text file

aab992d

Extend support for new import statements in federated LF programs; Ad…

fabf6b5

…d test case for federated LF program using new imports

Add the new terminal LIB_PATH to Token

031ac4e

Add the new terminal LIB_PATH to Token

82ccc7f

vinzbarbuto added 7 commits September 18, 2024 15:59

Resolved conflict in LunguaFranca.xtext by removing the LIB_PATH term…

5ac1d15

…inal; Refined importPackage management across affected files

Corrected formatting and updated import statements for generated file…

52cfaf6

…s in federated LF programs

Solved formatting error

fe878a5

Removed quotes in setImportPackage

3dadae8

Fix format

6345732

Enhanced tests for new import statement

feee84b

Enhanced tests for new import statement; Fix formatting

338726e

lhstrh force-pushed the extending branch from 3da89fc to 338726e Compare September 18, 2024 22:59

vinzbarbuto and others added 3 commits September 23, 2024 09:47

Merge branch 'extending' of https://github.com/lf-lang/lingua-franca …

40ddf3b

…into extending

Added full support for the new import statement structure for Lingo l…

67be868

…ibraries (‘<lingo_library/File.lf>’)

Merge branch 'master' into extending

0b94151

lhstrh self-requested a review September 29, 2024 23:08

lhstrh requested changes Sep 29, 2024

View reviewed changes

Enhance path handling in ImportUtil.java and add new test

a32c7ed

lhstrh added this to the 0.9.0 milestone Sep 30, 2024

Change ImportUtil.buildPackageURIfromSrc to return a Path object inst…

d5bdd9a

…ead of a String

tanneberger requested changes Sep 30, 2024

View reviewed changes

test/Python/target/lfc_include/library-test/src/lib/Import.lf Outdated Show resolved Hide resolved

Changed path in ImportUtil from 'target/lfc_include' to 'build/lfc_in…

6427abb

…clude'

tanneberger self-requested a review October 2, 2024 16:40

tanneberger approved these changes Oct 2, 2024

View reviewed changes

lhstrh approved these changes Oct 9, 2024

View reviewed changes

lhstrh added this pull request to the merge queue Oct 9, 2024

lhstrh removed this pull request from the merge queue due to a manual request Oct 9, 2024

lhstrh merged commit 4e27b9a into master Oct 9, 2024
24 checks passed

lhstrh deleted the extending branch October 9, 2024 05:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Angular bracket imports for reusable reactor modules #2404

Angular bracket imports for reusable reactor modules #2404

vinzbarbuto commented Sep 9, 2024

lhstrh left a comment

lhstrh left a comment

Angular bracket imports for reusable reactor modules #2404

Angular bracket imports for reusable reactor modules #2404

Conversation

vinzbarbuto commented Sep 9, 2024

lhstrh left a comment

Choose a reason for hiding this comment

lhstrh left a comment

Choose a reason for hiding this comment