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

BinarizeParseMojo generalization #2672

Merged
merged 4 commits into from
Dec 7, 2023
Merged

BinarizeParseMojo generalization #2672

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1595ba1
#2649 rename addRust, add documentation, create todo
c71n93 Dec 4, 2023
a72959b
#2649 fix checkstyle
c71n93 Dec 4, 2023
c73e864
#2649 fix todo
c71n93 Dec 4, 2023
dd418e8
#2649 fix todo
c71n93 Dec 4, 2023
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
24 changes: 15 additions & 9 deletions eo-maven-plugin/src/main/java/org/eolang/maven/BinarizeParseMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ public final class BinarizeParseMojo extends SafeMojo {
public static final Path DIR = Paths.get("binarize");

/**
* Parsing train with XSLs.
* Parsing train with XSLs. The task of XSLs is to find all the FFI inserts and put them at
* the end of the xmir file. When adding a new language for FFI inserts, you need to add the
* appropriate XSL transformation.
*/
static final Train<Shift> TRAIN = new TrBulk<>(
new TrClasspath<>(
Expand Down Expand Up @@ -122,11 +124,12 @@ public void exec() throws IOException {
}

/**
* Creates a "rust" section in xml file and returns the resulting XML.
* Creates sections for each language for FFI insert in xmir and returns the resulting XML file.
* @param input The .xmir file
* @return The content of rust section
* @return The content of FFI inserts sections
* @checkstyle AbbreviationAsWordInNameCheck (8 lines)
*/
private XML addRust(
private XML addFFIs(
final XML input
) {
final String name = input.xpath("/program/@name").get(0);
Expand All @@ -142,14 +145,17 @@ private XML addRust(
* Add ffi node via xsl transformation and return list of them.
* @param input Input xmir.
* @return FFI nodes.
* @todo #2609:90min We can make the current class more generic
* by transferring this.addRust(input) snippet to corresponding
* FFINode- {@link RustNode}. We wanna make the class independent of
* ffi-insert as a result.
* @todo #2649:90min This method may be more general. We need to get rid from rust dependencies
* in this method, because when adding another type of inserts it will be just copy-paste here.
* First of all, the for-loop must create all kinds of FFI nodes, not only {@link RustNode}. I
* think we can implement it, using something like {@code FFINodeFactory}, that will return
* appropriate FFI node for every XML node from {@code nodes}. Also it will be great to move
* paths to XML FFI insert nodes (such as {@code "/program/rusts/rust"}) from this method to
* a static class field.
* @checkstyle AbbreviationAsWordInNameCheck (8 lines)
*/
private Collection<FFINode> getFFIs(final XML input) {
final List<XML> nodes = this.addRust(input).nodes("/program/rusts/rust");
final List<XML> nodes = this.addFFIs(input).nodes("/program/rusts/rust");
final Collection<FFINode> ret = new ArrayList<>(nodes.size());
for (final XML node : nodes) {
ret.add(
Expand Down
Loading