Commit 1525b3d3 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ added decoded fields 

+ improved formatting
parent ed4edf29

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

+12 −1
Original line number Diff line number Diff line
@@ -1114,9 +1114,17 @@ SpecElement: 
	Head | RefValueTail;



ExtendedFieldReference:

	DOT (field=[FieldReference|IDENTIFIER] | type=PredefinedType) | array=ArrayOrBitRef | {ExtendedFieldReference}

	DOT (field=[FieldReference|IDENTIFIER] | type=PredefinedType) | array=ArrayOrBitRef | decoded=DecodedFieldReference | {ExtendedFieldReference}

	SQUAREOPEN MINUS SQUARECLOSE;



DecodedFieldReference:

	DECODEDFIELDCHAR DecodedFieldType

;



DecodedFieldType:

	type=Type

;



	// BaseTemplate contained in FunctionRef

// SingleVarInstance contained in TimerVarInstance (according to EBNF rules)

RefValue:
@@ -1502,6 +1510,9 @@ terminal STRINGANYOROMIT returns ecore::EString: 
terminal ASSIGNMENTCHAR returns ecore::EString:

	':=';



terminal DECODEDFIELDCHAR returns ecore::EString:

	'=>';



terminal INDEX_MODIFIER returns ecore::EString:

	'@index';

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/formatting/TTCN3Formatter.xtend

+16 −2
Original line number Diff line number Diff line
@@ -108,12 +108,26 @@ class TTCN3Formatter extends AbstractDeclarativeFormatter { 
        }



        for (r: findRuleCalls(functionFormalParListRule)) {

            c.setLinewrap.before(r)

//            c.setLinewrap.before(r)

//            c.setNoLinewrap.before(r)

            c.setIndentationIncrement.before(r)

            c.setIndentationDecrement.after(r)

            c.setLinewrap.after(r)

        }



        for (r: findRuleCalls(fieldSpecListRule)) {

//            c.setLinewrap.before(r)

//            c.setNoLinewrap.before(r)

//            c.setIndentationIncrement.before(r)

//            c.setIndentationDecrement.after(r)

//            c.setLinewrap.after(r)

        }



        for (r: findRuleCalls(fieldSpecRule)) {

            c.setLinewrap.before(r)

//            c.setNoLinewrap.before(r)

//            c.setLinewrap.after(r)

        }



        for (r: findRuleCalls(LBRACKETRule)) {

            c.setLinewrap.after(r)

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/scoping/TTCN3GlobalScopeProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -200,8 +200,8 @@ public class TTCN3GlobalScopeProvider extends AbstractGlobalScopeProvider { 
			if (d.getURI().lastSegment().endsWith("ttcn3") || d.getURI().lastSegment().endsWith("ttcn")) {

				Resource r = resource.getResourceSet().getResource(d.getURI(), true);

				TTCN3Module module = CommonHelper.getModule(r);

				//System.out.println(r.getURI());

				if (module !=null && !TTCN3GlobalScopeProvider.NAMED_MODULES.containsKey(module.getName())) {

//					System.out.println(r.getURI());

					TTCN3GlobalScopeProvider.RESOURCES.add(r);

					TTCN3GlobalScopeProvider.NAMED_MODULES.put(module.getName(), module);

				}