Merge pull request #1063 from umple/myNewFM

Enhancements to some code generators
umple · Jun 23, 2017 · a2086ef · a2086ef
2 parents d7c049e + f82f7b5
commit a2086ef
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 34 deletions.
diff --git a/cruise.umple/src/Generator_CodeYuml.ump b/cruise.umple/src/Generator_CodeYuml.ump
@@ -101,6 +101,9 @@ class YumlGenerator
       {
         direction = "->";
       }
+      else if (aAssoc.getIsLeftComposition() || aAssoc.getIsRightComposition()){
+	direction = "<>";
+      }
       yuml.append(StringFormatter.format("[{0}]{5}{2}{4}{6}{3}[{1}],",c1.getName(),c2.getName(),mult1,mult2,direction,roleName1.getRoleName()+" ",roleName2.getRoleName()+" "));
     }
 

diff --git a/cruise.umple/src/NuSMVCoordinationUnit.ump b/cruise.umple/src/NuSMVCoordinationUnit.ump
@@ -66,7 +66,7 @@ class NuSMVCoordinator
 				ivdec.addVariableSpecifier( specifiers.get(i) );
 			body.addModuleElement( ivdec );
 
-			System.out.println("I am here!");
+			//System.out.println("I am here!");
 		}
 
   		//Adding define declaration to module body
@@ -1049,7 +1049,7 @@ class NuSMVCoordinator
 		List<AssignConstraint> constraints = new ArrayList<AssignConstraint>();
 
 		for( Attribute attribute : uClass.getAllAttributes() ) {
-			if( !attribute.isConstant() && !attribute.isIsInput() ) {
+			if( !attribute.isConstant() && !attribute.isIsIvar() ) {
 				BasicExpression bexp = new BasicExpression("");
 
 				if( attribute.getValue() != null ){
@@ -1500,7 +1500,7 @@ class NuSMVCoordinator
 		List<VariableSpecifier> attributes = new ArrayList<VariableSpecifier>();
 
 		for( Attribute attribute : uClass.getAllAttributes() ){
-			if( attribute.isIsInput() ) { 
+			if( attribute.isIsIvar() ) { 
 				VariableSpecifier vs = new VariableSpecifier( attribute.getName() );
 				String type = attribute.getFullType();
 				generateSpecifier( type, vs, attributes );
@@ -1513,7 +1513,7 @@ class NuSMVCoordinator
 		List<VariableSpecifier> attributes = new ArrayList<VariableSpecifier>();
 
 		for( Attribute attribute : uClass.getAllAttributes() ){
-			if( !attribute.isConstant() && !attribute.isIsInput() ) { 
+			if( !attribute.isConstant() && !attribute.isIsIvar() ) { 
 				VariableSpecifier vs = new VariableSpecifier( attribute.getName() );
 				String type = attribute.getFullType();
 				generateSpecifier( type, vs, attributes );

diff --git a/cruise.umple/src/Umple.ump b/cruise.umple/src/Umple.ump
@@ -259,8 +259,8 @@ class MethodParameter
   // Specifies whether or not the method parameter is lazy.
   Boolean isLazy = false;
 
-  // Specifies whether or not the method parameter is input.
-  Boolean isInput = false;
+  // Specifies whether or not the method parameter is ivar.
+  Boolean isIvar = false;
 }
 
 /*
@@ -858,8 +858,8 @@ class Attribute
   Boolean isLazy = false;
   Boolean isRefinement = false;
 
-  // Specifies whether or not the method parameter is input.
-  Boolean isInput = false;
+  // Specifies whether or not the method parameter is ivar.
+  Boolean isIvar = false;
 
   //This supposed to show from where this method came.
   //fTrait means it comes from traits.
@@ -1114,4 +1114,4 @@ use UmpleVersion.ump;
 use UmpleDiagram.ump;
 use StateMachine.ump;
 use Umple_Code.ump;
-use UmpleEnumeration_Code.ump;
+use UmpleEnumeration_Code.ump;
diff --git a/cruise.umple/src/UmpleInternalParser_CodeClass.ump b/cruise.umple/src/UmpleInternalParser_CodeClass.ump
@@ -3824,7 +3824,7 @@ private Boolean checkIsDistributed(UmpleInterface uInterface)
     boolean isAutounique = attributeToken.getValue("autounique") != null;
     boolean isUnique = attributeToken.getValue("unique") != null;
     boolean isLazy = attributeToken.getValue("lazy") != null;
-	boolean isInput = attributeToken.getValue("input") != null;
+    boolean isIvar = attributeToken.getValue("ivar") != null;
     boolean isConstant = "const".equals(attributeToken.getValue("modifier"));
     boolean validName = Token.isValidIdentifier(attributeToken.getValue("name"));
     boolean properName = !Token.isValidIdentifier(attributeToken.getValue("name"), "[A-Z]");
@@ -3976,7 +3976,7 @@ private Boolean checkIsDistributed(UmpleInterface uInterface)
     Attribute attribute = new Attribute(name,type,modifier,value,isAutounique,aClass);
     attribute.setIsUnique(isUnique);
     attribute.setIsLazy(isLazy);
-	attribute.setIsInput(isInput);
+	attribute.setIsIvar(isIvar);
     boolean isList = attributeToken.getValue("list") != null;
 
     if (name == null)

diff --git a/cruise.umple/src/UmpleInternalParser_CodeTrait.ump b/cruise.umple/src/UmpleInternalParser_CodeTrait.ump
@@ -287,7 +287,7 @@ class UmpleInternalParser
     boolean isAutounique = attributeToken.getValue("autounique") != null;
     boolean isUnique = attributeToken.getValue("unique") != null;
     boolean isLazy = attributeToken.getValue("lazy") != null;
-	boolean isInput = attributeToken.getValue("input") != null;
+    boolean isIvar = attributeToken.getValue("ivar") != null;
     boolean isConstant = "const".equals(attributeToken.getValue("modifier"));
     boolean validName = Token.isValidIdentifier(attributeToken.getValue("name"));
     boolean properName = !Token.isValidIdentifier(attributeToken.getValue("name"), "[A-Z]");
@@ -436,7 +436,7 @@ class UmpleInternalParser
     Attribute attribute = new Attribute(name,type,modifier,value,isAutounique,aTrait);
     attribute.setIsUnique(isUnique);
     attribute.setIsLazy(isLazy);
-	attribute.setIsInput(isInput);
+	attribute.setIsIvar(isIvar);
     boolean isList = attributeToken.getValue("list") != null;
 
     if (name == null)

diff --git a/cruise.umple/src/UmpleInternalParser_CodeTrait_StateMachine.ump b/cruise.umple/src/UmpleInternalParser_CodeTrait_StateMachine.ump
@@ -1935,7 +1935,7 @@ class MethodParameter{
 		mp.isList = getIsList();
 		mp.isDerived = getIsDerived();
 		mp.isLazy = getIsLazy();
-		mp.isInput = getIsInput();
+		mp.isIvar = getIsIvar();
 		return mp;
   }
 }

diff --git a/cruise.umple/src/umple_classes.grammar b/cruise.umple/src/umple_classes.grammar
@@ -78,7 +78,7 @@ attribute : [[simpleAttribute]] | [[autouniqueAttribute]] | [[derivedAttribute]]
 simpleAttribute- : [~name] ;
 autouniqueAttribute- : [=autounique] [~name] ;
 derivedAttribute- : [=modifier:immutable|settable|internal|defaulted|const|fixml]? [[typedName]] = ( [[moreCode]] )+
-complexAttribute- : [=unique]? [=lazy]? [=input]? [=modifier:immutable|settable|internal|defaulted|const|fixml]? [[typedName]] (= [**value])? ;
+complexAttribute- : [=unique]? [=lazy]? [=ivar]? [=modifier:immutable|settable|internal|defaulted|const|fixml]? [[typedName]] (= [**value])? ;
 
 
 // Keys are used to define quality and hash codes, plus Sql keys.

diff --git a/cruise.umple/test/cruise/umple/compiler/008_autogeneratedMethodsInputAttribute.ump b/cruise.umple/test/cruise/umple/compiler/008_autogeneratedMethodsInputAttribute.ump
@@ -1,5 +1,5 @@
 class X
 {
-  input Double iDoub;
+  ivar Double iDoub;
   Double xDoub;
-}
+}
diff --git a/cruise.umple/test/cruise/umple/compiler/UmpleParserTest.java b/cruise.umple/test/cruise/umple/compiler/UmpleParserTest.java
@@ -2681,12 +2681,12 @@ public void autoGeneratedGetSetInputAttribute()
 	  assertSimpleParse("008_autogeneratedMethodsInputAttribute.ump");
 	  UmpleClass uClass = model.getUmpleClass("X");
 
-	  // input attributes should have both a set and a get method.
-	  Method inputGet = new Method("", "getIDoub", "Double", false);
-	  Method inputSet = new Method("", "setIDoub", "Boolean", false);
-	  inputSet.addMethodParameter(new MethodParameter("aIDoub", "Double", "", "", false));
-	  Assert.assertTrue(uClass.hasMethod(inputGet));
-	  Assert.assertTrue(uClass.hasMethod(inputSet));
+	  // ivar attributes should have both a set and a get method.
+	  Method ivarGet = new Method("", "getIDoub", "Double", false);
+	  Method ivarSet = new Method("", "setIDoub", "Boolean", false);
+	  ivarSet.addMethodParameter(new MethodParameter("aIDoub", "Double", "", "", false));
+	  Assert.assertTrue(uClass.hasMethod(ivarGet));
+	  Assert.assertTrue(uClass.hasMethod(ivarSet));
   }
 
 
@@ -2696,13 +2696,13 @@ public void inputModifierCheck()
 	  assertSimpleParse("008_autogeneratedMethodsInputAttribute.ump");
 	  UmpleClass uClass = model.getUmpleClass("X");
 
-	  //input attribute should be qualified as "input"
+	  //ivar attribute should be qualified as "ivar"
 	  Assert.assertEquals(uClass.getAllAttributes().size(), 2);
 	  Attribute attr = uClass.getAllAttributes().get(0);
-	  Assert.assertTrue( attr.isIsInput() ); 
+	  Assert.assertTrue( attr.isIsIvar() ); 
 
 	  Attribute nattr = uClass.getAllAttributes().get(1);
-	  Assert.assertTrue( !nattr.isIsInput() ); 
+	  Assert.assertTrue( !nattr.isIsIvar() ); 
   }
 
   @Test

diff --git a/cruise.umple/test/cruise/umple/implementation/nusmv/InputVarTest.ump b/cruise.umple/test/cruise/umple/implementation/nusmv/InputVarTest.ump
@@ -4,13 +4,13 @@ class CruiseControlSystem
   const int bb = 5;
   const float cc = 5.00;
   Integer c;
-  input Integer ayo;
-  input Float bayo;
-  input Boolean baro;
+  ivar Integer ayo;
+  ivar Float bayo;
+  ivar Boolean baro;
 
   sm {
     s1 {
       a ->/{ b = aa + 2; } s2;
     }
   }
-}
+}
diff --git a/cruise.umple/test/cruise/umple/implementation/nusmv/RangeTypeTest.ump b/cruise.umple/test/cruise/umple/implementation/nusmv/RangeTypeTest.ump
@@ -4,9 +4,9 @@ class CruiseControlSystem
   const int bb = 10;
   const float cc = 5.00;
   Integer c;
-  input Integer ayo;
-  input Float bayo;
-  input Boolean baro;
+  ivar Integer ayo;
+  ivar Float bayo;
+  ivar Boolean baro;
 
   [ayo >= aa]
   [ayo <= bb]
@@ -16,4 +16,4 @@ class CruiseControlSystem
       a ->/{ b = aa + 2; } s2;
     }
   }
-}
+}
diff --git a/cruise.umple/test/cruise/umple/implementation/yuml/CompositionEnds.ump b/cruise.umple/test/cruise/umple/implementation/yuml/CompositionEnds.ump
@@ -0,0 +1,5 @@
+class Vehicle { 
+  * <@>- 2..4 Wheel; 
+}
+
+class Wheel{ }
diff --git a/cruise.umple/test/cruise/umple/implementation/yuml/CompositionEnds.yuml.txt b/cruise.umple/test/cruise/umple/implementation/yuml/CompositionEnds.yuml.txt
@@ -0,0 +1 @@
+[Vehicle],[Wheel],[Vehicle]vehicles *<>wheels 2..4[Wheel],
diff --git a/cruise.umple/test/cruise/umple/implementation/yuml/CompositionEndsLHS.ump b/cruise.umple/test/cruise/umple/implementation/yuml/CompositionEndsLHS.ump
@@ -0,0 +1,4 @@
+class Vehicle {  }
+class Wheel{ 
+  2..4 -<@> * Vehicle;
+}
diff --git a/cruise.umple/test/cruise/umple/implementation/yuml/CompositionEndsLHS.yuml.txt b/cruise.umple/test/cruise/umple/implementation/yuml/CompositionEndsLHS.yuml.txt
@@ -0,0 +1 @@
+[Vehicle],[Wheel],[Wheel]wheels 2..4<>vehicles *[Vehicle],
diff --git a/cruise.umple/test/cruise/umple/implementation/yuml/YumlTemplateTest.java b/cruise.umple/test/cruise/umple/implementation/yuml/YumlTemplateTest.java
@@ -73,6 +73,18 @@ public void RoleNameWithMultiplicity()
   {
 	  assertUmpleTemplateFor("yuml/RoleNameWithMultiplicity.ump","yuml/RoleNameWithMultiplicity.yuml.txt");  
   }
+
+  @Test
+  public void CompositionEnds()
+  {
+	  assertUmpleTemplateFor("yuml/CompositionEnds.ump","yuml/CompositionEnds.yuml.txt");  
+  }
+
+  @Test
+  public void CompositionEndsLHS()
+  {
+	  assertUmpleTemplateFor("yuml/CompositionEndsLHS.ump","yuml/CompositionEndsLHS.yuml.txt");  
+  }
 
   @Test
   public void InterfaceInheritanceTest()