Merge branch 'master' into abroooo/fix_dbg_alignment

Author: ghaith

compiler/plc_ast/src/ast.rs

@@ -417,7 +417,7 @@ pub struct CompilationUnit {
     pub global_vars: Vec<VariableBlock>,
     pub var_config: Vec<ConfigVariable>,
     /// List of POU definitions (signature and some additional metadata)
-    pub units: Vec<Pou>,
+    pub pous: Vec<Pou>,
     /// List of statements within a POU body
     pub implementations: Vec<Implementation>,
     pub interfaces: Vec<Interface>,
@@ -430,7 +430,7 @@ impl CompilationUnit {
         CompilationUnit {
             global_vars: Vec::new(),
             var_config: Vec::new(),
-            units: Vec::new(),
+            pous: Vec::new(),
             implementations: Vec::new(),
             interfaces: Vec::new(),
             user_types: Vec::new(),
@@ -451,7 +451,7 @@ impl CompilationUnit {
     /// `other` the other CompilationUnit to import the elements from.
     pub fn import(&mut self, other: CompilationUnit) {
         self.global_vars.extend(other.global_vars);
-        self.units.extend(other.units);
+        self.pous.extend(other.pous);
         self.implementations.extend(other.implementations);
         self.user_types.extend(other.user_types);
     }

compiler/plc_ast/src/mut_visitor.rs

@@ -421,7 +421,7 @@ impl WalkerMut for CompilationUnit {
             visitor.visit_user_type_declaration(user_type);
         }
 
-        for pou in &mut self.units {
+        for pou in &mut self.pous {
             visitor.visit_pou(pou);
         }
 

compiler/plc_ast/src/pre_processor.rs

@@ -18,7 +18,7 @@ use plc_source::source_location::SourceLocation;
 
 pub fn pre_process(unit: &mut CompilationUnit, mut id_provider: IdProvider) {
     //process all local variables from POUs
-    for pou in unit.units.iter_mut() {
+    for pou in unit.pous.iter_mut() {
         //Find all generic types in that pou
         let generic_types = preprocess_generic_structs(pou);
         unit.user_types.extend(generic_types);

compiler/plc_ast/src/visitor.rs

@@ -627,7 +627,7 @@ impl Walker for CompilationUnit {
             visitor.visit_user_type_declaration(user_type);
         }
 
-        for pou in &self.units {
+        for pou in &self.pous {
             visitor.visit_pou(pou);
         }
 

compiler/plc_driver/src/pipelines/validator.rs

@@ -5,7 +5,7 @@ use super::{participant::PipelineParticipant, ParsedProject};
 impl PipelineParticipant for ParticipantValidator {
     fn pre_index(&mut self, project: &ParsedProject) {
         for unit in &project.units {
-            for pou in &unit.units {
+            for pou in &unit.pous {
                 self.validate_properties(pou);
             }
         }

compiler/plc_lowering/src/inheritance.rs

@@ -275,7 +275,7 @@ mod units_tests {
         .into();
 
         let (_, project) = parse_and_annotate("test", vec![src]).unwrap();
-        let unit = &project.units[0].get_unit().units[1];
+        let unit = &project.units[0].get_unit().pous[1];
         assert_debug_snapshot!(unit, @r###"
         POU {
             name: "bar",
@@ -2006,7 +2006,7 @@ mod units_tests {
         .into();
 
         let (_, project) = parse_and_annotate("test", vec![src]).unwrap();
-        let unit = &project.units[0].get_unit().units[2];
+        let unit = &project.units[0].get_unit().pous[2];
         assert_debug_snapshot!(unit, @r###"
         POU {
             name: "child",
@@ -2094,7 +2094,7 @@ mod units_tests {
         .into();
 
         let (_, project) = parse_and_annotate("test", vec![src]).unwrap();
-        let unit = &project.units[0].get_unit().units[3];
+        let unit = &project.units[0].get_unit().pous[3];
         assert_debug_snapshot!(unit, @r#"
         POU {
             name: "child.foo",

compiler/plc_xml/src/xml_parser/snapshots/plc_xml__xml_parser__control__tests__jump_and_label_converted_to_ast.snap

@@ -1,12 +1,11 @@
 ---
 source: compiler/plc_xml/src/xml_parser/control.rs
 expression: ast
-snapshot_kind: text
 ---
 CompilationUnit {
     global_vars: [],
     var_config: [],
-    units: [
+    pous: [
         POU {
             name: "program_0",
             variable_blocks: [

compiler/plc_xml/src/xml_parser/snapshots/plc_xml__xml_parser__control__tests__negated_jump_ast.snap

@@ -1,12 +1,11 @@
 ---
 source: compiler/plc_xml/src/xml_parser/control.rs
 expression: ast
-snapshot_kind: text
 ---
 CompilationUnit {
     global_vars: [],
     var_config: [],
-    units: [
+    pous: [
         POU {
             name: "program_0",
             variable_blocks: [

compiler/plc_xml/src/xml_parser/snapshots/plc_xml__xml_parser__control__tests__unconnected_jump_generated_as_empty_statement.snap

@@ -1,12 +1,11 @@
 ---
 source: compiler/plc_xml/src/xml_parser/control.rs
 expression: ast
-snapshot_kind: text
 ---
 CompilationUnit {
     global_vars: [],
     var_config: [],
-    units: [
+    pous: [
         POU {
             name: "program_0",
             variable_blocks: [

compiler/plc_xml/src/xml_parser/snapshots/plc_xml__xml_parser__control__tests__unnamed_controls.snap

@@ -1,12 +1,11 @@
 ---
 source: compiler/plc_xml/src/xml_parser/control.rs
 expression: ast
-snapshot_kind: text
 ---
 CompilationUnit {
     global_vars: [],
     var_config: [],
-    units: [
+    pous: [
         POU {
             name: "program_0",
             variable_blocks: [],