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

* clean up of leftovers

parent 62d29185

de.ugoe.cs.swe.T3Q/src/de/ugoe/cs/swe/T3Q/TTCN3ResourceProvider.java

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ public class TTCN3ResourceProvider { 


			ArrayList<Resolver> resolver = new ArrayList<Resolver>();

			for (Resource r : TTCN3GlobalScopeProvider.RESOURCES) {

				//only ignored?

				matcher = pattern.matcher(r.getURI().toFileString());

				if(matcher.matches()) {

					resolver.add(new Resolver(r, logger));

de.ugoe.cs.swe.TTCN3.ui/src/de/ugoe/cs/swe/ui/ScopeRebuild.java

+5 −3
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ public class ScopeRebuild extends BuilderParticipant { 
//

//			//generator.doGenerate(context.getResourceSet(), fileSystemAccess);

//		}

		boolean reset = false;

		//TODO: expose as option?

		boolean reset = true;

		if (reset) {

			TTCN3GlobalScopeProvider.RESOURCES.clear();

			TTCN3GlobalScopeProvider.NAMED_MODULES.clear();
@@ -80,8 +81,9 @@ public class ScopeRebuild extends BuilderParticipant { 
			TTCN3GlobalScopeProvider.IMPORTED_FROM.clear();

			TTCN3GlobalScopeProvider.IMPORTED_RESOURCES.clear();

			TTCN3GlobalScopeProvider.STATIC_SCOPE.clear();

			TTCN3ScopeProvider.tailTrail.clear();

			TTCN3ScopeProvider.tailTrailCurrent.clear();

			//TTCN3ScopeProvider.tailTrail.clear();

			//TTCN3ScopeProvider.tailTrailCurrent.clear();

			

			System.out.println("Reset Master : "+resource.getURI());

			

			for (IResourceDescription d : resourceDescriptionsProvider.getResourceDescriptions(context.getResourceSet()).getAllResourceDescriptions()) {

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/TTCN3.xtext

+1 −0
Original line number Diff line number Diff line
@@ -1178,6 +1178,7 @@ CompoundExpression: 
	FieldExpressionList | ArrayOrMixedExpression;



ArrayOrMixedExpression:

	//TODO: is this correct?

	{ArrayOrMixedExpression} LBRACKET (list=ArrayElementExpressionList (COMMA specs+=FieldExpressionSpec)*)? RBRACKET;



FieldExpressionList:

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

+1 −0
Original line number Diff line number Diff line
@@ -592,6 +592,7 @@ class TTCN3ScopeHelper { 
		val type = getReferencedOrNestedTypeWithTail(ref)

		

		//TODO: replace with getFields?

//		var f = type.fields

		if (type instanceof NestedTypeDef) {

			list.addAll(type.nestedTypeFieldElements)

		} else if (type instanceof ReferencedType) {

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

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ class TTCN3ScopeProvider extends AbstractDeclarativeScopeProvider { 
	final static Logger LOG = Logger.getLogger(TTCN3LocalScopeProvider);

	static HashMap<EObject, HashMap<EObject, List<EObject>>> cache = newHashMap

	static HashMap<EObject, HashMap<EObject, List<EObject>>> importedCache = newHashMap

	public static HashMap<EObject, Integer> tailTrail = newHashMap

	public static HashMap<EObject, Integer> tailTrailCurrent = newHashMap

//	public static HashMap<EObject, Integer> tailTrail = newHashMap

//	public static HashMap<EObject, Integer> tailTrailCurrent = newHashMap



	def IScope scope_FieldSpec_ref(FieldSpec spec, EReference ref) {

		spec.scopeFieldExpressionList