Commit c0a74701 authored by Reiner Jung's avatar Reiner Jung

Fixed the build issue. Started building the generator for the SMM.

parent c17e6e80
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: de.cau.cs.se.measure.definition.language.tests
Bundle-Vendor: My Company
Bundle-Version: 1.0.0
Bundle-SymbolicName: de.cau.cs.se.measure.definition.language.tests;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: de.cau.cs.se.measure.definition.language.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: de.cau.cs.se.measure.definition.language,
de.cau.cs.se.measure.definition.language.ui,
......@@ -14,7 +14,7 @@ Require-Bundle: de.cau.cs.se.measure.definition.language,
org.junit4,
org.eclipse.ui.workbench;resolution:=optional
Import-Package: org.apache.log4j,
org.apache.commons.logging,
org.junit;version="4.5.0",
org.junit.runner;version="4.5.0",
org.junit.runner.manipulation;version="4.5.0",
org.junit.runner.notification;version="4.5.0",
......
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: de.cau.cs.se.measure.definition.language.ui
Bundle-Vendor: My Company
Bundle-Version: 1.0.0
Bundle-SymbolicName: de.cau.cs.se.measure.definition.language.ui;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: de.cau.cs.se.measure.definition.language.ui; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: de.cau.cs.se.measure.definition.language;visibility:=reexport,
org.eclipse.xtext.ui,
......
......@@ -11,7 +11,7 @@
default="true"
extensions="mdl"
id="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage"
name="MeasureDefinitionLanguageEditor">
name="MeasureDefinitionLanguage Editor">
</editor>
</extension>
<extension
......@@ -21,7 +21,7 @@
commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
<activeWhen>
<reference
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguageEditor.opened">
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.Editor.opened">
</reference>
</activeWhen>
</handler>
......@@ -30,13 +30,13 @@
commandId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.validate">
<activeWhen>
<reference
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguageEditor.opened">
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.Editor.opened">
</reference>
</activeWhen>
</handler>
</extension>
<extension point="org.eclipse.core.expressions.definitions">
<definition id="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguageEditor.opened">
<definition id="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.Editor.opened">
<and>
<reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
<with variable="activeEditor">
......@@ -106,7 +106,7 @@
tooltip="Trigger expensive validation">
<visibleWhen checkEnabled="false">
<reference
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguageEditor.opened">
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.Editor.opened">
</reference>
</visibleWhen>
</command>
......@@ -116,7 +116,7 @@
<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
<command commandId="org.eclipse.xtext.ui.editor.FindReferences">
<visibleWhen checkEnabled="false">
<reference definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguageEditor.opened">
<reference definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.Editor.opened">
</reference>
</visibleWhen>
</command>
......@@ -128,7 +128,7 @@
commandId="org.eclipse.xtext.ui.editor.FindReferences">
<activeWhen>
<reference
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguageEditor.opened">
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.Editor.opened">
</reference>
</activeWhen>
</handler>
......@@ -151,6 +151,28 @@
</extension>
<!-- marker definitions for de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage -->
<extension
id="measuredefinitionlanguage.check.fast"
name="MeasureDefinitionLanguage Problem"
point="org.eclipse.core.resources.markers">
<super type="org.eclipse.xtext.ui.check.fast"/>
<persistent value="true"/>
</extension>
<extension
id="measuredefinitionlanguage.check.normal"
name="MeasureDefinitionLanguage Problem"
point="org.eclipse.core.resources.markers">
<super type="org.eclipse.xtext.ui.check.normal"/>
<persistent value="true"/>
</extension>
<extension
id="measuredefinitionlanguage.check.expensive"
name="MeasureDefinitionLanguage Problem"
point="org.eclipse.core.resources.markers">
<super type="org.eclipse.xtext.ui.check.expensive"/>
<persistent value="true"/>
</extension>
<extension
point="org.eclipse.xtext.builder.participant">
......@@ -191,7 +213,7 @@
commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
<activeWhen>
<reference
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguageEditor.opened">
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.Editor.opened">
</reference>
</activeWhen>
</handler>
......@@ -211,18 +233,39 @@
style="push"
tooltip="Open Quick Outline">
<visibleWhen checkEnabled="false">
<reference definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguageEditor.opened"/>
<reference definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.Editor.opened"/>
</visibleWhen>
</command>
</menuContribution>
</extension>
<!-- quickfix marker resolution generator -->
<extension
point="org.eclipse.ui.ide.markerResolution">
<markerResolutionGenerator
class="de.cau.cs.se.measure.definition.language.ui.MeasureDefinitionLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator">
</markerResolutionGenerator>
</extension>
<!-- quickfix marker resolution generator for de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage -->
<extension
point="org.eclipse.ui.ide.markerResolution">
<markerResolutionGenerator
class="de.cau.cs.se.measure.definition.language.ui.MeasureDefinitionLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
markerType="de.cau.cs.se.measure.definition.language.ui.measuredefinitionlanguage.check.fast">
<attribute
name="FIXABLE_KEY"
value="true">
</attribute>
</markerResolutionGenerator>
<markerResolutionGenerator
class="de.cau.cs.se.measure.definition.language.ui.MeasureDefinitionLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
markerType="de.cau.cs.se.measure.definition.language.ui.measuredefinitionlanguage.check.normal">
<attribute
name="FIXABLE_KEY"
value="true">
</attribute>
</markerResolutionGenerator>
<markerResolutionGenerator
class="de.cau.cs.se.measure.definition.language.ui.MeasureDefinitionLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
markerType="de.cau.cs.se.measure.definition.language.ui.measuredefinitionlanguage.check.expensive">
<attribute
name="FIXABLE_KEY"
value="true">
</attribute>
</markerResolutionGenerator>
</extension>
<!-- Rename Refactoring -->
<extension point="org.eclipse.ui.handlers">
<handler
......@@ -230,7 +273,7 @@
commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
<activeWhen>
<reference
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguageEditor.opened">
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.Editor.opened">
</reference>
</activeWhen>
</handler>
......@@ -242,7 +285,7 @@
style="push">
<visibleWhen checkEnabled="false">
<reference
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguageEditor.opened">
definitionId="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.Editor.opened">
</reference>
</visibleWhen>
</command>
......@@ -259,19 +302,19 @@
</extension>
<extension point="org.eclipse.compare.contentViewers">
<viewer id="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguagecompare.contentViewers"
<viewer id="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.compare.contentViewers"
class="de.cau.cs.se.measure.definition.language.ui.MeasureDefinitionLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
extensions="mdl">
</viewer>
</extension>
<extension point="org.eclipse.compare.contentMergeViewers">
<viewer id="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguagecompare.contentMergeViewers"
<viewer id="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.compare.contentMergeViewers"
class="de.cau.cs.se.measure.definition.language.ui.MeasureDefinitionLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
extensions="mdl" label="MeasureDefinitionLanguage Compare">
</viewer>
</extension>
<extension point="org.eclipse.ui.editors.documentProviders">
<provider id="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguageeditors.documentProviders"
<provider id="de.cau.cs.se.measure.definition.language.MeasureDefinitionLanguage.editors.documentProviders"
class="de.cau.cs.se.measure.definition.language.ui.MeasureDefinitionLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"
extensions="mdl">
</provider>
......
......@@ -38,6 +38,11 @@ public abstract class AbstractMeasureDefinitionLanguageUiModule extends DefaultU
binder.bind(org.eclipse.xtext.parser.antlr.ITokenDefProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.ui.LexerUIBindings.HIGHLIGHTING)).to(org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class);
}
// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {
return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;
}
// contributed by org.eclipse.xtext.generator.exporting.QualifiedNamesFragment
public Class<? extends org.eclipse.xtext.ui.refactoring.IDependentElementsCalculator> bindIDependentElementsCalculator() {
return org.eclipse.xtext.ui.refactoring.impl.DefaultDependentElementsCalculator.class;
......@@ -158,61 +163,6 @@ public abstract class AbstractMeasureDefinitionLanguageUiModule extends DefaultU
return org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler.class;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public java.lang.ClassLoader bindClassLoaderToInstance() {
return getClass().getClassLoader();
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
return org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderFactory.class;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
return org.eclipse.xtext.common.types.xtext.ui.JdtBasedSimpleTypeScopeProvider.class;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public Class<? extends org.eclipse.xtext.common.types.xtext.ui.ITypesProposalProvider> bindITypesProposalProvider() {
return org.eclipse.xtext.common.types.xtext.ui.JdtTypesProposalProvider.class;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public Class<? extends org.eclipse.xtext.common.types.access.jdt.IJavaProjectProvider> bindIJavaProjectProvider() {
return org.eclipse.xtext.common.types.xtext.ui.XtextResourceSetBasedProjectProvider.class;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public Class<? extends org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkHelper> bindIHyperlinkHelper() {
return org.eclipse.xtext.common.types.xtext.ui.TypeAwareHyperlinkHelper.class;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public Class<? extends org.eclipse.xtext.ui.editor.contentassist.PrefixMatcher> bindPrefixMatcher() {
return org.eclipse.xtext.ui.editor.contentassist.FQNPrefixMatcher.class;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public Class<? extends org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider.ReferenceProposalCreator> bindAbstractJavaBasedContentProposalProvider$ReferenceProposalCreator() {
return org.eclipse.xtext.common.types.xtext.ui.TypeAwareReferenceProposalCreator.class;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public Class<? extends org.eclipse.xtext.ui.editor.IValidationJobScheduler> bindIValidationJobScheduler() {
return org.eclipse.xtext.common.types.xtext.ui.JdtValidationJobScheduler.class;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public Class<? extends org.eclipse.xtext.ui.refactoring.impl.RefactoringResourceSetProvider> bindRefactoringResourceSetProvider() {
return org.eclipse.xtext.common.types.ui.refactoring.JvmRefactoringResourceSetProvider.class;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public Class<? extends org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation> bindIJavaSearchParticipation() {
return org.eclipse.xtext.common.types.ui.query.IJavaSearchParticipation.Yes.class;
}
// contributed by org.eclipse.xtext.ui.generator.templates.CodetemplatesGeneratorFragment
public com.google.inject.Provider<org.eclipse.xtext.ui.codetemplates.ui.preferences.TemplatesLanguageConfiguration> provideTemplatesLanguageConfiguration() {
return org.eclipse.xtext.ui.codetemplates.ui.AccessibleCodetemplatesActivator.getTemplatesLanguageConfigurationProvider();
......
......@@ -68,7 +68,7 @@ public class AbstractMeasureDefinitionLanguageProposalProvider extends Terminals
public void completeSIUnit_Kind(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeSIUnit_Dimenstion(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
public void completeSIUnit_Dimension(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeTypeReference_Metamodel(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
......@@ -95,6 +95,9 @@ public class AbstractMeasureDefinitionLanguageProposalProvider extends Terminals
public void completeNamedMeasure_Scope(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeCountingMeasure_ResultType(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor);
}
public void completeCountingMeasure_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
......
......@@ -70,8 +70,8 @@ public class MeasureDefinitionLanguageParser extends AbstractContentAssistParser
put(grammarAccess.getNamedMeasureAccess().getGroup_5(), "rule__NamedMeasure__Group_5__0");
put(grammarAccess.getNamedMeasureAccess().getGroup_5_2(), "rule__NamedMeasure__Group_5_2__0");
put(grammarAccess.getCountingMeasureAccess().getGroup(), "rule__CountingMeasure__Group__0");
put(grammarAccess.getCountingMeasureAccess().getGroup_4(), "rule__CountingMeasure__Group_4__0");
put(grammarAccess.getCountingMeasureAccess().getGroup_4_2(), "rule__CountingMeasure__Group_4_2__0");
put(grammarAccess.getCountingMeasureAccess().getGroup_5(), "rule__CountingMeasure__Group_5__0");
put(grammarAccess.getCountingMeasureAccess().getGroup_5_2(), "rule__CountingMeasure__Group_5_2__0");
put(grammarAccess.getMeasureExpressionAccess().getGroup(), "rule__MeasureExpression__Group__0");
put(grammarAccess.getMeasureExpressionAccess().getGroup_5(), "rule__MeasureExpression__Group_5__0");
put(grammarAccess.getMeasureExpressionAccess().getGroup_5_2(), "rule__MeasureExpression__Group_5_2__0");
......@@ -138,7 +138,7 @@ public class MeasureDefinitionLanguageParser extends AbstractContentAssistParser
put(grammarAccess.getUnitCombinationAccess().getUnitsAssignment_1_1(), "rule__UnitCombination__UnitsAssignment_1_1");
put(grammarAccess.getSIUnitAccess().getPrefixAssignment_0(), "rule__SIUnit__PrefixAssignment_0");
put(grammarAccess.getSIUnitAccess().getKindAssignment_1(), "rule__SIUnit__KindAssignment_1");
put(grammarAccess.getSIUnitAccess().getDimenstionAssignment_2(), "rule__SIUnit__DimenstionAssignment_2");
put(grammarAccess.getSIUnitAccess().getDimensionAssignment_2(), "rule__SIUnit__DimensionAssignment_2");
put(grammarAccess.getTypeReferenceAccess().getMetamodelAssignment_0_0(), "rule__TypeReference__MetamodelAssignment_0_0");
put(grammarAccess.getTypeReferenceAccess().getDataTypeAssignment_0_2(), "rule__TypeReference__DataTypeAssignment_0_2");
put(grammarAccess.getTypeReferenceAccess().getMeasureTypeAssignment_1(), "rule__TypeReference__MeasureTypeAssignment_1");
......@@ -148,12 +148,13 @@ public class MeasureDefinitionLanguageParser extends AbstractContentAssistParser
put(grammarAccess.getNamedMeasureAccess().getParameterAssignment_5_1(), "rule__NamedMeasure__ParameterAssignment_5_1");
put(grammarAccess.getNamedMeasureAccess().getParameterAssignment_5_2_1(), "rule__NamedMeasure__ParameterAssignment_5_2_1");
put(grammarAccess.getNamedMeasureAccess().getScopeAssignment_6(), "rule__NamedMeasure__ScopeAssignment_6");
put(grammarAccess.getCountingMeasureAccess().getNameAssignment_1(), "rule__CountingMeasure__NameAssignment_1");
put(grammarAccess.getCountingMeasureAccess().getElementTypeAssignment_3(), "rule__CountingMeasure__ElementTypeAssignment_3");
put(grammarAccess.getCountingMeasureAccess().getParameterAssignment_4_1(), "rule__CountingMeasure__ParameterAssignment_4_1");
put(grammarAccess.getCountingMeasureAccess().getParameterAssignment_4_2_1(), "rule__CountingMeasure__ParameterAssignment_4_2_1");
put(grammarAccess.getCountingMeasureAccess().getSelectionAssignment_6(), "rule__CountingMeasure__SelectionAssignment_6");
put(grammarAccess.getCountingMeasureAccess().getScopeAssignment_7(), "rule__CountingMeasure__ScopeAssignment_7");
put(grammarAccess.getCountingMeasureAccess().getResultTypeAssignment_1(), "rule__CountingMeasure__ResultTypeAssignment_1");
put(grammarAccess.getCountingMeasureAccess().getNameAssignment_2(), "rule__CountingMeasure__NameAssignment_2");
put(grammarAccess.getCountingMeasureAccess().getElementTypeAssignment_4(), "rule__CountingMeasure__ElementTypeAssignment_4");
put(grammarAccess.getCountingMeasureAccess().getParameterAssignment_5_1(), "rule__CountingMeasure__ParameterAssignment_5_1");
put(grammarAccess.getCountingMeasureAccess().getParameterAssignment_5_2_1(), "rule__CountingMeasure__ParameterAssignment_5_2_1");
put(grammarAccess.getCountingMeasureAccess().getSelectionAssignment_7(), "rule__CountingMeasure__SelectionAssignment_7");
put(grammarAccess.getCountingMeasureAccess().getScopeAssignment_8(), "rule__CountingMeasure__ScopeAssignment_8");
put(grammarAccess.getMeasureExpressionAccess().getResultTypeAssignment_1(), "rule__MeasureExpression__ResultTypeAssignment_1");
put(grammarAccess.getMeasureExpressionAccess().getNameAssignment_2(), "rule__MeasureExpression__NameAssignment_2");
put(grammarAccess.getMeasureExpressionAccess().getElementTypeAssignment_4(), "rule__MeasureExpression__ElementTypeAssignment_4");
......
......@@ -44,7 +44,9 @@ T__42=42
T__43=43
T__40=40
T__41=41
T__80=80
T__46=46
T__81=81
T__47=47
T__44=44
T__45=45
......@@ -75,70 +77,72 @@ T__79=79
T__78=78
T__77=77
'deci'=30
'#'=72
'#'=74
'>='=12
'count'=56
'count'=58
'=='=16
'/'=22
'model'=48
'model'=50
'tera'=34
'giga'=33
'measure'=53
'exists'=67
'measure'=55
'exists'=69
'>'=14
'||'=74
'&&'=75
'forall'=65
'typedef'=49
'||'=76
'&&'=77
'forall'=67
'typedef'=51
'+'=18
'.'=69
'.'=71
'gram'=38
'library'=46
'import'=47
'isKindOf'=45
'else'=64
'library'=48
'import'=49
'isKindOf'=47
'else'=66
'centi'=29
'{'=61
'{'=63
'sum'=40
'pico'=25
'def'=58
'def'=60
'kilo'=31
'standard-deviation'=42
'floor'=77
'if'=63
'('=50
':'=54
'floor'=79
'if'=65
'('=52
':'=56
'-'=19
'**'=21
'second'=37
','=55
'ceil'=78
'in'=68
'select'=57
','=57
'ceil'=80
'in'=70
'select'=59
'liter'=39
']'=71
']'=73
'milli'=28
'average'=41
'!'=24
'|'=66
'|'=68
'sd'=43
'meter'=36
'nano'=26
'null'=73
'null'=75
'peta'=35
'micro'=27
'::'=52
'collect'=59
')'=51
'::'=54
'collect'=61
')'=53
'mega'=32
'%'=23
'}'=62
'size'=79
'abs'=76
'max'=44
'}'=64
'size'=81
'abs'=78
'<='=13
'scope'=62
'!='=17
'scope'=60
'<'=15
'isTypeOf'=44
'['=70
'isTypeOf'=46
'['=72
'*'=20
'min'=45
......@@ -5,5 +5,6 @@
<classpathentry kind="src" path="xtend-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="lib" path="lib/mamba.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: de.cau.se.measure.definition.language
Bundle-Name: de.cau.cs.se.measure.definition.language
Bundle-Vendor: My Company
Bundle-Version: 1.0.0
Bundle-SymbolicName: de.cau.cs.se.measure.definition.language;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: de.cau.cs.se.measure.definition.language; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext;visibility:=reexport,
org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
......@@ -21,16 +21,17 @@ Import-Package: org.apache.log4j,
org.eclipse.xtext.xbase.lib
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: de.cau.cs.se.measure.definition.language,
de.cau.cs.se.measure.definition.language.formatting,
de.cau.cs.se.measure.definition.language.generator,
de.cau.cs.se.measure.definition.language.jvmmodel,
de.cau.cs.se.measure.definition.language.scoping,
de.cau.cs.se.measure.definition.language.services,
de.cau.cs.se.measure.definition.language.validation,
de.cau.cs.se.measure.definition.language.definition,
de.cau.cs.se.measure.definition.language.definition.impl,
de.cau.cs.se.measure.definition.language.definition.util,
de.cau.cs.se.measure.definition.language.serializer,
de.cau.cs.se.measure.definition.language.parser.antlr,
de.cau.cs.se.measure.definition.language.parser.antlr.internal,
de.cau.cs.se.measure.definition.language.definition,
de.cau.cs.se.measure.definition.language.definition.impl,
de.cau.cs.se.measure.definition.language.definition.util
de.cau.cs.se.measure.definition.language.validation,
de.cau.cs.se.measure.definition.language.scoping,
de.cau.cs.se.measure.definition.language.generator,
de.cau.cs.se.measure.definition.language.formatting
Bundle-ClassPath: lib/mamba.jar,
.
......@@ -3,4 +3,6 @@ source.. = src/,\
xtend-gen/
bin.includes = META-INF/,\
.,\
plugin.xml
\ No newline at end of file
plugin.xml,\
lib/mamba.jar
......@@ -6,7 +6,7 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<package
uri = "http://se.cs.cau.de/languages/MeasureDefinitionLanguage"
class = "de.cau.cs.se.measure.definition.language.measureDefinition.MeasureDefinitionPackage"
class = "de.cau.cs.se.measure.definition.language.definition.DefinitionPackage"
genModel = "de/cau/cs/se/measure/definition/language/MeasureDefinitionLanguage.genmodel" />
</extension>
......
......@@ -34,6 +34,11 @@ public abstract class AbstractMeasureDefinitionLanguageRuntimeModule extends Def
binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("mdl");
}
// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
public java.lang.ClassLoader bindClassLoaderToInstance() {
return getClass().getClassLoader();
}
// contributed by org.eclipse.xtext.generator.grammarAccess.GrammarAccessFragment
public Class<? extends org.eclipse.xtext.IGrammarAccess> bindIGrammarAccess() {
return de.cau.cs.se.measure.definition.language.services.MeasureDefinitionLanguageGrammarAccess.class;
......@@ -104,6 +109,11 @@ public abstract class AbstractMeasureDefinitionLanguageRuntimeModule extends Def
binder.bind(org.eclipse.xtext.scoping.IScopeProvider.class).annotatedWith(com.google.inject.name.Names.named(org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider.NAMED_DELEGATE)).to(org.eclipse.xtext.scoping.impl.ImportedNamespaceAwareLocalScopeProvider.class);
}
// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
return org.eclipse.xtext.scoping.impl.DefaultGlobalScopeProvider.class;
}
// contributed by org.eclipse.xtext.generator.scoping.AbstractScopingFragment
public void configureIgnoreCaseLinking(com.google.inject.Binder binder) {
binder.bindConstant().annotatedWith(org.eclipse.xtext.scoping.IgnoreCaseLinking.class).to(false);
......@@ -144,29 +154,4 @@ public abstract class AbstractMeasureDefinitionLanguageRuntimeModule extends Def
return de.cau.cs.se.measure.definition.language.formatting.MeasureDefinitionLanguageFormatter.class;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public java.lang.ClassLoader bindClassLoaderToInstance() {
return getClass().getClassLoader();
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public org.eclipse.xtext.common.types.TypesFactory bindTypesFactoryToInstance() {
return org.eclipse.xtext.common.types.TypesFactory.eINSTANCE;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public Class<? extends org.eclipse.xtext.common.types.access.IJvmTypeProvider.Factory> bindIJvmTypeProvider$Factory() {
return org.eclipse.xtext.common.types.access.ClasspathTypeProviderFactory.class;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public Class<? extends org.eclipse.xtext.common.types.xtext.AbstractTypeScopeProvider> bindAbstractTypeScopeProvider() {
return org.eclipse.xtext.common.types.xtext.ClasspathBasedTypeScopeProvider.class;
}
// contributed by org.eclipse.xtext.generator.types.TypesGeneratorFragment
public Class<? extends org.eclipse.xtext.scoping.IGlobalScopeProvider> bindIGlobalScopeProvider() {
return org.eclipse.xtext.common.types.xtext.TypesAwareDefaultGlobalScopeProvider.class;
}
}
......@@ -44,7 +44,7 @@
<eClassifiers xsi:type="ecore:EClass" name="SIUnit" eSuperTypes="#//UnitCombination">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="prefix" eType="#//Prefix"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//Kind"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="dimenstion" eType="ecore:EDataType ../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="dimension" eType="ecore:EDataType ../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="Prefix">
<eLiterals name="PICO" literal="pico"/>
......@@ -71,6 +71,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="measureType" eType="#//MeasureType"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Measure">
<eStructuralFeatures xsi:type="ecore:EReference" name="resultType" eType="#//MeasureType"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType ../../../../../../../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="elementType" eType="#//ModelType"
containment="true"/>
......@@ -79,20 +80,16 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="scope" eType="#//Scope"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="NamedMeasure" eSuperTypes="#//Measure">
<eStructuralFeatures xsi:type="ecore:EReference" name="resultType" eType="#//MeasureType"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="NamedMeasure" eSuperTypes="#//Measure"/>
<eClassifiers xsi:type="ecore:EClass" name="CountingMeasure" eSuperTypes="#//Measure">
<eStructuralFeatures xsi:type="ecore:EReference" name="selection" eType="#//Expression"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="MeasureExpression" eSuperTypes="#//Measure">
<eStructuralFeatures xsi:type="ecore:EReference" name="resultType" eType="#//MeasureType"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//Expression"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CollectiveMeasure" eSuperTypes="#//Measure">
<eStructuralFeatures xsi:type="ecore:EReference" name="resultType" eType="#//MeasureType"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="accumulator" eType="#//Accumulator"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="referencedMeasure" eType="#//Measure"/>
</eClassifiers>
......@@ -100,6 +97,8 @@
<eLiterals name="SUM" literal="sum"/>
<eLiterals name="AVERAGE" value="1" literal="average"/>
<eLiterals name="STANDARD_DEVIATION" value="2" literal="standard-deviation"/>