Removed PreLinterResult

Author: ngeor

rusty_linter/src/converter/mod.rs

@@ -1,21 +1,7 @@
 //! Converter is the main logic of the linter, where most validation takes place,
 //! as well as resolving variable types.
-mod common;
+//! To convert a program, invoke the convert method of the Convertible trait on it.
+pub mod common;
 mod dim_rules;
 mod expr_rules;
 mod statement;
-
-use rusty_parser::Program;
-
-use crate::LinterContext;
-use crate::converter::common::Convertible;
-use crate::core::LintErrorPos;
-use crate::pre_linter::PreLinterResult;
-
-pub fn convert(
-    program: Program,
-    pre_linter_result: PreLinterResult,
-) -> Result<(LinterContext, Program), LintErrorPos> {
-    let mut context = LinterContext::new(pre_linter_result);
-    program.convert(&mut context).map(|p| (context, p))
-}

rusty_linter/src/core/linter_context.rs

@@ -2,7 +2,6 @@ use rusty_parser::*;
 
 use crate::core::*;
 use crate::names::Names;
-use crate::pre_linter::PreLinterResult;
 
 pub struct LinterContext {
     pub functions: SignatureMap,
@@ -19,11 +18,15 @@ impl TypeResolver for LinterContext {
 }
 
 impl LinterContext {
-    pub fn new(pre_linter_result: PreLinterResult) -> Self {
+    pub fn new(
+        functions: SignatureMap,
+        subs: SignatureMap,
+        user_defined_types: UserDefinedTypes,
+    ) -> Self {
         Self {
-            functions: pre_linter_result.functions,
-            subs: pre_linter_result.subs,
-            user_defined_types: pre_linter_result.user_defined_types,
+            functions,
+            subs,
+            user_defined_types,
             resolver: TypeResolverImpl::new(),
             names: Names::new(),
         }

rusty_linter/src/lib.rs

@@ -13,16 +13,16 @@ pub use self::core::{
     CastVariant, LintError, LinterContext, QBNumberCast, ScopeName, qualifier_of_variant
 };
 pub use self::names::Names;
-use crate::converter::convert;
+use crate::converter::common::Convertible;
 use crate::core::LintErrorPos;
 use crate::post_linter::post_linter;
 use crate::pre_linter::pre_lint_program;
 
 pub fn lint(program: Program) -> Result<(Program, LinterContext), LintErrorPos> {
     // first pass, get user defined types and functions/subs
-    let pre_linter_result = pre_lint_program(&program)?;
+    let mut context = pre_lint_program(&program)?;
     // convert to fully typed
-    let (context, program) = convert(program, pre_linter_result)?;
+    let program = program.convert(&mut context)?;
     // lint and reduce
     post_linter(program, &context).map(|program| (program, context))
 }

rusty_linter/src/pre_linter/main.rs

@@ -2,8 +2,8 @@ use rusty_common::*;
 use rusty_parser::*;
 
 use crate::core::*;
+use crate::pre_linter::ConstantMap;
 use crate::pre_linter::sub_program_context::SubprogramContext;
-use crate::pre_linter::{ConstantMap, PreLinterResult};
 
 // CONST -> stored in global_constants
 // DEFINT -> stored in resolver
@@ -20,17 +20,17 @@ struct MainContext {
     declaration_pos: Position,
 }
 
-pub fn pre_lint_program(program: &Program) -> Result<PreLinterResult, LintErrorPos> {
+pub fn pre_lint_program(program: &Program) -> Result<LinterContext, LintErrorPos> {
     let mut visitor = GlobalVisitor::new(MainContext::default());
     visitor.visit(program)?;
     let ctx = visitor.delegate();
     ctx.post_visit_functions()?;
     ctx.post_visit_subs()?;
-    Ok(PreLinterResult {
-        functions: ctx.functions.implementations(),
-        subs: ctx.subs.implementations(),
-        user_defined_types: ctx.user_defined_types,
-    })
+    Ok(LinterContext::new(
+        ctx.functions.implementations(),
+        ctx.subs.implementations(),
+        ctx.user_defined_types,
+    ))
 }
 
 impl SetPosition for MainContext {

rusty_linter/src/pre_linter/mod.rs

@@ -1,9 +1,7 @@
 mod constant_map;
 mod main;
-mod pre_linter_result;
 mod sub_program_context;
 mod user_defined_type_visitor;
 
 pub use self::constant_map::*;
 pub use self::main::*;
-pub use self::pre_linter_result::*;