diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/pre/locators-to-java.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/pre/locators-to-java.yaml index b3f45e00fe..0dfa9b34ff 100644 --- a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/pre/locators-to-java.yaml +++ b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/pre/locators-to-java.yaml @@ -2,6 +2,7 @@ xsls: - /org/eolang/parser/add-default-package.xsl - /org/eolang/parser/wrap-method-calls.xsl - /org/eolang/parser/set-locators.xsl + - /org/eolang/parser/explicit-data.xsl - /org/eolang/maven/pre/classes.xsl - /org/eolang/maven/pre/attrs.xsl - /org/eolang/maven/pre/data.xsl @@ -15,6 +16,7 @@ tests: - //java[contains(text(), 'new PhLocated(ret_base, 7, 2, "Φ.bar.φ.ρ")')] - //java[contains(text(), 'new PhLocated(ret, 7, 4, "Φ.bar.φ")')] - //java[contains(text(), 'new PhLocated(ret_1, 7, 10, "Φ.bar.φ.α0")')] + - //java[contains(text(), 'new PhLocated(ret, 8, 2, "Φ.bar.five")')] eo: | [] > foo 42 > @ @@ -22,4 +24,5 @@ eo: | 43.plus y > @ [] > bar - 42.plus 43 > @ \ No newline at end of file + 42.plus 43 > @ + int 5 > five diff --git a/eo-parser/src/main/java/org/eolang/parser/ParsingTrain.java b/eo-parser/src/main/java/org/eolang/parser/ParsingTrain.java index d5b10ec21f..9870bfe8a9 100644 --- a/eo-parser/src/main/java/org/eolang/parser/ParsingTrain.java +++ b/eo-parser/src/main/java/org/eolang/parser/ParsingTrain.java @@ -91,9 +91,9 @@ public final class ParsingTrain extends TrEnvelope { "/org/eolang/parser/warnings/correct-package-meta.xsl", "/org/eolang/parser/warnings/prohibited-package.xsl", "/org/eolang/parser/errors/unused-aliases.xsl", - "/org/eolang/parser/errors/data-objects.xsl", "/org/eolang/parser/warnings/unit-test-without-phi.xsl", "/org/eolang/parser/set-locators.xsl", + "/org/eolang/parser/explicit-data.xsl", }; /** diff --git a/eo-parser/src/main/resources/org/eolang/parser/explicit-data.xsl b/eo-parser/src/main/resources/org/eolang/parser/explicit-data.xsl new file mode 100644 index 0000000000..56ad9f5bbd --- /dev/null +++ b/eo-parser/src/main/resources/org/eolang/parser/explicit-data.xsl @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eo-parser/src/test/resources/org/eolang/parser/packs/explicit-data.yaml b/eo-parser/src/test/resources/org/eolang/parser/packs/explicit-data.yaml new file mode 100644 index 0000000000..71d73a04d9 --- /dev/null +++ b/eo-parser/src/test/resources/org/eolang/parser/packs/explicit-data.yaml @@ -0,0 +1,23 @@ +xsls: + - /org/eolang/parser/wrap-method-calls.xsl + - /org/eolang/parser/expand-qqs.xsl + - /org/eolang/parser/add-default-package.xsl + - /org/eolang/parser/explicit-data.xsl +tests: + - /program/errors[count(*)=0] + - //o[@base='org.eolang.int' and @name='first' and @data] + - //o[@base='org.eolang.float' and @name='second' and @data and count(o)=0] + - //o[@base='org.eolang.bool' and @name='third' and @data and count(o)=0] + - //o[@base='org.eolang.bytes' and @name='fourth' and @data and count(o)=0] + - //o[@base='org.eolang.string' and @name='str' and @data and count(o)=0] + - //o[@base='org.eolang.tuple' and o[@base='org.eolang.tuple']] +eo: | + 42 > first + float 22.2 > second + QQ.bool TRUE > third + QQ.bytes > fourth + 11-21 + Q.org.eolang.string "Hey" > str + tuple + * 1 + 2