Skip to content

Commit 73e5f00

Browse files
mbdevplmbdevpl
committed
started migration to new generic implementation of handling lists of AST nodes
1 parent e00af06 commit 73e5f00

File tree

2 files changed

+186
-75
lines changed

2 files changed

+186
-75
lines changed

‎src/fortran/ofp/XMLPrinter.java‎

Lines changed: 66 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,7 @@ public void generic_name_list_part(Token id) {
8080
public void generic_name_list__begin() {
8181
if (context.getTagName().equals("specification") || context.getTagName().equals("file"))
8282
contextOpen("declaration");
83-
contextOpen("names");
84-
if (verbosity >= 100)
85-
super.generic_name_list__begin();
86-
}
87-
88-
public void generic_name_list(int count) {
89-
if (verbosity >= 100)
90-
super.generic_name_list(count);
91-
setAttribute("count", count);
92-
contextClose("names");
83+
super.generic_name_list__begin();
9384
}
9485

9586
public void specification_part(int numUseStmts, int numImportStmts, int numImplStmts, int numDeclConstructs) {
@@ -522,19 +513,19 @@ public void entity_decl(Token id, boolean hasArraySpec, boolean hasCoarraySpec,
522513
}
523514

524515
public void entity_decl_list__begin() {
525-
contextOpen("variables");
526-
if (verbosity >= 100)
516+
// contextOpen("variables");
517+
// if (verbosity >= 100)
527518
super.entity_decl_list__begin();
528519
contextOpen("variable");
529520
}
530521

531522
public void entity_decl_list(int count) {
532523
contextClose("variable");
533-
contextCloseAllInner("variables");
534-
if (verbosity >= 100)
524+
// contextCloseAllInner("variables");
525+
// if (verbosity >= 100)
535526
super.entity_decl_list(count);
536-
setAttribute("count", count);
537-
contextClose();
527+
// setAttribute("count", count);
528+
// contextClose();
538529
}
539530

540531
public void initialization(boolean hasExpr, boolean hasNullInit) {
@@ -689,17 +680,17 @@ public void data_stmt_object_list__begin() {
689680
if (!context.getTagName().equals("declaration"))
690681
contextOpen("declaration");
691682
setAttribute("type", "data");
692-
contextOpen("variables");
693-
if (verbosity >= 100)
683+
// contextOpen("variables");
684+
// if (verbosity >= 100)
694685
super.data_stmt_object_list__begin();
695686
}
696687

697688
public void data_stmt_object_list(int count) {
698-
contextCloseAllInner("variables");
699-
if (verbosity >= 100)
689+
// contextCloseAllInner("variables");
690+
// if (verbosity >= 100)
700691
super.data_stmt_object_list(count);
701-
setAttribute("count", count);
702-
contextClose("variables");
692+
// setAttribute("count", count);
693+
// contextClose("variables");
703694
}
704695

705696
public void data_stmt_value(Token asterisk) {
@@ -708,17 +699,17 @@ public void data_stmt_value(Token asterisk) {
708699
}
709700

710701
public void data_stmt_value_list__begin() {
711-
contextOpen("values");
712-
if (verbosity >= 100)
702+
// contextOpen("values");
703+
// if (verbosity >= 100)
713704
super.data_stmt_value_list__begin();
714705
}
715706

716707
public void data_stmt_value_list(int count) {
717-
contextCloseAllInner("values");
718-
if (verbosity >= 100)
708+
// contextCloseAllInner("values");
709+
// if (verbosity >= 100)
719710
super.data_stmt_value_list(count);
720-
setAttribute("count", count);
721-
contextClose("values");
711+
// setAttribute("count", count);
712+
// contextClose("values");
722713
}
723714

724715
public void hollerith_literal_constant(Token hollerithConstant) {
@@ -760,17 +751,17 @@ public void named_constant_def_list__begin() {
760751
if (!context.getTagName().equals("declaration"))
761752
contextOpen("declaration");
762753
setAttribute("type", "parameter");
763-
contextOpen("constants");
764-
if (verbosity >= 100)
754+
// contextOpen("constants");
755+
// if (verbosity >= 100)
765756
super.named_constant_def_list__begin();
766757
}
767758

768759
public void named_constant_def_list(int count) {
769-
contextCloseAllInner("constants");
770-
if (verbosity >= 100)
760+
// contextCloseAllInner("constants");
761+
// if (verbosity >= 100)
771762
super.named_constant_def_list(count);
772-
setAttribute("count", count);
773-
contextClose("constants");
763+
// setAttribute("count", count);
764+
// contextClose("constants");
774765
}
775766

776767
public void named_constant_def(Token id) {
@@ -793,17 +784,17 @@ public void pointer_stmt(Token label, Token keyword, Token eos) {
793784
public void pointer_decl_list__begin() {
794785
if (!context.getTagName().equals("declaration"))
795786
contextOpen("declaration");
796-
contextOpen("names");
797-
if (verbosity >= 100)
787+
// contextOpen("names");
788+
// if (verbosity >= 100)
798789
super.pointer_decl_list__begin();
799790
}
800791

801792
public void pointer_decl_list(int count) {
802-
contextCloseAllInner("names");
803-
if (verbosity >= 100)
793+
// contextCloseAllInner("names");
794+
// if (verbosity >= 100)
804795
super.pointer_decl_list(count);
805-
setAttribute("count", count);
806-
contextClose("names");
796+
// setAttribute("count", count);
797+
// contextClose("names");
807798
}
808799

809800
public void pointer_decl(Token id, boolean hasSpecList) {
@@ -871,16 +862,16 @@ public void letter_spec(Token id1, Token id2) {
871862
}
872863

873864
public void letter_spec_list__begin() {
874-
contextOpen("letter-ranges");
875-
if (verbosity >= 100)
865+
// contextOpen("letter-ranges");
866+
// if (verbosity >= 100)
876867
super.letter_spec_list__begin();
877868
}
878869

879870
public void letter_spec_list(int count) {
880-
contextCloseAllInner("letter-ranges");
881-
if (verbosity >= 100)
871+
// contextCloseAllInner("letter-ranges");
872+
// if (verbosity >= 100)
882873
super.letter_spec_list(count);
883-
contextClose();
874+
// contextClose();
884875
}
885876

886877
public void namelist_stmt(Token label, Token keyword, Token eos, int count) {
@@ -912,19 +903,19 @@ public void equivalence_set_list__begin() {
912903
if (!context.getTagName().equals("declaration"))
913904
contextOpen("declaration");
914905
setAttribute("type", "equivalence");
915-
contextOpen("equivalents");
916-
if (verbosity >= 100)
906+
// contextOpen("equivalents");
907+
// if (verbosity >= 100)
917908
super.equivalence_set_list__begin();
918909
contextOpen("equivalent");
919910
}
920911

921912
public void equivalence_set_list(int count) {
922913
contextClose("equivalent");
923-
contextCloseAllInner("equivalents");
924-
setAttribute("count", count);
925-
if (verbosity >= 100)
914+
// contextCloseAllInner("equivalents");
915+
// setAttribute("count", count);
916+
// if (verbosity >= 100)
926917
super.equivalence_set_list(count);
927-
contextClose();
918+
// contextClose();
928919
}
929920

930921
public void equivalence_object() {
@@ -952,17 +943,17 @@ public void common_block_name(Token id) {
952943
}
953944

954945
public void common_block_object_list__begin() {
955-
contextOpen("objects");
956-
if (verbosity >= 100)
946+
// contextOpen("objects");
947+
// if (verbosity >= 100)
957948
super.common_block_object_list__begin();
958949
}
959950

960951
public void common_block_object_list(int count) {
961-
contextCloseAllInner("objects");
962-
if (verbosity >= 100)
952+
// contextCloseAllInner("objects");
953+
// if (verbosity >= 100)
963954
super.common_block_object_list(count);
964-
setAttribute("count", count);
965-
contextClose();
955+
// setAttribute("count", count);
956+
// contextClose();
966957
}
967958

968959
public void variable() {
@@ -1081,19 +1072,19 @@ else if (hasLowerBound && !hasUpperBound && !hasStride) {
10811072
}
10821073

10831074
public void section_subscript_list__begin() {
1084-
contextOpen("subscripts");
1085-
if (verbosity >= 100)
1075+
// contextOpen("subscripts");
1076+
// if (verbosity >= 100)
10861077
super.section_subscript_list__begin();
10871078
// contextOpen("subscript");
10881079
}
10891080

10901081
public void section_subscript_list(int count) {
10911082
// contextClose("subscript");
1092-
contextCloseAllInner("subscripts");
1093-
if (verbosity >= 100)
1083+
// contextCloseAllInner("subscripts");
1084+
// if (verbosity >= 100)
10941085
super.section_subscript_list(count);
1095-
setAttribute("count", count);
1096-
contextClose("subscripts");
1086+
// setAttribute("count", count);
1087+
// contextClose("subscripts");
10971088
}
10981089

10991090
public void allocate_stmt(Token label, Token allocateKeyword, Token eos, boolean hasTypeSpec,
@@ -1151,17 +1142,17 @@ public void allocation(boolean hasAllocateShapeSpecList, boolean hasAllocateCoar
11511142
}
11521143

11531144
public void allocation_list__begin() {
1154-
contextOpen("expressions");
1155-
if (verbosity >= 100)
1145+
// contextOpen("expressions");
1146+
// if (verbosity >= 100)
11561147
super.allocation_list__begin();
11571148
}
11581149

11591150
public void allocation_list(int count) {
1160-
contextCloseAllInner("expressions");
1161-
setAttribute("count", count);
1162-
if (verbosity >= 100)
1151+
// contextCloseAllInner("expressions");
1152+
// setAttribute("count", count);
1153+
// if (verbosity >= 100)
11631154
super.allocation_list(count);
1164-
contextClose();
1155+
// contextClose();
11651156
}
11661157

11671158
public void allocate_object() {
@@ -1176,17 +1167,17 @@ public void allocate_object() {
11761167
}
11771168

11781169
public void allocate_object_list__begin() {
1179-
contextOpen("expressions");
1180-
if (verbosity >= 100)
1170+
// contextOpen("expressions");
1171+
// if (verbosity >= 100)
11811172
super.allocate_object_list__begin();
11821173
}
11831174

11841175
public void allocate_object_list(int count) {
1185-
contextCloseAllInner("expressions");
1186-
setAttribute("count", count);
1187-
if (verbosity >= 100)
1176+
// contextCloseAllInner("expressions");
1177+
// setAttribute("count", count);
1178+
// if (verbosity >= 100)
11881179
super.allocate_object_list(count);
1189-
contextClose();
1180+
// contextClose();
11901181
}
11911182

11921183
public void deallocate_stmt(Token label, Token deallocateKeyword, Token eos, boolean hasDeallocOptList) {

0 commit comments

Comments
 (0)