Commit ece5319a authored by Daniel Honsel's avatar Daniel Honsel
Browse files

fixed scoping issue that caused validation issues on checkNoUnusedLocalDefinitions

parent 7d668b48

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

+7 −0
Original line number Diff line number Diff line
@@ -190,6 +190,8 @@ class TTCN3ScopeHelper { 
				for (SingleConstDef d : constDefList.list) {

					list.add(d);

				}

			} else if (l.locDef != null && l.locDef.templateDef != null) {

				list.add(l.locDef.templateDef.base)

			}

			if (l.locInst != null && l.locInst.variable != null) {

				val varList = l.locInst.variable.list
@@ -200,6 +202,11 @@ class TTCN3ScopeHelper { 
				if (tempList != null) {

					list.addAll(tempList.variables);

				}

			} else if (l.locInst != null && l.locInst.timer != null) {

				val varList = l.locInst.timer.list

				if (varList != null) {

					list.addAll(varList.variables);

				}

			}

		}

	}

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/scoping/TTCN3ScopeProvider.xtend

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ import static org.eclipse.xtext.scoping.Scopes.* 


import static extension de.ugoe.cs.swe.common.TTCN3ScopeHelper.*

import static extension org.eclipse.xtext.EcoreUtil2.*

import de.ugoe.cs.swe.tTCN3.TTCN3Reference



class TTCN3ScopeProvider extends AbstractDeclarativeScopeProvider {

	private final static Logger LOG = Logger.getLogger(TTCN3LocalScopeProvider);