improved (0139e3ef) · Commits · MTS / TTCN-3 / T3Q

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/common/TTCN3ScopeHelper.xtend

+7 −3

Original line number	Diff line number	Diff line
		@@ -214,8 +214,12 @@ class TTCN3ScopeHelper {
		}

		def static void scopeFunctionParameterValue(FunctionFormalParList parList, ArrayList<EObject> list) {
		for (FunctionFormalPar p : parList.params.filter[it.value != null]) {
		list.add(p.value);
		for (FunctionFormalPar p : parList.params) {
		if (p.template != null) {
		list.add(p.template)
		} else if (p.value != null) {
		list.add(p.value)
		}
		}
		}

		@@ -269,7 +273,7 @@ class TTCN3ScopeHelper {
		}

		def static void scopeAltstepLocalDefList(AltstepLocalDefList localList, ArrayList<EObject> list) {
		for (AltstepLocalDef a : localList.defs.filter[it != null]) {
		for (AltstepLocalDef a : localList.defs) {
		if (a.const != null) {
		val constDefList = a.const.defs as ConstList
		for (SingleConstDef d : constDefList.list) {

+9 −2

Original line number	Diff line number	Diff line
		@@ -170,6 +170,7 @@ class TTCN3ScopeProvider extends AbstractDeclarativeScopeProvider {
		}
		}
		} else if (reference instanceof AltstepDef) {

		//TODO: implement if really needed
		LOG.info("Method is not implemented for Type AltstepDef!")
		}
		@@ -536,12 +537,18 @@ class TTCN3ScopeProvider extends AbstractDeclarativeScopeProvider {
		} else if (value instanceof TemplateDef) {
		value.scopeTemplateParameter(list)
		scopeFor(list, value.eContainer.scope_ReferencedValueHead(ref))
		} else if (value instanceof FunctionInstance) {
		// TODO: implement this
		scopeFor(list, value.eContainer.scope_ReferencedValueHead(ref))
		} else {
		scopeFor(list, value.eContainer.scope_ReferencedValueHead(ref))
		}
		}

		def IScope scope_RefValueTail_value(RefValueTail it, EReference ref) {
		def IScope scope_RefValueTail_value(
		RefValueTail it,
		EReference ref
		) {
		scopeFor((eContainer as SpecElement).directElements)
		}