syntax.exp in expressir-0.2.1

- old
+ new

@@ -10,16 +10,16 @@
 
 CONSTANT
   -- literals
   binaryExpression : STRING := %011110000111100001111000;
   integerExpression : STRING := 999;
-  logicalTrueExpression : STRING := TRUE;
-  logicalFalseExpression : STRING := FALSE;
-  logicalUnknownExpression : STRING := UNKNOWN;
+  trueLogicalExpression : STRING := TRUE;
+  falseLogicalExpression : STRING := FALSE;
+  unknownLogicalExpression : STRING := UNKNOWN;
   realExpression : STRING := 999.999;
-  stringSimpleExpression : STRING := 'xxx';
-  stringEncodedExpression : STRING := "000000780000007800000078";
+  simpleStringExpression : STRING := 'xxx';
+  encodedStringExpression : STRING := "000000780000007800000078";
 
   -- constants
   constEExpression : STRING := CONST_E;
   indeterminateExpression : STRING := ?;
   piExpression : STRING := PI;
@@ -91,14 +91,14 @@
   combineExpression : STRING := test || test;
   inExpression : STRING := TRUE IN [TRUE];
   likeExpression : STRING := 'xxx' LIKE 'xxx';
 
   -- aggregate initializers
-  aggregateExpression : STRING := ['xxx'];
-  aggregateRepeatedExpression : STRING := ['xxx' : 2];
-  aggregateComplexExpression : STRING := [4 + 2];
-  aggregateComplexRepeatedExpression : STRING := [4 + 2 : 4 + 2];
+  aggregateInitializerExpression : STRING := ['xxx'];
+  repeatedAggregateInitializerExpression : STRING := ['xxx' : 2];
+  complexAggregateInitializerExpression : STRING := [4 + 2];
+  complexRepeatedAggregateInitializerExpression : STRING := [4 + 2 : 4 + 2];
 
   -- entity constructors
   entityConstructorExpression : STRING := explicitAttributeEntity(TRUE);
 
   -- enumeration references
@@ -173,17 +173,22 @@
 ENTITY supertypeConstraintSubtypeEntity SUPERTYPE OF (emptyEntity) SUBTYPE OF (emptyEntity); END_ENTITY;
 ENTITY explicitAttributeEntity; test : BOOLEAN; END_ENTITY;
 ENTITY explicitAttributeOptionalEntity; test : OPTIONAL BOOLEAN; END_ENTITY;
 ENTITY explicitAttributeMultipleEntity; test : BOOLEAN; test2 : BOOLEAN; END_ENTITY;
 ENTITY explicitAttributeMultipleShorthandEntity; test, test2 : BOOLEAN; END_ENTITY;
-ENTITY explicitAttributeRenamedEntity; SELF\explicitAttributeEntity.test RENAMED test2: BOOLEAN; END_ENTITY;
+ENTITY explicitAttributeRedeclaredEntity; SELF\explicitAttributeEntity.test: BOOLEAN; END_ENTITY;
+ENTITY explicitAttributeRedeclaredRenamedEntity; SELF\explicitAttributeEntity.test RENAMED test2: BOOLEAN; END_ENTITY;
 ENTITY derivedAttributeEntity; DERIVE test : BOOLEAN := TRUE; END_ENTITY;
+ENTITY derivedAttributeRedeclaredEntity; DERIVE SELF\explicitAttributeEntity.test : BOOLEAN := TRUE; END_ENTITY;
+ENTITY derivedAttributeRedeclaredRenamedEntity; DERIVE SELF\explicitAttributeEntity.test RENAMED test2 : BOOLEAN := TRUE; END_ENTITY;
 ENTITY inverseAttributeEntity; INVERSE test : explicitAttributeEntity FOR test; END_ENTITY;
 ENTITY inverseAttributeEntityEntity; INVERSE test : explicitAttributeEntity FOR explicitAttributeEntity.test; END_ENTITY;
 ENTITY inverseAttributeSetEntity; INVERSE test : SET OF explicitAttributeEntity FOR test; END_ENTITY;
 ENTITY inverseAttributeSetBoundEntity; INVERSE test : SET [1:9] OF explicitAttributeEntity FOR test; END_ENTITY;
 ENTITY inverseAttributeBagEntity; INVERSE test : BAG OF explicitAttributeEntity FOR test; END_ENTITY;
 ENTITY inverseAttributeBagBoundEntity; INVERSE test : BAG [1:9] OF explicitAttributeEntity FOR test; END_ENTITY;
+ENTITY inverseAttributeRedeclaredEntity; INVERSE SELF\explicitAttributeEntity.test : explicitAttributeEntity FOR test; END_ENTITY;
+ENTITY inverseAttributeRedeclaredRenamedEntity; INVERSE SELF\explicitAttributeEntity.test RENAMED test2 : explicitAttributeEntity FOR test; END_ENTITY;
 ENTITY uniqueEntity; UNIQUE test; END_ENTITY;
 ENTITY uniqueLabelEntity; UNIQUE UR1: test; END_ENTITY;
 ENTITY uniqueQualifiedEntity; UNIQUE SELF\explicitAttributeEntity.test; END_ENTITY;
 ENTITY uniqueLabelQualifiedEntity; UNIQUE UR1: SELF\explicitAttributeEntity.test; END_ENTITY;
 ENTITY whereEntity; WHERE TRUE; END_ENTITY;