Skip to content

Commit

Permalink
[Truffle] Fix guard in OM DSL.
Browse files Browse the repository at this point in the history
@chrisseaton
chrisseaton committed Feb 9, 2016
1 parent 8a846d3 commit bb6cf1c
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutGenerator.java
View file
Original file line number Diff line number Diff line change
@@ -611,14 +611,14 @@ public void run(PropertyModel property, boolean last) {

if (property.isVolatile()) {
if (property.getType().getKind() == TypeKind.INT) {
stream.printf(" return ((AtomicInteger) %s_PROPERTY.get(object, true)).get();%n", NameUtils.identifierToConstant(property.getName()));
stream.printf(" return ((AtomicInteger) %s_PROPERTY.get(object, is%s(object))).get();%n", NameUtils.identifierToConstant(property.getName()), layout.getName());
} else if (property.getType().getKind() == TypeKind.BOOLEAN) {
stream.printf(" return ((AtomicBoolean) %s_PROPERTY.get(object, true)).get();%n", NameUtils.identifierToConstant(property.getName()));
stream.printf(" return ((AtomicBoolean) %s_PROPERTY.get(object, is%s(object))).get();%n", NameUtils.identifierToConstant(property.getName()), layout.getName());
} else {
stream.printf(" return ((AtomicReference<%s>) %s_PROPERTY.get(object, true)).get();%n", property.getType(), NameUtils.identifierToConstant(property.getName()));
stream.printf(" return ((AtomicReference<%s>) %s_PROPERTY.get(object, is%s(object))).get();%n", property.getType(), NameUtils.identifierToConstant(property.getName()), layout.getName());
}
} else {
stream.printf(" return (%s) %s_PROPERTY.get(object, true);%n", property.getType(), NameUtils.identifierToConstant(property.getName()));
stream.printf(" return (%s) %s_PROPERTY.get(object, is%s(object));%n", property.getType(), NameUtils.identifierToConstant(property.getName()), layout.getName());
}
}

@@ -675,11 +675,11 @@ public void run(PropertyModel property, boolean last) {
stream.printf(" %s_PROPERTY.setInternal(object, value);%n", NameUtils.identifierToConstant(property.getName()));
} else if (property.isVolatile()) {
if (property.getType().getKind() == TypeKind.INT) {
stream.printf(" ((AtomicInteger) %s_PROPERTY.get(object, true)).set(value);%n", NameUtils.identifierToConstant(property.getName()));
stream.printf(" ((AtomicInteger) %s_PROPERTY.get(object, is%s(object))).set(value);%n", NameUtils.identifierToConstant(property.getName()), layout.getName());
} else if (property.getType().getKind() == TypeKind.BOOLEAN) {
stream.printf(" ((AtomicBoolean) %s_PROPERTY.get(object, true)).set(value);%n", NameUtils.identifierToConstant(property.getName()));
stream.printf(" ((AtomicBoolean) %s_PROPERTY.get(object, is%s(object))).set(value);%n", NameUtils.identifierToConstant(property.getName()), layout.getName());
} else {
stream.printf(" ((AtomicReference<%s>) %s_PROPERTY.get(object, true)).set(value);%n", property.getType(), NameUtils.identifierToConstant(property.getName()));
stream.printf(" ((AtomicReference<%s>) %s_PROPERTY.get(object, is%s(object))).set(value);%n", property.getType(), NameUtils.identifierToConstant(property.getName()), layout.getName());
}
} else {
stream.printf(" try {%n");
@@ -712,17 +712,17 @@ public void run(PropertyModel property, boolean last) {

if (property.getType().getKind() == TypeKind.INT) {
stream.printf(
" return ((AtomicInteger) %s_PROPERTY.get(object, true)).compareAndSet(expected_value, value);%n",
NameUtils.identifierToConstant(property.getName()));
" return ((AtomicInteger) %s_PROPERTY.get(object, is%s(object))).compareAndSet(expected_value, value);%n",
NameUtils.identifierToConstant(property.getName()), layout.getName());
} else if (property.getType().getKind() == TypeKind.BOOLEAN) {
stream.printf(
" return ((AtomicBoolean) %s_PROPERTY.get(object, true)).compareAndSet(expected_value, value);%n",
NameUtils.identifierToConstant(property.getName()));
" return ((AtomicBoolean) %s_PROPERTY.get(object, is%s(object))).compareAndSet(expected_value, value);%n",
NameUtils.identifierToConstant(property.getName()), layout.getName());
} else {
stream.printf(
" return ((AtomicReference<%s>) %s_PROPERTY.get(object, true)).compareAndSet(expected_value, value);%n",
" return ((AtomicReference<%s>) %s_PROPERTY.get(object, is%s(object))).compareAndSet(expected_value, value);%n",
property.getType(),
NameUtils.identifierToConstant(property.getName()));
NameUtils.identifierToConstant(property.getName()), layout.getName());
}

stream.println(" }");
@@ -747,17 +747,17 @@ public void run(PropertyModel property, boolean last) {

if (property.getType().getKind() == TypeKind.INT) {
stream.printf(
" return ((AtomicInteger) %s_PROPERTY.get(object, true)).getAndSet(value);%n",
NameUtils.identifierToConstant(property.getName()));
" return ((AtomicInteger) %s_PROPERTY.get(object, is%s(object))).getAndSet(value);%n",
NameUtils.identifierToConstant(property.getName()), layout.getName());
} else if (property.getType().getKind() == TypeKind.BOOLEAN) {
stream.printf(
" return ((AtomicBoolean) %s_PROPERTY.get(object, true)).getAndSet(value);%n",
NameUtils.identifierToConstant(property.getName()));
" return ((AtomicBoolean) %s_PROPERTY.get(object, is%s(object))).getAndSet(value);%n",
NameUtils.identifierToConstant(property.getName()), layout.getName());
} else {
stream.printf(
" return ((AtomicReference<%s>) %s_PROPERTY.get(object, true)).getAndSet(value);%n",
" return ((AtomicReference<%s>) %s_PROPERTY.get(object, is%s(object))).getAndSet(value);%n",
property.getType(),
NameUtils.identifierToConstant(property.getName()));
NameUtils.identifierToConstant(property.getName()), layout.getName());
}

stream.println(" }");

0 comments on commit bb6cf1c

Please sign in to comment.