Skip to content

Commit 8571ff1

Browse files
aardvark179aardvark179
committed
Clean up imports and formatting.
1 parent 344a5f9 commit 8571ff1

File tree

7 files changed

+24
-38
lines changed

7 files changed

+24
-38
lines changed

‎src/main/java/org/truffleruby/core/module/ModuleNodes.java

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@ public GenerateAccessorNode(boolean isGetter) {
391391

392392
@Specialization
393393
protected DynamicObject generateAccessor(VirtualFrame frame, DynamicObject module, Object nameObject,
394-
@Cached NameToJavaStringNode nameToJavaStringNode,
395-
@Cached ReadCallerFrameNode readCallerFrame) {
394+
@Cached NameToJavaStringNode nameToJavaStringNode,
395+
@Cached ReadCallerFrameNode readCallerFrame) {
396396
final String name = nameToJavaStringNode.executeToJavaString(nameObject);
397397
createAccessor(module, name, readCallerFrame.execute(frame));
398398
return nil();
@@ -624,21 +624,24 @@ protected DynamicObject toStr(VirtualFrame frame, Object object) {
624624
}
625625

626626
@Specialization(guards = "isRubyString(code)")
627-
protected Object classEval(VirtualFrame frame, DynamicObject module, DynamicObject code, NotProvided file, NotProvided line,
627+
protected Object classEval(VirtualFrame frame, DynamicObject module, DynamicObject code, NotProvided file,
628+
NotProvided line,
628629
NotProvided block,
629630
@Cached IndirectCallNode callNode) {
630631
return classEvalSource(frame, module, code, "(eval)", callNode);
631632
}
632633

633634
@Specialization(guards = { "isRubyString(code)", "isRubyString(file)" })
634-
protected Object classEval(VirtualFrame frame, DynamicObject module, DynamicObject code, DynamicObject file, NotProvided line,
635+
protected Object classEval(VirtualFrame frame, DynamicObject module, DynamicObject code, DynamicObject file,
636+
NotProvided line,
635637
NotProvided block,
636638
@Cached IndirectCallNode callNode) {
637639
return classEvalSource(frame, module, code, StringOperations.getString(file), callNode);
638640
}
639641

640642
@Specialization(guards = { "isRubyString(code)", "isRubyString(file)" })
641-
protected Object classEval(VirtualFrame frame, DynamicObject module, DynamicObject code, DynamicObject file, int line,
643+
protected Object classEval(VirtualFrame frame, DynamicObject module, DynamicObject code, DynamicObject file,
644+
int line,
642645
NotProvided block,
643646
@Cached IndirectCallNode callNode) {
644647
final CodeLoader.DeferredCall deferredCall = classEvalSource(
@@ -670,7 +673,8 @@ private Object classEvalSource(VirtualFrame frame, DynamicObject module, Dynamic
670673
return deferredCall.call(callNode);
671674
}
672675

673-
private CodeLoader.DeferredCall classEvalSource(VirtualFrame frame, DynamicObject module, DynamicObject rubySource, String file,
676+
private CodeLoader.DeferredCall classEvalSource(VirtualFrame frame, DynamicObject module,
677+
DynamicObject rubySource, String file,
674678
int line) {
675679
assert RubyGuards.isRubyString(rubySource);
676680

@@ -680,7 +684,8 @@ private CodeLoader.DeferredCall classEvalSource(VirtualFrame frame, DynamicObjec
680684
}
681685

682686
@TruffleBoundary
683-
private CodeLoader.DeferredCall classEvalSourceInternal(DynamicObject module, DynamicObject rubySource, String file, int line,
687+
private CodeLoader.DeferredCall classEvalSourceInternal(DynamicObject module, DynamicObject rubySource,
688+
String file, int line,
684689
final MaterializedFrame callerFrame) {
685690
final RubySource source = createEvalSourceNode
686691
.createEvalSource(StringOperations.rope(rubySource), "class/module_eval", file, line);
@@ -1090,13 +1095,15 @@ protected DynamicObject defineMethod(DynamicObject module, String name, NotProvi
10901095
}
10911096

10921097
@Specialization
1093-
protected DynamicObject defineMethodBlock(VirtualFrame frame, DynamicObject module, String name, NotProvided proc,
1098+
protected DynamicObject defineMethodBlock(VirtualFrame frame, DynamicObject module, String name,
1099+
NotProvided proc,
10941100
DynamicObject block) {
10951101
return defineMethodProc(frame, module, name, block, NotProvided.INSTANCE);
10961102
}
10971103

10981104
@Specialization(guards = "isRubyProc(proc)")
1099-
protected DynamicObject defineMethodProc(VirtualFrame frame, DynamicObject module, String name, DynamicObject proc,
1105+
protected DynamicObject defineMethodProc(VirtualFrame frame, DynamicObject module, String name,
1106+
DynamicObject proc,
11001107
NotProvided block) {
11011108
return defineMethod(module, name, proc, readCallerFrame.execute(frame));
11021109
}
@@ -1126,7 +1133,8 @@ protected DynamicObject defineMethodMethod(DynamicObject module, String name, Dy
11261133
}
11271134

11281135
@Specialization(guards = "isRubyUnboundMethod(method)")
1129-
protected DynamicObject defineMethod(VirtualFrame frame, DynamicObject module, String name, DynamicObject method,
1136+
protected DynamicObject defineMethod(VirtualFrame frame, DynamicObject module, String name,
1137+
DynamicObject method,
11301138
NotProvided block) {
11311139
final MaterializedFrame callerFrame = readCallerFrame.execute(frame);
11321140
return defineMethodInternal(module, name, method, callerFrame);
@@ -1156,7 +1164,8 @@ private DynamicObject defineMethodInternal(DynamicObject module, String name, Dy
11561164
}
11571165

11581166
@TruffleBoundary
1159-
private DynamicObject defineMethod(DynamicObject module, String name, DynamicObject proc, MaterializedFrame callerFrame) {
1167+
private DynamicObject defineMethod(DynamicObject module, String name, DynamicObject proc,
1168+
MaterializedFrame callerFrame) {
11601169
final RootCallTarget callTarget = Layouts.PROC.getCallTargetForLambdas(proc);
11611170
final RubyRootNode rootNode = (RubyRootNode) callTarget.getRootNode();
11621171
final SharedMethodInfo info = Layouts.PROC.getSharedMethodInfo(proc).forDefineMethod(module, name);
@@ -1205,7 +1214,8 @@ public Object execute(VirtualFrame frame) {
12051214
}
12061215

12071216
@TruffleBoundary
1208-
private DynamicObject addMethod(DynamicObject module, String name, InternalMethod method, MaterializedFrame callerFrame) {
1217+
private DynamicObject addMethod(DynamicObject module, String name, InternalMethod method,
1218+
MaterializedFrame callerFrame) {
12091219
method = method.withName(name);
12101220

12111221
final Visibility visibility = GetCurrentVisibilityNode.getVisibilityFromNameAndFrame(name, callerFrame);

‎src/main/java/org/truffleruby/core/proc/ProcNodes.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
4040
import com.oracle.truffle.api.dsl.Cached;
4141
import com.oracle.truffle.api.dsl.Specialization;
42-
import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
4342
import com.oracle.truffle.api.frame.MaterializedFrame;
4443
import com.oracle.truffle.api.frame.VirtualFrame;
4544
import com.oracle.truffle.api.object.DynamicObject;
@@ -74,8 +73,8 @@ public abstract DynamicObject executeProcNew(
7473

7574
@Specialization
7675
protected DynamicObject proc(VirtualFrame frame, DynamicObject procClass, Object[] args, NotProvided block,
77-
@Cached("create(nil())") FindAndReadDeclarationVariableNode readNode,
78-
@Cached ReadCallerFrameNode readCaller) {
76+
@Cached("create(nil())") FindAndReadDeclarationVariableNode readNode,
77+
@Cached ReadCallerFrameNode readCaller) {
7978
final MaterializedFrame parentFrame = readCaller.execute(frame);
8079

8180
DynamicObject parentBlock = (DynamicObject) readNode

‎src/main/java/org/truffleruby/language/arguments/ReadCallerFrameNode.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,13 @@
1111

1212
import org.truffleruby.language.FrameSendingNode;
1313
import org.truffleruby.language.RubyBaseNode;
14-
import org.truffleruby.language.backtrace.Activation;
15-
import org.truffleruby.language.dispatch.CachedDispatchNode;
16-
import org.truffleruby.language.dispatch.UncachedDispatchNode;
17-
import org.truffleruby.language.supercall.CallSuperMethodNode;
1814

1915
import com.oracle.truffle.api.CompilerDirectives;
2016
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
2117
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
2218
import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
2319
import com.oracle.truffle.api.frame.Frame;
2420
import com.oracle.truffle.api.frame.MaterializedFrame;
25-
import com.oracle.truffle.api.frame.VirtualFrame;
2621
import com.oracle.truffle.api.nodes.DirectCallNode;
2722
import com.oracle.truffle.api.nodes.IndirectCallNode;
2823
import com.oracle.truffle.api.nodes.Node;

‎src/main/java/org/truffleruby/language/dispatch/CachedDispatchNode.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,19 @@
1313
import org.truffleruby.core.rope.RopeNodes;
1414
import org.truffleruby.core.string.StringOperations;
1515
import org.truffleruby.language.RubyGuards;
16-
import org.truffleruby.language.RubyRootNode;
17-
import org.truffleruby.language.arguments.ReadCallerFrameNode;
1816
import org.truffleruby.language.arguments.RubyArguments;
1917
import org.truffleruby.language.methods.InternalMethod;
2018

2119
import com.oracle.truffle.api.Assumption;
2220
import com.oracle.truffle.api.CompilerAsserts;
2321
import com.oracle.truffle.api.CompilerDirectives;
24-
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
2522
import com.oracle.truffle.api.frame.MaterializedFrame;
2623
import com.oracle.truffle.api.frame.VirtualFrame;
2724
import com.oracle.truffle.api.nodes.DirectCallNode;
2825
import com.oracle.truffle.api.nodes.ExplodeLoop;
2926
import com.oracle.truffle.api.nodes.InvalidAssumptionException;
30-
import com.oracle.truffle.api.nodes.Node;
3127
import com.oracle.truffle.api.object.DynamicObject;
3228
import com.oracle.truffle.api.profiles.BranchProfile;
33-
import com.oracle.truffle.api.utilities.AlwaysValidAssumption;
3429

3530
public abstract class CachedDispatchNode extends DispatchNode {
3631

‎src/main/java/org/truffleruby/language/dispatch/DispatchNode.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.truffleruby.core.string.StringOperations;
1515
import org.truffleruby.core.string.StringUtils;
1616
import org.truffleruby.language.FrameSendingNode;
17-
import org.truffleruby.language.RubyBaseNode;
1817
import org.truffleruby.language.RubyGuards;
1918
import org.truffleruby.language.control.RaiseException;
2019
import org.truffleruby.language.methods.LookupMethodNode;

‎src/main/java/org/truffleruby/language/dispatch/UncachedDispatchNode.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,12 @@
99
*/
1010
package org.truffleruby.language.dispatch;
1111

12-
import com.oracle.truffle.api.Assumption;
1312
import com.oracle.truffle.api.CompilerDirectives;
14-
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
1513
import com.oracle.truffle.api.frame.MaterializedFrame;
1614
import com.oracle.truffle.api.frame.VirtualFrame;
1715
import com.oracle.truffle.api.nodes.InvalidAssumptionException;
18-
import com.oracle.truffle.api.nodes.Node;
1916
import com.oracle.truffle.api.object.DynamicObject;
20-
import com.oracle.truffle.api.utilities.AlwaysValidAssumption;
2117

22-
import org.truffleruby.language.RubyRootNode;
23-
import org.truffleruby.language.arguments.ReadCallerFrameNode;
2418

2519
public class UncachedDispatchNode extends DispatchNode {
2620

‎src/main/java/org/truffleruby/language/supercall/CallSuperMethodNode.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,16 @@
1111

1212
import org.truffleruby.core.array.ArrayUtils;
1313
import org.truffleruby.language.FrameSendingNode;
14-
import org.truffleruby.language.RubyBaseNode;
1514
import org.truffleruby.language.arguments.RubyArguments;
1615
import org.truffleruby.language.dispatch.CallDispatchHeadNode;
1716
import org.truffleruby.language.methods.CallInternalMethodNode;
1817
import org.truffleruby.language.methods.InternalMethod;
1918

20-
import com.oracle.truffle.api.Assumption;
2119
import com.oracle.truffle.api.CompilerDirectives;
22-
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
2320
import com.oracle.truffle.api.dsl.Specialization;
24-
import com.oracle.truffle.api.frame.MaterializedFrame;
2521
import com.oracle.truffle.api.frame.VirtualFrame;
26-
import com.oracle.truffle.api.nodes.InvalidAssumptionException;
2722
import com.oracle.truffle.api.object.DynamicObject;
2823
import com.oracle.truffle.api.profiles.ConditionProfile;
29-
import com.oracle.truffle.api.utilities.CyclicAssumption;
3024

3125
public abstract class CallSuperMethodNode extends FrameSendingNode {
3226

0 commit comments

Comments
 (0)