#162: Minor refactorings.

parsingdata · Jun 9, 2017 · b5e0d7f · b5e0d7f
1 parent 32e5bd4
commit b5e0d7f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/src/main/java/io/parsingdata/metal/token/Nod.java b/core/src/main/java/io/parsingdata/metal/token/Nod.java
@@ -51,7 +51,7 @@ public Nod(final String name, final ValueExpression size, final Encoding encodin
     }
 
     @Override
-    protected Optional<Environment> parseImpl(final String scope, final Environment environment, final Encoding encoding) throws IOException {
+    protected Optional<Environment> parseImpl(final String scope, final Environment environment, final Encoding encoding) {
         final ImmutableList<Optional<Value>> sizes = size.eval(environment.order, encoding);
         if (sizes.size != 1 || !sizes.head.isPresent()) {
             return failure();

diff --git a/core/src/main/java/io/parsingdata/metal/token/Pre.java b/core/src/main/java/io/parsingdata/metal/token/Pre.java
@@ -24,6 +24,7 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import io.parsingdata.metal.Util;
 import io.parsingdata.metal.data.Environment;
 import io.parsingdata.metal.encoding.Encoding;
 import io.parsingdata.metal.expression.Expression;
@@ -57,7 +58,7 @@ protected Optional<Environment> parseImpl(final String scope, final Environment
             return failure();
         }
         final Optional<Environment> result = token.parse(scope, environment.addBranch(this), encoding);
-        return result.isPresent() ? success(result.get().closeBranch()) : failure();
+        return result.map(resultEnvironment -> success(resultEnvironment.closeBranch())).orElseGet(Util::failure);
     }
 
     @Override