Skip to content

Commit abfd96d

Browse files
EricGrangeEricGrange
committed
Reactivate BuildTests + update cmaps
1 parent e8bfad1 commit abfd96d

15 files changed

Lines changed: 440 additions & 152 deletions

‎Test/BuildScripts/ImplementInWrongUnit.cmap‎

Lines changed: 57 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@
66
{
77
"Token" : "ttUSES",
88
"Symbol" : null,
9-
"SubContexts" : [ ]
9+
"SubContexts" : [ ],
10+
"Start" : " [line: 1, column: 1]",
11+
"End" : " [line: 1, column: 50]"
1012
}
11-
]
13+
],
14+
"Start" : " [line: 1, column: 1]",
15+
"End" : " [line: 5, column: 1]"
1216
},
1317
{
1418
"Token" : "ttUNIT",
@@ -30,27 +34,37 @@
3034
"Class" : "TClassSymbol",
3135
"Name" : "TTest1"
3236
},
33-
"SubContexts" : [ ]
37+
"SubContexts" : [ ],
38+
"Start" : " [line: 6, column: 4, file: ImplementInWrongUnit1]",
39+
"End" : " [line: 10, column: 10, file: ImplementInWrongUnit1]"
3440
},
3541
{
3642
"Token" : "ttPROCEDURE",
3743
"Symbol" : {
3844
"Class" : "TSourceFuncSymbol",
3945
"Name" : "World"
4046
},
41-
"SubContexts" : [ ]
47+
"SubContexts" : [ ],
48+
"Start" : " [line: 10, column: 1, file: ImplementInWrongUnit1]",
49+
"End" : " [line: 12, column: 1, file: ImplementInWrongUnit1]"
4250
}
43-
]
51+
],
52+
"Start" : " [line: 3, column: 1, file: ImplementInWrongUnit1]",
53+
"End" : " [line: 12, column: 1, file: ImplementInWrongUnit1]"
4454
},
4555
{
4656
"Token" : "ttIMPLEMENTATION",
4757
"Symbol" : {
4858
"Class" : "TUnitMainSymbol",
4959
"Name" : "ImplementInWrongUnit1"
5060
},
51-
"SubContexts" : [ ]
61+
"SubContexts" : [ ],
62+
"Start" : " [line: 12, column: 1, file: ImplementInWrongUnit1]",
63+
"End" : ""
5264
}
53-
]
65+
],
66+
"Start" : " [line: 1, column: 1, file: ImplementInWrongUnit1]",
67+
"End" : ""
5468
},
5569
{
5670
"Token" : "ttUNIT",
@@ -72,17 +86,23 @@
7286
"Class" : "TClassSymbol",
7387
"Name" : "TTest2"
7488
},
75-
"SubContexts" : [ ]
89+
"SubContexts" : [ ],
90+
"Start" : " [line: 6, column: 4, file: ImplementInWrongUnit2]",
91+
"End" : " [line: 10, column: 10, file: ImplementInWrongUnit2]"
7692
},
7793
{
7894
"Token" : "ttPROCEDURE",
7995
"Symbol" : {
8096
"Class" : "TSourceFuncSymbol",
8197
"Name" : "Hello"
8298
},
83-
"SubContexts" : [ ]
99+
"SubContexts" : [ ],
100+
"Start" : " [line: 10, column: 1, file: ImplementInWrongUnit2]",
101+
"End" : " [line: 12, column: 1, file: ImplementInWrongUnit2]"
84102
}
85-
]
103+
],
104+
"Start" : " [line: 3, column: 1, file: ImplementInWrongUnit2]",
105+
"End" : " [line: 12, column: 1, file: ImplementInWrongUnit2]"
86106
},
87107
{
88108
"Token" : "ttIMPLEMENTATION",
@@ -94,7 +114,9 @@
94114
{
95115
"Token" : "ttUSES",
96116
"Symbol" : null,
97-
"SubContexts" : [ ]
117+
"SubContexts" : [ ],
118+
"Start" : " [line: 14, column: 1, file: ImplementInWrongUnit2]",
119+
"End" : " [line: 14, column: 27, file: ImplementInWrongUnit2]"
98120
},
99121
{
100122
"Token" : "ttPROCEDURE",
@@ -113,11 +135,17 @@
113135
{
114136
"Token" : "ttBEGIN",
115137
"Symbol" : null,
116-
"SubContexts" : [ ]
138+
"SubContexts" : [ ],
139+
"Start" : " [line: 17, column: 6, file: ImplementInWrongUnit2]",
140+
"End" : " [line: 19, column: 4, file: ImplementInWrongUnit2]"
117141
}
118-
]
142+
],
143+
"Start" : " [line: 17, column: 6, file: ImplementInWrongUnit2]",
144+
"End" : " [line: 19, column: 4, file: ImplementInWrongUnit2]"
119145
}
120-
]
146+
],
147+
"Start" : " [line: 16, column: 1, file: ImplementInWrongUnit2]",
148+
"End" : " [line: 19, column: 4, file: ImplementInWrongUnit2]"
121149
},
122150
{
123151
"Token" : "ttPROCEDURE",
@@ -136,14 +164,24 @@
136164
{
137165
"Token" : "ttBEGIN",
138166
"Symbol" : null,
139-
"SubContexts" : [ ]
167+
"SubContexts" : [ ],
168+
"Start" : " [line: 21, column: 18, file: ImplementInWrongUnit2]",
169+
"End" : " [line: 21, column: 18, file: ImplementInWrongUnit2]"
140170
}
141-
]
171+
],
172+
"Start" : " [line: 21, column: 18, file: ImplementInWrongUnit2]",
173+
"End" : " [line: 21, column: 18, file: ImplementInWrongUnit2]"
142174
}
143-
]
175+
],
176+
"Start" : " [line: 21, column: 1, file: ImplementInWrongUnit2]",
177+
"End" : " [line: 21, column: 18, file: ImplementInWrongUnit2]"
144178
}
145-
]
179+
],
180+
"Start" : " [line: 12, column: 1, file: ImplementInWrongUnit2]",
181+
"End" : ""
146182
}
147-
]
183+
],
184+
"Start" : " [line: 1, column: 1, file: ImplementInWrongUnit2]",
185+
"End" : ""
148186
}
149187
]

‎Test/BuildScripts/InvalidDottedName.cmap‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
{
33
"Token" : "ttUNIT",
44
"Symbol" : null,
5-
"SubContexts" : [ ]
5+
"SubContexts" : [ ],
6+
"Start" : " [line: 1, column: 1]",
7+
"End" : ""
68
}
79
]

‎Test/BuildScripts/circular_dependency1.cmap‎

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@
66
{
77
"Token" : "ttUSES",
88
"Symbol" : null,
9-
"SubContexts" : [ ]
9+
"SubContexts" : [ ],
10+
"Start" : " [line: 1, column: 1]",
11+
"End" : " [line: 1, column: 15]"
1012
}
11-
]
13+
],
14+
"Start" : " [line: 1, column: 1]",
15+
"End" : ""
1216
},
1317
{
1418
"Token" : "ttUNIT",
@@ -27,11 +31,17 @@
2731
{
2832
"Token" : "ttUSES",
2933
"Symbol" : null,
30-
"SubContexts" : [ ]
34+
"SubContexts" : [ ],
35+
"Start" : " [line: 5, column: 1, file: CircularA]",
36+
"End" : " [line: 5, column: 15, file: CircularA]"
3137
}
32-
]
38+
],
39+
"Start" : " [line: 3, column: 1, file: CircularA]",
40+
"End" : ""
3341
}
34-
]
42+
],
43+
"Start" : " [line: 1, column: 1, file: CircularA]",
44+
"End" : ""
3545
},
3646
{
3747
"Token" : "ttUNIT",
@@ -50,11 +60,17 @@
5060
{
5161
"Token" : "ttUSES",
5262
"Symbol" : null,
53-
"SubContexts" : [ ]
63+
"SubContexts" : [ ],
64+
"Start" : " [line: 5, column: 1, file: CircularB]",
65+
"End" : " [line: 5, column: 15, file: CircularB]"
5466
}
55-
]
67+
],
68+
"Start" : " [line: 3, column: 1, file: CircularB]",
69+
"End" : ""
5670
}
57-
]
71+
],
72+
"Start" : " [line: 1, column: 1, file: CircularB]",
73+
"End" : ""
5874
},
5975
{
6076
"Token" : "ttUNIT",
@@ -73,10 +89,16 @@
7389
{
7490
"Token" : "ttUSES",
7591
"Symbol" : null,
76-
"SubContexts" : [ ]
92+
"SubContexts" : [ ],
93+
"Start" : " [line: 5, column: 1, file: CircularC]",
94+
"End" : " [line: 5, column: 15, file: CircularC]"
7795
}
78-
]
96+
],
97+
"Start" : " [line: 3, column: 1, file: CircularC]",
98+
"End" : ""
7999
}
80-
]
100+
],
101+
"Start" : " [line: 1, column: 1, file: CircularC]",
102+
"End" : ""
81103
}
82-
]
104+
]

‎Test/BuildScripts/ctx_main.cmap‎

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@
1313
"Class" : "TClassSymbol",
1414
"Name" : "TTest"
1515
},
16-
"SubContexts" : [ ]
16+
"SubContexts" : [ ],
17+
"Start" : " [line: 1, column: 6, file: ctx_sub1.pas]",
18+
"End" : " [line: 6, column: 1, file: ctx_sub1.pas]"
1719
}
18-
]
20+
],
21+
"Start" : " [line: 1, column: 1, file: ctx_sub1.pas]",
22+
"End" : " [line: 6, column: 1, file: ctx_sub1.pas]"
1923
},
2024
{
2125
"Token" : "ttSWITCH",
@@ -38,13 +42,21 @@
3842
{
3943
"Token" : "ttBEGIN",
4044
"Symbol" : null,
41-
"SubContexts" : [ ]
45+
"SubContexts" : [ ],
46+
"Start" : " [line: 2, column: 6, file: ctx_sub2.pas]",
47+
"End" : " [line: 3, column: 4, file: ctx_sub2.pas]"
4248
}
43-
]
49+
],
50+
"Start" : " [line: 2, column: 6, file: ctx_sub2.pas]",
51+
"End" : " [line: 3, column: 4, file: ctx_sub2.pas]"
4452
}
45-
]
53+
],
54+
"Start" : " [line: 1, column: 1, file: ctx_sub2.pas]",
55+
"End" : " [line: 3, column: 4, file: ctx_sub2.pas]"
4656
}
47-
]
57+
],
58+
"Start" : " [line: 1, column: 1, file: ctx_sub2.pas]",
59+
"End" : " [line: 6, column: 1, file: ctx_sub2.pas]"
4860
},
4961
{
5062
"Token" : "ttCONSTRUCTOR",
@@ -63,11 +75,17 @@
6375
{
6476
"Token" : "ttBEGIN",
6577
"Symbol" : null,
66-
"SubContexts" : [ ]
78+
"SubContexts" : [ ],
79+
"Start" : " [line: 5, column: 6]",
80+
"End" : " [line: 6, column: 4]"
6781
}
68-
]
82+
],
83+
"Start" : " [line: 4, column: 27]",
84+
"End" : " [line: 6, column: 4]"
6985
}
70-
]
86+
],
87+
"Start" : " [line: 4, column: 1]",
88+
"End" : " [line: 6, column: 4]"
7189
},
7290
{
7391
"Token" : "ttFUNCTION",
@@ -86,12 +104,20 @@
86104
{
87105
"Token" : "ttBEGIN",
88106
"Symbol" : null,
89-
"SubContexts" : [ ]
107+
"SubContexts" : [ ],
108+
"Start" : " [line: 9, column: 6]",
109+
"End" : " [line: 11, column: 4]"
90110
}
91-
]
111+
],
112+
"Start" : " [line: 9, column: 6]",
113+
"End" : " [line: 11, column: 4]"
92114
}
93-
]
115+
],
116+
"Start" : " [line: 8, column: 1]",
117+
"End" : " [line: 11, column: 4]"
94118
}
95-
]
119+
],
120+
"Start" : " [line: 1, column: 1]",
121+
"End" : ""
96122
}
97123
]

‎Test/BuildScripts/missing_unit1.cmap‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@
66
{
77
"Token" : "ttUSES",
88
"Symbol" : null,
9-
"SubContexts" : [ ]
9+
"SubContexts" : [ ],
10+
"Start" : " [line: 1, column: 1]",
11+
"End" : " [line: 1, column: 11]"
1012
}
11-
]
13+
],
14+
"Start" : " [line: 1, column: 1]",
15+
"End" : " [line: 4, column: 1]"
1216
}
13-
]
17+
]

‎Test/BuildScripts/missing_unit2.cmap‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@
66
{
77
"Token" : "ttUSES",
88
"Symbol" : null,
9-
"SubContexts" : [ ]
9+
"SubContexts" : [ ],
10+
"Start" : " [line: 1, column: 1]",
11+
"End" : " [line: 1, column: 20]"
1012
}
11-
]
13+
],
14+
"Start" : " [line: 1, column: 1]",
15+
"End" : " [line: 4, column: 1]"
1216
},
1317
{
1418
"Token" : "ttUNIT",
@@ -20,8 +24,12 @@
2024
{
2125
"Token" : "ttUSES",
2226
"Symbol" : null,
23-
"SubContexts" : [ ]
27+
"SubContexts" : [ ],
28+
"Start" : " [line: 3, column: 1, file: Missing]",
29+
"End" : " [line: 3, column: 15, file: Missing]"
2430
}
25-
]
31+
],
32+
"Start" : " [line: 1, column: 1, file: Missing]",
33+
"End" : " [line: 4, column: 1, file: Missing]"
2634
}
27-
]
35+
]

0 commit comments

Comments
 (0)