Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
GodRui
asm
Commits
72225c99
Commit
72225c99
authored
Jul 05, 2020
by
Eric Bruneton
Browse files
Merge branch 'rename-subtype-to-subclass' into 'master'
Rename remaining 'subtype' to 'subclass'. See merge request
asm/asm!295
parents
975df122
66a06368
Changes
6
Hide whitespace changes
Inline
Side-by-side
asm-test/src/main/java/org/objectweb/asm/test/AsmTest.java
View file @
72225c99
...
...
@@ -125,8 +125,7 @@ public abstract class AsmTest {
JDK11_ALL_STRUCTURES_NESTED
(
"jdk11.AllStructures$Nested"
),
JDK14_ALL_STRUCTURES_RECORD
(
"jdk14.AllStructures$RecordSubType"
),
JDK14_ALL_STRUCTURES_EMPTY_RECORD
(
"jdk14.AllStructures$EmptyRecord"
),
JDK15_ALL_STRUCTURES
(
"jdk15.AllStructures"
),
;
JDK15_ALL_STRUCTURES
(
"jdk15.AllStructures"
);
private
final
String
name
;
private
byte
[]
bytes
;
...
...
asm-test/src/main/java/org/objectweb/asm/test/ClassFile.java
View file @
72225c99
...
...
@@ -495,7 +495,7 @@ public class ClassFile {
}
else
if
(
attributeName
.
equals
(
"NestMembers"
))
{
dumpNestMembersAttribute
(
parser
,
builder
);
}
else
if
(
attributeName
.
equals
(
"PermittedSubclasses"
))
{
dumpPermittedSub
typ
esAttribute
(
parser
,
builder
);
dumpPermittedSub
class
esAttribute
(
parser
,
builder
);
}
else
if
(
attributeName
.
equals
(
"Record"
))
{
dumpRecordAttribute
(
parser
,
builder
);
}
else
if
(
attributeName
.
equals
(
"StackMap"
))
{
...
...
@@ -1691,17 +1691,17 @@ public class ClassFile {
}
/**
* Parses and dumps a PermittedSub
typ
es attribute.
* Parses and dumps a PermittedSub
class
es attribute.
*
* @param parser a class parser.
* @param builder a dump builder.
* @throws IOException if the class can't be parsed.
* @see <a href="https://openjdk.java.net/jeps/360">JEP 360</a>
*/
private
static
void
dumpPermittedSub
typ
esAttribute
(
final
Parser
parser
,
final
Builder
builder
)
private
static
void
dumpPermittedSub
class
esAttribute
(
final
Parser
parser
,
final
Builder
builder
)
throws
IOException
{
int
permittedSub
Typ
esCount
=
builder
.
add
(
"permitted_sub
typ
es_count: "
,
parser
.
u2
());
for
(
int
i
=
0
;
i
<
permittedSub
Typ
esCount
;
++
i
)
{
int
permittedSub
class
esCount
=
builder
.
add
(
"permitted_sub
class
es_count: "
,
parser
.
u2
());
for
(
int
i
=
0
;
i
<
permittedSub
class
esCount
;
++
i
)
{
builder
.
addCpInfo
(
"class: "
,
parser
.
u2
());
}
}
...
...
asm-test/src/resources/java/jdk15/AllStructures.java
View file @
72225c99
...
...
@@ -34,4 +34,4 @@ public sealed interface AllStructures {
record
RecordSubType
(
int
component1
,
String
component2
)
implements
AllStructures
{
}
}
\ No newline at end of file
}
asm-util/src/test/java/org/objectweb/asm/util/PrinterTest.java
View file @
72225c99
...
...
@@ -89,12 +89,12 @@ public class PrinterTest {
}
@Test
public
void
testVisitPermittedSub
type
_unsupportedByDefault
()
{
public
void
testVisitPermittedSub
class
_unsupportedByDefault
()
{
Printer
printer
=
new
EmptyPrinter
(
/* latest */
Opcodes
.
ASM10_EXPERIMENTAL
);
Executable
visitPermittedSub
type
=
()
->
printer
.
visitPermittedSubclass
(
null
);
Executable
visitPermittedSub
class
=
()
->
printer
.
visitPermittedSubclass
(
null
);
Exception
exception
=
assertThrows
(
UnsupportedOperationException
.
class
,
visitPermittedSub
type
);
Exception
exception
=
assertThrows
(
UnsupportedOperationException
.
class
,
visitPermittedSub
class
);
assertEquals
(
UNSUPPORTED_OPERATION_MESSAGE
,
exception
.
getMessage
());
}
...
...
asm/src/main/java/org/objectweb/asm/ClassVisitor.java
View file @
72225c99
...
...
@@ -30,7 +30,7 @@ package org.objectweb.asm;
/**
* A visitor to visit a Java class. The methods of this class must be called in the following order:
* {@code visit} [ {@code visitSource} ] [ {@code visitModule} ][ {@code visitNestHost} ][ {@code
* visitPermitted
Subtype
} ][ {@code visitOuterClass} ] ( {@code visitAnnotation} | {@code
* visitPermitted
class
} ][ {@code visitOuterClass} ] ( {@code visitAnnotation} | {@code
* visitTypeAnnotation} | {@code visitAttribute} )* ( {@code visitNestMember} | {@code
* visitInnerClass} | {@code visitRecordComponent} | {@code visitField} | {@code visitMethod} )*
* {@code visitEnd}.
...
...
asm/src/test/java/org/objectweb/asm/ClassReaderTest.java
View file @
72225c99
...
...
@@ -370,7 +370,7 @@ public class ClassReaderTest extends AsmTest implements Opcodes {
/**
* Tests the ClassReader accept method with a visitor that skips fields, methods, members,
* modules, nest host, permitted sub
typ
es and record.
* modules, nest host, permitted sub
class
es and record.
*/
@ParameterizedTest
@MethodSource
(
ALL_CLASSES_AND_ALL_APIS
)
...
...
@@ -470,7 +470,7 @@ public class ClassReaderTest extends AsmTest implements Opcodes {
Executable
accept
=
()
->
classReader
.
accept
(
classVisitor
,
0
);
boolean
hasPermittedSub
typ
es
=
classParameter
==
PrecompiledClass
.
JDK15_ALL_STRUCTURES
;
boolean
hasPermittedSub
class
es
=
classParameter
==
PrecompiledClass
.
JDK15_ALL_STRUCTURES
;
boolean
hasRecord
=
classParameter
==
PrecompiledClass
.
JDK14_ALL_STRUCTURES_RECORD
||
classParameter
==
PrecompiledClass
.
JDK14_ALL_STRUCTURES_EMPTY_RECORD
;
...
...
@@ -479,7 +479,7 @@ public class ClassReaderTest extends AsmTest implements Opcodes {
||
classParameter
==
PrecompiledClass
.
JDK11_ALL_STRUCTURES_NESTED
;
boolean
hasModules
=
classParameter
==
PrecompiledClass
.
JDK9_MODULE
;
boolean
hasTypeAnnotations
=
classParameter
==
PrecompiledClass
.
JDK8_ALL_STRUCTURES
;
if
((
hasPermittedSub
typ
es
&&
apiParameter
.
value
()
<
ASM9
)
if
((
hasPermittedSub
class
es
&&
apiParameter
.
value
()
<
ASM9
)
||
(
hasRecord
&&
apiParameter
.
value
()
<
ASM8
)
||
(
hasNestHostOrMembers
&&
apiParameter
.
value
()
<
ASM7
)
||
(
hasModules
&&
apiParameter
.
value
()
<
ASM6
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment