Merge v0.6.0 changes into main

.gitignore

@@ -5,4 +5,6 @@
 *.idea
 *.iml
 
+config.yaml
+framec_tests/config.yaml
 target

framec/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "framec"
-version = "0.5.1"
+version = "0.6.0"
 authors = ["Mark Truluck <mark@frame-lang.org>"]
 edition = "2018"
 
@@ -9,13 +9,14 @@ edition = "2018"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-wasm-bindgen="0.2"
+convert_case = "0.4.0"
 downcast-rs = "1.2.0"
-# runtime-fmt = "0.4.1"
+exitcode = "1.1.2"
 fomat-macros = "0.3.1"
+# runtime-fmt = "0.4.1"
 structopt = "0.3.21"
-exitcode = "1.1.2"
+wasm-bindgen = "0.2"
 yaml-rust = "0.4.5"
 
 [package.metadata.wasm-pack.profile.release]
-wasm-opt = false
+wasm-opt = false

framec/src/frame_c/ast.rs

@@ -557,7 +557,7 @@ impl EventHandlerNode {
             state_name,
             msg_t,
             statements,
-            terminator_node,
+            terminator_node: terminator_node,
             event_symbol_rcref,
             event_handler_has_transition,
             line,

framec/src/frame_c/compiler.rs

@@ -22,7 +22,7 @@ use yaml_rust::YamlLoader;
 /* --------------------------------------------------------------------- */
 
 static IS_DEBUG: bool = false;
-static FRAMEC_VERSION: &str = "emitted from framec_v0.5.1";
+static FRAMEC_VERSION: &str = "emitted from framec_v0.6.0";
 
 /* --------------------------------------------------------------------- */
 

framec/src/frame_c/default_config.yaml

@@ -5,9 +5,9 @@ codegen:
 
   rust:
     features:
-      lower_case_states: false
-      introspection: true
       generate_action_impl: true
+      generate_hook_methods: true
+      follow_rust_naming: true
     code:
       actions_prefix:
       actions_suffix: Actions
@@ -16,31 +16,33 @@ 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_rc
-      state_context_var_name_suffix: _state_context
-      state_context_struct_name: StateContext
+      state_context_var_name: state_context
+      state_context_method_suffix: _context
       this_state_context_var_name: this_state_context
       frame_event_message_type_name: FrameMessage
       frame_event_type_name: FrameEvent
       frame_event_parameter_type_name: FrameEventParameter
       frame_event_parameters_type_name: FrameEventParameters
       frame_event_return: FrameEventReturn
-      frame_event_variable_name: e
+      frame_event_variable_name: frame_event
       frame_event_parameters_attribute_name: parameters
       frame_event_message_attribute_name: message
       frame_event_return_attribute_name: ret
-      frame_state_type_name: FrameState
       state_var_name: state
-      state_var_name_prefix:
-      state_var_name_suffix: _state
+      state_handler_name_prefix:
+      state_handler_name_suffix: _handler
       state_enum_suffix: State
       state_enum_traits: Clone, Copy, Debug, Eq, Hash, PartialEq, PartialOrd, Ord
       initialize_method_name: initialize
+      handle_event_method_name: handle_event
       transition_method_name: transition
       change_state_method_name: change_state
       transition_hook_method_name: transition_hook

framec/src/frame_c/parser.rs

@@ -1059,14 +1059,6 @@ impl<'a> Parser<'a> {
         let mut type_node_opt: Option<TypeNode> = None;
 
         if self.match_token(&vec![ColonTok]) {
-            // if !self.match_token(&vec![TokenType::IdentifierTok]) {
-            //     self.error_at_previous("Expected parameter type.");
-            //     return Err(ParseError::new("TODO"));
-            // }
-            //
-            // let type_name = self.previous().lexeme.clone();
-            //
-            // type_opt = Some(type_name);
             match self.type_decl() {
                 Ok(type_node) => type_node_opt = Some(type_node),
                 Err(parse_error) => return Err(parse_error),
@@ -1802,7 +1794,6 @@ impl<'a> Parser<'a> {
         }
 
         let statements = self.statements();
-
         let event_symbol_rcref = self.arcanum.get_event(&msg, &self.state_name_opt).unwrap();
         let ret_event_symbol_rcref = Rc::clone(&event_symbol_rcref);
         let terminator_node = match self.event_handler_terminator(event_symbol_rcref) {
@@ -1910,10 +1901,32 @@ impl<'a> Parser<'a> {
 
         loop {
             // let result = self.decl_or_stmt();
+            //            let must_terminate = false;
             match self.decl_or_stmt() {
                 Ok(opt_smt) => match opt_smt {
                     Some(statement) => {
-                        statements.push(statement);
+                        match &statement {
+                            DeclOrStmtType::StmtT { stmt_t } => {
+                                // Transitions or state changes must be the last statement in
+                                // an event handler.
+                                match stmt_t {
+                                    StatementType::TransitionStmt { .. } => {
+                                        statements.push(statement);
+                                        return statements;
+                                    }
+                                    StatementType::ChangeStateStmt { .. } => {
+                                        statements.push(statement);
+                                        return statements;
+                                    }
+                                    _ => {
+                                        statements.push(statement);
+                                    }
+                                }
+                            }
+                            _ => {
+                                statements.push(statement);
+                            }
+                        }
                     }
                     None => {
                         return statements;
@@ -2317,15 +2330,13 @@ impl<'a> Parser<'a> {
         expr_t: ExprType,
     ) -> Result<BoolTestConditionalBranchNode, ParseError> {
         let statements = self.statements();
-
         let result = self.branch_terminator();
-
         return match result {
-            Ok(branch_terminator_t_opt) => Ok(BoolTestConditionalBranchNode::new(
+            Ok(branch_terminator_expr_opt) => Ok(BoolTestConditionalBranchNode::new(
                 is_negated,
                 expr_t,
                 statements,
-                branch_terminator_t_opt,
+                branch_terminator_expr_opt,
             )),
             Err(parse_error) => Err(parse_error),
         };
@@ -2337,21 +2348,19 @@ impl<'a> Parser<'a> {
 
     fn bool_test_else_branch(&mut self) -> Result<BoolTestElseBranchNode, ParseError> {
         let statements = self.statements();
-
         let result = self.branch_terminator();
-
         return match result {
-            Ok(branch_terminator_opt) => Ok(BoolTestElseBranchNode::new(
+            Ok(branch_terminator_expr_opt) => Ok(BoolTestElseBranchNode::new(
                 statements,
-                branch_terminator_opt,
+                branch_terminator_expr_opt,
             )),
             Err(parse_error) => Err(parse_error),
         };
     }
 
     /* --------------------------------------------------------------------- */
 
-    // branch_terminator -> ^ | '>'
+    // branch_terminator -> '^' | ':>'
 
     // TODO: explore returning a TerminatorType rather than node
     fn branch_terminator(&mut self) -> Result<Option<TerminatorExpr>, ParseError> {
@@ -2488,9 +2497,7 @@ impl<'a> Parser<'a> {
         }
 
         let statements = self.statements();
-
         let result = self.branch_terminator();
-
         return match result {
             Ok(branch_terminator_t_opt) => Ok(StringMatchTestMatchBranchNode::new(
                 string_match_pattern_node,
@@ -2509,9 +2516,7 @@ impl<'a> Parser<'a> {
         &mut self,
     ) -> Result<StringMatchTestElseBranchNode, ParseError> {
         let statements = self.statements();
-
         let result = self.branch_terminator();
-
         return match result {
             Ok(branch_terminator_opt) => Ok(StringMatchTestElseBranchNode::new(
                 statements,
@@ -3366,31 +3371,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(
@@ -3458,7 +3438,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),
@@ -3558,11 +3538,8 @@ impl<'a> Parser<'a> {
         if let Err(parse_error) = self.consume(ForwardSlashTok, "Expected '/'.") {
             return Err(parse_error);
         }
-
         let statements = self.statements();
-
         let result = self.branch_terminator();
-
         return match result {
             Ok(branch_terminator_t_opt) => Ok(NumberMatchTestMatchBranchNode::new(
                 match_numbers,
@@ -3581,9 +3558,7 @@ impl<'a> Parser<'a> {
         &mut self,
     ) -> Result<NumberMatchTestElseBranchNode, ParseError> {
         let statements = self.statements();
-
         let result = self.branch_terminator();
-
         return match result {
             Ok(branch_terminator_opt) => Ok(NumberMatchTestElseBranchNode::new(
                 statements,

framec/src/frame_c/visitors/cpp_visitor.rs

@@ -1353,6 +1353,7 @@ impl AstVisitor for CppVisitor {
 
         let terminator_node = &evt_handler_node.terminator_node;
         terminator_node.accept(self);
+
         self.outdent();
 
         self.newline();

framec/src/frame_c/visitors/plantuml_visitor.rs

@@ -1251,10 +1251,6 @@ impl AstVisitor for PlantUmlVisitor {
 
         let terminator_node = &evt_handler_node.terminator_node;
         terminator_node.accept(self);
-        // self.outdent();
-        //
-        // self.newline();
-        // self.add_code(&format!("}}"));
 
         // this controls formatting here
         self.first_event_handler = false;