Browse Source

Downgrade to rev. 1543 because the last commits removed latest changes. Added last changes and manually and commited them new.

markus.muehlbrandt@itemis.de 14 years ago
parent
commit
a142e959c6
16 changed files with 5366 additions and 5160 deletions
  1. 11 4
      plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.g
  2. 72 70
      plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.tokens
  3. 558 518
      plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSTextLexer.java
  4. 3828 3791
      plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSTextParser.java
  5. 3 2
      plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore
  6. 1 0
      plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.genmodel
  7. 4 0
      plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.xmi
  8. 12 6
      plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSText.g
  9. 36 34
      plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSText.tokens
  10. 436 398
      plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSTextLexer.java
  11. 352 320
      plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSTextParser.java
  12. 19 11
      plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/services/STextGrammarAccess.java
  13. 31 4
      plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/Direction.java
  14. 1 1
      plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/impl/EventDefinitionImpl.java
  15. 1 0
      plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/impl/StextPackageImpl.java
  16. 1 1
      plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/SText.xtext

+ 11 - 4
plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.g

@@ -2289,17 +2289,24 @@ rule__Direction__Alternatives
     }
 :
 (
-{ before(grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0()); }
+{ before(grammarAccess.getDirectionAccess().getLOCALEnumLiteralDeclaration_0()); }
+(	'local' 
+)
+{ after(grammarAccess.getDirectionAccess().getLOCALEnumLiteralDeclaration_0()); }
+)
+
+    |(
+{ before(grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_1()); }
 (	'in' 
 )
-{ after(grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0()); }
+{ after(grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_1()); }
 )
 
     |(
-{ before(grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1()); }
+{ before(grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_2()); }
 (	'out' 
 )
-{ after(grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1()); }
+{ after(grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_2()); }
 )
 
 ;

+ 72 - 70
plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.tokens

@@ -55,6 +55,7 @@ T__48=48
 T__49=49
 RULE_FLOAT=8
 RULE_SL_COMMENT=11
+T__84=84
 RULE_ML_COMMENT=10
 T__30=30
 T__31=31
@@ -78,73 +79,74 @@ T__73=73
 T__79=79
 T__78=78
 T__77=77
-'#'=66
-'out'=15
-'>='=40
-'internal'=56
-'~'=36
-'/'=34
-'=='=41
-'/='=20
-'string'=50
-'integer'=47
-'%='=21
-'>'=39
-'event'=57
-'||'=76
-'&&'=77
-';'=69
-'raise'=74
-'+'=31
-'^'=79
-'>>'=30
-'^='=27
-'+='=22
-'readonly'=82
-'>>='=25
-'void'=46
-'?'=75
-'var'=58
-'&='=26
-'s'=43
-':'=55
-'('=61
-'exit'=71
-'-'=32
-','=63
-'in'=14
-'-='=23
-']'=68
-'<<='=24
-'ns'=45
-'real'=48
-'!'=78
-'|'=80
-'ms'=44
-'every'=17
-'|='=28
-'@@statechart@@'=51
-'exitpoint'=65
-'@@state@@'=52
-'='=18
-'always'=73
-'oncycle'=72
-')'=62
-'*='=19
-'entry'=70
-'%'=35
-'operation'=60
-'after'=16
-'boolean'=49
-'entrypoint'=64
-'<<'=29
-'<='=38
-'!='=42
-'@@transition@@'=53
-'external'=83
-'<'=37
-'['=67
-'*'=33
-'clock'=59
-'&'=81
-'interface'=54
+'#'=67
+'out'=16
+'>='=41
+'internal'=57
+'~'=37
+'/'=35
+'=='=42
+'/='=21
+'string'=51
+'integer'=48
+'%='=22
+'>'=40
+'event'=58
+'||'=77
+'&&'=78
+';'=70
+'raise'=75
+'+'=32
+'^'=80
+'>>'=31
+'^='=28
+'+='=23
+'readonly'=83
+'>>='=26
+'void'=47
+'?'=76
+'var'=59
+'&='=27
+'s'=44
+':'=56
+'('=62
+'exit'=72
+'-'=33
+','=64
+'in'=15
+'-='=24
+']'=69
+'<<='=25
+'ns'=46
+'real'=49
+'!'=79
+'|'=81
+'ms'=45
+'every'=18
+'|='=29
+'@@statechart@@'=52
+'exitpoint'=66
+'@@state@@'=53
+'='=19
+'always'=74
+'oncycle'=73
+')'=63
+'*='=20
+'entry'=71
+'%'=36
+'operation'=61
+'after'=17
+'boolean'=50
+'entrypoint'=65
+'<<'=30
+'<='=39
+'!='=43
+'@@transition@@'=54
+'external'=84
+'<'=38
+'['=68
+'*'=34
+'clock'=60
+'local'=14
+'&'=82
+'interface'=55

File diff suppressed because it is too large
+ 558 - 518
plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSTextLexer.java


File diff suppressed because it is too large
+ 3828 - 3791
plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSTextParser.java


+ 3 - 2
plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore

@@ -38,8 +38,9 @@
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="Direction">
-    <eLiterals name="IN" literal="in"/>
-    <eLiterals name="OUT" value="1" literal="out"/>
+    <eLiterals name="LOCAL" literal="local"/>
+    <eLiterals name="IN" value="1" literal="in"/>
+    <eLiterals name="OUT" value="2" literal="out"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="LocalReaction" eSuperTypes="platform:/resource/org.yakindu.sct.model.sgraph/model/emf/sgraph.ecore#//Declaration platform:/resource/org.yakindu.sct.model.sgraph/model/emf/sgraph.ecore#//Reaction">
     <eStructuralFeatures xsi:type="ecore:EReference" name="properties" eType="ecore:EClass platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//ReactionProperties"

+ 1 - 0
plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.genmodel

@@ -10,6 +10,7 @@
   <genPackages prefix="Stext" basePackage="org.yakindu.sct.model.stext" disposableProviderFactory="true"
       ecorePackage="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//Direction">
+      <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//Direction/LOCAL"/>
       <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//Direction/IN"/>
       <genEnumLiterals ecoreEnumLiteral="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//Direction/OUT"/>
     </genEnums>

+ 4 - 0
plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.xmi

@@ -221,6 +221,10 @@
         <classifier xsi:type="ecore:EEnum" href="http://www.yakindu.org/sct/statechart/SText#//Direction"/>
       </type>
       <alternatives xsi:type="xtext:Alternatives">
+        <elements xsi:type="xtext:EnumLiteralDeclaration">
+          <enumLiteral href="http://www.yakindu.org/sct/statechart/SText#//Direction/LOCAL"/>
+          <literal value="local"/>
+        </elements>
         <elements xsi:type="xtext:EnumLiteralDeclaration">
           <enumLiteral href="http://www.yakindu.org/sct/statechart/SText#//Direction/IN"/>
           <literal value="in"/>

+ 12 - 6
plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSText.g

@@ -3530,16 +3530,22 @@ ruleLiteral returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()
 ruleDirection returns [Enumerator current=null] 
     @init { enterRule(); }
     @after { leaveRule(); }:
-((	enumLiteral_0='in' 
+((	enumLiteral_0='local' 
 	{
-        $current = grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_0, grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_0()); 
+        $current = grammarAccess.getDirectionAccess().getLOCALEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
+        newLeafNode(enumLiteral_0, grammarAccess.getDirectionAccess().getLOCALEnumLiteralDeclaration_0()); 
     }
 )
-    |(	enumLiteral_1='out' 
+    |(	enumLiteral_1='in' 
 	{
-        $current = grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
-        newLeafNode(enumLiteral_1, grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_1()); 
+        $current = grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
+        newLeafNode(enumLiteral_1, grammarAccess.getDirectionAccess().getINEnumLiteralDeclaration_1()); 
+    }
+)
+    |(	enumLiteral_2='out' 
+	{
+        $current = grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
+        newLeafNode(enumLiteral_2, grammarAccess.getDirectionAccess().getOUTEnumLiteralDeclaration_2()); 
     }
 ));
 

+ 36 - 34
plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSText.tokens

@@ -55,6 +55,7 @@ T__48=48
 T__49=49
 RULE_FLOAT=9
 RULE_SL_COMMENT=11
+T__84=84
 RULE_ML_COMMENT=10
 T__30=30
 T__31=31
@@ -78,51 +79,51 @@ T__73=73
 T__79=79
 T__78=78
 T__77=77
-'>='=73
+'>='=74
 '#'=33
 'internal'=19
-'out'=51
-'~'=70
-'=='=74
+'out'=52
+'~'=71
+'=='=75
 '/'=32
-'string'=83
-'/='=55
-'integer'=80
-'%='=56
+'string'=84
+'/='=56
+'integer'=81
+'%='=57
 '>'=37
 'event'=20
 '||'=44
 '&&'=45
 ';'=36
 'raise'=42
-'+'=66
+'+'=67
 '^'=47
-'>>'=65
-'^='=62
-'+='=57
+'>>'=66
+'^='=63
+'+='=58
 'readonly'=23
-'>>='=60
-'void'=79
+'>>='=61
+'void'=80
 '?'=43
 'var'=22
-'s'=76
-'&='=61
+'s'=77
+'&='=62
 '('=27
 ':'=18
-'-'=67
+'-'=68
 'exit'=39
 ','=28
-'in'=50
-'-='=58
+'in'=51
+'-='=59
 ']'=35
-'<<='=59
-'real'=81
-'ns'=78
+'<<='=60
+'real'=82
+'ns'=79
 '!'=46
 '|'=48
-'ms'=77
-'every'=53
-'|='=63
+'ms'=78
+'every'=54
+'|='=64
 '@@statechart@@'=14
 'exitpoint'=31
 '@@state@@'=15
@@ -130,21 +131,22 @@ T__77=77
 'always'=41
 ')'=29
 'oncycle'=40
-'*='=54
+'*='=55
 'entry'=38
-'%'=69
+'%'=70
 'operation'=26
-'after'=52
-'boolean'=82
+'after'=53
+'boolean'=83
 'entrypoint'=30
-'<<'=64
-'<='=72
-'!='=75
+'<<'=65
+'<='=73
+'!='=76
 '@@transition@@'=16
 'external'=24
-'<'=71
-'*'=68
+'<'=72
+'*'=69
 '['=34
 'clock'=25
+'local'=50
 '&'=49
 'interface'=17

File diff suppressed because it is too large
+ 436 - 398
plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSTextLexer.java


File diff suppressed because it is too large
+ 352 - 320
plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSTextParser.java


+ 19 - 11
plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/services/STextGrammarAccess.java

@@ -2084,29 +2084,37 @@ public class STextGrammarAccess extends AbstractGrammarElementFinder {
 	public class DirectionElements extends AbstractEnumRuleElementFinder {
 		private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "Direction");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final EnumLiteralDeclaration cINEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-		private final Keyword cINInKeyword_0_0 = (Keyword)cINEnumLiteralDeclaration_0.eContents().get(0);
-		private final EnumLiteralDeclaration cOUTEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-		private final Keyword cOUTOutKeyword_1_0 = (Keyword)cOUTEnumLiteralDeclaration_1.eContents().get(0);
+		private final EnumLiteralDeclaration cLOCALEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
+		private final Keyword cLOCALLocalKeyword_0_0 = (Keyword)cLOCALEnumLiteralDeclaration_0.eContents().get(0);
+		private final EnumLiteralDeclaration cINEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
+		private final Keyword cINInKeyword_1_0 = (Keyword)cINEnumLiteralDeclaration_1.eContents().get(0);
+		private final EnumLiteralDeclaration cOUTEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
+		private final Keyword cOUTOutKeyword_2_0 = (Keyword)cOUTEnumLiteralDeclaration_2.eContents().get(0);
 		
 		//enum Direction:
-		//	IN="in" | OUT="out";
+		//	LOCAL="local" | IN="in" | OUT="out";
 		public EnumRule getRule() { return rule; }
 
-		//IN="in" | OUT="out"
+		//LOCAL="local" | IN="in" | OUT="out"
 		public Alternatives getAlternatives() { return cAlternatives; }
 
+		//LOCAL="local"
+		public EnumLiteralDeclaration getLOCALEnumLiteralDeclaration_0() { return cLOCALEnumLiteralDeclaration_0; }
+
+		//"local"
+		public Keyword getLOCALLocalKeyword_0_0() { return cLOCALLocalKeyword_0_0; }
+
 		//IN="in"
-		public EnumLiteralDeclaration getINEnumLiteralDeclaration_0() { return cINEnumLiteralDeclaration_0; }
+		public EnumLiteralDeclaration getINEnumLiteralDeclaration_1() { return cINEnumLiteralDeclaration_1; }
 
 		//"in"
-		public Keyword getINInKeyword_0_0() { return cINInKeyword_0_0; }
+		public Keyword getINInKeyword_1_0() { return cINInKeyword_1_0; }
 
 		//OUT="out"
-		public EnumLiteralDeclaration getOUTEnumLiteralDeclaration_1() { return cOUTEnumLiteralDeclaration_1; }
+		public EnumLiteralDeclaration getOUTEnumLiteralDeclaration_2() { return cOUTEnumLiteralDeclaration_2; }
 
 		//"out"
-		public Keyword getOUTOutKeyword_1_0() { return cOUTOutKeyword_1_0; }
+		public Keyword getOUTOutKeyword_2_0() { return cOUTOutKeyword_2_0; }
 	}
 
 	public class TimeEventTypeElements extends AbstractEnumRuleElementFinder {
@@ -2783,7 +2791,7 @@ public class STextGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//enum Direction:
-	//	IN="in" | OUT="out";
+	//	LOCAL="local" | IN="in" | OUT="out";
 	public DirectionElements getDirectionAccess() {
 		return (unknownRuleDirection != null) ? unknownRuleDirection : (unknownRuleDirection = new DirectionElements());
 	}

+ 31 - 4
plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/Direction.java

@@ -23,6 +23,16 @@ import org.eclipse.emf.common.util.Enumerator;
  */
 public enum Direction implements Enumerator
 {
+  /**
+   * The '<em><b>LOCAL</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #LOCAL_VALUE
+   * @generated
+   * @ordered
+   */
+  LOCAL(0, "LOCAL", "local"),
+
   /**
    * The '<em><b>IN</b></em>' literal object.
    * <!-- begin-user-doc -->
@@ -31,7 +41,7 @@ public enum Direction implements Enumerator
    * @generated
    * @ordered
    */
-  IN(0, "IN", "in"),
+  IN(1, "IN", "in"),
 
   /**
    * The '<em><b>OUT</b></em>' literal object.
@@ -41,7 +51,22 @@ public enum Direction implements Enumerator
    * @generated
    * @ordered
    */
-  OUT(1, "OUT", "out");
+  OUT(2, "OUT", "out");
+
+  /**
+   * The '<em><b>LOCAL</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>LOCAL</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #LOCAL
+   * @model literal="local"
+   * @generated
+   * @ordered
+   */
+  public static final int LOCAL_VALUE = 0;
 
   /**
    * The '<em><b>IN</b></em>' literal value.
@@ -56,7 +81,7 @@ public enum Direction implements Enumerator
    * @generated
    * @ordered
    */
-  public static final int IN_VALUE = 0;
+  public static final int IN_VALUE = 1;
 
   /**
    * The '<em><b>OUT</b></em>' literal value.
@@ -71,7 +96,7 @@ public enum Direction implements Enumerator
    * @generated
    * @ordered
    */
-  public static final int OUT_VALUE = 1;
+  public static final int OUT_VALUE = 2;
 
   /**
    * An array of all the '<em><b>Direction</b></em>' enumerators.
@@ -82,6 +107,7 @@ public enum Direction implements Enumerator
   private static final Direction[] VALUES_ARRAY =
     new Direction[]
     {
+      LOCAL,
       IN,
       OUT,
     };
@@ -142,6 +168,7 @@ public enum Direction implements Enumerator
   {
     switch (value)
     {
+      case LOCAL_VALUE: return LOCAL;
       case IN_VALUE: return IN;
       case OUT_VALUE: return OUT;
     }

+ 1 - 1
plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/impl/EventDefinitionImpl.java

@@ -47,7 +47,7 @@ public class EventDefinitionImpl extends EventImpl implements EventDefinition
    * @generated
    * @ordered
    */
-  protected static final Direction DIRECTION_EDEFAULT = Direction.IN;
+  protected static final Direction DIRECTION_EDEFAULT = Direction.LOCAL;
 
   /**
    * The cached value of the '{@link #getDirection() <em>Direction</em>}' attribute.

+ 1 - 0
plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/impl/StextPackageImpl.java

@@ -2380,6 +2380,7 @@ public class StextPackageImpl extends EPackageImpl implements StextPackage
 
     // Initialize enums and add enum literals
     initEEnum(directionEEnum, Direction.class, "Direction");
+    addEEnumLiteral(directionEEnum, Direction.LOCAL);
     addEEnumLiteral(directionEEnum, Direction.IN);
     addEEnumLiteral(directionEEnum, Direction.OUT);
 

+ 1 - 1
plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/SText.xtext

@@ -69,7 +69,7 @@ EventDerivation:
 	'=' condition=Expression (':' value=Expression)?;
 
 enum Direction:
-	IN='in' | OUT='out';
+	LOCAL='local' | IN='in' | OUT='out';
 
 /* ---- variable definition ---- */
 VariableDefinition returns sct::Variable: