From 777d5ecc6031f02ad3757db1c9736b6aad5ac6f5 Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Tue, 30 Jan 2018 01:27:48 +0100 Subject: Scoping + Linking services fixed --- .../inf/dslreasoner/application/ApplicationConfiguration.xtext | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext') diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext index 2ac81bf6..3efde6ec 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext @@ -15,7 +15,7 @@ Command : ; QualifiedName returns ecore::EString: - ID (=>'.' ID)*; + ID ('.' ID)*; /////////////////////////////////////////////////// // Imports @@ -106,10 +106,14 @@ enum Solver: SMTSolver | AlloySolver | ViatraSolver; ScopeSpecification: {ScopeSpecification} '{' (scopes += TypeScope (',' scopes += TypeScope)*)? '}'; -TypeScope: ( min = INT ( greather?='<' | greaterOrEqual?= '<='))? '#' type = TypeReference (( less?='<' | lessOrEqual?= '<=') max = INT)?; +TypeScope: '#' type = TypeReference + (setsNew ?='+=' | setsSum ?= '=') + ( min = INT ) + ('..' (maxUnlimited?='*' | max=INT))? +; TypeReference: ClassReference | ObjectReference | IntegerReference | RealReference | StringReference; ClassReference: '[' element = MetamodelElement ']'; -ObjectReference: {ObjectReference} 'Object'; +ObjectReference: {ObjectReference} 'node'; IntegerReference: {IntegerScope} 'int'; RealReference: {RealScope} 'real'; StringReference: {StringScope} 'string'; -- cgit v1.2.3-70-g09d2