commit 874303c24c230b4603079eaa12a6f651d1ac943c · tholps.site/skidmark

+1 -1

src/console.rs

···

       2
       2
        
       

     

       3
       3
        
       use colored::Colorize;

     

       4
       4
        
       

     

       5
       5
       -
       use crate::projectparse::{FileIndexing, ProjectContext};

     

       5
       5
       +
       use crate::project::{FileIndexing, ProjectContext};

     

       6
       6
        
       

     

       7
       7
        
       pub fn error_generic(msg: &String) {

     

       8
       8
        
           println!("{} {}", "[ERROR]".red(), msg);

+1 -1

src/macros/insert.rs

···

       2
       2
        
       

     

       3
       3
        
       use crate::{

     

       4
       4
        
           console::error_skid,

     

       5
       5
       -
           projectparse::{FileIndexing, ProjectContext},

     

       5
       5
       +
           project::{FileIndexing, ProjectContext},

     

       6
       6
        
           stringtools::split_to_tokens,

     

       7
       7
        
           types::{InputFile, Token},

     

       8
       8
        
       };

+1 -1

src/macros/simple_blocks.rs

···

       2
       2
        
       

     

       3
       3
        
       use crate::{

     

       4
       4
        
           console::{error_skid, warn_skid},

     

       5
       5
       -
           projectparse::ProjectContext,

     

       5
       5
       +
           project::ProjectContext,

     

       6
       6
        
           stringtools::{find_pattern, split_to_tokens, TokenTools},

     

       7
       7
        
           types::{InputFile, Token},

     

       8
       8
        
       };

+1 -1

src/macros/simple_macros.rs

···

       5
       5
        
       

     

       6
       6
        
       use crate::{

     

       7
       7
        
           console::{error_skid, reminder_skid},

     

       8
       8
       -
           projectparse::{FileIndexing, ProjectContext},

     

       8
       8
       +
           project::{FileIndexing, ProjectContext},

     

       9
       9
        
           stringtools::split_to_tokens,

     

       10
       10
        
           types::{InputFile, Token},

     

       11
       11
        
       };

+1 -1

src/macros/template.rs

···

       1
       1
        
       use crate::{

     

       2
       2
        
           console::error_skid,

     

       3
       3
       -
           projectparse::ProjectContext,

     

       3
       3
       +
           project::ProjectContext,

     

       4
       4
        
           stringtools::{find_pattern, split_to_tokens, WhitespaceChecks},

     

       5
       5
        
           types::{InputFile, Token},

     

       6
       6
        
       };

+2 -2

src/main.rs

···

       1
       1
        
       mod console;

     

       2
       2
        
       mod macros;

     

       3
       3
       -
       mod projectparse;

     

       3
       3
       +
       mod project;

     

       4
       4
        
       mod stringtools;

     

       5
       5
        
       mod types;

     

       6
       6
        
       

     

       7
       7
        
       use console::*;

     

       8
       8
        
       use macros::MACRO_LIST;

     

       9
       9
        
       use markdown::{CompileOptions, Constructs, Options, ParseOptions};

     

       10
       10
       -
       use projectparse::{parse_project, FileIndexing, ProjectContext};

     

       10
       10
       +
       use project::{parse_project, FileIndexing, ProjectContext};

     

       11
       11
        
       use std::{

     

       12
       12
        
           env,

     

       13
       13
        
           fs::{self},

src/projectparse.rs src/project.rs

+1 -1

src/types.rs

···

       3
       3
        
       use crate::{

     

       4
       4
        
           console::error_skid,

     

       5
       5
        
           macros::{simple_blocks::macro_comment, template::SkidTemplate},

     

       6
       6
       -
           projectparse::ProjectContext,

     

       6
       6
       +
           project::ProjectContext,

     

       7
       7
        
       };

     

       8
       8
        
       

     

       9
       9
        
       pub struct Token {