diff --git a/de.cau.cs.se.measure.definition.language/.antlr-generator-3.2.0.jar b/de.cau.cs.se.measure.definition.language/.antlr-generator-3.2.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..56240aea90aff9710817345828e8e8c8afea909b Binary files /dev/null and b/de.cau.cs.se.measure.definition.language/.antlr-generator-3.2.0.jar differ diff --git a/de.cau.cs.se.measure.definition.language/src-gen/de/cau/cs/se/measure/definition/language/MeasureDefinitionLanguage.xtextbin b/de.cau.cs.se.measure.definition.language/src-gen/de/cau/cs/se/measure/definition/language/MeasureDefinitionLanguage.xtextbin new file mode 100644 index 0000000000000000000000000000000000000000..ff9458d890a3d4b62bcc7f9cfb2f5acecf73530d Binary files /dev/null and b/de.cau.cs.se.measure.definition.language/src-gen/de/cau/cs/se/measure/definition/language/MeasureDefinitionLanguage.xtextbin differ diff --git a/de.cau.cs.se.measure.definition.language/src/de/cau/cs/se/measure/definition/language/generator/ScopeExpressionGenerator.xtend b/de.cau.cs.se.measure.definition.language/src/de/cau/cs/se/measure/definition/language/generator/ScopeExpressionGenerator.xtend index 7c75d69bd4f6cf4cff18e909c12475a1dbea7dbf..6ea9a09b49d62a57ef95e5d83b2ab2085722cc7c 100644 --- a/de.cau.cs.se.measure.definition.language/src/de/cau/cs/se/measure/definition/language/generator/ScopeExpressionGenerator.xtend +++ b/de.cau.cs.se.measure.definition.language/src/de/cau/cs/se/measure/definition/language/generator/ScopeExpressionGenerator.xtend @@ -123,7 +123,7 @@ class ScopeExpressionGenerator { // this function is only valid for abs, floor, ceil, size and other single parameter function def private dispatch CharSequence renderExpression(FunctionCall expression) ''' - «expression.parameterAssignments.get(0).renderExpression».«expression.function.name»()''' + «expression.parameterAssignments.get(0).renderExpression».«expression.function.literal»()''' /** * Compose a reference chain in OCL @@ -146,7 +146,7 @@ class ScopeExpressionGenerator { // maybe the identification for the type must be improved def private dispatch CharSequence renderExpression(ReflectionCall expression) ''' - ocl«expression.reflectionType.name.toFirstUpper»(«expression.type.eClass.name»)''' + ocl«expression.reflectionType.literal.toFirstUpper»(«expression.type.eClass.name»)''' def private dispatch CharSequence renderExpression(ModelType expression) ''' «expression.metamodel.name»::«expression.classifier.name»'''