Pārlūkot izejas kodu

update initial state name

bouqpaul 6 gadi atpakaļ
vecāks
revīzija
4f7aeb29b0

+ 1 - 1
plugins/org.yakindu.sct.generator.sccd/src/org/yakindu/sct/generator/sccd/Expressions.xtend

@@ -139,7 +139,7 @@ class Expressions {
 	}
 	
 	def static dispatch CharSequence generate(ActiveStateReferenceExpression it){
-		'''INSTATE(«value.name»)'''
+		'''INSTATE('«value.name»')'''
 	}
 
 	def static dispatch CharSequence generate(ConditionalExpression it){

+ 3 - 2
plugins/org.yakindu.sct.generator.sccd/src/org/yakindu/sct/generator/sccd/ModifyNames.xtend

@@ -31,10 +31,11 @@ class ModifyNames {
 						generateAbsoluteName(reg, vertex.name + "/" + Names.PARALLEL_REGIONS_NAME + vertex.generateName + "/" + reg.name)
 					}
 				}
-				else if((vertex as State).regions.length >= 1){
+				else if((vertex as State).regions.length == 1){
 					vertex.name = currentName + "/" + vertex.name
 					for(Region reg : (vertex as State).regions){
-						generateAbsoluteName(reg, vertex.name + "/" + reg.name)
+						//generateAbsoluteName(reg, vertex.name + "/" + reg.name)
+						generateAbsoluteName(reg, vertex.name)
 					}
 					
 				}

+ 3 - 2
plugins/org.yakindu.sct.generator.sccd/src/org/yakindu/sct/generator/sccd/Vertices.xtend

@@ -30,14 +30,15 @@ class Vertices {
 			«commonPart»
 			<parallel id="«Names.PARALLEL_REGIONS_NAME»«generateName(it)»">
 				«FOR region : regions»
-					<state id="«region.name»" initial="«initialState(region).name»">
+					«««»»<state id="«region.name»" initial="«initialState(region).name»">
+					<state id="«region.name»" initial="«generateName(initialState(region))»">
 						«region.generate»
 					</state>
 				«ENDFOR»
 			</parallel>
 		</state>
 		«ELSE»
-		<state id="«generateName(it)»"«IF regions.head !== null» initial="«initialState(regions.head).name»"«ENDIF»>
+		<state id="«generateName(it)»"«IF regions.head !== null» initial="«generateName(initialState(regions.head))»"«ENDIF»>
 			«commonPart»
 			«FOR region : regions»
 				«region.generate»