Skip to content

Commit 176446e

Browse files
lkuskovlkuskov
committed
7902688: Asmtools support for JEP 360: changing the name from SealedTypes to SealedClasses
1 parent 656d105 commit 176446e

File tree

11 files changed

+56
-56
lines changed

11 files changed

+56
-56
lines changed

‎src/org/openjdk/asmtools/jasm/ClassArrayAttr.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
* }
3838
* <p>
3939
* JEP 360 (Sealed types): class file 59.65535
40-
* PermittedSubtypes_attribute {
40+
* PermittedSubclasses_attribute {
4141
* u2 attribute_name_index;
4242
* u4 attribute_length;
43-
* u2 permitted_subtypes_count;
44-
* u2 classes[permitted_subtypes_count];
43+
* u2 number_of_classes;
44+
* u2 classes[number_of_classes];
4545
* }
4646
*/
4747
public class ClassArrayAttr extends AttrData {

‎src/org/openjdk/asmtools/jasm/ClassData.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ class ClassData extends MemberData {
5555
// JEP 359 - Record attribute since class file 58.65535
5656
private RecordData recordData;
5757

58-
// JEP 360 - PermittedSubtypes attribute since class file 59.65535
59-
private PermittedTypesAttr permittedTypesAttr;
58+
// JEP 360 - PermittedSubclasses attribute since class file 59.65535
59+
private PermittedSubclassesAttr permittedSubclassesAttr;
6060

6161
ModuleAttr moduleAttribute = null;
6262
Environment env;
@@ -311,9 +311,9 @@ public void addNestMembers(List<ConstantPool.ConstCell> classes) {
311311
nestMembersAttr = new NestMembersAttr(this, classes);
312312
}
313313

314-
public void addPermittedSubtypes(List<ConstantPool.ConstCell> classes) {
315-
env.traceln("addPermittedSubtypes");
316-
permittedTypesAttr = new PermittedTypesAttr(this, classes);
314+
public void addPermittedSubclasses(List<ConstantPool.ConstCell> classes) {
315+
env.traceln("addPermittedSubclasses");
316+
permittedSubclassesAttr = new PermittedSubclassesAttr(this, classes);
317317
}
318318

319319

@@ -459,8 +459,8 @@ protected DataVector getAttrVector() {
459459
if(nestMembersAttributesExist())
460460
attrs.add(nestMembersAttr);
461461
// since class version 59.65535 (JEP 360)
462-
if ( permittedSubtypesAttributesExist() )
463-
attrs.add(permittedTypesAttr);
462+
if ( permittedSubclassesAttributesExist() )
463+
attrs.add(permittedSubclassesAttr);
464464
}
465465
return attrs;
466466
}
@@ -515,7 +515,7 @@ public boolean nestHostAttributeExists() {
515515

516516
public boolean nestMembersAttributesExist() { return nestMembersAttr != null; }
517517

518-
public boolean permittedSubtypesAttributesExist() { return permittedTypesAttr != null; }
518+
public boolean permittedSubclassesAttributesExist() { return permittedSubclassesAttr != null; }
519519

520520
public boolean recordAttributeExists() { return recordData != null; }
521521

‎src/org/openjdk/asmtools/jasm/JasmTokens.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ public enum Token {
380380
RECORD (175, "RECORD", "Record", EnumSet.of(TokenType.DECLARATION, TokenType.JASM_IDENT, TokenType.MODULE_NAME ), KeywordType.KEYWORD),
381381
COMPONENT (176, "COMPONENT", "Component", EnumSet.of(TokenType.DECLARATION, TokenType.JASM_IDENT, TokenType.MODULE_NAME ), KeywordType.KEYWORD),
382382
//
383-
PERMITTEDSUBTYPES (177, "PERMITTEDSUBTYPES", "PermittedSubtypes", EnumSet.of(TokenType.DECLARATION, TokenType.JASM_IDENT, TokenType.MODULE_NAME ), KeywordType.KEYWORD),
383+
PERMITTEDSUBCLASSES (177, "PERMITTEDSUBCLASSES", "PermittedSubclasses", EnumSet.of(TokenType.DECLARATION, TokenType.JASM_IDENT, TokenType.MODULE_NAME ), KeywordType.KEYWORD),
384384

385385
//Module statements
386386
REQUIRES (180, "REQUIRES", "requires", EnumSet.of(TokenType.DECLARATION, TokenType.JASM_IDENT, TokenType.MODULE_NAME ), KeywordType.KEYWORD),

‎src/org/openjdk/asmtools/jasm/Parser.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ ConstCell parseName() throws Scanner.SyntaxError, IOException {
332332
case INNER_TYPE_TYPEPATH:
333333
case WILDCARD_TYPEPATH:
334334
case TYPE_ARGUMENT_TYPEPATH:
335-
case PERMITTEDSUBTYPES:
335+
case PERMITTEDSUBCLASSES:
336336
case INF:
337337
case NAN:
338338
case COMPONENT:
@@ -466,7 +466,7 @@ ConstCell parseClassName(boolean uncond) throws Scanner.SyntaxError, IOException
466466
case INNER_TYPE_TYPEPATH:
467467
case WILDCARD_TYPEPATH:
468468
case TYPE_ARGUMENT_TYPEPATH:
469-
case PERMITTEDSUBTYPES:
469+
case PERMITTEDSUBCLASSES:
470470
case INF:
471471
case NAN:
472472
case COMPONENT:
@@ -965,13 +965,13 @@ private void parseNestHost() throws Scanner.SyntaxError, IOException {
965965
}
966966

967967
/**
968-
* Parse a list of classes belonging to the [NestMembers | PermittedSubtypes] entry
968+
* Parse a list of classes belonging to the [NestMembers | PermittedSubclasses] entry
969969
*/
970970
private void parseClasses(Consumer<ArrayList<ConstCell>> classesConsumer)
971971
throws Scanner.SyntaxError, IOException {
972972
ArrayList<ConstCell> classes = new ArrayList<>();
973973
// Parses in the form:
974-
// (NESTMEMBERS|PERMITTEDSUBTYPES)? IDENT(, IDENT)*;
974+
// (NESTMEMBERS|PERMITTEDSUBCLASSES)? IDENT(, IDENT)*;
975975
debugStr(" [Parser.parseClasses]: <<<Begin>>>");
976976
while (true) {
977977
String className = prependPackage(parseIdent(), true);
@@ -1757,13 +1757,13 @@ private void parseClassMembers() throws IOException {
17571757
scanner.scan();
17581758
parseClasses(list -> cd.addNestMembers(list));
17591759
break;
1760-
case PERMITTEDSUBTYPES: // JEP 360
1760+
case PERMITTEDSUBCLASSES: // JEP 360
17611761
if (cd.nestMembersAttributesExist()) {
1762-
env.error(scanner.pos, "extra.permittedsubtypes.attribute");
1762+
env.error(scanner.pos, "extra.permittedsubclasses.attribute");
17631763
throw new Scanner.SyntaxError();
17641764
}
17651765
scanner.scan();
1766-
parseClasses(list -> cd.addPermittedSubtypes(list));
1766+
parseClasses(list -> cd.addPermittedSubclasses(list));
17671767
break;
17681768
case RECORD: // JEP 359
17691769
if (cd.recordAttributeExists()) {

‎src/org/openjdk/asmtools/jasm/PermittedTypesAttr.java‎ renamed to ‎src/org/openjdk/asmtools/jasm/PermittedSubclassesAttr.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
/**
2828
* The "classes[]" data of attributes
2929
* JEP 360 (Sealed types): class file 59.65535
30-
* PermittedSubtypes_attribute {
30+
* PermittedSubclasses_attribute {
3131
* u2 attribute_name_index;
3232
* u4 attribute_length;
33-
* u2 permitted_subtypes_count;
34-
* u2 classes[permitted_subtypes_count];
33+
* u2 number_of_classes;
34+
* u2 classes[number_of_classes];
3535
* }
3636
*/
37-
public class PermittedTypesAttr extends ClassArrayAttr {
38-
public PermittedTypesAttr(ClassData cdata, List<ConstantPool.ConstCell> classes) {
39-
super(Tables.AttrTag.ATT_PermittedSubtypes.parsekey(), cdata, classes);
37+
public class PermittedSubclassesAttr extends ClassArrayAttr {
38+
public PermittedSubclassesAttr(ClassData cdata, List<ConstantPool.ConstCell> classes) {
39+
super(Tables.AttrTag.ATT_PermittedSubclasses.parsekey(), cdata, classes);
4040
}
4141
}

‎src/org/openjdk/asmtools/jasm/Tables.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,13 @@ static public enum AttrTag {
229229
// }
230230
ATT_Record (34, "ATT_Record", "Record"),
231231
// JEP 360 (Sealed types): class file 59.65535
232-
// PermittedSubtypes_attribute {
232+
// PermittedSubclasses_attribute {
233233
// u2 attribute_name_index;
234234
// u4 attribute_length;
235-
// u2 permitted_subtypes_count;
236-
// u2 classes[permitted_subtypes_count];
235+
// u2 number_of_classes;
236+
// u2 classes[number_of_classes];
237237
// }
238-
ATT_PermittedSubtypes (35, "ATT_PermittedSubtypes", "PermittedSubtypes");
238+
ATT_PermittedSubclasses (35, "ATT_PermittedSubclasses", "PermittedSubclasses");
239239

240240
private final Integer value;
241241
private final String printval;

‎src/org/openjdk/asmtools/jasm/i18n.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ err.token.expected={0} expected.
7979
err.identifier.expected=Identifier expected.
8080
err.extra.nesthost.attribute=There may be at most one NestHost attribute.
8181
err.extra.nestmembers.attribute=There may be at most one NestMembers attribute.
82-
err.extra.permittedsubtypes.attribute=There may be at most one PermittedSubtypes attribute.
82+
err.extra.permittedsubclasses.attribute=There may be at most one PermittedSubclasses attribute.
8383
err.extra.record.attribute=There may be at most one Record attribute.
8484
err.grouped.component.expected=Either an annotation or a record component expected.
8585
warn.no.components.in.record.attribute=Record should have at least one component.

‎src/org/openjdk/asmtools/jdec/ClassData.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,13 +1008,13 @@ private void decodeAttr(DataInputStream in, PrintWriter out) throws IOException
10081008
// }
10091009
case ATT_NestMembers:
10101010
// JEP 360 (Sealed types): class file 59.65535
1011-
// PermittedSubtypes_attribute {
1011+
// PermittedSubclasses_attribute {
10121012
// u2 attribute_name_index;
10131013
// u4 attribute_length;
1014-
// u2 permitted_subtypes_count;
1015-
// u2 classes[permitted_subtypes_count];
1014+
// u2 number_of_classes;
1015+
// u2 classes[number_of_classes];
10161016
// }
1017-
case ATT_PermittedSubtypes:
1017+
case ATT_PermittedSubclasses:
10181018
int nsubtypes = in.readUnsignedShort();
10191019
startArrayCmt(nsubtypes, "classes");
10201020
try {

‎src/org/openjdk/asmtools/jdis/ClassArrayData.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
* }
3838
* <p>
3939
* JEP 360 (Sealed types): class file 59.65535
40-
* PermittedSubtypes_attribute {
40+
* PermittedSubclasses_attribute {
4141
* u2 attribute_name_index;
4242
* u4 attribute_length;
43-
* u2 permitted_subtypes_count;
44-
* u2 classes[permitted_subtypes_count];
43+
* u2 number_of_classes;
44+
* u2 classes[number_of_classes];
4545
* }
4646
* </p>
4747
*/
48-
public class ClassArrayData {
48+
public class ClassArrayData extends Indenter {
4949
String name;
5050
ClassData cls;
5151
int[] classes;
@@ -72,7 +72,7 @@ public void print() {
7272
String indexes = "";
7373
String names = "";
7474
boolean pr_cpx = options.contains(Options.PR.CPX);
75-
cls.out.print(name + " ");
75+
cls.out.print(getIndentString() + name + " ");
7676
for (int i = 0; i < classes.length; i++) {
7777
if (pr_cpx) {
7878
indexes += (indexes.isEmpty() ? "" : ", ") + "#" + classes[i];

‎src/org/openjdk/asmtools/jdis/ClassData.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ public class ClassData extends MemberData {
9696
// The NestMembers of this class (since class file: 55.0)
9797
protected NestMembersData nestMembers;
9898

99-
// The PermittedSubtypes of this class (JEP 360 (Sealed types): class file 59.65535)
100-
protected PermittedSubtypesData permittedSubtypes;
99+
// The PermittedSubclasses of this class (JEP 360 (Sealed types): class file 59.65535)
100+
protected PermittedSubclassesData permittedSubclassesData;
101101

102102
// other parsing fields
103103
protected PrintWriter out;
@@ -228,9 +228,9 @@ protected boolean handleAttributes(DataInputStream in, AttrTag attrtag, int attr
228228
case ATT_Record:
229229
record = new RecordData(this).read(in);
230230
break;
231-
case ATT_PermittedSubtypes:
232-
// Read PermittedSubtypes Attribute (JEP 360 (Sealed types): class file 59.65535)
233-
permittedSubtypes = new PermittedSubtypesData(this).read(in, attrlen);
231+
case ATT_PermittedSubclasses:
232+
// Read PermittedSubclasses Attribute (JEP 360 (Sealed types): class file 59.65535)
233+
permittedSubclassesData = new PermittedSubclassesData(this).read(in, attrlen);
234234
break;
235235
default:
236236
handled = false;
@@ -448,9 +448,9 @@ public void print() throws IOException {
448448
record.print();
449449
}
450450

451-
// Print PermittedSubtypes Attribute (JEP 360 (Sealed types): class file 59.65535)
452-
if( permittedSubtypes != null) {
453-
permittedSubtypes.print();
451+
// Print PermittedSubclasses Attribute (JEP 360 (Sealed types): class file 59.65535)
452+
if( permittedSubclassesData != null) {
453+
permittedSubclassesData.print();
454454
}
455455
// Print the NestHost (since class file: 55.0)
456456
if(nestHost != null) {

0 commit comments

Comments
 (0)