Skip to content

Refactor and fix state contexts in Rust backend #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 4, 2021
Merged

Refactor and fix state contexts in Rust backend #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
13a3f35
Make remaining hard-coded names configurable.
walkie Sep 2, 2021
078c2da
Begin state-context refactor.
walkie Sep 2, 2021
49cc9ca
Remove dependence on transition node in helper functions.
walkie Sep 2, 2021
36fa93d
Fix typo in field name.
walkie Sep 2, 2021
fa17543
Comments and minor re-org of generate transition.
walkie Sep 2, 2021
ef49ae4
Generate state contexts on change-state.
walkie Sep 2, 2021
0ee1d33
Vary the number of parameters in test.
walkie Sep 2, 2021
855edf6
Fix state contexts that require enter args on state-change.
walkie Sep 3, 2021
cca2a42
Update context on change-state, initial tests.
walkie Sep 3, 2021
ab5b72b
Fix parsing of change-state context, more tests.
walkie Sep 3, 2021
3f50559
Fix and test state contexts for initial states.
walkie Sep 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions framec/src/frame_c/default_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ codegen:
enter_msg: Enter
exit_msg: Exit
enter_args_member_name: enter_args
enter_args_suffix: EnterArgs
exit_args_member_name: exit_args
state_args_var: state_args
state_args_suffix: StateArgs
state_vars_var_name: state_vars
state_vars_suffix: StateVars
state_context_name: StateContext
state_context_suffix: StateContext
state_context_var_name: state_context
Expand Down
27 changes: 1 addition & 26 deletions framec/src/frame_c/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3444,31 +3444,6 @@ impl<'a> Parser<'a> {

/* --------------------------------------------------------------------- */

// state_context ->

fn change_state_context(
&mut self,
_: Option<ExprListNode>,
) -> Result<Option<StateContextType>, ParseError> {
// parse state ref e.g. '$S1'
if !self.match_token(&vec![TokenType::StateTok]) {
return Err(ParseError::new("Missing $"));
}

if !self.match_token(&vec![TokenType::IdentifierTok]) {
return Err(ParseError::new("Missing state identifier."));
}

let state_id = self.previous();
let name = state_id.lexeme.clone();

let state_context_node = StateContextNode::new(StateRefNode::new(name), None, None);

Ok(Some(StateContextType::StateRef { state_context_node }))
}

/* --------------------------------------------------------------------- */

// transition : exitArgs '->' enterArgs transitionLabel stateRef stateArgs

fn transition(
Expand Down Expand Up @@ -3536,7 +3511,7 @@ impl<'a> Parser<'a> {
}

let state_context_t;
match self.change_state_context(None) {
match self.state_context(None) {
Ok(Some(scn)) => state_context_t = scn,
Ok(None) => return Err(ParseError::new("TODO")),
Err(parse_error) => return Err(parse_error),
Expand Down
Loading