Removing annotation processor support for State argument

Author: JaroslavTulach

engine/interpreter-dsl-test/src/test/java/org/enso/interpreter/dsl/test/InliningBuiltinsTest.java

@@ -37,7 +37,7 @@ public void executeWithoutVirtualFrame() {
                         return call.call(
                             frame,
                             Function.ArgumentsHelper.buildArguments(
-                                null, null, new Object[] {null, 5L, 7L}));
+                                null, new Object[] {null, 5L, 7L}));
                       });
               assertEquals(12L, res);
             } else {
@@ -70,7 +70,7 @@ public void executeWithVirtualFrame() {
                       (frame) -> {
                         return call.call(
                             Function.ArgumentsHelper.buildArguments(
-                                null, null, new Object[] {null, 3L, 9L}));
+                                null, new Object[] {null, 3L, 9L}));
                       });
               assertEquals(12L, res);
             }
@@ -101,7 +101,7 @@ public void executeWhenNeedsVirtualFrame() {
                       (frame) -> {
                         return call.call(
                             Function.ArgumentsHelper.buildArguments(
-                                null, null, new Object[] {null, 3L, 9L}));
+                                null, new Object[] {null, 3L, 9L}));
                       });
               assertEquals(12L, res);
             }
@@ -134,7 +134,7 @@ public void executeWhenNeedNotVirtualFrame() {
                         return call.call(
                             frame,
                             Function.ArgumentsHelper.buildArguments(
-                                null, null, new Object[] {null, 5L, 7L}));
+                                null, new Object[] {null, 5L, 7L}));
                       });
               assertEquals(12L, res);
             } else {

lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/MethodProcessor.java

@@ -341,11 +341,7 @@ private void generateCode(MethodDefinition methodDefinition) throws IOException
           "    Object[] arguments = Function.ArgumentsHelper.getPositionalArguments(args);");
       List<String> callArgNames = new ArrayList<>();
       for (MethodDefinition.ArgumentDefinition arg : methodDefinition.getArguments()) {
-        if (!(arg.isImplicit()
-            || arg.isFrame()
-            || arg.isState()
-            || arg.isCallerInfo()
-            || arg.isNode())) {
+        if (!(arg.isImplicit() || arg.isFrame() || arg.isCallerInfo() || arg.isNode())) {
           out.println(
               "    int arg" + arg.getPosition() + "Idx = " + arg.getPosition() + " + prefix;");
         }
@@ -359,8 +355,6 @@ private void generateCode(MethodDefinition methodDefinition) throws IOException
                 + argumentDefinition.getPosition()
                 + "  ***/");
         if (argumentDefinition.isImplicit()) {
-        } else if (argumentDefinition.isState()) {
-          callArgNames.add("/* state */");
         } else if (argumentDefinition.isFrame()) {
           callArgNames.add("frame");
         } else if (argumentDefinition.isNode()) {

lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/model/MethodDefinition.java

@@ -278,11 +278,6 @@ public interface ArgumentDefinition {
 
     boolean validate(ProcessingEnvironment processingEnvironment);
 
-    /**
-     * @return whether this argument should be passed the monadic state.
-     */
-    boolean isState();
-
     /**
      * @return whether this argument should be passed the execution frame.
      */
@@ -366,11 +361,6 @@ public boolean validate(ProcessingEnvironment processingEnvironment) {
       return true;
     }
 
-    @Override
-    public boolean isState() {
-      return false;
-    }
-
     @Override
     public boolean isFrame() {
       return false;
@@ -477,11 +467,9 @@ public static class ArgumentDefinitionFromParameter implements ArgumentDefinitio
     private static final String DATAFLOW_ERROR = "org.enso.interpreter.runtime.error.DataflowError";
     private static final String SELF = "self";
 
-    private static final String STATE = "org.enso.interpreter.runtime.state.State";
     private final String typeName;
     private final TypeMirror type;
     private final String name;
-    private final boolean isState;
     private final boolean isNode;
     private final boolean isFrame;
     private final boolean isCallerInfo;
@@ -503,7 +491,6 @@ public ArgumentDefinitionFromParameter(VariableElement element, int position) {
       String[] typeNameSegments = type.toString().split("\\.");
       typeName = typeNameSegments[typeNameSegments.length - 1];
       name = element.getSimpleName().toString();
-      isState = type.toString().equals(STATE);
       isSuspended = element.getAnnotation(Suspend.class) != null;
       acceptsError =
           (element.getAnnotation(AcceptsError.class) != null)
@@ -546,26 +533,9 @@ public boolean validate(ProcessingEnvironment processingEnvironment) {
         return false;
       }
 
-      if (isState() && !type.toString().equals(STATE)) {
-        processingEnvironment
-            .getMessager()
-            .printMessage(
-                Diagnostic.Kind.ERROR,
-                "The monadic state argument must be typed as " + STATE,
-                element);
-        return false;
-      }
-
       return true;
     }
 
-    /**
-     * @return whether this argument should be passed the monadic state.
-     */
-    public boolean isState() {
-      return isState;
-    }
-
     /**
      * @return whether this argument should be passed the execution frame.
      */
@@ -591,7 +561,7 @@ public boolean isCallerInfo() {
      * @return whether this argument should be passed the next positional function argument.
      */
     public boolean isPositional() {
-      return !isFrame() && !isState() && !isCallerInfo() && !isNode();
+      return !isFrame() && !isCallerInfo() && !isNode();
     }
 
     /**