Project

General

Profile

Revision 9

Added by Willibald K. over 8 years ago

remove support for Qualitative Action Systems, rename UlyssesType to Type

View differences:

OoaCompleteAstTraversalVisitor.java
42 42
import org.momut.ooas.ast.expressions.ListConstructor;
43 43
import org.momut.ooas.ast.expressions.MapConstructor;
44 44
import org.momut.ooas.ast.expressions.ObjectConstructor;
45
import org.momut.ooas.ast.expressions.QValConstructor;
46 45
import org.momut.ooas.ast.expressions.SetConstructor;
47 46
import org.momut.ooas.ast.expressions.TernaryOperator;
48 47
import org.momut.ooas.ast.expressions.TupleConstructor;
......
57 56
import org.momut.ooas.ast.identifiers.EnumIdentifier;
58 57
import org.momut.ooas.ast.identifiers.ExpressionVariableIdentifier;
59 58
import org.momut.ooas.ast.identifiers.Identifier;
60
import org.momut.ooas.ast.identifiers.LandmarkIdentifier;
61 59
import org.momut.ooas.ast.identifiers.LocalVariableIdentifier;
62 60
import org.momut.ooas.ast.identifiers.MainModule;
63 61
import org.momut.ooas.ast.identifiers.MethodIdentifier;
......
78 76
import org.momut.ooas.ast.statements.KillStatement;
79 77
import org.momut.ooas.ast.statements.NondetBlock;
80 78
import org.momut.ooas.ast.statements.PrioBlock;
81
import org.momut.ooas.ast.statements.QualitativeConstraintStatement;
82 79
import org.momut.ooas.ast.statements.SeqBlock;
83 80
import org.momut.ooas.ast.statements.SkipStatement;
84 81
import org.momut.ooas.ast.statements.Statement;
......
94 91
import org.momut.ooas.ast.types.NullType;
95 92
import org.momut.ooas.ast.types.OoActionSystemType;
96 93
import org.momut.ooas.ast.types.OpaqueType;
97
import org.momut.ooas.ast.types.QrType;
98 94
import org.momut.ooas.ast.types.TupleType;
99
import org.momut.ooas.ast.types.UlyssesType;
95
import org.momut.ooas.ast.types.Type;
100 96
import org.momut.ooas.parser.ParserState;
101 97

  
102 98
public abstract class OoaCompleteAstTraversalVisitor implements IAstVisitor
......
122 118
	/// </summary>
123 119
	/// <param name="element">to be visited</param>
124 120
	/// <param name="parent">parent of the element in the ast</param>
125
	protected /*virtual*/ void VisitAstElement(IAst element, IAst parent)
121
	protected void VisitAstElement(IAst element, IAst parent)
126 122
	{
127 123
		element.Accept(this);
128 124
	}
......
155 151
	}
156 152

  
157 153
	@Override
158
	public /*virtual*/ void visit(EnumIdentifier enumIdentifier)
154
	public void visit(EnumIdentifier enumIdentifier)
159 155
	{
160 156
		VisitSub(enumIdentifier.type(), enumIdentifier);
161 157
	}
162 158

  
163 159
	@Override
164
	public /*virtual*/ void visit(ConstantIdentifier constantIdentifier)
160
	public void visit(ConstantIdentifier constantIdentifier)
165 161
	{
166 162
		if (constantIdentifier.type() != null)
167 163
			VisitSub(constantIdentifier.type(), constantIdentifier);
168 164
		VisitSub(constantIdentifier.Value(), constantIdentifier);
169 165
	}
170 166

  
171

  
172 167
	@Override
173
	public /*virtual*/ void visit(LandmarkIdentifier landmarkIdentifier)
168
	public void visit(AttributeIdentifier attributeIdentifier)
174 169
	{
175
		VisitSub(landmarkIdentifier.type(), landmarkIdentifier);
176
	}
177

  
178
	@Override
179
	public /*virtual*/ void visit(AttributeIdentifier attributeIdentifier)
180
	{
181 170
		VisitSub(attributeIdentifier.type(), attributeIdentifier);
182 171
		VisitSub(attributeIdentifier.initializer(), attributeIdentifier);
183 172
	}
184 173

  
185 174
	@Override
186
	public /*virtual*/ void visit(ExpressionVariableIdentifier expressionVariableIdentifier)
175
	public void visit(ExpressionVariableIdentifier expressionVariableIdentifier)
187 176
	{
188 177
		VisitSub(expressionVariableIdentifier.type(), expressionVariableIdentifier);
189 178
	}
190 179

  
191 180
	@Override
192
	public /*virtual*/ void visit(ParameterIdentifier parameterIdentifier)
181
	public void visit(ParameterIdentifier parameterIdentifier)
193 182
	{
194 183
		VisitSub(parameterIdentifier.type(), parameterIdentifier);
195 184
	}
196 185

  
197 186
	@Override
198
	public /*virtual*/ void visit(LocalVariableIdentifier localVariableIdentifier)
187
	public void visit(LocalVariableIdentifier localVariableIdentifier)
199 188
	{
200 189
		VisitSub(localVariableIdentifier.type(), localVariableIdentifier);
201 190
	}
202 191

  
203 192
	@Override
204
	public /*virtual*/ void visit(TypeIdentifier typeIdentifier)
193
	public void visit(TypeIdentifier typeIdentifier)
205 194
	{
206 195
		VisitSub(typeIdentifier.type(), typeIdentifier);
207 196
	}
208 197

  
209 198
	@Override
210
	public /*virtual*/ void visit(SelfTypeIdentifier aself)
199
	public void visit(SelfTypeIdentifier aself)
211 200
	{
212 201
		visit((TypeIdentifier)aself);
213 202
	}
214 203

  
215 204
	@Override
216
	public /*virtual*/ void visit(MethodIdentifier methodIdentifier)
205
	public void visit(MethodIdentifier methodIdentifier)
217 206
	{
218 207
		VisitSub(methodIdentifier.type(), methodIdentifier);
219 208
		for (final Identifier sym: methodIdentifier.symbolTable().symbolList())
......
224 213
	}
225 214

  
226 215
	@Override
227
	public /*virtual*/ void visit(NamedActionIdentifier namedActionIdentifier)
216
	public void visit(NamedActionIdentifier namedActionIdentifier)
228 217
	{
229 218
		VisitSub(namedActionIdentifier.type(), namedActionIdentifier);
230 219
		for (final Identifier sym : namedActionIdentifier.symbolTable().symbolList())
......
235 224
	}
236 225

  
237 226
	@Override
238
	public /*virtual*/ void visit(MainModule mainModule)
227
	public void visit(MainModule mainModule)
239 228
	{
240 229
		for (final Identifier sym: mainModule.symbolTable().symbolList())
241 230
			VisitSub(sym, mainModule);
......
247 236
	}
248 237

  
249 238
	@Override
250
	public /*virtual*/ void visit(Module module)
239
	public void visit(Module module)
251 240
	{
252 241
		for (final Identifier sym: module.symbolTable().symbolList())
253 242
			VisitSub(sym, module);
254 243
	}
255 244

  
256 245
	@Override
257
	public /*virtual*/ void visit(NondetIdentifierList nondetIdentifierList)
246
	public void visit(NondetIdentifierList nondetIdentifierList)
258 247
	{
259 248
		for (final Identifier id: nondetIdentifierList.identifiers())
260 249
			VisitSub(id, nondetIdentifierList);
261 250
	}
262 251

  
263 252
	@Override
264
	public /*virtual*/ void visit(SeqIdentifierList seqIdentifierList)
253
	public void visit(SeqIdentifierList seqIdentifierList)
265 254
	{
266 255
		for (final Identifier id: seqIdentifierList.identifiers())
267 256
			VisitSub(id, seqIdentifierList);
268 257
	}
269 258

  
270 259
	@Override
271
	public /*virtual*/ void visit(PrioIdentifierList prioIdentifierList)
260
	public void visit(PrioIdentifierList prioIdentifierList)
272 261
	{
273 262
		for (final Identifier id: prioIdentifierList.identifiers())
274 263
			VisitSub(id, prioIdentifierList);
275 264
	}
276 265

  
277 266
	@Override
278
	public /*virtual*/ void visit(UnspecIdentifierList unspecIdentifierList)
267
	public void visit(UnspecIdentifierList unspecIdentifierList)
279 268
	{
280 269
		for (final Identifier id: unspecIdentifierList.identifiers())
281 270
			VisitSub(id, unspecIdentifierList);
282 271
	}
283 272

  
284 273
	@Override
285
	public /*virtual*/ void visit(NondetBlock nondetBlock)
274
	public void visit(NondetBlock nondetBlock)
286 275
	{
287 276
		for (final Identifier id: nondetBlock.symbols().symbolList())
288 277
			VisitSub(id, nondetBlock);
......
292 281
	}
293 282

  
294 283
	@Override
295
	public /*virtual*/ void visit(SeqBlock seqBlock)
284
	public void visit(SeqBlock seqBlock)
296 285
	{
297 286
		for (final Identifier id: seqBlock.symbols().symbolList())
298 287
			VisitSub(id, seqBlock);
......
305 294
	}
306 295

  
307 296
	@Override
308
	public /*virtual*/ void visit(PrioBlock prioBlock)
297
	public void visit(PrioBlock prioBlock)
309 298
	{
310 299
		for (final Identifier id: prioBlock.symbols().symbolList())
311 300
			VisitSub(id, prioBlock);
......
315 304
	}
316 305

  
317 306
	@Override
318
	public /*virtual*/ void visit(GuardedCommand guardedCommand)
307
	public void visit(GuardedCommand guardedCommand)
319 308
	{
320 309
		VisitSub(guardedCommand.guard(), guardedCommand);
321 310
		VisitSub(guardedCommand.body(), guardedCommand);
322 311
	}
323 312

  
324 313
	@Override
325
	public /*virtual*/ void visit(Assignment assignment)
314
	public void visit(Assignment assignment)
326 315
	{
327 316
		for (final Expression vexp: assignment.places())
328 317
			VisitSub(vexp, assignment);
......
333 322
	}
334 323

  
335 324
	@Override
336
	public /*virtual*/ void visit(Call call)
325
	public void visit(Call call)
337 326
	{
338 327
		VisitSub(call.callExpression(), call);
339 328
	}
340 329

  
341 330
	@Override
342
	public /*virtual*/ void visit(SkipStatement skipStatement)
331
	public void visit(SkipStatement skipStatement)
343 332
	{ }
344 333

  
345 334
	@Override
......
347 336
	{ }
348 337

  
349 338
	@Override
350
	public /*virtual*/ void visit(AbortStatement abortStatement)
339
	public void visit(AbortStatement abortStatement)
351 340
	{ }
352 341

  
353 342
	@Override
354
	public /*virtual*/ void visit(KillStatement killStatement)
343
	public void visit(KillStatement killStatement)
355 344
	{
356 345
		VisitSub(killStatement.someOne, killStatement);
357 346
	}
358 347

  
359 348
	@Override
360
	public /*virtual*/ <T>void visit(ValueExpression<T> valueExpression)
349
	public <T>void visit(ValueExpression<T> valueExpression)
361 350
	{ }
362 351

  
363 352
	@Override
364
	public /*virtual*/ void visit(UnresolvedIdentifierExpression unresolvedIdentifierExpression)
353
	public void visit(UnresolvedIdentifierExpression unresolvedIdentifierExpression)
365 354
	{
366 355
		VisitSub(unresolvedIdentifierExpression.type(), unresolvedIdentifierExpression);
367 356
	}
368 357

  
369 358
	@Override
370
	public /*virtual*/ void visit(IdentifierExpression identifierExpression)
359
	public void visit(IdentifierExpression identifierExpression)
371 360
	{
372 361
		VisitSub(identifierExpression.type(), identifierExpression);
373 362
		VisitSub(identifierExpression.identifier(), identifierExpression);
374 363
	}
375 364

  
376 365
	@Override
377
	public /*virtual*/ void visit(TypeExpression typeExpression)
366
	public void visit(TypeExpression typeExpression)
378 367
	{
379 368
		VisitSub(typeExpression.type(), typeExpression);
380 369
	}
381 370

  
382 371
	@Override
383
	public /*virtual*/ void visit(ListConstructor listConstructor)
372
	public void visit(ListConstructor listConstructor)
384 373
	{
385 374
		for (final Identifier lvar: listConstructor.comprehensionVariables().symbolList())
386 375
			VisitSub(lvar, listConstructor);
......
393 382
	}
394 383

  
395 384
	@Override
396
	public /*virtual*/ void visit(SetConstructor setConstructor)
385
	public void visit(SetConstructor setConstructor)
397 386
	{
398 387
		for (final Identifier svar: setConstructor.comprehensionVariables().symbolList())
399 388
			VisitSub(svar, setConstructor);
......
405 394
	}
406 395

  
407 396
	@Override
408
	public /*virtual*/ void visit(MapConstructor mapConstructor)
397
	public void visit(MapConstructor mapConstructor)
409 398
	{
410 399
		/*foreach (var lvar in mapConstructor.localVariables.symbolList)
411 400
			VisitSub(lvar, mapConstructor);*/
......
418 407
	}
419 408

  
420 409
	@Override
421
	public /*virtual*/ void visit(TupleConstructor tupleConstructor)
410
	public void visit(TupleConstructor tupleConstructor)
422 411
	{
423 412
		/*foreach (var lvar in tupleConstructor.localVariables.symbolList)
424 413
			VisitSub(lvar, tupleConstructor);*/
......
428 417
	}
429 418

  
430 419
	@Override
431
	public /*virtual*/ void visit(AccessExpression accessExpression)
420
	public void visit(AccessExpression accessExpression)
432 421
	{
433 422
		VisitSub(accessExpression.left(), accessExpression);
434 423
		VisitSub(accessExpression.right(), accessExpression);
435 424
	}
436 425

  
437 426
	@Override
438
	public /*virtual*/ void visit(BinaryOperator binaryOperator)
427
	public void visit(BinaryOperator binaryOperator)
439 428
	{
440 429
		VisitSub(binaryOperator.left(), binaryOperator);
441 430
		VisitSub(binaryOperator.right(), binaryOperator);
442 431
	}
443 432

  
444 433
	@Override
445
	public /*virtual*/ void visit(TernaryOperator ternaryOperator)
434
	public void visit(TernaryOperator ternaryOperator)
446 435
	{
447 436
		VisitSub(ternaryOperator.left(), ternaryOperator);
448 437
		VisitSub(ternaryOperator.mid(), ternaryOperator);
......
450 439
	}
451 440

  
452 441
	@Override
453
	public /*virtual*/ void visit(TupleMapAccessExpression tupleMapAccessExpression)
442
	public void visit(TupleMapAccessExpression tupleMapAccessExpression)
454 443
	{
455 444
		VisitSub(tupleMapAccessExpression.argument(), tupleMapAccessExpression);
456 445
		VisitSub(tupleMapAccessExpression.child(), tupleMapAccessExpression);
457 446
	}
458 447

  
459 448
	@Override
460
	public /*virtual*/ void visit(CallExpression callExpression)
449
	public void visit(CallExpression callExpression)
461 450
	{
462 451
		if (callExpression.arguments() != null)
463 452
			for (final Expression arg: callExpression.arguments())
......
466 455
	}
467 456

  
468 457
	@Override
469
	public /*virtual*/ void visit(ForallQuantifier quantifier)
458
	public void visit(ForallQuantifier quantifier)
470 459
	{
471 460
		for (final Identifier lvar: quantifier.symbols().symbolList())
472 461
			VisitSub(lvar, quantifier);
......
475 464
	}
476 465

  
477 466
	@Override
478
	public /*virtual*/ void visit(ExistsQuantifier quantifier)
467
	public void visit(ExistsQuantifier quantifier)
479 468
	{
480 469
		for (final Identifier lvar: quantifier.symbols().symbolList())
481 470
			VisitSub(lvar, quantifier);
......
484 473
	}
485 474

  
486 475
	@Override
487
	public /*virtual*/ void visit(UnaryOperator unaryOperator)
476
	public void visit(UnaryOperator unaryOperator)
488 477
	{
489 478
		VisitSub(unaryOperator.child(), unaryOperator);
490 479
		if (unaryOperator.kind() == ExpressionKind.Cast)
......
494 483

  
495 484

  
496 485
	@Override
497
	public /*virtual*/ void visit(CharType charType)
486
	public void visit(CharType charType)
498 487
	{
499 488
	}
500 489

  
501 490
	@Override
502
	public /*virtual*/ void visit(IntType intType)
491
	public void visit(IntType intType)
503 492
	{
504 493
	}
505 494

  
506 495
	@Override
507
	public /*virtual*/ void visit(BoolType boolType)
496
	public void visit(BoolType boolType)
508 497
	{
509 498
	}
510 499

  
511 500
	@Override
512
	public /*virtual*/ void visit(FloatType floatType)
501
	public void visit(FloatType floatType)
513 502
	{
514 503
	}
515 504

  
516 505
	@Override
517
	public /*virtual*/ void visit(EnumType enumType)
506
	public void visit(EnumType enumType)
518 507
	{
519 508
		for (final Identifier sym: enumType.listOfEnumSymbols())
520 509
			VisitSub(sym, enumType);
521 510
	}
522 511

  
523 512
	@Override
524
	public /*virtual*/ void visit(ListType listType)
513
	public void visit(ListType listType)
525 514
	{
526 515
		VisitSub(listType.innerType(), listType);
527 516
	}
528 517

  
529 518
	@Override
530
	public /*virtual*/ void visit(MapType mapType)
519
	public void visit(MapType mapType)
531 520
	{
532 521
		VisitSub(mapType.fromType(), mapType);
533 522
		VisitSub(mapType.toType(), mapType);
534 523
	}
535 524

  
536 525
	@Override
537
	public /*virtual*/ void visit(QrType qrType)
526
	public void visit(TupleType tupleType)
538 527
	{
539
		for (final Identifier m: qrType.landmarks())
540
			VisitSub(m, qrType);
541
	}
542

  
543
	@Override
544
	public /*virtual*/ void visit(TupleType tupleType)
545
	{
546
		for (final UlyssesType t: tupleType.innerTypes())
528
		for (final Type t: tupleType.innerTypes())
547 529
			VisitSub(t, tupleType);
548 530
	}
549 531

  
550 532
	@Override
551
	public /*virtual*/ void visit(FunctionType functionType)
533
	public void visit(FunctionType functionType)
552 534
	{
553
		for (final UlyssesType a: functionType.parameter())
535
		for (final Type a: functionType.parameter())
554 536
			VisitSub(a, functionType);
555 537
		VisitSub(functionType.returnType(), functionType);
556 538
	}
557 539

  
558 540
	@Override
559
	public /*virtual*/ void visit(OoActionSystemType ooActionSystemType)
541
	public void visit(OoActionSystemType ooActionSystemType)
560 542
	{
561 543
		for (final Identifier s: ooActionSystemType.symbols().symbolList())
562 544
			VisitSub(s, ooActionSystemType);
......
564 546
		VisitSub(ooActionSystemType.doOdBlock(), ooActionSystemType);
565 547
	}
566 548

  
567
	public /*virtual*/ @Override
549
	public @Override
568 550
	void visit(OpaqueType opaqueType)
569 551
	{
570 552
		VisitSub(opaqueType.resolvedType(), opaqueType);
571 553
	}
572 554

  
573 555
	@Override
574
	public /*virtual*/ void visit(NullType nullType)
556
	public void visit(NullType nullType)
575 557
	{ }
576 558

  
577 559
	@Override
578
	public /*virtual*/ void visit(AnyType anyType)
560
	public void visit(AnyType anyType)
579 561
	{ }
580 562

  
581 563
	@Override
582
	public /*virtual*/ void visit(ObjectConstructor objectConstructor)
564
	public void visit(ObjectConstructor objectConstructor)
583 565
	{
584 566
		VisitSub(objectConstructor.type(), objectConstructor);
585 567
	}
586

  
587
	@Override
588
	public /*virtual*/ void visit(QValConstructor qValConstructor)
589
	{
590
	}
591

  
592
	@Override
593
	public /*virtual*/ void visit(QualitativeConstraintStatement qalitativeConstraintStatement)
594
	{
595
		VisitSub(qalitativeConstraintStatement.variable0(), qalitativeConstraintStatement);
596
		VisitSub(qalitativeConstraintStatement.variable1(), qalitativeConstraintStatement);
597
		if (qalitativeConstraintStatement.variable2() != null)
598
			VisitSub(qalitativeConstraintStatement.variable2(), qalitativeConstraintStatement);
599
	}
600 568
}
601 569

  

Also available in: Unified diff