Skip to content

Commit bc8df05

Browse files
lukasstadlerlukasstadler
committed
style fixes and simplifications
1 parent ee64126 commit bc8df05

File tree

18 files changed

+37
-47
lines changed

18 files changed

+37
-47
lines changed

‎graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import java.io.IOException;
4949
import java.util.Arrays;
5050
import java.util.List;
51+
import java.io.UnsupportedEncodingException;
5152

5253
import org.graalvm.polyglot.Context;
5354
import org.graalvm.polyglot.Context.Builder;
@@ -99,7 +100,7 @@ public void evalFailsOnError() {
99100
}
100101

101102
@Test
102-
public void truffleMethodExport() throws Exception {
103+
public void truffleMethodExport() {
103104
String source = "import polyglot\n" +
104105
"@polyglot.export_value\n" +
105106
"def foo():\n" +
@@ -111,7 +112,7 @@ public void truffleMethodExport() throws Exception {
111112
}
112113

113114
@Test
114-
public void javaArraySet() throws Exception {
115+
public void javaArraySet() {
115116
String source = "import java\n" +
116117
"array = java.type(\"int[]\")(4)\n" +
117118
"array[2] = 42\n" +
@@ -120,7 +121,7 @@ public void javaArraySet() throws Exception {
120121
}
121122

122123
@Test
123-
public void testPassingFloats() throws Exception {
124+
public void testPassingFloats() throws UnsupportedEncodingException {
124125
String source = "import polyglot\n" +
125126
"@polyglot.export_value\n" +
126127
"def foo(x, y):\n" +
@@ -133,7 +134,7 @@ public void testPassingFloats() throws Exception {
133134
}
134135

135136
@Test
136-
public void testAsFunction() throws Exception {
137+
public void testAsFunction() throws UnsupportedEncodingException {
137138
String source = "import polyglot\n" +
138139
"@polyglot.export_value\n" +
139140
"def foo():\n" +
@@ -146,7 +147,7 @@ public void testAsFunction() throws Exception {
146147
}
147148

148149
@Test
149-
public void testAsFunctionVarArgs() throws Exception {
150+
public void testAsFunctionVarArgs() throws UnsupportedEncodingException {
150151
String source = "import polyglot\n" +
151152
"@polyglot.export_value\n" +
152153
"def foo(a, b):\n" +
@@ -159,7 +160,7 @@ public void testAsFunctionVarArgs() throws Exception {
159160
}
160161

161162
@Test
162-
public void mainFunctionsAreImplicitlyImporteable() throws Exception {
163+
public void mainFunctionsAreImplicitlyImporteable() throws UnsupportedEncodingException {
163164
String source = "def foo(a, b):\n" +
164165
" print(a, b)\n\n";
165166
Source script = Source.create("python", source);
@@ -170,7 +171,7 @@ public void mainFunctionsAreImplicitlyImporteable() throws Exception {
170171
}
171172

172173
@Test
173-
public void builtinFunctionsAreImporteable() throws Exception {
174+
public void builtinFunctionsAreImporteable() throws UnsupportedEncodingException {
174175
String source = "pass";
175176
Source script = Source.create("python", source);
176177
context.eval(script);
@@ -180,7 +181,7 @@ public void builtinFunctionsAreImporteable() throws Exception {
180181
}
181182

182183
@Test
183-
public void testMultipleInvocationsAreInSameScope() throws Exception {
184+
public void testMultipleInvocationsAreInSameScope() throws UnsupportedEncodingException {
184185
String source = "def foo(a, b):\n" +
185186
" print(a, b)\n" +
186187
"foo";

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,12 @@ protected OptionDescriptors getOptionDescriptors() {
221221
}
222222

223223
@Override
224-
protected void initializeContext(PythonContext context) throws Exception {
224+
protected void initializeContext(PythonContext context) {
225225
context.initialize();
226226
}
227227

228228
@Override
229-
protected CallTarget parse(ParsingRequest request) throws Exception {
229+
protected CallTarget parse(ParsingRequest request) {
230230
PythonContext context = this.getContextReference().get();
231231
PythonCore core = context.getCore();
232232
Source source = request.getSource();
@@ -253,7 +253,7 @@ private RootNode doParse(PythonCore pythonCore, Source source) {
253253
}
254254

255255
@Override
256-
protected ExecutableNode parse(InlineParsingRequest request) throws Exception {
256+
protected ExecutableNode parse(InlineParsingRequest request) {
257257
CompilerDirectives.transferToInterpreter();
258258
final Source source = request.getSource();
259259
final MaterializedFrame requestFrame = request.getFrame();

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/keywords/ExecuteKeywordStarargsNode.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,12 @@
5353
import com.oracle.truffle.api.dsl.Cached;
5454
import com.oracle.truffle.api.dsl.ImportStatic;
5555
import com.oracle.truffle.api.dsl.NodeChild;
56-
import com.oracle.truffle.api.dsl.NodeChildren;
5756
import com.oracle.truffle.api.dsl.Specialization;
5857
import com.oracle.truffle.api.frame.VirtualFrame;
5958
import com.oracle.truffle.api.nodes.Node;
6059

6160
@ImportStatic(PythonOptions.class)
62-
@NodeChildren({@NodeChild(value = "starargs", type = ExpressionNode.class)})
61+
@NodeChild(value = "starargs", type = ExpressionNode.class)
6362
public abstract class ExecuteKeywordStarargsNode extends Node {
6463
public abstract PKeyword[] execute(VirtualFrame frame);
6564

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/DeleteAttributeNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
import com.oracle.graal.python.nodes.statement.StatementNode;
4646
import com.oracle.truffle.api.dsl.Cached;
4747
import com.oracle.truffle.api.dsl.NodeChild;
48-
import com.oracle.truffle.api.dsl.NodeChildren;
4948
import com.oracle.truffle.api.dsl.Specialization;
5049

51-
@NodeChildren({@NodeChild(value = "object", type = ExpressionNode.class), @NodeChild(value = "key", type = ExpressionNode.class)})
50+
@NodeChild(value = "object", type = ExpressionNode.class)
51+
@NodeChild(value = "key", type = ExpressionNode.class)
5252
public abstract class DeleteAttributeNode extends StatementNode {
5353
public static DeleteAttributeNode create() {
5454
return DeleteAttributeNodeGen.create(null, null);

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/SetAttributeNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
import com.oracle.graal.python.nodes.statement.StatementNode;
5050
import com.oracle.truffle.api.dsl.Cached;
5151
import com.oracle.truffle.api.dsl.NodeChild;
52-
import com.oracle.truffle.api.dsl.NodeChildren;
5352
import com.oracle.truffle.api.dsl.Specialization;
5453
import com.oracle.truffle.api.frame.VirtualFrame;
5554

56-
@NodeChildren({@NodeChild(value = "object", type = ExpressionNode.class), @NodeChild(value = "rhs", type = ExpressionNode.class)})
55+
@NodeChild(value = "object", type = ExpressionNode.class)
56+
@NodeChild(value = "rhs", type = ExpressionNode.class)
5757
public abstract class SetAttributeNode extends StatementNode implements WriteNode {
5858

5959
public static final class Dynamic extends PNodeWithContext {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/InvokeNode.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,7 @@ protected static Arity getArity(PythonCallable callee) {
111111
}
112112

113113
protected static boolean isBuiltin(PythonCallable callee) {
114-
if (callee instanceof PBuiltinFunction || callee instanceof PBuiltinMethod || callee instanceof PythonBuiltinClass) {
115-
return true;
116-
} else {
117-
return false;
118-
}
114+
return callee instanceof PBuiltinFunction || callee instanceof PBuiltinMethod || callee instanceof PythonBuiltinClass;
119115
}
120116
}
121117

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/cell/WriteLocalCellNode.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,13 @@
3434
import com.oracle.graal.python.nodes.statement.StatementNode;
3535
import com.oracle.truffle.api.CompilerDirectives;
3636
import com.oracle.truffle.api.dsl.NodeChild;
37-
import com.oracle.truffle.api.dsl.NodeChildren;
3837
import com.oracle.truffle.api.dsl.Specialization;
3938
import com.oracle.truffle.api.frame.FrameSlot;
4039
import com.oracle.truffle.api.frame.VirtualFrame;
4140
import com.oracle.truffle.api.nodes.NodeInfo;
4241

4342
@NodeInfo(shortName = "write_cell")
44-
@NodeChildren({@NodeChild(value = "rhs", type = ExpressionNode.class)})
43+
@NodeChild(value = "rhs", type = ExpressionNode.class)
4544
public abstract class WriteLocalCellNode extends StatementNode implements WriteIdentifierNode {
4645
@Child private ExpressionNode readLocal;
4746

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/BinaryOpNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
import com.oracle.graal.python.nodes.PGuards;
2929
import com.oracle.truffle.api.dsl.NodeChild;
30-
import com.oracle.truffle.api.dsl.NodeChildren;
3130
import com.oracle.truffle.api.nodes.UnexpectedResultException;
3231

33-
@NodeChildren({@NodeChild(value = "leftNode", type = ExpressionNode.class), @NodeChild(value = "rightNode", type = ExpressionNode.class)})
32+
@NodeChild(value = "leftNode", type = ExpressionNode.class)
33+
@NodeChild(value = "rightNode", type = ExpressionNode.class)
3434
public abstract class BinaryOpNode extends ExpressionNode {
3535
public abstract ExpressionNode getLeftNode();
3636

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/LookupAndCallInplaceNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
import com.oracle.truffle.api.CompilerDirectives;
5252
import com.oracle.truffle.api.dsl.Cached;
5353
import com.oracle.truffle.api.dsl.NodeChild;
54-
import com.oracle.truffle.api.dsl.NodeChildren;
5554
import com.oracle.truffle.api.dsl.Specialization;
5655

57-
@NodeChildren({@NodeChild("arg"), @NodeChild("arg2")})
56+
@NodeChild("arg")
57+
@NodeChild("arg2")
5858
public abstract class LookupAndCallInplaceNode extends ExpressionNode {
5959

6060
public abstract static class NotImplementedHandler extends PNodeWithContext {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/WriteGlobalNode.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@
4949
import com.oracle.graal.python.nodes.subscript.SetItemNode;
5050
import com.oracle.truffle.api.dsl.Cached;
5151
import com.oracle.truffle.api.dsl.NodeChild;
52-
import com.oracle.truffle.api.dsl.NodeChildren;
5352
import com.oracle.truffle.api.dsl.Specialization;
5453
import com.oracle.truffle.api.frame.VirtualFrame;
5554

56-
@NodeChildren({@NodeChild(value = "rhs", type = ExpressionNode.class)})
55+
@NodeChild(value = "rhs", type = ExpressionNode.class)
5756
public abstract class WriteGlobalNode extends StatementNode implements GlobalNode, WriteNode {
5857
protected final String attributeId;
5958

0 commit comments

Comments
 (0)