Commit 2423f988 authored by Faezeh KHORRAM's avatar Faezeh KHORRAM 💬
Browse files

update models

parent e0611bd9
......@@ -9,8 +9,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.sirius,
org.eclipse.sirius.common.acceleo.aql,
org.eclipse.xtext,
org.eclipse.gemoc.executionframework.extensions.sirius;bundle-version="0.0.0";visibility:="reexport",
org.eclipse.gemoc.execution.sequential.javaengine.ui;bundle-version=0.0.0;visibility:=reexport
org.eclipse.gemoc.executionframework.extensions.sirius;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.gemoc.execution.sequential.javaengine.ui;bundle-version="4.0.0"
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.gemoc.example.k3fsm.design.Activator
Bundle-ActivationPolicy: lazy
......
/*
* generated by Xtext 2.24.0
* generated by Xtext 2.25.0
*/
package org.eclipse.gemoc.example.k3fsm.ide.contentassist.antlr;
......
/*
* generated by Xtext 2.24.0
* generated by Xtext 2.25.0
*/
package org.eclipse.gemoc.example.k3fsm.xtext.ui.internal;
......
/*
* generated by Xtext 2.24.0
* generated by Xtext 2.25.0
*/
package org.eclipse.gemoc.example.k3fsm.parser.antlr;
......
/*
* generated by Xtext 2.24.0
* generated by Xtext 2.25.0
*/
package org.eclipse.gemoc.example.k3fsm.parser.antlr;
......
/*
* generated by Xtext 2.24.0
* generated by Xtext 2.25.0
*/
package org.eclipse.gemoc.example.k3fsm.serializer;
......
/*
* generated by Xtext 2.24.0
* generated by Xtext 2.25.0
*/
package org.eclipse.gemoc.example.k3fsm.serializer;
......
/*
* generated by Xtext 2.24.0
* generated by Xtext 2.25.0
*/
package org.eclipse.gemoc.example.k3fsm.services;
......@@ -69,22 +69,30 @@ public class K3FSMGrammarAccess extends AbstractElementFinder.AbstractGrammarEle
private final Keyword cRightCurlyBracketKeyword_10_4 = (Keyword)cGroup_10.eContents().get(4);
private final Keyword cRightCurlyBracketKeyword_11 = (Keyword)cGroup.eContents().get(11);
//FSM:
// 'FSM'
// name=EString
// '{' ('unprocessedString' unprocessedString=EString)? ('consummedString' consumedString=EString)? ('producedString'
// producedString=EString)?
// 'initialState' initialState=[State|EString] ('finalState' finalState=[State|EString])? ('currentState'
// currentState=[State|EString])? ('ownedStates' '{' ownedStates+=State ("," ownedStates+=State)* '}')?
// '}';
//FSM returns FSM:
// 'FSM'
// name=EString
// '{'
// ('unprocessedString' unprocessedString=EString)?
// ('consummedString' consumedString=EString)?
// ('producedString' producedString=EString)?
// 'initialState' initialState=[State|EString]
// ('finalState' finalState=[State|EString])?
// ('currentState' currentState=[State|EString])?
// ('ownedStates' '{' ownedStates+=State ( "," ownedStates+=State)* '}' )?
// '}';
@Override public ParserRule getRule() { return rule; }
//'FSM'
//name=EString
//'{' ('unprocessedString' unprocessedString=EString)? ('consummedString' consumedString=EString)? ('producedString'
//producedString=EString)?
//'initialState' initialState=[State|EString] ('finalState' finalState=[State|EString])? ('currentState'
//currentState=[State|EString])? ('ownedStates' '{' ownedStates+=State ("," ownedStates+=State)* '}')?
//'{'
// ('unprocessedString' unprocessedString=EString)?
// ('consummedString' consumedString=EString)?
// ('producedString' producedString=EString)?
// 'initialState' initialState=[State|EString]
// ('finalState' finalState=[State|EString])?
// ('currentState' currentState=[State|EString])?
// ('ownedStates' '{' ownedStates+=State ( "," ownedStates+=State)* '}' )?
//'}'
public Group getGroup() { return cGroup; }
......@@ -178,7 +186,7 @@ public class K3FSMGrammarAccess extends AbstractElementFinder.AbstractGrammarEle
//EString
public RuleCall getCurrentStateStateEStringParserRuleCall_9_1_0_1() { return cCurrentStateStateEStringParserRuleCall_9_1_0_1; }
//('ownedStates' '{' ownedStates+=State ("," ownedStates+=State)* '}')?
//('ownedStates' '{' ownedStates+=State ( "," ownedStates+=State)* '}' )?
public Group getGroup_10() { return cGroup_10; }
//'ownedStates'
......@@ -193,7 +201,7 @@ public class K3FSMGrammarAccess extends AbstractElementFinder.AbstractGrammarEle
//State
public RuleCall getOwnedStatesStateParserRuleCall_10_2_0() { return cOwnedStatesStateParserRuleCall_10_2_0; }
//("," ownedStates+=State)*
//( "," ownedStates+=State)*
public Group getGroup_10_3() { return cGroup_10_3; }
//","
......@@ -217,8 +225,8 @@ public class K3FSMGrammarAccess extends AbstractElementFinder.AbstractGrammarEle
private final RuleCall cSTRINGTerminalRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
private final RuleCall cIDTerminalRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
//EString:
// STRING | ID;
//EString returns ecore::EString:
// STRING | ID;
@Override public ParserRule getRule() { return rule; }
//STRING | ID
......@@ -250,18 +258,22 @@ public class K3FSMGrammarAccess extends AbstractElementFinder.AbstractGrammarEle
private final Keyword cRightCurlyBracketKeyword_4_4 = (Keyword)cGroup_4.eContents().get(4);
private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
//State:
// {State}
// 'State'
// name=EString
// '{' ('outgoingTransitions' '{' outgoingTransitions+=Transition ("," outgoingTransitions+=Transition)* '}')?
// '}';
//State returns State:
// {State}
// 'State'
// name=EString
// '{'
// //('incomingTransitions' '(' incomingTransitions+=[Transition|EString] ( "," incomingTransitions+=[Transition|EString])* ')' )?
// ('outgoingTransitions' '{' outgoingTransitions+=Transition ( "," outgoingTransitions+=Transition)* '}' )?
// '}';
@Override public ParserRule getRule() { return rule; }
//{State}
//'State'
//name=EString
//'{' ('outgoingTransitions' '{' outgoingTransitions+=Transition ("," outgoingTransitions+=Transition)* '}')?
//'{'
// //('incomingTransitions' '(' incomingTransitions+=[Transition|EString] ( "," incomingTransitions+=[Transition|EString])* ')' )?
// ('outgoingTransitions' '{' outgoingTransitions+=Transition ( "," outgoingTransitions+=Transition)* '}' )?
//'}'
public Group getGroup() { return cGroup; }
......@@ -280,7 +292,8 @@ public class K3FSMGrammarAccess extends AbstractElementFinder.AbstractGrammarEle
//'{'
public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
//('outgoingTransitions' '{' outgoingTransitions+=Transition ("," outgoingTransitions+=Transition)* '}')?
////('incomingTransitions' '(' incomingTransitions+=[Transition|EString] ( "," incomingTransitions+=[Transition|EString])* ')' )?
//('outgoingTransitions' '{' outgoingTransitions+=Transition ( "," outgoingTransitions+=Transition)* '}' )?
public Group getGroup_4() { return cGroup_4; }
//'outgoingTransitions'
......@@ -295,7 +308,7 @@ public class K3FSMGrammarAccess extends AbstractElementFinder.AbstractGrammarEle
//Transition
public RuleCall getOutgoingTransitionsTransitionParserRuleCall_4_2_0() { return cOutgoingTransitionsTransitionParserRuleCall_4_2_0; }
//("," outgoingTransitions+=Transition)*
//( "," outgoingTransitions+=Transition)*
public Group getGroup_4_3() { return cGroup_4_3; }
//","
......@@ -334,18 +347,22 @@ public class K3FSMGrammarAccess extends AbstractElementFinder.AbstractGrammarEle
private final RuleCall cTargetStateEStringParserRuleCall_6_0_1 = (RuleCall)cTargetStateCrossReference_6_0.eContents().get(1);
private final Keyword cRightCurlyBracketKeyword_7 = (Keyword)cGroup.eContents().get(7);
//Transition:
// 'Transition'
// name=EString
// '{' ('input' input=EString)? ('output' output=EString)?
// 'target' target=[State|EString]
// '}';
//Transition returns Transition:
// 'Transition'
// name=EString
// '{'
// ('input' input=EString)?
// ('output' output=EString)?
// 'target' target=[State|EString]
// '}';
@Override public ParserRule getRule() { return rule; }
//'Transition'
//name=EString
//'{' ('input' input=EString)? ('output' output=EString)?
//'target' target=[State|EString]
//'{'
// ('input' input=EString)?
// ('output' output=EString)?
// 'target' target=[State|EString]
//'}'
public Group getGroup() { return cGroup; }
......@@ -449,14 +466,18 @@ public class K3FSMGrammarAccess extends AbstractElementFinder.AbstractGrammarEle
}
//FSM:
// 'FSM'
// name=EString
// '{' ('unprocessedString' unprocessedString=EString)? ('consummedString' consumedString=EString)? ('producedString'
// producedString=EString)?
// 'initialState' initialState=[State|EString] ('finalState' finalState=[State|EString])? ('currentState'
// currentState=[State|EString])? ('ownedStates' '{' ownedStates+=State ("," ownedStates+=State)* '}')?
// '}';
//FSM returns FSM:
// 'FSM'
// name=EString
// '{'
// ('unprocessedString' unprocessedString=EString)?
// ('consummedString' consumedString=EString)?
// ('producedString' producedString=EString)?
// 'initialState' initialState=[State|EString]
// ('finalState' finalState=[State|EString])?
// ('currentState' currentState=[State|EString])?
// ('ownedStates' '{' ownedStates+=State ( "," ownedStates+=State)* '}' )?
// '}';
public FSMElements getFSMAccess() {
return pFSM;
}
......@@ -465,8 +486,8 @@ public class K3FSMGrammarAccess extends AbstractElementFinder.AbstractGrammarEle
return getFSMAccess().getRule();
}
//EString:
// STRING | ID;
//EString returns ecore::EString:
// STRING | ID;
public EStringElements getEStringAccess() {
return pEString;
}
......@@ -475,12 +496,14 @@ public class K3FSMGrammarAccess extends AbstractElementFinder.AbstractGrammarEle
return getEStringAccess().getRule();
}
//State:
// {State}
// 'State'
// name=EString
// '{' ('outgoingTransitions' '{' outgoingTransitions+=Transition ("," outgoingTransitions+=Transition)* '}')?
// '}';
//State returns State:
// {State}
// 'State'
// name=EString
// '{'
// //('incomingTransitions' '(' incomingTransitions+=[Transition|EString] ( "," incomingTransitions+=[Transition|EString])* ')' )?
// ('outgoingTransitions' '{' outgoingTransitions+=Transition ( "," outgoingTransitions+=Transition)* '}' )?
// '}';
public StateElements getStateAccess() {
return pState;
}
......@@ -489,12 +512,14 @@ public class K3FSMGrammarAccess extends AbstractElementFinder.AbstractGrammarEle
return getStateAccess().getRule();
}
//Transition:
// 'Transition'
// name=EString
// '{' ('input' input=EString)? ('output' output=EString)?
// 'target' target=[State|EString]
// '}';
//Transition returns Transition:
// 'Transition'
// name=EString
// '{'
// ('input' input=EString)?
// ('output' output=EString)?
// 'target' target=[State|EString]
// '}';
public TransitionElements getTransitionAccess() {
return pTransition;
}
......@@ -503,45 +528,40 @@ public class K3FSMGrammarAccess extends AbstractElementFinder.AbstractGrammarEle
return getTransitionAccess().getRule();
}
//terminal ID:
// '^'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;
//terminal ID: '^'?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
public TerminalRule getIDRule() {
return gaTerminals.getIDRule();
}
//terminal INT returns ecore::EInt:
// '0'..'9'+;
//terminal INT returns ecore::EInt: ('0'..'9')+;
public TerminalRule getINTRule() {
return gaTerminals.getINTRule();
}
//terminal STRING:
// '"' ('\\' . | !('\\' | '"'))* '"' |
// "'" ('\\' . | !('\\' | "'"))* "'";
// '"' ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|'"') )* '"' |
// "'" ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|"'") )* "'"
// ;
public TerminalRule getSTRINGRule() {
return gaTerminals.getSTRINGRule();
}
//terminal ML_COMMENT:
// '/*'->'*/';
//terminal ML_COMMENT : '/*' -> '*/';
public TerminalRule getML_COMMENTRule() {
return gaTerminals.getML_COMMENTRule();
}
//terminal SL_COMMENT:
// '//' !('\n' | '\r')* ('\r'? '\n')?;
//terminal SL_COMMENT : '//' !('\n'|'\r')* ('\r'? '\n')?;
public TerminalRule getSL_COMMENTRule() {
return gaTerminals.getSL_COMMENTRule();
}
//terminal WS:
// ' ' | '\t' | '\r' | '\n'+;
//terminal WS : (' '|'\t'|'\r'|'\n')+;
public TerminalRule getWSRule() {
return gaTerminals.getWSRule();
}
//terminal ANY_OTHER:
// .;
//terminal ANY_OTHER: .;
public TerminalRule getANY_OTHERRule() {
return gaTerminals.getANY_OTHERRule();
}
......
/*
* generated by Xtext 2.24.0
* generated by Xtext 2.25.0
*/
package org.eclipse.gemoc.example.k3fsm.validation;
......
......@@ -13,22 +13,22 @@ Package testSuite {
//assertion
k3fsm.genericGate sends FSMNewState (producedString = "01001011") to tester.genericGate;
}
Test Description test2 uses configuration bitShiftingConfiguration{
tester.genericGate sends FSMNewState (unprocessedString = "000101010") to k3fsm.genericGate;
tester.genericGate sends runModel to k3fsm.genericGate;
tester.oclGate sends oclQuery (query = "self.currentState") to k3fsm.oclGate;
k3fsm.oclGate sends S2 to tester.oclGate;
}
Test Description test3 uses configuration bitShiftingConfiguration{
tester.genericGate sends FSMNewState (unprocessedString = "00000000") to k3fsm.genericGate;
tester.genericGate sends runModel to k3fsm.genericGate;
tester.genericGate sends getModelState to k3fsm.genericGate;
k3fsm.genericGate sends FSMNewState (producedString = "00000000") to tester.genericGate;
}
Test Description test4 uses configuration bitShiftingConfiguration{
tester.genericGate sends FSMNewState (unprocessedString = "11111111") to k3fsm.genericGate;
tester.genericGate sends runModel to k3fsm.genericGate;
tester.genericGate sends getModelState to k3fsm.genericGate;
k3fsm.genericGate sends FSMNewState (producedString = "01111111") to tester.genericGate;
}
// Test Description test2 uses configuration bitShiftingConfiguration{
// tester.genericGate sends FSMNewState (unprocessedString = "000101010") to k3fsm.genericGate;
// tester.genericGate sends runModel to k3fsm.genericGate;
// tester.oclGate sends oclQuery (query = "self.currentState") to k3fsm.oclGate;
// k3fsm.oclGate sends S2 to tester.oclGate;
// }
// Test Description test3 uses configuration bitShiftingConfiguration{
// tester.genericGate sends FSMNewState (unprocessedString = "00000000") to k3fsm.genericGate;
// tester.genericGate sends runModel to k3fsm.genericGate;
// tester.genericGate sends getModelState to k3fsm.genericGate;
// k3fsm.genericGate sends FSMNewState (producedString = "00000000") to tester.genericGate;
// }
// Test Description test4 uses configuration bitShiftingConfiguration{
// tester.genericGate sends FSMNewState (unprocessedString = "11111111") to k3fsm.genericGate;
// tester.genericGate sends runModel to k3fsm.genericGate;
// tester.genericGate sends getModelState to k3fsm.genericGate;
// k3fsm.genericGate sends FSMNewState (producedString = "01111111") to tester.genericGate;
// }
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment