engine: rename token module to lexer

The name "lexer" more accurately describes the module's purpose - it
contains the lexer implementation that tokenizes equation strings for
parsing.

Author: bpowers

src/simlin-engine/src/ast/expr0.rs

@@ -4,7 +4,7 @@
 
 use crate::builtins::{Loc, UntypedBuiltinFn, is_0_arity_builtin_fn};
 use crate::common::{EquationError, RawIdent};
-use crate::token::LexerType;
+use crate::lexer::LexerType;
 use std::result::Result as StdResult;
 
 #[derive(PartialEq, Eq, Hash, Copy, Clone, Debug)]
@@ -111,7 +111,7 @@ impl Expr0 {
     pub fn new(eqn: &str, lexer_type: LexerType) -> StdResult<Option<Expr0>, Vec<EquationError>> {
         let mut errs = Vec::new();
 
-        let lexer = crate::token::Lexer::new(eqn, lexer_type);
+        let lexer = crate::lexer::Lexer::new(eqn, lexer_type);
         match crate::equation::EquationParser::new().parse(eqn, lexer) {
             Ok(ast) => Ok(Some(match lexer_type {
                 // in variable equations we want to treat `pi` or `time`

src/simlin-engine/src/equation.lalrpop

@@ -7,7 +7,7 @@ use crate::ast::UnaryOp::*;
 use crate::ast::BinaryOp::*;
 use crate::ast::Expr0::*;
 use crate::common::{RawIdent, EquationError};
-use crate::token::Token;
+use crate::lexer::Token;
 use crate::builtins::UntypedBuiltinFn;
 
 grammar<'input>(input: &'input str);

src/simlin-engine/src/token/mod.rs src/simlin-engine/src/lexer/mod.rssrc/simlin-engine/src/token/mod.rs renamed to src/simlin-engine/src/lexer/mod.rs

@@ -24,9 +24,9 @@ pub mod builtins;
 mod builtins_visitor;
 mod compiler;
 mod dimensions;
+mod lexer;
 mod model;
 mod patch;
-mod token;
 mod variable;
 mod stdlib {
     include!(concat!(env!("OUT_DIR"), "/stdlib.rs"));

src/simlin-engine/src/token/test.rs src/simlin-engine/src/lexer/test.rssrc/simlin-engine/src/token/test.rs renamed to src/simlin-engine/src/lexer/test.rs

@@ -1378,7 +1378,7 @@ mod tests {
         use crate::ast::{Expr0, print_eqn};
         use crate::builtins::Loc;
         use crate::common::{RawIdent, canonicalize};
-        use crate::token::LexerType;
+        use crate::lexer::LexerType;
 
         println!("\n=== Testing $ variable parsing with double quotes ===");
 

src/simlin-engine/src/lib.rs

@@ -11,7 +11,7 @@ use float_cmp::approx_eq;
 use crate::ast::{BinaryOp, Expr0, UnaryOp};
 use crate::common::{EquationError, EquationResult, ErrorCode, UnitError};
 use crate::datamodel::{SimSpecs, Unit, UnitMap};
-use crate::token::LexerType;
+use crate::lexer::LexerType;
 use crate::{canonicalize, eqn_err};
 
 /// Units is used to distinguish between explicit units (and explicit

src/simlin-engine/src/ltm_augment.rs

@@ -15,9 +15,9 @@ use crate::common::{
 };
 use crate::datamodel;
 use crate::dimensions::{Dimension, DimensionsContext};
+use crate::lexer::LexerType;
 #[cfg(test)]
 use crate::model::ScopeStage0;
-use crate::token::LexerType;
 use crate::units::parse_units;
 use crate::{ErrorCode, eqn_err, units};