Changed maping from real to float instead of real to double

plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/AbstractSTextProposalProvider.java

@@ -501,7 +501,7 @@ public class AbstractSTextProposalProvider extends TerminalsProposalProvider {
 	public void complete_HEX(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
-	public void complete_DOUBLE(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+	public void complete_FLOAT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		// subclasses may override
 	}
 }

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

@@ -11475,8 +11475,8 @@ rule__RealLiteral__ValueAssignment_1
     }
 :
 (
-{ before(grammarAccess.getRealLiteralAccess().getValueDOUBLETerminalRuleCall_1_0()); }
-	RULE_DOUBLE{ after(grammarAccess.getRealLiteralAccess().getValueDOUBLETerminalRuleCall_1_0()); }
+{ before(grammarAccess.getRealLiteralAccess().getValueFLOATTerminalRuleCall_1_0()); }
+	RULE_FLOAT{ after(grammarAccess.getRealLiteralAccess().getValueFLOATTerminalRuleCall_1_0()); }
 )
 
 ;
@@ -11504,7 +11504,7 @@ RULE_BOOL : ('true'|'false'|'yes'|'no');
 
 RULE_HEX : '0' ('x'|'X') ('0'..'9'|'a'..'f'|'A'..'F')+;
 
-RULE_DOUBLE : RULE_INT '.' RULE_INT ('e' ('-'|'+') RULE_INT)? ('f'|'F'|'d'|'D')?;
+RULE_FLOAT : RULE_INT '.' RULE_INT ('e' ('-'|'+') RULE_INT)? ('f'|'F'|'d'|'D')?;
 
 RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 

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

@@ -73,8 +73,8 @@ T__44=44
 T__45=45
 T__48=48
 T__49=49
+RULE_FLOAT=7
 RULE_SL_COMMENT=11
-RULE_DOUBLE=7
 T__30=30
 T__31=31
 T__32=32

plugins/org.yakindu.sct.model.stext/META-INF/MANIFEST.MF

@@ -28,6 +28,7 @@ Import-Package: org.apache.commons.logging,
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.yakindu.sct.model.stext,
  org.yakindu.sct.model.stext.formatting,
+ org.yakindu.sct.model.stext.naming,
  org.yakindu.sct.model.stext.parseTreeConstruction,
  org.yakindu.sct.model.stext.parser.antlr,
  org.yakindu.sct.model.stext.parser.antlr.internal,

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

@@ -168,10 +168,10 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="RealLiteral" eSuperTypes="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//Literal">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="HexLiteral" eSuperTypes="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//Literal">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SimpleScope" eSuperTypes="platform:/resource/org.yakindu.sct.model.sgraph/model/emf/sgraph.ecore#//Scope"/>
   <eClassifiers xsi:type="ecore:EClass" name="InterfaceScope" eSuperTypes="platform:/resource/org.yakindu.sct.model.sgraph/model/emf/sgraph.ecore#//Scope">

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

@@ -1431,7 +1431,7 @@
     </rules>
     <rules xsi:type="xtext:TerminalRule" name="HEX">
       <type metamodel="/0/@metamodelDeclarations.2">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
       </type>
       <alternatives xsi:type="xtext:Group">
         <elements xsi:type="xtext:Keyword" value="0"/>
@@ -1455,9 +1455,9 @@
         </elements>
       </alternatives>
     </rules>
-    <rules xsi:type="xtext:TerminalRule" name="DOUBLE">
+    <rules xsi:type="xtext:TerminalRule" name="FLOAT">
       <type metamodel="/0/@metamodelDeclarations.2">
-        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+        <classifier xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
       </type>
       <alternatives xsi:type="xtext:Group">
         <elements xsi:type="xtext:Group">

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parseTreeConstruction/STextParsetreeConstructor.java

@@ -11649,11 +11649,11 @@ protected class IntLiteral_ValueAssignment_1 extends AssignmentToken  {
 /************ begin Rule RealLiteral ****************
  *
  * RealLiteral:
- * 	{RealLiteral} value=DOUBLE;
+ * 	{RealLiteral} value=FLOAT;
  *
  **/
 
-// {RealLiteral} value=DOUBLE
+// {RealLiteral} value=FLOAT
 protected class RealLiteral_Group extends GroupToken {
 	
 	public RealLiteral_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -11708,7 +11708,7 @@ protected class RealLiteral_RealLiteralAction_0 extends ActionToken  {
 	}
 }
 
-// value=DOUBLE
+// value=FLOAT
 protected class RealLiteral_ValueAssignment_1 extends AssignmentToken  {
 	
 	public RealLiteral_ValueAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -11732,9 +11732,9 @@ protected class RealLiteral_ValueAssignment_1 extends AssignmentToken  {
 	public IEObjectConsumer tryConsume() {
 		if((value = eObjectConsumer.getConsumable("value",true)) == null) return null;
 		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("value");
-		if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getRealLiteralAccess().getValueDOUBLETerminalRuleCall_1_0(), value, null)) {
+		if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getRealLiteralAccess().getValueFLOATTerminalRuleCall_1_0(), value, null)) {
 			type = AssignmentType.TERMINAL_RULE_CALL;
-			element = grammarAccess.getRealLiteralAccess().getValueDOUBLETerminalRuleCall_1_0();
+			element = grammarAccess.getRealLiteralAccess().getValueFLOATTerminalRuleCall_1_0();
 			return obj;
 		}
 		return null;

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

@@ -3951,9 +3951,9 @@ ruleRealLiteral returns [EObject current=null]
     }
 )(
 (
-		lv_value_1_0=RULE_DOUBLE
+		lv_value_1_0=RULE_FLOAT
 		{
-			newLeafNode(lv_value_1_0, grammarAccess.getRealLiteralAccess().getValueDOUBLETerminalRuleCall_1_0()); 
+			newLeafNode(lv_value_1_0, grammarAccess.getRealLiteralAccess().getValueFLOATTerminalRuleCall_1_0()); 
 		}
 		{
 	        if ($current==null) {
@@ -3963,7 +3963,7 @@ ruleRealLiteral returns [EObject current=null]
        			$current, 
        			"value",
         		lv_value_1_0, 
-        		"DOUBLE");
+        		"FLOAT");
 	    }
 
 )
@@ -4333,7 +4333,7 @@ RULE_BOOL : ('true'|'false'|'yes'|'no');
 
 RULE_HEX : '0' ('x'|'X') ('0'..'9'|'a'..'f'|'A'..'F')+;
 
-RULE_DOUBLE : RULE_INT '.' RULE_INT ('e' ('-'|'+') RULE_INT)? ('f'|'F'|'d'|'D')?;
+RULE_FLOAT : RULE_INT '.' RULE_INT ('e' ('-'|'+') RULE_INT)? ('f'|'F'|'d'|'D')?;
 
 RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 

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

@@ -73,8 +73,8 @@ T__44=44
 T__45=45
 T__48=48
 T__49=49
+RULE_FLOAT=7
 RULE_SL_COMMENT=11
-RULE_DOUBLE=7
 T__30=30
 T__31=31
 T__32=32

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

@@ -2338,23 +2338,23 @@ public class STextGrammarAccess extends AbstractGrammarElementFinder {
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Action cRealLiteralAction_0 = (Action)cGroup.eContents().get(0);
 		private final Assignment cValueAssignment_1 = (Assignment)cGroup.eContents().get(1);
-		private final RuleCall cValueDOUBLETerminalRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0);
+		private final RuleCall cValueFLOATTerminalRuleCall_1_0 = (RuleCall)cValueAssignment_1.eContents().get(0);
 		
 		//RealLiteral:
-		//	{RealLiteral} value=DOUBLE;
+		//	{RealLiteral} value=FLOAT;
 		public ParserRule getRule() { return rule; }
 
-		//{RealLiteral} value=DOUBLE
+		//{RealLiteral} value=FLOAT
 		public Group getGroup() { return cGroup; }
 
 		//{RealLiteral}
 		public Action getRealLiteralAction_0() { return cRealLiteralAction_0; }
 
-		//value=DOUBLE
+		//value=FLOAT
 		public Assignment getValueAssignment_1() { return cValueAssignment_1; }
 
-		//DOUBLE
-		public RuleCall getValueDOUBLETerminalRuleCall_1_0() { return cValueDOUBLETerminalRuleCall_1_0; }
+		//FLOAT
+		public RuleCall getValueFLOATTerminalRuleCall_1_0() { return cValueFLOATTerminalRuleCall_1_0; }
 	}
 
 	public class HexLiteralElements extends AbstractParserRuleElementFinder {
@@ -2906,7 +2906,7 @@ public class STextGrammarAccess extends AbstractGrammarElementFinder {
 	private HexLiteralElements pHexLiteral;
 	private TerminalRule tBOOL;
 	private TerminalRule tHEX;
-	private TerminalRule tDOUBLE;
+	private TerminalRule tFLOAT;
 	
 	private final GrammarProvider grammarProvider;
 
@@ -3739,7 +3739,7 @@ public class STextGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//RealLiteral:
-	//	{RealLiteral} value=DOUBLE;
+	//	{RealLiteral} value=FLOAT;
 	public RealLiteralElements getRealLiteralAccess() {
 		return (pRealLiteral != null) ? pRealLiteral : (pRealLiteral = new RealLiteralElements());
 	}
@@ -3764,16 +3764,16 @@ public class STextGrammarAccess extends AbstractGrammarElementFinder {
 		return (tBOOL != null) ? tBOOL : (tBOOL = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "BOOL"));
 	} 
 
-	//terminal HEX returns ecore::ELong:
+	//terminal HEX returns ecore::EInt:
 	//	"0" ("x" | "X") ("0".."9" | "a".."f" | "A".."F")+;
 	public TerminalRule getHEXRule() {
 		return (tHEX != null) ? tHEX : (tHEX = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "HEX"));
 	} 
 
-	//terminal DOUBLE returns ecore::EDouble:
+	//terminal FLOAT returns ecore::EFloat:
 	//	(INT "." INT) ("e" ("-" | "+") INT)? ("f" | "F" | "d" | "D")?;
-	public TerminalRule getDOUBLERule() {
-		return (tDOUBLE != null) ? tDOUBLE : (tDOUBLE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "DOUBLE"));
+	public TerminalRule getFLOATRule() {
+		return (tFLOAT != null) ? tFLOAT : (tFLOAT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "FLOAT"));
 	} 
 
 	//terminal ID:

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/HexLiteral.java

@@ -34,12 +34,12 @@ public interface HexLiteral extends Literal
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Value</em>' attribute.
-   * @see #setValue(long)
+   * @see #setValue(int)
    * @see org.yakindu.sct.model.stext.stext.StextPackage#getHexLiteral_Value()
    * @model
    * @generated
    */
-  long getValue();
+  int getValue();
 
   /**
    * Sets the value of the '{@link org.yakindu.sct.model.stext.stext.HexLiteral#getValue <em>Value</em>}' attribute.
@@ -49,6 +49,6 @@ public interface HexLiteral extends Literal
    * @see #getValue()
    * @generated
    */
-  void setValue(long value);
+  void setValue(int value);
 
 } // HexLiteral

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/RealLiteral.java

@@ -34,12 +34,12 @@ public interface RealLiteral extends Literal
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Value</em>' attribute.
-   * @see #setValue(double)
+   * @see #setValue(float)
    * @see org.yakindu.sct.model.stext.stext.StextPackage#getRealLiteral_Value()
    * @model
    * @generated
    */
-  double getValue();
+  float getValue();
 
   /**
    * Sets the value of the '{@link org.yakindu.sct.model.stext.stext.RealLiteral#getValue <em>Value</em>}' attribute.
@@ -49,6 +49,6 @@ public interface RealLiteral extends Literal
    * @see #getValue()
    * @generated
    */
-  void setValue(double value);
+  void setValue(float value);
 
 } // RealLiteral

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/impl/HexLiteralImpl.java

@@ -38,7 +38,7 @@ public class HexLiteralImpl extends LiteralImpl implements HexLiteral
    * @generated
    * @ordered
    */
-  protected static final long VALUE_EDEFAULT = 0L;
+  protected static final int VALUE_EDEFAULT = 0;
 
   /**
    * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
@@ -48,7 +48,7 @@ public class HexLiteralImpl extends LiteralImpl implements HexLiteral
    * @generated
    * @ordered
    */
-  protected long value = VALUE_EDEFAULT;
+  protected int value = VALUE_EDEFAULT;
 
   /**
    * <!-- begin-user-doc -->
@@ -76,7 +76,7 @@ public class HexLiteralImpl extends LiteralImpl implements HexLiteral
    * <!-- end-user-doc -->
    * @generated
    */
-  public long getValue()
+  public int getValue()
   {
     return value;
   }
@@ -86,9 +86,9 @@ public class HexLiteralImpl extends LiteralImpl implements HexLiteral
    * <!-- end-user-doc -->
    * @generated
    */
-  public void setValue(long newValue)
+  public void setValue(int newValue)
   {
-    long oldValue = value;
+    int oldValue = value;
     value = newValue;
     if (eNotificationRequired())
       eNotify(new ENotificationImpl(this, Notification.SET, StextPackage.HEX_LITERAL__VALUE, oldValue, value));
@@ -121,7 +121,7 @@ public class HexLiteralImpl extends LiteralImpl implements HexLiteral
     switch (featureID)
     {
       case StextPackage.HEX_LITERAL__VALUE:
-        setValue((Long)newValue);
+        setValue((Integer)newValue);
         return;
     }
     super.eSet(featureID, newValue);

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/impl/RealLiteralImpl.java

@@ -38,7 +38,7 @@ public class RealLiteralImpl extends LiteralImpl implements RealLiteral
    * @generated
    * @ordered
    */
-  protected static final double VALUE_EDEFAULT = 0.0;
+  protected static final float VALUE_EDEFAULT = 0.0F;
 
   /**
    * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
@@ -48,7 +48,7 @@ public class RealLiteralImpl extends LiteralImpl implements RealLiteral
    * @generated
    * @ordered
    */
-  protected double value = VALUE_EDEFAULT;
+  protected float value = VALUE_EDEFAULT;
 
   /**
    * <!-- begin-user-doc -->
@@ -76,7 +76,7 @@ public class RealLiteralImpl extends LiteralImpl implements RealLiteral
    * <!-- end-user-doc -->
    * @generated
    */
-  public double getValue()
+  public float getValue()
   {
     return value;
   }
@@ -86,9 +86,9 @@ public class RealLiteralImpl extends LiteralImpl implements RealLiteral
    * <!-- end-user-doc -->
    * @generated
    */
-  public void setValue(double newValue)
+  public void setValue(float newValue)
   {
-    double oldValue = value;
+    float oldValue = value;
     value = newValue;
     if (eNotificationRequired())
       eNotify(new ENotificationImpl(this, Notification.SET, StextPackage.REAL_LITERAL__VALUE, oldValue, value));
@@ -121,7 +121,7 @@ public class RealLiteralImpl extends LiteralImpl implements RealLiteral
     switch (featureID)
     {
       case StextPackage.REAL_LITERAL__VALUE:
-        setValue((Double)newValue);
+        setValue((Float)newValue);
         return;
     }
     super.eSet(featureID, newValue);

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

@@ -2581,10 +2581,10 @@ public class StextPackageImpl extends EPackageImpl implements StextPackage
     initEAttribute(getIntLiteral_Value(), ecorePackage.getEInt(), "value", null, 0, 1, IntLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(realLiteralEClass, RealLiteral.class, "RealLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getRealLiteral_Value(), ecorePackage.getEDouble(), "value", null, 0, 1, RealLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getRealLiteral_Value(), ecorePackage.getEFloat(), "value", null, 0, 1, RealLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(hexLiteralEClass, HexLiteral.class, "HexLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getHexLiteral_Value(), ecorePackage.getELong(), "value", null, 0, 1, HexLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getHexLiteral_Value(), ecorePackage.getEInt(), "value", null, 0, 1, HexLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(simpleScopeEClass, SimpleScope.class, "SimpleScope", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 

plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/SText.xtext

@@ -313,6 +313,7 @@ OperationCall returns Expression:
 
 Literal:
 	BoolLiteral | IntLiteral | HexLiteral |  RealLiteral;
+	
 BoolLiteral:
 	{BoolLiteral} value=BOOL
 ;
@@ -320,7 +321,7 @@ IntLiteral:
 	{IntLiteral} value = INT
 ;
 RealLiteral: 
-	{RealLiteral} value = DOUBLE
+	{RealLiteral} value = FLOAT
 ;
 HexLiteral:
 	{HexLiteral} value = HEX
@@ -329,11 +330,11 @@ HexLiteral:
 terminal BOOL returns ecore::EBoolean:
 	'true' | 'false' | 'yes' | 'no';
 
-terminal HEX returns ecore::ELong: 
+terminal HEX returns ecore::EInt: 
 	('0') ('x'|'X') ('0'..'9'|'a'..'f'|'A'..'F')+
 ;
 
-terminal DOUBLE returns ecore::EDouble:
+terminal FLOAT returns ecore::EFloat:
 	(INT '.' INT) ('e' ('-' | '+') INT)? ('f'|'F'|'d'|'D')?
 ;