Skip to content

Commit

Permalink
#3636: StrictXmir
Browse files Browse the repository at this point in the history
  • Loading branch information
yegor256 committed Dec 12, 2024
1 parent c039166 commit a7a76c4
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 3 deletions.
104 changes: 104 additions & 0 deletions eo-parser/src/main/java/org/eolang/parser/StrictXmir.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2016-2024 Objectionary.com
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.eolang.parser;

import com.jcabi.xml.StrictXML;
import com.jcabi.xml.XML;
import java.util.Collection;
import java.util.List;
import javax.xml.namespace.NamespaceContext;
import org.w3c.dom.Node;
import org.xml.sax.SAXParseException;

/**
* XMIR that validates itself right after construction.
*
* @since 0.49.0
*/
public final class StrictXmir implements XML {

/**
* The XML.
*/
private final XML xml;

/**
* Ctor.
* @param src The source
*/
public StrictXmir(final XML src) {
this.xml = new StrictXML(src);
}

@Override
public String toString() {
return this.xml.toString();
}

@Override
public List<String> xpath(final String xpath) {
return this.xml.xpath(xpath);
}

@Override
public List<XML> nodes(final String xpath) {
return this.xml.nodes(xpath);
}

@Override
public XML registerNs(final String pfx, final Object uri) {
return this.xml.registerNs(pfx, uri);
}

@Override
public XML merge(final NamespaceContext ctx) {
return this.xml.merge(ctx);
}

@Override
@Deprecated
public Node node() {
throw new UnsupportedOperationException("deprecated");
}

@Override
public Node inner() {
return this.xml.inner();
}

@Override
public Node deepCopy() {
return this.xml.deepCopy();
}

@Override
public Collection<SAXParseException> validate() {
return this.xml.validate();
}

@Override
public Collection<SAXParseException> validate(final XML xsd) {
return this.xml.validate(xsd);
}
}
5 changes: 2 additions & 3 deletions eo-parser/src/test/java/org/eolang/parser/PhiSyntaxTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package org.eolang.parser;

import com.jcabi.matchers.XhtmlMatchers;
import com.jcabi.xml.StrictXML;
import com.jcabi.xml.XML;
import java.io.IOException;
import org.eolang.jucs.ClasspathSource;
Expand Down Expand Up @@ -98,7 +97,7 @@ void addsMetaForPackage() throws IOException {
@ParameterizedTest
@ClasspathSource(value = "org/eolang/parser/phi-syntax/", glob = "**.phi")
void checksValidExpressions(final String phi) throws IOException {
final XML xml = new StrictXML(new PhiSyntax(phi).parsed());
final XML xml = new StrictXmir(new PhiSyntax(phi).parsed());
MatcherAssert.assertThat(
"syntax is valid, can be parsed without errors",
XhtmlMatchers.xhtml(xml.toString()),
Expand All @@ -109,7 +108,7 @@ void checksValidExpressions(final String phi) throws IOException {
@ParameterizedTest
@ClasspathSource(value = "org/eolang/parser/phi-typos/", glob = "**.phi")
void checksBrokenExpressions(final String phi) throws IOException {
final XML xml = new StrictXML(new PhiSyntax(phi).parsed());
final XML xml = new StrictXmir(new PhiSyntax(phi).parsed());
MatcherAssert.assertThat(
"syntax is broken, can't be parsed without errors",
XhtmlMatchers.xhtml(xml.toString()),
Expand Down

0 comments on commit a7a76c4

Please sign in to comment.