Skip to content

Commit ed42033

Browse files
committed
Merge remote-tracking branch 'upstream/master' into issue/24
2 parents 96b9655 + ff09371 commit ed42033

48 files changed

Lines changed: 747 additions & 100 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/plugin/TaskPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public final Builder<?> apply(Builder<?> builder, TypeDescription typeDescriptio
4848
.transitionResult(builder, typeDescription);
4949
List<String> issues = result.issues();
5050
if(issues.isEmpty()) {
51-
return result.outcome().get();
51+
return result.value().get();
5252
} else {
5353
issues.map(str -> "ERROR: " + str).forEach(System.err::println);
5454
throw new RuntimeException("Plugin was failed. Details are in the Maven logs.");

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/smt/SmtArray.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public SmtArrayInference(List<Result<StackManipulation>> members) {
3939
}
4040

4141
@Override
42-
public final Result<StackManipulation> taskResult() {
42+
public final Result<StackManipulation> result() {
4343
return new RTransformed<>(
4444
members,
4545
list -> ArrayFactory.forType(TypeDescription.Generic.OBJECT).withValues(

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/smt/SmtBox.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public SmtBoxInference(TypeDescription type) {
7272
}
7373

7474
@Override
75-
public final Result<StackManipulation> taskResult() {
75+
public final Result<StackManipulation> result() {
7676
return Match(type).<Result<StackManipulation>>of(Case($(t -> t.represents(boolean.class)), new RSuccess<StackManipulation>(
7777
MethodInvocation.invoke(new MethodDescription.ForLoadedMethod(BOOLEAN_VALUEOF))
7878
)),

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/smt/SmtBoxField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public SmtBoxFieldInference(FieldDescription field) {
3838
}
3939

4040
@Override
41-
public final Result<StackManipulation> taskResult() {
41+
public final Result<StackManipulation> result() {
4242
TypeDescription type = field.getType().asErasure();
4343
if (type.isPrimitive()) {
4444
return new SmtBox(type);

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/smt/SmtCast.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public SmtCastInference(TypeDescription typeDescription) {
3838
}
3939

4040
@Override
41-
public final Result<StackManipulation> taskResult() {
41+
public final Result<StackManipulation> result() {
4242
return new RSuccess<>(TypeCasting.to(typeDescription));
4343
}
4444
}

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/smt/SmtCheckFieldsEquality.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public SmtFieldsEqualityInference(TypeDescription type) {
3838
}
3939

4040
@Override
41-
public final Result<StackManipulation> taskResult() {
41+
public final Result<StackManipulation> result() {
4242
return new SmtCombined(
4343
List.of(type)
4444
.flatMap(TypeDescription::getDeclaredFields)

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/smt/SmtGetField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public SmtGetFieldInference(FieldDescription field) {
3838
}
3939

4040
@Override
41-
public final Result<StackManipulation> taskResult() {
41+
public final Result<StackManipulation> result() {
4242
return new RSuccess<>(
4343
FieldAccess.forField(field).read()
4444
);

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/smt/SmtIf.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public SmtIfInference(Condition condition, StackManipulationToken successBranch)
4242
}
4343

4444
@Override
45-
public final Result<StackManipulation> taskResult() {
45+
public final Result<StackManipulation> result() {
4646
Label label = new Label();
4747
return new SmtCombined(
4848
new SmtStatic(condition.branching(label)),

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/smt/SmtIfNotEqual.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public SmtIfNotEqualInference(TypeDescription type, StackManipulationToken smt)
3838
}
3939

4040
@Override
41-
public final Result<StackManipulation> taskResult() {
41+
public final Result<StackManipulation> result() {
4242
if(type.isArray()) {
4343
return new SmtIfNotDeeplyEqual(smt);
4444
} else {

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/smt/SmtLoadArrayOfFields.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public SmtLoadArrayOfFieldsInference(TypeDescription type) {
3737
}
3838

3939
@Override
40-
public final Result<StackManipulation> taskResult() {
40+
public final Result<StackManipulation> result() {
4141
return new SmtArray(
4242
List.of(type)
4343
.flatMap(TypeDescription::getDeclaredFields)

0 commit comments

Comments
 (0)