Skip to content

Commit 75ead13

Browse files
rakachanrakachan
committed
Reorder imports
1 parent b54ba32 commit 75ead13

File tree

90 files changed

+171
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+171
-185
lines changed

‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ClassfileStream.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@
2222
*/
2323
package com.oracle.truffle.espresso.classfile;
2424

25-
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
26-
import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
2725
import java.nio.BufferUnderflowException;
2826
import java.nio.ByteBuffer;
2927
import java.nio.ByteOrder;
3028

29+
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
30+
import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
31+
3132
/**
3233
* Operations for sequentially scanning data items in a class file. Any IO exceptions that occur
3334
* during scanning are converted to {@link ParserException.ClassFormatError}s.

‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ClasspathEntry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
*/
2323
package com.oracle.truffle.espresso.classfile;
2424

25-
import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
26-
2725
import java.io.File;
2826

27+
import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
28+
2929
/**
3030
* An entry in a classpath is a file system path that denotes an existing directory, an existing
3131
* zip/jar file or a file.

‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ClasspathFile.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
*/
2323
package com.oracle.truffle.espresso.classfile;
2424

25-
import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
26-
2725
import java.io.File;
2826

27+
import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
28+
2929
/**
3030
* Encapsulates the contents of a file loaded from an {@linkplain ClasspathEntry entry} on a
3131
* classpath.

‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ConstantPool.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,23 @@
2222
*/
2323
package com.oracle.truffle.espresso.classfile;
2424

25+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.CLASS;
26+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.DOUBLE;
27+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.FIELD_REF;
28+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.FLOAT;
29+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.INTEGER;
30+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.INTERFACE_METHOD_REF;
31+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.INVOKEDYNAMIC;
32+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.LONG;
33+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.METHOD_REF;
34+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.NAME_AND_TYPE;
35+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.STRING;
36+
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.UTF8;
37+
38+
import java.util.Arrays;
39+
import java.util.Formatter;
40+
2541
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
26-
import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
27-
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.ModifiedUTF8;
2842
import com.oracle.truffle.espresso.classfile.constantpool.ClassConstant;
2943
import com.oracle.truffle.espresso.classfile.constantpool.ClassMethodRefConstant;
3044
import com.oracle.truffle.espresso.classfile.constantpool.DoubleConstant;
@@ -40,22 +54,8 @@
4054
import com.oracle.truffle.espresso.classfile.constantpool.PoolConstant;
4155
import com.oracle.truffle.espresso.classfile.constantpool.StringConstant;
4256
import com.oracle.truffle.espresso.classfile.constantpool.Utf8Constant;
43-
44-
import java.util.Arrays;
45-
import java.util.Formatter;
46-
47-
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.CLASS;
48-
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.DOUBLE;
49-
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.FIELD_REF;
50-
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.FLOAT;
51-
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.INTEGER;
52-
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.INTERFACE_METHOD_REF;
53-
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.INVOKEDYNAMIC;
54-
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.LONG;
55-
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.METHOD_REF;
56-
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.NAME_AND_TYPE;
57-
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.STRING;
58-
import static com.oracle.truffle.espresso.classfile.ConstantPool.Tag.UTF8;
57+
import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
58+
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.ModifiedUTF8;
5959

6060
/**
6161
* Immutable, shareable constant-pool representation.

‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ImmutableConstantPool.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
*/
2323
package com.oracle.truffle.espresso.classfile;
2424

25+
import java.nio.ByteBuffer;
26+
import java.util.Arrays;
27+
import java.util.Objects;
28+
2529
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
2630
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
27-
import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
2831
import com.oracle.truffle.espresso.classfile.constantpool.ClassConstant;
2932
import com.oracle.truffle.espresso.classfile.constantpool.PoolConstant;
3033
import com.oracle.truffle.espresso.classfile.constantpool.Utf8Constant;
31-
32-
import java.nio.ByteBuffer;
33-
import java.util.Arrays;
34-
import java.util.Objects;
34+
import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
3535

3636
/**
3737
* Immutable constant pool implementation backed by an array of constants.

‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ParserField.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
*/
2323
package com.oracle.truffle.espresso.classfile;
2424

25+
import static com.oracle.truffle.espresso.classfile.Constants.ACC_HIDDEN;
26+
2527
import java.lang.reflect.Modifier;
2628

2729
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
30+
import com.oracle.truffle.espresso.classfile.attributes.Attribute;
2831
import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
2932
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
3033
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Type;
3134
import com.oracle.truffle.espresso.classfile.descriptors.Types;
32-
import com.oracle.truffle.espresso.classfile.attributes.Attribute;
33-
34-
import static com.oracle.truffle.espresso.classfile.Constants.ACC_HIDDEN;
3535

3636
public final class ParserField {
3737
public static final ParserField[] EMPTY_ARRAY = new ParserField[0];

‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ParserKlass.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
package com.oracle.truffle.espresso.classfile;
2424

2525
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
26+
import com.oracle.truffle.espresso.classfile.attributes.Attribute;
2627
import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
2728
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
2829
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Type;
29-
import com.oracle.truffle.espresso.classfile.attributes.Attribute;
3030

3131
/**
3232
* Immutable raw representation of classes in Espresso, this is the output of the parser, super

‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ParserMethod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
package com.oracle.truffle.espresso.classfile;
2424

2525
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
26+
import com.oracle.truffle.espresso.classfile.attributes.Attribute;
2627
import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
2728
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
2829
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Signature;
29-
import com.oracle.truffle.espresso.classfile.attributes.Attribute;
3030

3131
/**
3232
* Immutable raw representation of methods in Espresso, this is the output of the parser.

‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/ParsingContext.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
*/
2323
package com.oracle.truffle.espresso.classfile;
2424

25+
import java.util.function.Supplier;
26+
27+
import com.oracle.truffle.espresso.classfile.constantpool.Utf8Constant;
2528
import com.oracle.truffle.espresso.classfile.descriptors.ByteSequence;
2629
import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
2730
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
2831
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Type;
29-
import com.oracle.truffle.espresso.classfile.constantpool.Utf8Constant;
3032
import com.oracle.truffle.espresso.classfile.perf.TimerCollection;
3133

32-
import java.util.function.Supplier;
33-
3434
public interface ParsingContext {
3535

3636
JavaVersion getJavaVersion();

‎espresso/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/attributes/CodeAttribute.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@
2323

2424
package com.oracle.truffle.espresso.classfile.attributes;
2525

26-
import com.oracle.truffle.api.CompilerDirectives;
27-
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
28-
import com.oracle.truffle.espresso.classfile.bytecode.BytecodeStream;
29-
import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
30-
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
31-
import com.oracle.truffle.espresso.classfile.ClassfileParser;
32-
import com.oracle.truffle.espresso.classfile.ExceptionHandler;
33-
3426
import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.JSR;
3527
import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.JSR_W;
3628
import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.MONITORENTER;
3729
import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.MONITOREXIT;
3830
import static com.oracle.truffle.espresso.classfile.bytecode.Bytecodes.RET;
3931

32+
import com.oracle.truffle.api.CompilerDirectives;
33+
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
34+
import com.oracle.truffle.espresso.classfile.ClassfileParser;
35+
import com.oracle.truffle.espresso.classfile.ExceptionHandler;
36+
import com.oracle.truffle.espresso.classfile.bytecode.BytecodeStream;
37+
import com.oracle.truffle.espresso.classfile.descriptors.Symbol;
38+
import com.oracle.truffle.espresso.classfile.descriptors.Symbol.Name;
39+
4040
public final class CodeAttribute extends Attribute {
4141

4242
public static final Symbol<Name> NAME = Name.Code;

0 commit comments

Comments
 (0)