···

       
1
       
1
       
-
       
use std::{

     

       
2
       
2
       
-
       
    env::Args,

     

       
3
       
3
       
-
       
    fs,

     

       
4
       
4
       
-
       
    path::{Path, PathBuf},

     

       
5
       
5
       
-
       
    process::exit,

     

       
6
       
6
       
-
       
};

     

       
1
       
1
       
+
       
use std::{fs, path::PathBuf};

     

       
7
       
2
       
 
       


     

       
8
       
3
       
 
       
use crate::{

     

       
9
       
4
       
 
       
    console::error_skid,

     

       
10
       
5
       
 
       
    projectparse::{FileIndexing, ProjectContext},

     

       
11
       
11
       
-
       
    stringtools::{split_keep_delimiters, split_to_tokens, strings_to_tokens},

     

       
6
       
6
       
+
       
    stringtools::split_to_tokens,

     

       
12
       
7
       
 
       
    types::{InputFile, Token},

     

       
13
       
8
       
 
       
};

     

       
14
       
9
       
 
       


     

···

       
1
       
1
       
 
       
// This file for implementations of short macros, im qualifying that as less than 30ish lines

     

       
2
       
2
       
 
       
use std::process::exit;

     

       
3
       
3
       
 
       


     

       
4
       
4
       
-
       
use chrono::{DateTime, Local};

     

       
4
       
4
       
+
       
use chrono::Local;

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
use crate::{

     

       
7
       
7
       
 
       
    console::error_skid,

     

···

       
1
       
1
       
-
       
use std::{fmt::format, process::exit, thread::scope};

     

       
2
       
2
       
-
       


     

       
3
       
1
       
 
       
use crate::{

     

       
4
       
2
       
 
       
    console::error_skid,

     

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

     

       
6
       
6
       
-
       
    stringtools::{find_pattern, split_to_tokens, strings_to_tokens, WhitespaceChecks},

     

       
3
       
3
       
+
       
    projectparse::ProjectContext,

     

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

     

       
7
       
5
       
 
       
    types::{InputFile, Token},

     

       
8
       
6
       
 
       
};

     

       
9
       
7
       
 
       


     

···

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
use console::*;

     

       
8
       
8
       
 
       
use macros::MACRO_LIST;

     

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

     

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

     

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

     

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

     

       
11
       
11
       
 
       
use std::{

     

       
12
       
12
       
-
       
    convert, env,

     

       
13
       
13
       
-
       
    fs::{self, File},

     

       
14
       
14
       
-
       
    io::Write,

     

       
12
       
12
       
+
       
    env,

     

       
13
       
13
       
+
       
    fs::{self},

     

       
15
       
14
       
 
       
    path::PathBuf,

     

       
16
       
16
       
-
       
    process::{exit, Output},

     

       
17
       
15
       
 
       
};

     

       
18
       
18
       
-
       
use stringtools::{

     

       
19
       
19
       
-
       
    collect_arguments, collect_block, split_keep_delimiters, split_to_tokens, strings_to_tokens,

     

       
20
       
20
       
-
       
    trim_whitespace_tokens,

     

       
21
       
21
       
-
       
};

     

       
22
       
22
       
-
       
use types::{InputFile, Macro, Token};

     

       
16
       
16
       
+
       
use stringtools::{collect_arguments, collect_block, split_to_tokens, trim_whitespace_tokens};

     

       
17
       
17
       
+
       
use types::{InputFile, Token};

     

       
23
       
18
       
 
       


     

       
24
       
19
       
 
       
use crate::types::Expand;

     

       
25
       
20
       
 
       


     

···

       
1
       
1
       
-
       
use crate::types::{self, InputFile};

     

       
1
       
1
       
+
       
use crate::types::InputFile;

     

       
2
       
2
       
 
       
use std::{

     

       
3
       
3
       
-
       
    any::Any,

     

       
4
       
3
       
 
       
    fs,

     

       
5
       
5
       
-
       
    iter::{FilterMap, Map},

     

       
6
       
4
       
 
       
    path::{Path, PathBuf},

     

       
7
       
7
       
-
       
    process::exit,

     

       
8
       
8
       
-
       
    string,

     

       
9
       
5
       
 
       
};

     

       
10
       
10
       
-
       
use toml::{ser, Table};

     

       
6
       
6
       
+
       
use toml::Table;

     

       
11
       
7
       
 
       


     

       
12
       
8
       
 
       
pub struct Project {

     

       
13
       
9
       
 
       
    pub filegroups: Vec<FileGroup>,

     

···

       
1
       
1
       
-
       
use core::fmt;

     

       
2
       
2
       
-
       
use std::{ascii::escape_default, error, fmt::Arguments, ops::Index, process::exit, thread::sleep};

     

       
3
       
3
       
-
       


     

       
4
       
1
       
 
       
use super::DELIMITERS;

     

       
5
       
2
       
 
       
use crate::types::Token;

     

       
6
       
3
       
 
       


     
···

       
265
       
262
       
 
       
    // FIXME: this fucks up when the begining of a pattern is repeated

     

       
266
       
263
       
 
       
    // ex. searching for "[[hello]]" in "[[[[hello]]" yeilds None

     

       
267
       
264
       
 
       
    // ALSO, this is a coarse search, operating on tokens only, not the characters within

     

       
265
       
265
       
+
       
    //

     

       
268
       
266
       
 
       
    let split_pattern = split_to_tokens(pat, 0);

     

       
269
       
267
       
 
       
    let mut pattern_index: usize = 0;

     

       
270
       
268
       
 
       
    let mut token_index: usize = 0;