Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Truffle] Fix indentation #2597

Merged
merged 1 commit into from Feb 13, 2015
Merged

[Truffle] Fix indentation #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
View file
Open in desktop
Expand Up @@ -53,7 +53,7 @@ public RubyCallNode(RubyContext context, SourceSection section, String methodNam

ProcOrNullNode blockNode = null;
if (block != null) {
blockNode = ProcOrNullNodeFactory.create(context, section, block);
blockNode = ProcOrNullNodeFactory.create(context, section, block);
}

this.isVCall = isVCall;
Expand Down
8 changes: 4 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBooleanDispatchNode.java
View file
Open in desktop
Expand Up @@ -129,8 +129,8 @@ public Object executeDispatch(

switch (getDispatchAction()) {
case CALL_METHOD: {
argumentsObjects = executeArguments(frame, argumentsObjects);
blockObject = executeBlock(frame, blockObject);
argumentsObjects = executeArguments(frame, argumentsObjects);
blockObject = executeBlock(frame, blockObject);
if (isIndirect()) {
return indirectCallNode.call(
frame,
Expand Down Expand Up @@ -179,8 +179,8 @@ public Object executeDispatch(

switch (getDispatchAction()) {
case CALL_METHOD: {
argumentsObjects = executeArguments(frame, argumentsObjects);
blockObject = executeBlock(frame, blockObject);
argumentsObjects = executeArguments(frame, argumentsObjects);
blockObject = executeBlock(frame, blockObject);
if (isIndirect()) {
return indirectCallNode.call(
frame,
Expand Down
26 changes: 13 additions & 13 deletions truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedDispatchNode.java
View file
Open in desktop
Expand Up @@ -126,17 +126,17 @@ public static RubyNode[] expandedArgumentNodes(RubyContext context,

List<String> restKeywordLabels = new ArrayList<String>();
for (int j = 0; j < hashNode.size(); j++) {
Object key = hashNode.getKey(j);
boolean keyIsSymbol = key instanceof ObjectLiteralNode &&
((ObjectLiteralNode) key).getObject() instanceof RubySymbol;
if (!keyIsSymbol) {
// cannot optimize case where keyword label is dynamic (not a fixed RubySymbol)
return argumentNodes;
}
final String label = ((ObjectLiteralNode) hashNode.getKey(j)).getObject().toString();
restKeywordLabels.add(label);
Object key = hashNode.getKey(j);
boolean keyIsSymbol = key instanceof ObjectLiteralNode &&
((ObjectLiteralNode) key).getObject() instanceof RubySymbol;
if (!keyIsSymbol) {
// cannot optimize case where keyword label is dynamic (not a fixed RubySymbol)
return argumentNodes;
}
final String label = ((ObjectLiteralNode) hashNode.getKey(j)).getObject().toString();
restKeywordLabels.add(label);
}

for (String kwarg : kwargs) {
Expand Down Expand Up @@ -255,8 +255,8 @@ public Object executeDispatch(

switch (getDispatchAction()) {
case CALL_METHOD: {
argumentsObjects = executeArguments(frame, argumentsObjects);
blockObject = executeBlock(frame, blockObject);
argumentsObjects = executeArguments(frame, argumentsObjects);
blockObject = executeBlock(frame, blockObject);
if (isIndirect()) {
return indirectCallNode.call(
frame,
Expand Down
6 changes: 3 additions & 3 deletions .../src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedMethodMissingDispatchNode.java
View file
Open in desktop
Expand Up @@ -116,8 +116,8 @@ public Object executeDispatch(
final Object[] modifiedArgumentsObjects = new Object[1 + argumentsObjectsArray.length];
modifiedArgumentsObjects[0] = getCachedNameAsSymbol();
RubyArguments.arraycopy(argumentsObjectsArray, 0, modifiedArgumentsObjects, 1, argumentsObjectsArray.length);
blockObject = executeBlock(frame, blockObject);
blockObject = executeBlock(frame, blockObject);
if (isIndirect()) {
return indirectCallNode.call(
frame,
Expand All @@ -144,7 +144,7 @@ public Object executeDispatch(
return false;

case READ_CONSTANT: {
blockObject = executeBlock(frame, blockObject);
blockObject = executeBlock(frame, blockObject);
if (isIndirect()) {
return indirectCallNode.call(
frame,
Expand Down
6 changes: 3 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedSymbolDispatchNode.java
View file
Open in desktop
Expand Up @@ -98,9 +98,9 @@ public Object executeDispatch(

switch (getDispatchAction()) {
case CALL_METHOD: {
argumentsObjects = executeArguments(frame, argumentsObjects);
blockObject = executeBlock(frame, blockObject);
argumentsObjects = executeArguments(frame, argumentsObjects);
blockObject = executeBlock(frame, blockObject);

if (isIndirect()) {
return indirectCallNode.call(
frame,
Expand Down
6 changes: 3 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedUnboxedDispatchNode.java
View file
Open in desktop
Expand Up @@ -97,9 +97,9 @@ public Object executeDispatch(

switch (getDispatchAction()) {
case CALL_METHOD: {
argumentsObjects = executeArguments(frame, argumentsObjects);
blockObject = executeBlock(frame, blockObject);
argumentsObjects = executeArguments(frame, argumentsObjects);
blockObject = executeBlock(frame, blockObject);

if (isIndirect()) {
return indirectCallNode.call(
frame,
Expand Down
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/dispatch/DispatchHeadNode.java
View file
Open in desktop
Expand Up @@ -94,6 +94,6 @@ public RubyNode[] getArgumentNodes() {
}

public ProcOrNullNode getBlock() {
return block;
return block;
}
}
8 changes: 4 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/nodes/dispatch/DispatchNode.java
View file
Open in desktop
Expand Up @@ -221,10 +221,10 @@ protected Object executeArguments(VirtualFrame frame, Object argumentOverride) {
}

protected Object executeBlock(VirtualFrame frame, Object blockOverride) {
if (blockOverride != null) {
return blockOverride;
}
if (blockOverride != null) {
return blockOverride;
}
if (block != null) {
return block.executeRubyProc(frame);
} else {
Expand Down
10 changes: 5 additions & 5 deletions truffle/src/main/java/org/jruby/truffle/nodes/dispatch/UncachedDispatchNode.java
View file
Open in desktop
Expand Up @@ -95,9 +95,9 @@ public Object executeDispatch(

if (method != null) {
if (dispatchAction == DispatchAction.CALL_METHOD) {
argumentsObjects = executeArguments(frame, argumentsObjects);
blockObject = executeBlock(frame, blockObject);
argumentsObjects = executeArguments(frame, argumentsObjects);
blockObject = executeBlock(frame, blockObject);

return callNode.call(
frame,
method.getCallTarget(),
Expand Down Expand Up @@ -136,8 +136,8 @@ public Object executeDispatch(

RubyArguments.arraycopy(argumentsObjectsArray, 0, modifiedArgumentsObjects, 1, argumentsObjectsArray.length);

blockObject = executeBlock(frame, blockObject);
blockObject = executeBlock(frame, blockObject);

return callNode.call(
frame,
missingMethod.getCallTarget(),
Expand Down