+ added rules for DataElementUse and other refinements

//#####################################################################################

DataUse returns DataUse:

	DynamicDataUse | StaticDataUse;

    //TODO: make sure that DataElementUse works -> may be clashing with others (requires deeper alignment and cleanup)

	DynamicDataUse | StaticDataUse | DataElementUse;

StaticDataUse returns StaticDataUse:

	SpecialValueUse | DataInstanceUse | LiteralValueUse;

DynamicDataUse returns DynamicDataUse:

	VariableUse | FunctionCall | PredefinedFunctionCall | FormalParameterUse | TimeLabelUse;

//Copied and adjusted from TDLtx 

DataElementUse returns DataElementUse:

	// XXX dataelementuse

	'TODO'

    //'unified' //this gets embedded in the first alternative somehow!? -> shouldn't be needed anyway

    //express also through table

    //              -   (binding) [index] [items]

    //anonymous            x                 x

    //type                 x                 x

    //instance      x      x         x        

    (   

//        //anonymous - split in case of problems

////        (ParameterBindingFragment | CollectionItemFragment)

////    ) | (

        //instance

        dataElement=[NamedElement|Identifier]

        UnassignedFragmentNamedElement?

        ParameterBindingFragment?

        ReductionFragment

    ) | (

        //type / anonymous (simplified, avoid duplication, otherwise remove "?")

        //DONE: empty parameters / collections? -> added

        //DONE: support simple data types as well? -> use any value instead

        //DONE: decide on prefix -> extract to comment? -> capture as name

        //(('new' | 'a') dataElement=[tdl::DataType|Identifier])?

        (

            //DONE: do we really need different ways? -> not for now!

            //name=('new' | 'a' | 'an' | 'the')

            'new' dataElement=[DataType|Identifier]

        )?

        UnassignedFragmentNamedElement?

        (ParameterBindingFragment | CollectionItemFragment)

    )

;

fragment UnassignedFragmentNamedElement returns DataElementUse:

    '<' unassignedMember=UnassignedMemberTreatment '>'

;

fragment CollectionItemFragment returns DataElementUse:

    '[' (item+=DataUse (',' item+=DataUse)*)? ']'

;

fragment ReductionFragment returns DataUse:

    (->reduction+=CollectionReference)?

    ('.' reduction+=MemberReference)*

;

CollectionReference returns MemberReference:

    '[' collectionIndex=DataUse ']'

;

SpecialValueUse returns StaticDataUse:

	NoneValue | AnyValue | AnyNoneValue;

EString returns ecore::EString:

	ID;

Identifier:

    ID

;

DataInstanceUse returns DataInstanceUse:

	{DataInstanceUse}

	((dataInstance=[DataInstance|NumberAsIdentifier] |

LiteralValueUse returns LiteralValueUse:

	{LiteralValueUse}

	(value=String0 | intValue=BigInt | boolValue=Boolean)

	(':' dataType=[DataType|EString])?

	// XXX check arugment and reduction

	(':' dataType=[DataType|EString]

       (ParameterBindingFragment | ReductionFragment)

	)?

;

BigInt returns ecore::EBigInteger:

	("." reduction+=MemberReference)*;

TimeLabelUse returns TimeLabelUse:

	// XXX need to add kind

	// XXX need to add predefined function

	timeLabel=[TimeLabel|EString];

	// XXX need to add predefined function -> for what

	timeLabel=[TimeLabel|EString]

    ('.' kind=TimeLabelUseKind)?

;	

enum TimeLabelUseKind returns TimeLabelUseKind:

    Last = 'last' | Previous = 'previous' | First = 'first'

;

fragment ParameterBindingFragment returns DataUse:

    LParen (argument+=ParameterBinding ( ',' argument+=ParameterBinding)*)? RParen

;

ParameterBinding returns ParameterBinding:

	parameter=[Parameter|EString]

String0 returns ecore::EString:

	STRING;

ComponentInstanceBinding returns ComponentInstanceBinding:

    formalComponent=[ComponentInstance|Identifier]

    '->' actualComponent=[ComponentInstance|Identifier]

;

PredefinedFunctionCall returns PredefinedFunctionCall:

	// XXX add all predefined functions

	// XXX add all predefined functions -> done?

	PredefinedFunctionCallSize | PredefinedFunctionCallNot | PredefinedFunctionCallBinary;

PredefinedFunctionCallSize returns PredefinedFunctionCall:

	'('

	actualParameters+=DataUse

	')'

	// XXX check reduction

	// XXX check reduction -> no reduction?

;

PredefinedFunctionCallNot returns PredefinedFunctionCall:

PredefinedIdentifierSize returns ecore::EString:

	'size';

LParen:

    '('

;

RParen:

    ')'

;

 No newline at end of file