extends macro to handle multiple borrows on AstNode parameter

PLC-lang · Jun 19, 2024 · 119ea09 · 119ea09
1 parent 7c31425
commit 119ea09
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler/plc_ast/src/ast.rs b/compiler/plc_ast/src/ast.rs
@@ -638,9 +638,13 @@ pub enum AstStatement {
 /// Will try to return a reference to the variants inner type, specified via the `t:ty` parameter.
 /// Converts the `try_from`-`Result` into an `Option`
 macro_rules! try_from {
+    () => { None };
     ($ex:expr, $t:ty) => {
         <&$t>::try_from($ex.get_stmt()).ok()
     };
+    ($($ex:tt)*, $t:ty) => {
+        try_from!($($ex)*, $t).ok()
+    };
 }
 
 impl Debug for AstNode {

diff --git a/compiler/plc_ast/src/pre_processor.rs b/compiler/plc_ast/src/pre_processor.rs
@@ -10,7 +10,7 @@ use crate::{
         DataTypeDeclaration, Operator, Pou, UserTypeDeclaration, Variable,
     },
     literals::AstLiteral,
-    provider::IdProvider,
+    provider::IdProvider, try_from,
 };
 use plc_source::source_location::SourceLocation;
 
@@ -96,17 +96,15 @@ pub fn pre_process(unit: &mut CompilationUnit, mut id_provider: IdProvider) {
 
                     let initialized_enum_elements = flatten_expression_list(original_elements)
                         .iter()
-                        .map(|it| match &it.stmt {
-                            AstStatement::Assignment(Assignment { left, right }) => {
-                                //<element-name, initializer, location>
-                                (
-                                    extract_flat_ref_name(left.as_ref()),
-                                    Some(*right.clone()),
-                                    it.get_location(),
+                        .map(|it| try_from!(it, Assignment).map_or_else(
+                            || (extract_flat_ref_name(it), None, it.get_location()), 
+                            | Assignment { left, right } | (
+                                extract_flat_ref_name(left.as_ref()),
+                                Some(*right.clone()),
+                                it.get_location(),
                                 )
-                            }
-                            _ => (extract_flat_ref_name(it), None, it.get_location()),
-                        })
+                            )                        
+                        )
                         .map(|(element_name, initializer, location)| {
                             let enum_literal = initializer.unwrap_or_else(|| {
                                 build_enum_initializer(&last_name, &location, &mut id_provider, enum_name)

diff --git a/compiler/plc_xml/src/xml_parser/fbd.rs b/compiler/plc_xml/src/xml_parser/fbd.rs
@@ -1,4 +1,4 @@
-use ast::ast::{AstFactory, AstNode, AstStatement};
+use ast::{ast::{AstFactory, AstNode, CallStatement}, try_from};
 
 use plc::index::FxIndexMap;
 use plc_source::source_location::SourceLocation;
@@ -54,11 +54,10 @@ impl<'xml> FunctionBlockDiagram<'xml> {
                 let (rhs, remove_id) = ast_association
                     .get(&ref_id)
                     .map(|stmt| {
-                        if matches!(stmt.get_stmt(), AstStatement::CallStatement(..)) {
-                            (stmt.clone(), Some(ref_id))
-                        } else {
-                            self.transform_node(ref_id, session, ast_association)
-                        }
+                        try_from!(stmt, CallStatement).map_or_else(
+                            || self.transform_node(ref_id, session, ast_association),
+                            |_| (stmt.clone(), Some(ref_id))
+                        )
                     })
                     .expect("Expected AST statement, found None");