remove AtFileReader

Author: h908714124

README.md

@@ -47,7 +47,7 @@ public static void main(String[] args) {
 
 ````
 
-In addition to `parseOrExit`, there is also a highly configurable `parse` method with no side effects.
+In addition to `parseOrExit`, there is also a basic `parse` method with no side effects.
 Please see the [wiki](https://github.com/h908714124/jbock/wiki) for details.
 
 ### Sample projects

compiler/src/main/java/net/jbock/context/ParseMethod.java

@@ -4,16 +4,13 @@
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.ParameterSpec;
 import net.jbock.processor.SourceElement;
-import net.jbock.util.AtFileError;
-import net.jbock.util.AtFileReader;
 import net.jbock.util.ExNotSuccess;
-import net.jbock.util.ParseRequest;
 
 import javax.inject.Inject;
-import java.util.List;
 
 import static com.squareup.javapoet.ParameterSpec.builder;
 import static net.jbock.common.Constants.EITHER;
+import static net.jbock.common.Constants.LIST_OF_STRING;
 import static net.jbock.common.Constants.STRING_ITERATOR;
 
 @ContextScope
@@ -39,39 +36,27 @@ public class ParseMethod extends CachedMethod {
     @Override
     MethodSpec define() {
 
-        ParameterSpec request = builder(ParseRequest.class, "request").build();
+        ParameterSpec tokens = builder(LIST_OF_STRING, "tokens").build();
         ParameterSpec it = builder(STRING_ITERATOR, "it").build();
-        ParameterSpec err = builder(AtFileError.class, "err").build();
 
         CodeBlock.Builder code = CodeBlock.builder();
 
-        code.addStatement("return $L", CodeBlock.builder()
-                .add("new $T().read($N)\n", AtFileReader.class, request).indent()
-                .add(".mapLeft($1N -> $1N.addModel($2N()))\n", err, createModelMethod.get())
-                .add(".map($T::iterator)\n", List.class)
-                .add(".flatMap($N -> {\n", it)
-                .indent().add(coreBlock(it)).unindent()
-                .add("})").unindent()
-                .build());
-
-        return MethodSpec.methodBuilder("parse")
-                .addParameter(request)
-                .returns(generatedTypes.parseResultType())
-                .addCode(code.build())
-                .addModifiers(sourceElement.accessModifiers())
-                .build();
-    }
-
-    private CodeBlock coreBlock(ParameterSpec it) {
+        code.addStatement("$T $N = $N.iterator()", STRING_ITERATOR, it, tokens);
         ParameterSpec state = builder(generatedTypes.statefulParserType(), "statefulParser").build();
         ParameterSpec e = builder(Exception.class, "e").build();
-        return CodeBlock.builder().add("$T $N = new $T();\n", state.type, state, state.type)
+        code.add("$T $N = new $T();\n", state.type, state, state.type)
                 .add("try {\n").indent()
                 .add("return $T.right($N.parse($N).$N());\n", EITHER, state, it, buildMethod.get())
                 .unindent().add("} catch ($T $N) {\n", ExNotSuccess.class, e).indent()
                 .add("return $T.left($N.toError($N()));\n",
                         EITHER, e, createModelMethod.get())
-                .unindent().add("}\n")
+                .unindent().add("}\n");
+
+        return MethodSpec.methodBuilder("parse")
+                .addParameter(tokens)
+                .returns(generatedTypes.parseResultType())
+                .addCode(code.build())
+                .addModifiers(sourceElement.accessModifiers())
                 .build();
     }
 }

compiler/src/main/java/net/jbock/context/ParseOrExitMethod.java

@@ -6,6 +6,7 @@
 import net.jbock.contrib.StandardErrorHandler;
 import net.jbock.convert.Mapping;
 import net.jbock.processor.SourceElement;
+import net.jbock.util.AtFileError;
 import net.jbock.util.ParseRequest;
 
 import javax.inject.Inject;
@@ -42,7 +43,7 @@ MethodSpec define() {
 
         ParameterSpec args = builder(STRING_ARRAY, "args").build();
         ParameterSpec notSuccess = builder(generatedTypes.parseResultType(), "notSuccess").build();
-        ParameterSpec request = builder(ParseRequest.class, "request").build();
+        ParameterSpec err = builder(AtFileError.class, "err").build();
 
         CodeBlock.Builder code = CodeBlock.builder();
         if (allMappings.stream().anyMatch(Mapping::isRequired)) {
@@ -58,14 +59,16 @@ MethodSpec define() {
                     .addStatement("$T.exit(0)", System.class)
                     .endControlFlow();
         }
-        code.addStatement("$1T $2N = $1T.maybeExpand($3N)", ParseRequest.class, request, args);
-        code.add("return $N($N)", parseMethod.get(), request)
+
+        code.add("return $T.from($N).expand()\n", ParseRequest.class, args).indent()
+                .add(".mapLeft($1N -> $1N.addModel($2N()))\n", err, createModelMethod.get())
+                .add(".flatMap(this::$N)\n", parseMethod.get())
                 .add(".orElseThrow($N -> {\n", notSuccess).indent()
                 .addStatement("$T.builder().build().handle($N)",
                         StandardErrorHandler.class, notSuccess)
                 .addStatement("$T.exit(1)", System.class)
                 .addStatement("return new $T()", RuntimeException.class).unindent()
-                .addStatement("})");
+                .addStatement("})").unindent();
         return methodBuilder("parseOrExit").addParameter(args)
                 .addModifiers(sourceElement.accessModifiers())
                 .returns(generatedTypes.parseSuccessType())

core/build.gradle

@@ -35,6 +35,7 @@ tasks.withType(GenerateModuleMetadata) {
 
 dependencies {
     api('io.github.jbock-java:either:1.5')
+    testImplementation('org.mockito:mockito-core:3.9.0')
     testImplementation('org.junit.jupiter:junit-jupiter:5.7.1')
 }
 

core/src/main/java/net/jbock/util/AtFileReader.java

@@ -1,5 +1,7 @@
 package net.jbock.util;
 
+import io.jbock.util.Either;
+
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
@@ -18,7 +20,7 @@ public abstract class ParseRequest {
      * @param args command line input
      * @return a parse request
      */
-    public static ParseRequest maybeExpand(String[] args) {
+    public static ParseRequest from(String[] args) {
         if (args.length >= 1
                 && args[0].length() >= 2
                 && args[0].startsWith("@")) {
@@ -67,4 +69,6 @@ public static ParseRequest expand(Path atFile, List<String> rest) {
      * @return command line arguments
      */
     public abstract List<String> args();
-}
+
+    public abstract Either<? extends AtFileError, List<String>> expand();
+}