Skip to content

Commit fa19fde

Browse files
smarrsmarr
committed
Apply ant eclipse format
Signed-off-by: Stefan Marr <[email protected]>
1 parent 2e289ad commit fa19fde

26 files changed

+163
-129
lines changed

‎src/som/compiler/MixinDefinition.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -769,13 +769,17 @@ public Object invoke(final IndirectCallNode call, final Object[] arguments) {
769769
Object superclassAndMixins;
770770
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE) {
771771
superclassAndMixins = mixinDefinition.getSuperclassAndMixinResolutionInvokable()
772-
.getCallTarget().call(rcvr, SArguments.instantiateTopShadowStackEntry(mixinDefinition.getSuperclassAndMixinResolutionInvokable()));
772+
.getCallTarget().call(rcvr,
773+
SArguments.instantiateTopShadowStackEntry(
774+
mixinDefinition.getSuperclassAndMixinResolutionInvokable()));
773775
} else {
774776
superclassAndMixins = mixinDefinition.getSuperclassAndMixinResolutionInvokable()
775-
.getCallTarget().call(rcvr); }
777+
.getCallTarget().call(rcvr);
778+
}
776779
// ok, now it is for sure not initialized yet, instantiate class
777-
// Object superclassAndMixins = mixinDefinition.getSuperclassAndMixinResolutionInvokable()
778-
// .getCallTarget().call(rcvr);
780+
// Object superclassAndMixins =
781+
// mixinDefinition.getSuperclassAndMixinResolutionInvokable()
782+
// .getCallTarget().call(rcvr);
779783
SClass clazz = mixinDefinition.instantiateClass(null, rcvr, superclassAndMixins);
780784
rcvr.writeSlot(this, clazz);
781785
return clazz;

‎src/som/interpreter/SArguments.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,11 @@ public static void setShadowStackEntry(final Object[] args, final ShadowStackEnt
247247
args[args.length - 1] = entry;
248248
}
249249

250-
public static void updateShadowStackEntry(final Object[] args, final ShadowStackEntry entry) {
251-
//assert args[args.length - 1] instanceof ShadowStackEntry : "Assume shadow stack entry is set";
252-
//assert entry.getPreviousShadowStackEntry() == (args[args.length -1]);
250+
public static void updateShadowStackEntry(final Object[] args,
251+
final ShadowStackEntry entry) {
252+
// assert args[args.length - 1] instanceof ShadowStackEntry : "Assume shadow stack entry is
253+
// set";
254+
// assert entry.getPreviousShadowStackEntry() == (args[args.length -1]);
253255
args[args.length - 1] = entry;
254256
}
255257

‎src/som/interpreter/actors/EventualMessage.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,8 @@ private void setPromiseValue(final Object value, final Actor resolvingActor,
434434
assert args[args.length - 1] instanceof ShadowStackEntry;
435435
ShadowStackEntry callPromiseStack = (ShadowStackEntry) args[args.length - 1];
436436
boolean promiseGroup = false;
437-
if (callPromiseStack.getPreviousShadowStackEntry().getExpression().getParent().getParent() instanceof Method) {
437+
if (callPromiseStack.getPreviousShadowStackEntry().getExpression().getParent()
438+
.getParent() instanceof Method) {
438439
promiseGroup =
439440
((Method) callPromiseStack.getExpression().getParent()
440441
.getParent()).getName().startsWith("PromiseGroup");

‎src/som/interpreter/nodes/MessageSendNode.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,11 @@ private Object[] evaluateArguments(final VirtualFrame frame) {
162162
Object[] arguments = SArguments.allocateArgumentsArray(argumentNodes);
163163
for (int i = 0; i < argumentNodes.length; i++) {
164164
arguments[i] = argumentNodes[i].executeGeneric(frame);
165-
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE && arguments[i] instanceof ShadowStackEntry) {
165+
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE
166+
&& arguments[i] instanceof ShadowStackEntry) {
166167
CompilerDirectives.transferToInterpreter();
167-
insert(ExceptionSignalingNode.createArgumentErrorNode(sourceSection)).signal(frame, frame.getArguments());
168+
insert(ExceptionSignalingNode.createArgumentErrorNode(sourceSection)).signal(frame,
169+
frame.getArguments());
168170
}
169171
assert arguments[i] != null : "Some expression evaluated to null, which is not supported.";
170172
assert !(arguments[i] instanceof ShadowStackEntry);

‎src/som/interpreter/nodes/ReturnNonLocalNode.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ public Object executeGeneric(final VirtualFrame frame) {
9494
SInvokable invokable = (SInvokable) Types.getClassOf(self).lookupMessage(
9595
escapedBlock, AccessModifier.PROTECTED);
9696

97-
return invokable.invoke(call, new Object[] {self, block, SArguments.getShadowStackEntry(frame)});
97+
return invokable.invoke(call,
98+
new Object[] {self, block, SArguments.getShadowStackEntry(frame)});
9899
}
99100
}
100101

‎src/som/interpreter/nodes/dispatch/BlockDispatchNode.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,9 @@ protected static final IndirectCallNode createIndirectCall() {
6868
public Object activateCachedBlock(VirtualFrame frame, final Object[] arguments,
6969
@Cached("getMethod(arguments)") final SInvokable cached,
7070
@Cached("createCallNode(arguments)") final DirectCallNode call) {
71-
if(VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE && !(arguments[arguments.length-1] instanceof ShadowStackEntry)){
72-
Object[] newArguments = Arrays.copyOf(arguments,arguments.length+1);
71+
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE
72+
&& !(arguments[arguments.length - 1] instanceof ShadowStackEntry)) {
73+
Object[] newArguments = Arrays.copyOf(arguments, arguments.length + 1);
7374
newArguments[arguments.length] = SArguments.getShadowStackEntry(frame);
7475
return call.call(newArguments);
7576
}

‎src/som/interpreter/nodes/dispatch/CachedDnuNode.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ protected Object performDnu(final Object[] arguments,
8080
Object[] argsArr;
8181
SArray.SImmutableArray dnuArguments = SArguments.getArgumentsWithoutReceiver(arguments);
8282
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE) {
83-
argsArr = new Object[]{
84-
rcvr, selector, dnuArguments,
85-
arguments[arguments.length - 1]
83+
argsArr = new Object[] {
84+
rcvr, selector, dnuArguments,
85+
arguments[arguments.length - 1]
8686
};
8787
} else {
88-
argsArr = new Object[]{
89-
rcvr, selector, dnuArguments};
88+
argsArr = new Object[] {
89+
rcvr, selector, dnuArguments};
9090
}
9191
return cachedMethod.call(argsArr);
9292
}

‎src/som/interpreter/nodes/literals/ObjectLiteralNode.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,20 @@ public Object executeGeneric(final VirtualFrame frame) {
4949

5050
Object superclassAndMixins;
5151
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE) {
52-
superclassAndMixins = superClassResolver.call(outer, SArguments.getShadowStackEntry(frame));
52+
superclassAndMixins =
53+
superClassResolver.call(outer, SArguments.getShadowStackEntry(frame));
5354
} else {
54-
superclassAndMixins = superClassResolver.call(outer);
55+
superclassAndMixins = superClassResolver.call(outer);
5556
}
5657
SClass sClassObject =
5758
instantiation.execute(outer, superclassAndMixins, frame.materialize());
5859
Object[] arguments;
59-
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE){
60-
arguments = new Object[] {sClassObject,null};
60+
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE) {
61+
arguments = new Object[] {sClassObject, null};
6162
} else {
6263
arguments = new Object[] {sClassObject};
6364
}
64-
return newMessage.doPreEvaluated(frame, arguments );
65+
return newMessage.doPreEvaluated(frame, arguments);
6566
}
6667

6768
@Override

‎src/som/interpreter/nodes/nary/EagerBinaryPrimitiveNode.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,18 @@ public Object executeGeneric(final VirtualFrame frame) {
9393

9494
return executeEvaluated(frame, rcvr, arg);
9595
}
96+
9697
/** MATTEO: HERE IS THE SPOT IN WHICH I MIGHT BREAK EVERYTHING. **/
9798
public Object executeEvaluated(final VirtualFrame frame,
9899
final Object receiver, final Object argument) {
99100
try {
100-
// if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE) {
101-
// Object[] args;
102-
//
103-
// args = new Object[] {receiver, argument, null};
104-
//
105-
// return makeGenericSend().doPreEvaluated(frame, args);
106-
// }
101+
// if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE) {
102+
// Object[] args;
103+
//
104+
// args = new Object[] {receiver, argument, null};
105+
//
106+
// return makeGenericSend().doPreEvaluated(frame, args);
107+
// }
107108
return primitive.executeEvaluated(frame, receiver, argument);
108109
} catch (UnsupportedSpecializationException e) {
109110
TruffleCompiler.transferToInterpreterAndInvalidate(

‎src/som/interpreter/nodes/nary/EagerTernaryPrimitiveNode.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ public Object executeEvaluated(final VirtualFrame frame,
105105
} catch (UnsupportedSpecializationException e) {
106106
TruffleCompiler.transferToInterpreterAndInvalidate(
107107
"Eager Primitive with unsupported specialization.");
108-
Object[] arguments = {receiver, argument1, argument2};
108+
Object[] arguments = {receiver, argument1, argument2};
109109
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE) {
110-
arguments = new Object[]{receiver, argument1, argument2, null};
110+
arguments = new Object[] {receiver, argument1, argument2, null};
111111
}
112112
return makeGenericSend().doPreEvaluated(frame,
113-
arguments );
113+
arguments);
114114
}
115115
}
116116

‎src/som/interpreter/nodes/specialized/IfMessageNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ public final Object cachedBlock(VirtualFrame frame, final boolean rcvr, final SB
5757
@Cached("createDirect(method)") final DirectCallNode callTarget) {
5858
Object[] args;
5959
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE) {
60-
args = new Object[]{arg, SArguments.getShadowStackEntry(frame)};
60+
args = new Object[] {arg, SArguments.getShadowStackEntry(frame)};
6161
} else {
62-
args = new Object[]{arg};
62+
args = new Object[] {arg};
6363
}
6464
// this was there before Async Stack traces
6565
if (condProf.profile(rcvr == expected)) {

‎src/som/primitives/ActivitySpawn.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,20 +158,21 @@ public final SpawnPrim initialize(final VM vm) {
158158
}
159159

160160
@Specialization(guards = "clazz == TaskClass")
161-
public final SomForkJoinTask spawnTask(VirtualFrame frame, final SClass clazz, final SBlock block) {
161+
public final SomForkJoinTask spawnTask(VirtualFrame frame, final SClass clazz,
162+
final SBlock block) {
162163
Object[] arguments;
163164
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE) {
164165
arguments = new Object[] {block, SArguments.getShadowStackEntry(frame)};
165166
} else {
166-
arguments =new Object[] {block};
167+
arguments = new Object[] {block};
167168
}
168169

169170
SomForkJoinTask task = createTask(arguments,
170171
onExec.executeShouldHalt(), block, sourceSection, traceProcCreation, vm);
171172
fork(task);
172173
return task;
173174
}
174-
175+
175176
@TruffleBoundary
176177
private void fork(final SomForkJoinTask task) {
177178
forkJoinPool.execute(task);
@@ -285,8 +286,8 @@ public final Object spawnProcess(final VirtualFrame frame, final SImmutableObjec
285286
notAValue.signal(frame, procCls);
286287
}
287288
Object[] arguments = argArr;
288-
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE){
289-
arguments = Arrays.copyOf(argArr,argArr.length+1);
289+
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE) {
290+
arguments = Arrays.copyOf(argArr, argArr.length + 1);
290291
arguments[argArr.length] = SArguments.getShadowStackEntry(frame);
291292
}
292293
spawnProcess(procCls, arguments, traceProcCreation);

‎src/som/primitives/FilePrims.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ public abstract static class FileOpenPrim extends BinaryExpressionNode {
182182
@Child protected BlockDispatchNode dispatchHandler = BlockDispatchNodeGen.create();
183183

184184
@Specialization
185-
public final Object fileOpen(final VirtualFrame frame, final SFileDescriptor file, final SBlock handler) {
185+
public final Object fileOpen(final VirtualFrame frame, final SFileDescriptor file,
186+
final SBlock handler) {
186187
return file.openFile(frame, handler, dispatchHandler);
187188
}
188189
}

‎src/som/primitives/ObjectPrims.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
import tools.dym.Tags.OpComparison;
4949

5050

51-
52-
5351
public final class ObjectPrims {
5452

5553
@GenerateNodeFactory
@@ -58,15 +56,17 @@ public abstract static class AsyncTracePrim extends UnaryExpressionNode {
5856
@Specialization
5957
public final Object doSAbstractObject(VirtualFrame frame, final Object receiver) {
6058
CompilerDirectives.transferToInterpreter();
61-
59+
6260
Output.errorPrintln("ASYNC STACK TRACE");
63-
StackIterator.ShadowStackIterator iterator = new StackIterator.ShadowStackIterator.HaltShadowStackIterator(this.sourceSection);
61+
StackIterator.ShadowStackIterator iterator =
62+
new StackIterator.ShadowStackIterator.HaltShadowStackIterator(this.sourceSection);
6463
List<String> stack = new ArrayList<>();
65-
while (iterator.hasNext()){
64+
while (iterator.hasNext()) {
6665
ApplicationThreadStack.StackFrame sf = iterator.next();
6766
if (sf != null) {
6867
SourceSection section = sf.section;
69-
stack.add(sf.name + ", " + section.getSource().getName() + ", " + section.getStartLine());
68+
stack.add(
69+
sf.name + ", " + section.getSource().getName() + ", " + section.getStartLine());
7070
}
7171
}
7272
return new SImmutableArray(stack.toArray(), Classes.arrayClass);
@@ -91,12 +91,14 @@ public final Object doSAbstractObject(VirtualFrame frame, final Object receiver)
9191
boolean keepLooping = true;
9292
String methodName;
9393
while (keepLooping && currentEntry != null) {
94-
if(currentEntry instanceof ShadowStackEntry.EntryForPromiseResolution){
95-
methodName = ((ShadowStackEntry.EntryForPromiseResolution) currentEntry).resolutionLocation.toString();
94+
if (currentEntry instanceof ShadowStackEntry.EntryForPromiseResolution) {
95+
methodName =
96+
((ShadowStackEntry.EntryForPromiseResolution) currentEntry).resolutionLocation.toString();
9697
} else {
97-
methodName = ((CachedDispatchNode) currentEntry.getExpression()).getCachedMethod().getName();
98+
methodName =
99+
((CachedDispatchNode) currentEntry.getExpression()).getCachedMethod().getName();
98100
}
99-
if (methodName.equals("ON_WHEN_RESOLVED_BLOCK")) {
101+
if (methodName.equals("ON_WHEN_RESOLVED_BLOCK")) {
100102
keepLooping = false;
101103
} else {
102104
currentEntry = currentEntry.getPreviousShadowStackEntry();

‎src/som/primitives/PathPrims.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ public abstract static class FileCopyPrim extends TernaryExpressionNode {
9393
@Child protected BlockDispatchNode dispatchHandler = BlockDispatchNodeGen.create();
9494

9595
@Specialization
96-
public final Object copyAs(final VirtualFrame frame, final String source, final String dest, final SBlock fail) {
96+
public final Object copyAs(final VirtualFrame frame, final String source,
97+
final String dest, final SBlock fail) {
9798
try {
9899
copy(source, dest);
99100
} catch (IOException e) {
@@ -114,7 +115,8 @@ public abstract static class CreateDirectoryPrim extends BinaryExpressionNode {
114115
@Child protected BlockDispatchNode dispatchHandler = BlockDispatchNodeGen.create();
115116

116117
@Specialization
117-
public final Object createDirectory(final VirtualFrame frame, final String dir, final SBlock fail) {
118+
public final Object createDirectory(final VirtualFrame frame, final String dir,
119+
final SBlock fail) {
118120
try {
119121
createDirectory(dir);
120122
} catch (IOException e) {
@@ -135,7 +137,8 @@ public abstract static class DeleteDirectoryPrim extends BinaryExpressionNode {
135137
@Child protected BlockDispatchNode dispatchHandler = BlockDispatchNodeGen.create();
136138

137139
@Specialization
138-
public final Object delteDirectory(final VirtualFrame frame, final String dir, final SBlock fail) {
140+
public final Object delteDirectory(final VirtualFrame frame, final String dir,
141+
final SBlock fail) {
139142
try {
140143
delete(dir);
141144
} catch (IOException e) {
@@ -222,7 +225,8 @@ public abstract static class FileMovePrim extends TernaryExpressionNode {
222225
@Child protected BlockDispatchNode dispatchHandler = BlockDispatchNodeGen.create();
223226

224227
@Specialization
225-
public final Object moveAs(final VirtualFrame frame, final String source, final String dest, final SBlock fail) {
228+
public final Object moveAs(final VirtualFrame frame, final String source,
229+
final String dest, final SBlock fail) {
226230
try {
227231
move(source, dest);
228232
} catch (IOException e) {

‎src/som/primitives/arrays/ArraySetAllStrategy.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static void evalBlockForRemaining(final VirtualFrame frame, final SBlock
5858
}
5959
}
6060

61-
public static void evalBlockForRemaining(final VirtualFrame frame,final SBlock block,
61+
public static void evalBlockForRemaining(final VirtualFrame frame, final SBlock block,
6262
final long length, final boolean[] storage,
6363
final BlockDispatchNode blockDispatch) {
6464
for (int i = SArray.FIRST_IDX + 1; i < length; i++) {
@@ -211,7 +211,8 @@ public static Object evaluateFirstDetermineStorageAndEvaluateRest(final VirtualF
211211
final ExceptionSignalingNode notAValue) {
212212
// TODO: this version does not handle the case that a subsequent value is
213213
// not of the expected type...
214-
Object result = blockDispatch.executeDispatch(frame, new Object[] {blockWithArg, (long) 1});
214+
Object result =
215+
blockDispatch.executeDispatch(frame, new Object[] {blockWithArg, (long) 1});
215216

216217
if (result instanceof Long) {
217218
long[] newStorage = new long[(int) length];

‎src/som/primitives/arrays/PutAllNode.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ public SMutableArray doPutEvalBlock(VirtualFrame frame, final SMutableArray rcvr
5959
}
6060

6161
try {
62-
Object newStorage = ArraySetAllStrategy.evaluateFirstDetermineStorageAndEvaluateRest(frame,
63-
block, length, this.block);
62+
Object newStorage =
63+
ArraySetAllStrategy.evaluateFirstDetermineStorageAndEvaluateRest(frame,
64+
block, length, this.block);
6465
rcvr.transitionTo(newStorage);
6566
} finally {
6667
if (CompilerDirectives.inInterpreter()) {

‎src/som/primitives/processes/ChannelPrimitives.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ public void run() {
123123
Symbols.symbolFor("run"), AccessModifier.PROTECTED);
124124

125125
beforeExec(disp);
126-
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE){
127-
disp.invoke(new Object[]{obj,null});
126+
if (VmSettings.ACTOR_ASYNC_STACK_TRACE_STRUCTURE) {
127+
disp.invoke(new Object[] {obj, null});
128128
} else {
129-
disp.invoke(new Object[]{obj});
129+
disp.invoke(new Object[] {obj});
130130
}
131131
} catch (Throwable t) {
132132
t.printStackTrace();

0 commit comments

Comments
 (0)