Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/OseeDsl.xtext')
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/OseeDsl.xtext11
1 files changed, 4 insertions, 7 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/OseeDsl.xtext b/plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/OseeDsl.xtext
index 377247352a..d332ee82b5 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/OseeDsl.xtext
+++ b/plugins/org.eclipse.osee.framework.core.dsl/src/org/eclipse/osee/framework/core/dsl/OseeDsl.xtext
@@ -18,9 +18,6 @@ terminal STRING:
terminal WHOLE_NUM_STR:
('0'..'9')+;
-terminal HEX_INT:
- '0x' ('A'..'F' | '0'..'9')+;
-
QUALIFIED_NAME:
ID ('.' ID)*;
@@ -37,7 +34,7 @@ XArtifactType:
(abstract?='abstract')? 'artifactType' name=STRING ('extends'
superArtifactTypes+=[XArtifactType|STRING] (','
superArtifactTypes+=[XArtifactType|STRING])*)? '{' ('guid' typeGuid=STRING)?
- 'uuid' uuid=HEX_INT
+ 'id' id=WHOLE_NUM_STR
(validAttributeTypes+=XAttributeTypeRef)* '}';
XAttributeTypeRef:
@@ -45,7 +42,7 @@ XAttributeTypeRef:
XAttributeType:
'attributeType' name=STRING ('extends' baseAttributeType=AttributeBaseType) ('overrides'
- override=[XAttributeType|STRING])? '{' ('guid' typeGuid=STRING)? 'uuid' uuid=HEX_INT 'dataProvider'
+ override=[XAttributeType|STRING])? '{' ('guid' typeGuid=STRING)? 'id' id=WHOLE_NUM_STR 'dataProvider'
dataProvider=('DefaultAttributeDataProvider' | 'UriAttributeDataProvider' | QUALIFIED_NAME) 'min' min=WHOLE_NUM_STR
'max' max=(WHOLE_NUM_STR | 'unlimited') (('taggerId' taggerId=('DefaultAttributeTaggerProvider' | QUALIFIED_NAME))? &
('enumType' enumType=[XOseeEnumType|STRING])? & ('description' description=STRING)? & ('defaultValue'
@@ -58,7 +55,7 @@ AttributeBaseType:
QUALIFIED_NAME;
XOseeEnumType:
- 'oseeEnumType' name=STRING '{' ('guid' typeGuid=STRING)? 'uuid' uuid=HEX_INT (enumEntries+=XOseeEnumEntry)* '}';
+ 'oseeEnumType' name=STRING '{' ('guid' typeGuid=STRING)? 'id' id=WHOLE_NUM_STR (enumEntries+=XOseeEnumEntry)* '}';
XOseeEnumEntry:
'entry' name=STRING (ordinal=WHOLE_NUM_STR)? ('entryGuid' entryGuid=STRING)? ('description' description=STRING)?;
@@ -95,7 +92,7 @@ UpdateAttribute:
'update' attribute=XAttributeTypeRef;
XRelationType:
- 'relationType' name=STRING '{' ('guid' typeGuid=STRING)? 'uuid' uuid=HEX_INT
+ 'relationType' name=STRING '{' ('guid' typeGuid=STRING)? 'id' id=WHOLE_NUM_STR
'sideAName' sideAName=STRING 'sideAArtifactType' sideAArtifactType=[XArtifactType|STRING]
'sideBName' sideBName=STRING 'sideBArtifactType' sideBArtifactType=[XArtifactType|STRING]
'defaultOrderType' defaultOrderType=RelationOrderType 'multiplicity' multiplicity=RelationMultiplicityEnum '}';

Back to the top