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

some minor changes

parent 151d622a

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

+7 −6
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ DerivedDef: 
	MODIFIESKEYWORD name=ExtendedIdentifier;



BaseTemplate:

	(type=Type | Signature) name=IDENTIFIER (LPAREN template=TemplateOrValueFormalParList RPAREN)?;

	(type=Type | Signature) name=IDENTIFIER (LPAREN parList=TemplateOrValueFormalParList RPAREN)?;



TempVarList:

	var+=SingleTempVarInstance (COMMA var+=SingleTempVarInstance)*;
@@ -856,7 +856,7 @@ DerivedRefWithParList: 
	MODIFIESKEYWORD template=TemplateRefWithParList;



TemplateBody:

	(SimpleSpec | FieldSpecList | ArrayValueOrAttrib) extra=ExtraMatchingAttributes?;

	(simple=SimpleSpec | field=FieldSpecList | array=ArrayValueOrAttrib) extra=ExtraMatchingAttributes?;



ExtraMatchingAttributes:

	StringLength | {ExtraMatchingAttributes} IFPRESENTKEYWORD | (StringLength IFPRESENTKEYWORD);
@@ -876,8 +876,9 @@ SimpleTemplateSpec: 
SingleTemplateExpression:

	symbol=MatchingSymbol | list=TemplateRefWithParList ref+=ExtendedFieldReference;



	// TODO: test this!

TemplateRefWithParList:

	name=ExtendedIdentifier list=TemplateActualParList?;

	template=[TemplateDef|IDENTIFIER] list=TemplateActualParList?;



TemplateActualParList:

	{TemplateActualParList} LPAREN (actual+=TemplateInstanceActualPar (COMMA actual+=TemplateInstanceActualPar)* |
@@ -934,10 +935,10 @@ AliveOp: 
	ComponentId DOT ALIVEKEYWORD;



TemplateListItem:

	TemplateBody | AllElementsFrom;

	body=TemplateBody | all=AllElementsFrom;



AllElementsFrom:

	ALLKEYWORD FROMKEYWORD TemplateBody;

	ALLKEYWORD FROMKEYWORD body=TemplateBody;



Signature:

	ExtendedIdentifier;

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

+3 −2
Original line number Diff line number Diff line
@@ -174,10 +174,11 @@ class TTCN3ScopeHelper { 
		var RefValue value;



		for (TemplateOrValueFormalPar p : paramsList.params) {

			if (p.value != null)

			if (p.value != null) {

				value = p.value as RefValue

			else if (p.template != null)

			} else if (p.template != null) {

				value = p.template as RefValue;

			}



			if (value != null && value != variable)

				list.add(value);

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

+0 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ import de.ugoe.cs.swe.tTCN3.ComponentDefList 
import de.ugoe.cs.swe.tTCN3.FieldSpec

import de.ugoe.cs.swe.tTCN3.ForStatement

import de.ugoe.cs.swe.tTCN3.FunctionDef

import de.ugoe.cs.swe.tTCN3.FunctionFormalParList

import de.ugoe.cs.swe.tTCN3.GroupDef

import de.ugoe.cs.swe.tTCN3.Initial

import de.ugoe.cs.swe.tTCN3.ModuleControlPart
@@ -20,7 +19,6 @@ import de.ugoe.cs.swe.tTCN3.RefValue 
import de.ugoe.cs.swe.tTCN3.StatementBlock

import de.ugoe.cs.swe.tTCN3.TTCN3Module

import de.ugoe.cs.swe.tTCN3.TemplateDef

import de.ugoe.cs.swe.tTCN3.TemplateOrValueFormalParList

import de.ugoe.cs.swe.tTCN3.TestcaseDef

import de.ugoe.cs.swe.tTCN3.TypeDef

import java.util.ArrayList