Merge pull request #193 from skapral/issue/192

[#192] Got rid of oo.atom.r

Author: skapral

atom-basis/src/main/java/com/pragmaticobjects/oo/atom/codegen/bytebuddy/bt/AssertBuilderTransitionIsNotCorruptingClass.java

@@ -59,8 +59,7 @@ public final void check() throws Exception {
         assertThatCode(() -> {
             final DynamicType.Unloaded<?> make = bt
                     .transitionResult(subclass, typeDescription)
-                    .value()
-                    .get().make();
+                    .make();
             final Class<?> clazz = make.load(new AnonymousClassLoader()).getLoaded();
             clazz.getMethods(); // Initiate validation.
         }).doesNotThrowAnyException();

atom-basis/src/main/java/com/pragmaticobjects/oo/atom/codegen/bytebuddy/bt/AssertBuilderTransitionToAnnotateAClass.java

@@ -62,8 +62,6 @@ public final void check() throws Exception {
         final DynamicType.Builder<?> subclass = new ByteBuddy().redefine(type);
         final DynamicType.Unloaded<?> make = builderTransition
                 .transitionResult(subclass, typeDescription)
-                .value()
-                .get()
                 .make();
         final Class<?> clazz = make.load(new AnonymousClassLoader()).getLoaded();
         assertThat(clazz.getAnnotation(annotation))

atom-basis/src/main/java/com/pragmaticobjects/oo/atom/codegen/bytebuddy/bt/AssertClassToHaveCertainMethodsAfterBuilderTransition.java

@@ -78,8 +78,6 @@ public final void check() throws Exception {
         final DynamicType.Builder<?> subclass = new ByteBuddy().redefine(clazz);
         final DynamicType.Unloaded<?> make = bt
                 .transitionResult(subclass, typeDescription)
-                .value()
-                .get()
                 .make();
         final Class<?> newClazz = make.load(new AnonymousClassLoader()).getLoaded();
         assertThat(

atom-basis/src/main/java/com/pragmaticobjects/oo/atom/codegen/bytebuddy/bt/BtAnnotate.java

@@ -23,8 +23,6 @@
  */
 package com.pragmaticobjects.oo.atom.codegen.bytebuddy.bt;
 
-import com.pragmaticobjects.oo.atom.r.RSuccess;
-import com.pragmaticobjects.oo.atom.r.Result;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.dynamic.DynamicType.Builder;
 
@@ -48,17 +46,14 @@ public BtAnnotate(Annotation annotation) {
     }
 
     @Override
-    public final Result<Builder<?>> transitionResult(Builder<?> source, TypeDescription type) {
+    public final Builder<?> transitionResult(Builder<?> source, TypeDescription type) {
         boolean annotationPresent = type.getDeclaredAnnotations().isAnnotationPresent(
             annotation.annotationType()
         );
-        
-        return new RSuccess<>(
-            annotationPresent ?
-                source :
-                source.annotateType(
-                    annotation
-                )
-        );
+        return annotationPresent ?
+            source :
+            source.annotateType(
+                annotation
+            );
     }
 }

atom-basis/src/main/java/com/pragmaticobjects/oo/atom/codegen/bytebuddy/bt/BtConditional.java

@@ -23,9 +23,8 @@
  */
 package com.pragmaticobjects.oo.atom.codegen.bytebuddy.bt;
 
-import com.pragmaticobjects.oo.atom.r.Result;
 import net.bytebuddy.description.type.TypeDescription;
-import net.bytebuddy.dynamic.DynamicType;
+import net.bytebuddy.dynamic.DynamicType.Builder;
 import net.bytebuddy.matcher.ElementMatcher;
 
 /**
@@ -51,7 +50,7 @@ public BtConditional(ElementMatcher<TypeDescription> matcher, BuilderTransition
     }
 
     @Override
-    public final Result<DynamicType.Builder<?>> transitionResult(DynamicType.Builder<?> source, TypeDescription typeDescription) {
+    public final Builder<?> transitionResult(Builder<?> source, TypeDescription typeDescription) {
         if(matcher.matches(typeDescription)) {
             return matchBranch.transitionResult(source, typeDescription);
         } else {

atom-basis/src/main/java/com/pragmaticobjects/oo/atom/codegen/bytebuddy/bt/BtFail.java

@@ -24,75 +24,17 @@
 package com.pragmaticobjects.oo.atom.codegen.bytebuddy.bt;
 
 import com.pragmaticobjects.oo.atom.codegen.bytebuddy.smt.StackManipulationToken;
-import com.pragmaticobjects.oo.atom.r.RBind;
-import com.pragmaticobjects.oo.atom.r.RSuccess;
-import com.pragmaticobjects.oo.atom.r.Result;
 import lombok.Generated;
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.dynamic.DynamicType.Builder;
 import net.bytebuddy.dynamic.scaffold.InstrumentedType;
-import net.bytebuddy.implementation.Implementation;
-import net.bytebuddy.implementation.bytecode.ByteCodeAppender;
 import net.bytebuddy.implementation.bytecode.StackManipulation;
 import net.bytebuddy.jar.asm.MethodVisitor;
 import net.bytebuddy.matcher.ElementMatcher;
 
 import java.lang.annotation.Annotation;
 
-/**
- * {@link ByteCodeAppender} for {@link BtGenerateMethod}
- *
- * @author Kapralov Sergey
- */
-class BtGenerateMethodBytecodeAppender implements ByteCodeAppender {
-    private final StackManipulation sm;
-
-    /**
-     * Ctor.
-     *
-     * @param sm {@link ByteCodeAppender}'s {@link StackManipulation}.
-     */
-    public BtGenerateMethodBytecodeAppender(StackManipulation sm) {
-        this.sm = sm;
-    }
-
-    @Override
-    public final ByteCodeAppender.Size apply(MethodVisitor mv, Implementation.Context ctx, MethodDescription method) {
-        StackManipulation.Size size = sm.apply(mv, ctx);
-        return new ByteCodeAppender.Size(size.getMaximalSize(), method.getStackSize());
-    }
-}
-
-/**
- * {@link Implementation} for {@link BtGenerateMethod}
- *
- * @author Kapralov Sergey
- */
-class BtGenerateMethodImplementation implements Implementation {
-
-    private final StackManipulation sm;
-
-    /**
-     * Ctor.
-     *
-     * @param sm {@link Implementation}'s {@link StackManipulation}.
-     */
-    public BtGenerateMethodImplementation(StackManipulation sm) {
-        this.sm = sm;
-    }
-
-    @Override
-    public final ByteCodeAppender appender(Implementation.Target implementationTarget) {
-        return new BtGenerateMethodBytecodeAppender(sm);
-    }
-
-    @Override
-    public final InstrumentedType prepare(InstrumentedType instrumentedType) {
-        return instrumentedType;
-    }
-}
-
 /**
  * Transition which generates implementation for a certain declared method.
  *
@@ -126,16 +68,12 @@ public BtGenerateMethod(ElementMatcher<? super MethodDescription> elementMatcher
     }
 
     @Override
-    public final Result<Builder<?>> transitionResult(Builder<?> source, TypeDescription typeDescription) {
+    public final Builder<?> transitionResult(Builder<?> source, TypeDescription typeDescription) {
         final StackManipulationToken token = methodBodySmt.token(typeDescription);
-        return new RBind<>(token, sm -> {
-            return new RSuccess<>(
-                source
-                    .method(elementMatcher)
-                    .intercept(new BtGenerateMethodImplementation(sm))
-                    .annotateMethod(new GeneratedInstance())
-            );
-        });
+        return source
+            .method(elementMatcher)
+            .intercept(new Implementation(token.stackManipulation()))
+            .annotateMethod(new GeneratedInstance());
     }
 
     /**
@@ -149,4 +87,57 @@ public final Class<? extends Annotation> annotationType() {
             return Generated.class;
         }
     }
+
+    /**
+     * {@link Implementation} for {@link BtGenerateMethod}
+     *
+     * @author Kapralov Sergey
+     */
+    private static class Implementation implements net.bytebuddy.implementation.Implementation {
+
+        private final StackManipulation sm;
+
+        /**
+         * Ctor.
+         *
+         * @param sm {@link Implementation}'s {@link StackManipulation}.
+         */
+        public Implementation(StackManipulation sm) {
+            this.sm = sm;
+        }
+
+        @Override
+        public final ByteCodeAppender appender(Implementation.Target implementationTarget) {
+            return new ByteCodeAppender(sm);
+        }
+
+        @Override
+        public final InstrumentedType prepare(InstrumentedType instrumentedType) {
+            return instrumentedType;
+        }
+
+        /**
+         * {@link ByteCodeAppender} for {@link BtGenerateMethod}
+         *
+         * @author Kapralov Sergey
+         */
+        private static class ByteCodeAppender implements net.bytebuddy.implementation.bytecode.ByteCodeAppender {
+            private final StackManipulation sm;
+
+            /**
+             * Ctor.
+             *
+             * @param sm {@link ByteCodeAppender}'s {@link StackManipulation}.
+             */
+            public ByteCodeAppender(StackManipulation sm) {
+                this.sm = sm;
+            }
+
+            @Override
+            public final ByteCodeAppender.Size apply(MethodVisitor mv, net.bytebuddy.implementation.Implementation.Context ctx, MethodDescription method) {
+                StackManipulation.Size size = sm.apply(mv, ctx);
+                return new ByteCodeAppender.Size(size.getMaximalSize(), method.getStackSize());
+            }
+        }
+    }
 }

atom-basis/src/main/java/com/pragmaticobjects/oo/atom/codegen/bytebuddy/bt/BtFallback.java

@@ -23,10 +23,8 @@
  */
 package com.pragmaticobjects.oo.atom.codegen.bytebuddy.bt;
 
-import com.pragmaticobjects.oo.atom.r.RSuccess;
-import com.pragmaticobjects.oo.atom.r.Result;
 import net.bytebuddy.description.type.TypeDescription;
-import net.bytebuddy.dynamic.DynamicType;
+import net.bytebuddy.dynamic.DynamicType.Builder;
 
 /**
  * Transition which does nothing.
@@ -35,7 +33,7 @@
  */
 public class BtNop implements BuilderTransition {
     @Override
-    public final Result<DynamicType.Builder<?>> transitionResult(DynamicType.Builder<?> source, TypeDescription typeDescription) {
-        return new RSuccess<>(source);
+    public final Builder<?> transitionResult(Builder<?> source, TypeDescription typeDescription) {
+        return source;
     }
 }

atom-basis/src/main/java/com/pragmaticobjects/oo/atom/codegen/bytebuddy/bt/BtGenerateMethod.java

@@ -23,9 +23,6 @@
  */
 package com.pragmaticobjects.oo.atom.codegen.bytebuddy.bt;
 
-import com.pragmaticobjects.oo.atom.r.RBind;
-import com.pragmaticobjects.oo.atom.r.RSuccess;
-import com.pragmaticobjects.oo.atom.r.Result;
 import io.vavr.collection.List;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.dynamic.DynamicType.Builder;
@@ -55,14 +52,10 @@ public BtSequence(BuilderTransition... transitions) {
     }
 
     @Override
-    public final Result<Builder<?>> transitionResult(Builder<?> source, TypeDescription typeDescription) {
-        return transitions.<Result<Builder<?>>>foldLeft(
-            new RSuccess<>(source),
-            (state, transition) -> new RBind<>(
-                state,
-                new RtFromBuilderTransitionAdapter(transition, typeDescription)
-            )
+    public final Builder<?> transitionResult(Builder<?> source, TypeDescription typeDescription) {
+        return transitions.<Builder<?>>foldLeft(
+            source,
+            (state, transition) -> transition.transitionResult(state, typeDescription)
         );
     }
-
 }