Merge pull request #3604 from maxonfjvipon/fix/#3602/dot-in-xsd-fqn

fix(#3602): removed dot from XSD fqn
objectionary · Dec 4, 2024 · b37632b · b37632b
2 parents c80994b + 027c0fa
commit b37632b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/eo-parser/src/main/java/org/eolang/parser/XePhiListener.java b/eo-parser/src/main/java/org/eolang/parser/XePhiListener.java
@@ -317,7 +317,11 @@ public void enterDispatch(final PhiParser.DispatchContext ctx) {
 
     @Override
     public void exitDispatch(final PhiParser.DispatchContext ctx) {
-        this.objects().prop("base", String.format(".%s", this.attributes.pop())).leave();
+        final String attr = this.attributes.pop();
+        if (!attr.isEmpty()) {
+            this.objects().prop("base", String.format(".%s", attr));
+        }
+        this.objects().leave();
     }
 
     @Override

diff --git a/eo-parser/src/main/resources/XMIR.xsd b/eo-parser/src/main/resources/XMIR.xsd
@@ -96,7 +96,7 @@ SOFTWARE.
       </xs:documentation>
     </xs:annotation>
     <xs:restriction base="xs:string">
-      <xs:pattern value="∅|Q|QQ|[A-Z][a-zA-Z]+|\.|\.?(^|$|@|[a-z][^ \n\t\r]*)|[a-z][^ \n\t\r]*(\.[a-z][^ \n\t\r]*)*"/>
+      <xs:pattern value="∅|Q|QQ|[A-Z][a-zA-Z]+|\.?(^|$|@|[a-z][^ \n\t\r]*)|[a-z][^ \n\t\r]*(\.[a-z][^ \n\t\r]*)*"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="locator">

diff --git a/eo-parser/src/test/java/org/eolang/parser/PhiSyntaxTest.java b/eo-parser/src/test/java/org/eolang/parser/PhiSyntaxTest.java
@@ -108,7 +108,7 @@ void checksValidExpressions(final String phi) throws IOException {
 
     @ParameterizedTest
     @ClasspathSource(value = "org/eolang/parser/phi-typos/", glob = "**.phi")
-    void checksBrokenExressions(final String phi) throws IOException {
+    void checksBrokenExpressions(final String phi) throws IOException {
         final XML xml = new StrictXML(new PhiSyntax(phi).parsed());
         MatcherAssert.assertThat(
             "syntax is broken, can't be parsed without errors",