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

bug(#3845): introduced roll-bases.xsl #3867

Merged
merged 13 commits into from
Jan 29, 2025
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ public void exec() {
final Moja<?>[] mojas = {
new Moja<>(ParseMojo.class),
new Moja<>(ShakeMojo.class),
new Moja<>(DiscoverMojo.class),
new Moja<>(ProbeMojo.class),
new Moja<>(PullMojo.class),
new Moja<>(ResolveMojo.class),
Expand Down
137 changes: 0 additions & 137 deletions eo-maven-plugin/src/main/java/org/eolang/maven/DiscoverMojo.java

This file was deleted.

22 changes: 3 additions & 19 deletions eo-maven-plugin/src/main/java/org/eolang/maven/PrintMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package org.eolang.maven;

import com.jcabi.log.Logger;
import com.jcabi.xml.XML;
import com.jcabi.xml.XMLDocument;
import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -72,17 +71,6 @@ public final class PrintMojo extends SafeMojo {
)
private File printOutputDir;

/**
* Print EO in reversed notation.
* @checkstyle MemberNameCheck (10 lines)
*/
@Parameter(
property = "eo.printReversed",
required = true,
defaultValue = "false"
)
private boolean printReversed;

@Override
void exec() throws IOException {
final Home home = new HmBase(this.printOutputDir);
Expand All @@ -93,13 +81,9 @@ void exec() throws IOException {
this.printSourcesDir.toPath().relativize(source).toString()
.replace(".xmir", ".eo")
);
final XML xml = new XMLDocument(new TextOf(source).asString());
final String program;
if (this.printReversed) {
program = new Xmir(xml).toReversedEO();
} else {
program = new Xmir(xml).toEO();
}
final String program = new Xmir(
new XMLDocument(new TextOf(source).asString())
).toEO();
home.save(program, relative);
Logger.info(
this,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,7 @@ private void probe() throws IOException {
);
}
} else if (probed.isEmpty()) {
Logger.debug(
this, "No probes found in %d programs",
tojos.size()
);
Logger.info(this, "No probes found in %d programs", tojos.size());
} else {
Logger.info(
this, "Found %d probe(s) in %d program(s) in %[ms]s: %s",
Expand Down
14 changes: 3 additions & 11 deletions eo-maven-plugin/src/main/java/org/eolang/maven/TrShaking.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,9 @@ final class TrShaking extends TrEnvelope {
super(
new TrFull(
new TrClasspath<>(
"/org/eolang/parser/shake/cti-adds-errors.xsl",
"/org/eolang/parser/shake/vars-float-up.xsl",
"/org/eolang/parser/shake/build-fqns.xsl",
"/org/eolang/parser/shake/expand-qqs.xsl",
"/org/eolang/parser/shake/add-probes.xsl",
"/org/eolang/parser/shake/expand-aliases.xsl",
"/org/eolang/parser/shake/resolve-aliases.xsl",
"/org/eolang/parser/shake/add-default-package.xsl",
"/org/eolang/parser/shake/explicit-data.xsl",
"/org/eolang/parser/shake/set-locators.xsl",
"/org/eolang/parser/shake/blank-xsd-schema.xsl"
"/org/eolang/maven/shake/cti-adds-errors.xsl",
"/org/eolang/maven/shake/add-probes.xsl",
"/org/eolang/maven/shake/set-locators.xsl"
).back()
)
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,16 +196,6 @@ public ForeignTojo withJar(final Coordinates coordinates) {
return this;
}

/**
* Set the discovered size.
* @param size The size.
* @return The tojo itself.
*/
public ForeignTojo withDiscovered(final int size) {
this.delegate.set(ForeignTojos.Attribute.DISCOVERED.getKey(), Integer.valueOf(size));
return this;
}

/**
* Set the discovered at.
* @param path The path where was discovered.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,18 +133,6 @@ public ForeignTojo find(final String id) {
);
}

/**
* Get the tojos that are not discovered yet.
* @return The tojos.
*/
public Collection<ForeignTojo> notDiscovered() {
return this.select(
row ->
row.exists(Attribute.SHAKEN.getKey())
&& !row.exists(Attribute.DISCOVERED.getKey())
);
}

/**
* Get the tojos that have corresponding xmir.
* @return The tojos.
Expand Down Expand Up @@ -245,7 +233,6 @@ public String status() {
Attribute.EO,
Attribute.XMIR,
Attribute.SHAKEN,
Attribute.DISCOVERED,
Attribute.PROBED,
};
final Collection<String> parts = new LinkedList<>();
Expand Down Expand Up @@ -320,11 +307,6 @@ enum Attribute {
*/
JAR("jar"),

/**
* In how many EO programs this object was seen (integer).
*/
DISCOVERED("discovered"),

/**
* Absolute path of the {@code .xmir} file where this object was discovered.
*/
Expand Down
Loading
Loading