Commit b7bfc327 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ value assignment resolution for procedure parameters, safety checks

parent 2ec7a105

plugins/Prototypes/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/scoping/TDLScopeProvider.java

+8 −3
Original line number Original line Diff line number Diff line
@@ -123,10 +123,12 @@ public class TDLScopeProvider extends AbstractDeclarativeScopeProvider { 
					testDescription = ((TestDescriptionReference)context.eContainer()).getTestDescription();

					testDescription = ((TestDescriptionReference)context.eContainer()).getTestDescription();

				}

				}

				TestConfiguration configuration = testDescription.getTestConfiguration();

				TestConfiguration configuration = testDescription.getTestConfiguration();

				if (configuration!=null) {

					EList<ComponentInstance> components = configuration.getComponentInstance();

					EList<ComponentInstance> components = configuration.getComponentInstance();

					IScope scope = Scopes.scopeFor(components);

					IScope scope = Scopes.scopeFor(components);

					return scope;

					return scope;

				}

				}

			} 

		} else if (reference.getEType().getInstanceClass() == GateReference.class) {

		} else if (reference.getEType().getInstanceClass() == GateReference.class) {

			//TODO: safety checks in case invalid configuration is specified

			//TODO: safety checks in case invalid configuration is specified

			//TODO: only suggest connected gates as targets?

			//TODO: only suggest connected gates as targets?
@@ -341,6 +343,9 @@ public class TDLScopeProvider extends AbstractDeclarativeScopeProvider { 
					}

					}

				} else {

				} else {

				}

				}

			} else if (context instanceof ValueAssignment) {

				IScope scope = Scopes.scopeFor(((ProcedureCall)context.eContainer().eContainer()).getSignature().getParameter());

				return scope;

			}

			}

		} else if (reference.getEType().getInstanceClass() == Variable.class) {

		} else if (reference.getEType().getInstanceClass() == Variable.class) {

			if (context instanceof Assignment) {

			if (context instanceof Assignment) {