split vtable into module, add first tests

Author: ghaith

compiler/plc_driver/src/pipelines.rs

@@ -19,22 +19,20 @@ use ast::{
 
 use itertools::Itertools;
 use log::debug;
-use participant::{PipelineParticipant, PipelineParticipantMut, VTableIndexer};
+use participant::{PipelineParticipant, PipelineParticipantMut};
 use plc::{
     codegen::{CodegenContext, GeneratedModule},
     index::{indexer, FxIndexSet, Index},
     linker::LinkerType,
-    lowering::{
-        property::PropertyLowerer,
-        {calls::AggregateTypeLowerer, InitVisitor},
-    },
+    lowering::{calls::AggregateTypeLowerer, property::PropertyLowerer, InitVisitor},
     output::FormatOption,
     parser::parse_file,
     resolver::{
         const_evaluator::UnresolvableConstant, AnnotationMapImpl, AstAnnotations, Dependency, StringLiterals,
         TypeAnnotator,
     },
     validation::Validator,
+    vtable::VTableIndexer,
     ConfigFormat, ErrorFormat, OnlineChange, Target, Threads,
 };
 use plc_diagnostics::{

compiler/plc_driver/src/pipelines/participant.rs

@@ -11,16 +11,15 @@ use std::{
     sync::{Arc, Mutex, RwLock},
 };
 
-use ast::ast::{DataType, DataTypeDeclaration, UserTypeDeclaration};
-use ast::{ast::Variable, provider::IdProvider};
+use ast::provider::IdProvider;
 use plc::{
-    codegen::GeneratedModule, index::Index, lowering::calls::AggregateTypeLowerer, output::FormatOption,
-    typesystem::VOID_POINTER_TYPE, ConfigFormat, OnlineChange, Target,
+    codegen::GeneratedModule, lowering::calls::AggregateTypeLowerer, output::FormatOption,
+    vtable::VTableIndexer, ConfigFormat, OnlineChange, Target,
 };
 use plc_diagnostics::diagnostics::Diagnostic;
 use plc_lowering::inheritance::InheritanceLowerer;
 use project::{object::Object, project::LibraryInformation};
-use source_code::{source_location::SourceLocation, SourceContainer};
+use source_code::SourceContainer;
 
 use super::{AnnotatedProject, AnnotatedUnit, GeneratedProject, IndexedProject, ParsedProject};
 
@@ -283,98 +282,6 @@ impl PipelineParticipantMut for AggregateTypeLowerer {
     }
 }
 
-pub struct VTableIndexer {
-    id_provider: IdProvider,
-}
-
-impl VTableIndexer {
-    pub fn new(id_provider: IdProvider) -> Self {
-        Self { id_provider }
-    }
-
-    fn generate_vtable_name(name: &str) -> String {
-        format!("__vtable_{name}")
-    }
-
-    fn create_vtables_for_pous(index: &Index) -> Vec<UserTypeDeclaration> {
-        let mut vtables = Vec::new();
-        for pou in index.get_pous().values().filter(|pou| pou.is_function_block() || pou.is_class()) {
-            let mut variables = Vec::new();
-
-            if let Some(parent) = pou.get_super_class() {
-                variables.push(VTableIndexer::create_vtable_reference(parent));
-            }
-
-            for interface in pou.get_interfaces() {
-                variables.push(VTableIndexer::create_vtable_reference(interface));
-            }
-
-            for method in index.get_methods_local(pou.get_name()) {
-                variables.push(VTableIndexer::create_void_pointer(method.get_name()));
-            }
-
-            vtables.push(VTableIndexer::create_vtable(pou.get_name(), variables));
-        }
-
-        vtables
-    }
-
-    fn create_vtables_for_interfaces(index: &Index) -> Vec<UserTypeDeclaration> {
-        let mut vtables = Vec::new();
-        for interface in index.get_interfaces().values() {
-            let mut variables = Vec::new();
-            for extension in &interface.extensions {
-                variables.push(VTableIndexer::create_vtable_reference(&extension.name));
-            }
-
-            for method in interface.get_declared_methods(index) {
-                variables.push(VTableIndexer::create_void_pointer(method.get_name()));
-            }
-
-            vtables.push(VTableIndexer::create_vtable(interface.get_name(), variables));
-        }
-
-        vtables
-    }
-
-    /// Creates a void pointer variable with the given name and location
-    fn create_void_pointer(name: &str) -> Variable {
-        Variable {
-            name: name.to_string(),
-            data_type_declaration: DataTypeDeclaration::Reference {
-                referenced_type: VOID_POINTER_TYPE.into(),
-                location: SourceLocation::internal(),
-            },
-            initializer: None,
-            address: None,
-            location: SourceLocation::internal(),
-        }
-    }
-
-    fn create_vtable_reference(name: &str) -> Variable {
-        Variable {
-            name: VTableIndexer::generate_vtable_name(name),
-            data_type_declaration: DataTypeDeclaration::Reference {
-                referenced_type: VTableIndexer::generate_vtable_name(name),
-                location: SourceLocation::internal(),
-            },
-            initializer: None,
-            address: None,
-            location: SourceLocation::internal(),
-        }
-    }
-
-    /// Creates a vtable with the given member variables and a mangled name of the form `__vtable_<name>`
-    fn create_vtable(name: &str, variables: Vec<Variable>) -> UserTypeDeclaration {
-        UserTypeDeclaration {
-            data_type: DataType::StructType { name: Some(Self::generate_vtable_name(name)), variables },
-            initializer: None,
-            location: SourceLocation::internal(),
-            scope: Some(name.to_string()),
-        }
-    }
-}
-
 impl PipelineParticipantMut for VTableIndexer {
     // TODO: Don't track overridden methods in vtable, as they're part of the parent instance (same for interfaces)
     fn post_index(&mut self, indexed_project: IndexedProject) -> IndexedProject {

src/lib.rs

@@ -43,6 +43,7 @@ pub mod output;
 pub mod parser;
 pub mod resolver;
 mod test_utils;
+pub mod vtable;
 
 pub mod typesystem;
 pub mod validation;