summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2011-07-29 11:39:58 (EDT)
committer Henrik Rentz-Reichert2011-07-29 11:39:58 (EDT)
commit2fbc5eac9b1e10e5baf5a997cd935e5bb5a99aa6 (patch)
treeff2123f70dbb6c01ff31eb0f0968668ab1bf9f8c
parent0077ca03996add01fa52491a81cb1eb8dc78ac02 (diff)
downloadorg.eclipse.etrice-2fbc5eac9b1e10e5baf5a997cd935e5bb5a99aa6.zip
org.eclipse.etrice-2fbc5eac9b1e10e5baf5a997cd935e5bb5a99aa6.tar.gz
org.eclipse.etrice-2fbc5eac9b1e10e5baf5a997cd935e5bb5a99aa6.tar.bz2
[core.room] changed grammar such that only PlainStateGraphs are allowed
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g4
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java22
-rw-r--r--plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xmi2
-rw-r--r--plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java16
-rw-r--r--plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g6
-rw-r--r--plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java38
-rw-r--r--plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java18
-rw-r--r--plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext2
-rw-r--r--plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomNameProvider.java3
-rw-r--r--plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java2
10 files changed, 58 insertions, 55 deletions
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g
index 5339374..c204f02 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g
+++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g
@@ -17994,8 +17994,8 @@ rule__BaseState__SubgraphAssignment_3_3_1
}
:
(
-{ before(grammarAccess.getBaseStateAccess().getSubgraphStateGraphParserRuleCall_3_3_1_0()); }
- ruleStateGraph{ after(grammarAccess.getBaseStateAccess().getSubgraphStateGraphParserRuleCall_3_3_1_0()); }
+{ before(grammarAccess.getBaseStateAccess().getSubgraphPlainStateGraphParserRuleCall_3_3_1_0()); }
+ rulePlainStateGraph{ after(grammarAccess.getBaseStateAccess().getSubgraphPlainStateGraphParserRuleCall_3_3_1_0()); }
)
;
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java
index aec5269..bf4f51c 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoomParser.java
@@ -48176,25 +48176,25 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
// $ANTLR start "rule__BaseState__SubgraphAssignment_3_3_1"
- // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17991:1: rule__BaseState__SubgraphAssignment_3_3_1 : ( ruleStateGraph ) ;
+ // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17991:1: rule__BaseState__SubgraphAssignment_3_3_1 : ( rulePlainStateGraph ) ;
public final void rule__BaseState__SubgraphAssignment_3_3_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17995:1: ( ( ruleStateGraph ) )
- // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17996:1: ( ruleStateGraph )
+ // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17995:1: ( ( rulePlainStateGraph ) )
+ // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17996:1: ( rulePlainStateGraph )
{
- // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17996:1: ( ruleStateGraph )
- // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17997:1: ruleStateGraph
+ // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17996:1: ( rulePlainStateGraph )
+ // ../org.eclipse.etrice.core.room.ui/src-gen/org/eclipse/etrice/core/ui/contentassist/antlr/internal/InternalRoom.g:17997:1: rulePlainStateGraph
{
- before(grammarAccess.getBaseStateAccess().getSubgraphStateGraphParserRuleCall_3_3_1_0());
- pushFollow(FOLLOW_ruleStateGraph_in_rule__BaseState__SubgraphAssignment_3_3_136230);
- ruleStateGraph();
+ before(grammarAccess.getBaseStateAccess().getSubgraphPlainStateGraphParserRuleCall_3_3_1_0());
+ pushFollow(FOLLOW_rulePlainStateGraph_in_rule__BaseState__SubgraphAssignment_3_3_136230);
+ rulePlainStateGraph();
state._fsp--;
- after(grammarAccess.getBaseStateAccess().getSubgraphStateGraphParserRuleCall_3_3_1_0());
+ after(grammarAccess.getBaseStateAccess().getSubgraphPlainStateGraphParserRuleCall_3_3_1_0());
}
@@ -51688,7 +51688,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
public static final BitSet FOLLOW_78_in_rule__BaseState__Group_3_2__0__Impl22554 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__BaseState__Group_3_2__1__Impl_in_rule__BaseState__Group_3_2__122585 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__BaseState__ExitCodeAssignment_3_2_1_in_rule__BaseState__Group_3_2__1__Impl22612 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__BaseState__Group_3_3__0__Impl_in_rule__BaseState__Group_3_3__022646 = new BitSet(new long[]{0x0000000001000000L,0x0000004000000800L});
+ public static final BitSet FOLLOW_rule__BaseState__Group_3_3__0__Impl_in_rule__BaseState__Group_3_3__022646 = new BitSet(new long[]{0x0000000001000000L});
public static final BitSet FOLLOW_rule__BaseState__Group_3_3__1_in_rule__BaseState__Group_3_3__022649 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_79_in_rule__BaseState__Group_3_3__0__Impl22677 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__BaseState__Group_3_3__1__Impl_in_rule__BaseState__Group_3_3__122708 = new BitSet(new long[]{0x0000000000000002L});
@@ -52225,7 +52225,7 @@ public class InternalRoomParser extends AbstractInternalContentAssistParser {
public static final BitSet FOLLOW_ruleDocumentation_in_rule__BaseState__DocuAssignment_236137 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleDetailCode_in_rule__BaseState__EntryCodeAssignment_3_1_136168 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleDetailCode_in_rule__BaseState__ExitCodeAssignment_3_2_136199 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleStateGraph_in_rule__BaseState__SubgraphAssignment_3_3_136230 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_rulePlainStateGraph_in_rule__BaseState__SubgraphAssignment_3_3_136230 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleFQN_in_rule__RefinedState__BaseAssignment_136265 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleDocumentation_in_rule__RefinedState__DocuAssignment_236300 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleDetailCode_in_rule__RefinedState__EntryCodeAssignment_4_136331 = new BitSet(new long[]{0x0000000000000002L});
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xmi b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xmi
index a012469..182d6d0 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xmi
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/Room.xmi
@@ -1120,7 +1120,7 @@
<elements xsi:type="xtext:Group" cardinality="?">
<elements xsi:type="xtext:Keyword" value="subgraph"/>
<elements xsi:type="xtext:Assignment" feature="subgraph" operator="=">
- <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.44"/>
+ <terminal xsi:type="xtext:RuleCall" rule="/0/@rules.45"/>
</elements>
</elements>
<elements xsi:type="xtext:Keyword" value="}"/>
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java
index 20e1aec..3e2ec8e 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parseTreeConstruction/RoomParsetreeConstructor.java
@@ -12062,12 +12062,12 @@ protected class StateMachine_RightCurlyBracketKeyword_5 extends KeywordToken {
*
* BaseState:
* "State" name=ID docu=Documentation? ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("subgraph"
- * subgraph=StateGraph)? "}")?;
+ * subgraph=PlainStateGraph)? "}")?;
*
**/
// "State" name=ID docu=Documentation? ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("subgraph"
-// subgraph=StateGraph)? "}")?
+// subgraph=PlainStateGraph)? "}")?
protected class BaseState_Group extends GroupToken {
public BaseState_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -12199,7 +12199,7 @@ protected class BaseState_DocuAssignment_2 extends AssignmentToken {
}
}
-// ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}")?
+// ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("subgraph" subgraph=PlainStateGraph)? "}")?
protected class BaseState_Group_3 extends GroupToken {
public BaseState_Group_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -12427,7 +12427,7 @@ protected class BaseState_ExitCodeAssignment_3_2_1 extends AssignmentToken {
}
-// ("subgraph" subgraph=StateGraph)?
+// ("subgraph" subgraph=PlainStateGraph)?
protected class BaseState_Group_3_3 extends GroupToken {
public BaseState_Group_3_3(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -12473,7 +12473,7 @@ protected class BaseState_SubgraphKeyword_3_3_0 extends KeywordToken {
}
-// subgraph=StateGraph
+// subgraph=PlainStateGraph
protected class BaseState_SubgraphAssignment_3_3_1 extends AssignmentToken {
public BaseState_SubgraphAssignment_3_3_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -12488,7 +12488,7 @@ protected class BaseState_SubgraphAssignment_3_3_1 extends AssignmentToken {
@Override
public AbstractToken createFollower(int index, IEObjectConsumer inst) {
switch(index) {
- case 0: return new StateGraph_Alternatives(this, this, 0, inst);
+ case 0: return new PlainStateGraph_Group(this, this, 0, inst);
default: return null;
}
}
@@ -12499,9 +12499,9 @@ protected class BaseState_SubgraphAssignment_3_3_1 extends AssignmentToken {
IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("subgraph");
if(value instanceof EObject) { // org::eclipse::xtext::impl::RuleCallImpl
IEObjectConsumer param = createEObjectConsumer((EObject)value);
- if(param.isInstanceOf(grammarAccess.getStateGraphRule().getType().getClassifier())) {
+ if(param.isInstanceOf(grammarAccess.getPlainStateGraphRule().getType().getClassifier())) {
type = AssignmentType.PARSER_RULE_CALL;
- element = grammarAccess.getBaseStateAccess().getSubgraphStateGraphParserRuleCall_3_3_1_0();
+ element = grammarAccess.getBaseStateAccess().getSubgraphPlainStateGraphParserRuleCall_3_3_1_0();
consumed = obj;
return param;
}
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g
index 984049b..bb0879f 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g
@@ -4020,9 +4020,9 @@ ruleBaseState returns [EObject current=null]
(
(
{
- newCompositeNode(grammarAccess.getBaseStateAccess().getSubgraphStateGraphParserRuleCall_3_3_1_0());
+ newCompositeNode(grammarAccess.getBaseStateAccess().getSubgraphPlainStateGraphParserRuleCall_3_3_1_0());
}
- lv_subgraph_9_0=ruleStateGraph {
+ lv_subgraph_9_0=rulePlainStateGraph {
if ($current==null) {
$current = createModelElementForParent(grammarAccess.getBaseStateRule());
}
@@ -4030,7 +4030,7 @@ ruleBaseState returns [EObject current=null]
$current,
"subgraph",
lv_subgraph_9_0,
- "StateGraph");
+ "PlainStateGraph");
afterParserOrEnumRuleCall();
}
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java
index 385610b..2364f3f 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoomParser.java
@@ -9799,7 +9799,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleBaseState"
- // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3924:1: ruleBaseState returns [EObject current=null] : (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= ruleStateGraph ) ) )? otherlv_10= '}' )? ) ;
+ // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3924:1: ruleBaseState returns [EObject current=null] : (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= rulePlainStateGraph ) ) )? otherlv_10= '}' )? ) ;
public final EObject ruleBaseState() throws RecognitionException {
EObject current = null;
@@ -9822,11 +9822,11 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3927:28: ( (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= ruleStateGraph ) ) )? otherlv_10= '}' )? ) )
- // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3928:1: (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= ruleStateGraph ) ) )? otherlv_10= '}' )? )
+ // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3927:28: ( (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= rulePlainStateGraph ) ) )? otherlv_10= '}' )? ) )
+ // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3928:1: (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= rulePlainStateGraph ) ) )? otherlv_10= '}' )? )
{
- // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3928:1: (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= ruleStateGraph ) ) )? otherlv_10= '}' )? )
- // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3928:3: otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= ruleStateGraph ) ) )? otherlv_10= '}' )?
+ // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3928:1: (otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= rulePlainStateGraph ) ) )? otherlv_10= '}' )? )
+ // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3928:3: otherlv_0= 'State' ( (lv_name_1_0= RULE_ID ) ) ( (lv_docu_2_0= ruleDocumentation ) )? (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= rulePlainStateGraph ) ) )? otherlv_10= '}' )?
{
otherlv_0=(Token)match(input,67,FOLLOW_67_in_ruleBaseState7957);
@@ -9900,7 +9900,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3968:3: (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= ruleStateGraph ) ) )? otherlv_10= '}' )?
+ // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3968:3: (otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= rulePlainStateGraph ) ) )? otherlv_10= '}' )?
int alt91=2;
int LA91_0 = input.LA(1);
@@ -9909,7 +9909,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
}
switch (alt91) {
case 1 :
- // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3968:5: otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= ruleStateGraph ) ) )? otherlv_10= '}'
+ // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:3968:5: otherlv_3= '{' (otherlv_4= 'entry' ( (lv_entryCode_5_0= ruleDetailCode ) ) )? (otherlv_6= 'exit' ( (lv_exitCode_7_0= ruleDetailCode ) ) )? (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= rulePlainStateGraph ) ) )? otherlv_10= '}'
{
otherlv_3=(Token)match(input,12,FOLLOW_12_in_ruleBaseState8014);
@@ -10019,7 +10019,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
}
- // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4016:4: (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= ruleStateGraph ) ) )?
+ // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4016:4: (otherlv_8= 'subgraph' ( (lv_subgraph_9_0= rulePlainStateGraph ) ) )?
int alt90=2;
int LA90_0 = input.LA(1);
@@ -10028,23 +10028,23 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
}
switch (alt90) {
case 1 :
- // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4016:6: otherlv_8= 'subgraph' ( (lv_subgraph_9_0= ruleStateGraph ) )
+ // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4016:6: otherlv_8= 'subgraph' ( (lv_subgraph_9_0= rulePlainStateGraph ) )
{
otherlv_8=(Token)match(input,70,FOLLOW_70_in_ruleBaseState8099);
newLeafNode(otherlv_8, grammarAccess.getBaseStateAccess().getSubgraphKeyword_3_3_0());
- // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4020:1: ( (lv_subgraph_9_0= ruleStateGraph ) )
- // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4021:1: (lv_subgraph_9_0= ruleStateGraph )
+ // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4020:1: ( (lv_subgraph_9_0= rulePlainStateGraph ) )
+ // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4021:1: (lv_subgraph_9_0= rulePlainStateGraph )
{
- // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4021:1: (lv_subgraph_9_0= ruleStateGraph )
- // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4022:3: lv_subgraph_9_0= ruleStateGraph
+ // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4021:1: (lv_subgraph_9_0= rulePlainStateGraph )
+ // ../org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/parser/antlr/internal/InternalRoom.g:4022:3: lv_subgraph_9_0= rulePlainStateGraph
{
- newCompositeNode(grammarAccess.getBaseStateAccess().getSubgraphStateGraphParserRuleCall_3_3_1_0());
+ newCompositeNode(grammarAccess.getBaseStateAccess().getSubgraphPlainStateGraphParserRuleCall_3_3_1_0());
- pushFollow(FOLLOW_ruleStateGraph_in_ruleBaseState8120);
- lv_subgraph_9_0=ruleStateGraph();
+ pushFollow(FOLLOW_rulePlainStateGraph_in_ruleBaseState8120);
+ lv_subgraph_9_0=rulePlainStateGraph();
state._fsp--;
@@ -10056,7 +10056,7 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
current,
"subgraph",
lv_subgraph_9_0,
- "StateGraph");
+ "PlainStateGraph");
afterParserOrEnumRuleCall();
@@ -15822,8 +15822,8 @@ public class InternalRoomParser extends AbstractInternalAntlrParser {
public static final BitSet FOLLOW_ruleDetailCode_in_ruleBaseState8048 = new BitSet(new long[]{0x0000000000002000L,0x0000000000000060L});
public static final BitSet FOLLOW_69_in_ruleBaseState8063 = new BitSet(new long[]{0x0000000000045000L});
public static final BitSet FOLLOW_ruleDetailCode_in_ruleBaseState8084 = new BitSet(new long[]{0x0000000000002000L,0x0000000000000040L});
- public static final BitSet FOLLOW_70_in_ruleBaseState8099 = new BitSet(new long[]{0x0000000000001000L,0x0000000000000006L});
- public static final BitSet FOLLOW_ruleStateGraph_in_ruleBaseState8120 = new BitSet(new long[]{0x0000000000002000L});
+ public static final BitSet FOLLOW_70_in_ruleBaseState8099 = new BitSet(new long[]{0x0000000000001000L});
+ public static final BitSet FOLLOW_rulePlainStateGraph_in_ruleBaseState8120 = new BitSet(new long[]{0x0000000000002000L});
public static final BitSet FOLLOW_13_in_ruleBaseState8134 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleRefinedState_in_entryRuleRefinedState8172 = new BitSet(new long[]{0x0000000000000000L});
public static final BitSet FOLLOW_EOF_in_entryRuleRefinedState8182 = new BitSet(new long[]{0x0000000000000002L});
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java
index ebbf32b..5157c78 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java
@@ -2512,7 +2512,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
private final Group cGroup_3_3 = (Group)cGroup_3.eContents().get(3);
private final Keyword cSubgraphKeyword_3_3_0 = (Keyword)cGroup_3_3.eContents().get(0);
private final Assignment cSubgraphAssignment_3_3_1 = (Assignment)cGroup_3_3.eContents().get(1);
- private final RuleCall cSubgraphStateGraphParserRuleCall_3_3_1_0 = (RuleCall)cSubgraphAssignment_3_3_1.eContents().get(0);
+ private final RuleCall cSubgraphPlainStateGraphParserRuleCall_3_3_1_0 = (RuleCall)cSubgraphAssignment_3_3_1.eContents().get(0);
private final Keyword cRightCurlyBracketKeyword_3_4 = (Keyword)cGroup_3.eContents().get(4);
//// entry and exit code have multiplicity many: in BaseState to be able to add derived class codes here,
@@ -2521,11 +2521,11 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
//
//BaseState:
// "State" name=ID docu=Documentation? ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("subgraph"
- // subgraph=StateGraph)? "}")?;
+ // subgraph=PlainStateGraph)? "}")?;
public ParserRule getRule() { return rule; }
//"State" name=ID docu=Documentation? ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("subgraph"
- //subgraph=StateGraph)? "}")?
+ //subgraph=PlainStateGraph)? "}")?
public Group getGroup() { return cGroup; }
//"State"
@@ -2543,7 +2543,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
//Documentation
public RuleCall getDocuDocumentationParserRuleCall_2_0() { return cDocuDocumentationParserRuleCall_2_0; }
- //("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("subgraph" subgraph=StateGraph)? "}")?
+ //("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("subgraph" subgraph=PlainStateGraph)? "}")?
public Group getGroup_3() { return cGroup_3; }
//"{"
@@ -2573,17 +2573,17 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
//DetailCode
public RuleCall getExitCodeDetailCodeParserRuleCall_3_2_1_0() { return cExitCodeDetailCodeParserRuleCall_3_2_1_0; }
- //("subgraph" subgraph=StateGraph)?
+ //("subgraph" subgraph=PlainStateGraph)?
public Group getGroup_3_3() { return cGroup_3_3; }
//"subgraph"
public Keyword getSubgraphKeyword_3_3_0() { return cSubgraphKeyword_3_3_0; }
- //subgraph=StateGraph
+ //subgraph=PlainStateGraph
public Assignment getSubgraphAssignment_3_3_1() { return cSubgraphAssignment_3_3_1; }
- //StateGraph
- public RuleCall getSubgraphStateGraphParserRuleCall_3_3_1_0() { return cSubgraphStateGraphParserRuleCall_3_3_1_0; }
+ //PlainStateGraph
+ public RuleCall getSubgraphPlainStateGraphParserRuleCall_3_3_1_0() { return cSubgraphPlainStateGraphParserRuleCall_3_3_1_0; }
//"}"
public Keyword getRightCurlyBracketKeyword_3_4() { return cRightCurlyBracketKeyword_3_4; }
@@ -4601,7 +4601,7 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
//
//BaseState:
// "State" name=ID docu=Documentation? ("{" ("entry" entryCode=DetailCode)? ("exit" exitCode=DetailCode)? ("subgraph"
- // subgraph=StateGraph)? "}")?;
+ // subgraph=PlainStateGraph)? "}")?;
public BaseStateElements getBaseStateAccess() {
return (pBaseState != null) ? pBaseState : (pBaseState = new BaseStateElements());
}
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext
index 07cc2e5..6f24d90 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/Room.xtext
@@ -284,7 +284,7 @@ BaseState:
'State' name=ID (docu=Documentation)? ('{'
('entry' entryCode=DetailCode)?
('exit' exitCode=DetailCode)?
- ('subgraph' subgraph=StateGraph)?
+ ('subgraph' subgraph=PlainStateGraph)?
'}')?;
RefinedState:
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomNameProvider.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomNameProvider.java
index 22a3156..8c561b5 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomNameProvider.java
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomNameProvider.java
@@ -156,6 +156,9 @@ public class RoomNameProvider {
else if (t instanceof CPBranchTransition) {
return fromTo+"_COND_"+t.getName();
}
+ else if (t instanceof GuardedTransition) {
+ return fromTo+"_GUARD_"+t.getName();
+ }
}
assert(false): "Unexpected transition class "+t.eClass().getName();
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java
index 7da856d..cf60488 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java
@@ -517,7 +517,7 @@ public class StateSupport {
s = rs;
}
- s.setSubgraph(RoomFactory.eINSTANCE.createStateGraph());
+ s.setSubgraph(RoomFactory.eINSTANCE.createPlainStateGraph());
AddContext addContext = new AddContext();
addContext.setNewObject(s.getSubgraph());