commit 55632975c14e0a34d061470be4c575edfb1c818f · tholps.site/skidmark

Cargo.toml

···

       4
       4
        
       edition = "2021"

     

       5
       5
        
       

     

       6
       6
        
       [dependencies]

     

       7
       7
       +
       glob = "0.3.2"

     

       7
       8
        
       markdown = "1.0.0-alpha.21"

     

       9
       9
       +
       serde = "1.0.218"

     

       10
       10
       +
       toml = "0.8.19"

+7 -1

src/macros/clear.rs

···

       1
       1
        
       use crate::{

     

       2
       2
       +
           projectparse::ProjectContext,

     

       2
       3
        
           stringtools::{split_keep_delimiters, strings_to_tokens},

     

       3
       4
        
           types::{InputFile, Token},

     

       4
       5
        
       };

     

       5
       6
        
       

     

       6
       6
       -
       pub fn macro_clear(_file: &mut InputFile, _args: &Vec<String>, _scope: &[Token]) -> Vec<Token> {

     

       7
       7
       +
       pub fn macro_clear(

     

       8
       8
       +
           _file: &mut InputFile,

     

       9
       9
       +
           _context: &mut ProjectContext,

     

       10
       10
       +
           _args: &Vec<String>,

     

       11
       11
       +
           _scope: &[Token],

     

       12
       12
       +
       ) -> Vec<Token> {

     

       7
       13
        
           _file.tokens = _file.tokens.split_off(_file.working_index);

     

       8
       14
        
           _file.working_index = 0;

     

       9
       15
        
           return Vec::new();

+12 -3

src/macros/insert.rs

···

       1
       1
       -
       use std::{env::Args, fs};

     

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

     

       2
       2
        
       

     

       3
       3
        
       use crate::{

     

       4
       4
       +
           projectparse::{FileIndexing, ProjectContext},

     

       4
       5
        
           stringtools::{split_keep_delimiters, strings_to_tokens},

     

       5
       6
        
           types::{InputFile, Token},

     

       6
       7
        
       };

     

       7
       8
        
       

     

       8
       8
       -
       pub fn macro_insert(_file: &mut InputFile, args: &Vec<String>, _scope: &[Token]) -> Vec<Token> {

     

       9
       9
       +
       pub fn macro_insert(

     

       10
       10
       +
           _file: &mut InputFile,

     

       11
       11
       +
           _context: &mut ProjectContext,

     

       12
       12
       +
           args: &Vec<String>,

     

       13
       13
       +
           _scope: &[Token],

     

       14
       14
       +
       ) -> Vec<Token> {

     

       9
       15
        
           print!("\nargs: {:?}\n", args);

     

       10
       16
        
           let mut output = fs::read_to_string(args[0].clone()).expect("File unreadable or missing");

     

       11
       17
        
           if output.ends_with("\n") {

     
···

       13
       19
        
           } //remove trailing newline

     

       14
       20
        
       

     

       15
       21
        
           let split_output = split_keep_delimiters(output);

     

       16
       16
       -
           return strings_to_tokens(split_output, args[0].clone());

     

       22
       22
       +
           return strings_to_tokens(

     

       23
       23
       +
               split_output,

     

       24
       24
       +
               _context.index_of_file(&PathBuf::from(&args[0])),

     

       25
       25
       +
           );

     

       17
       26
        
       }

+3 -3

src/macros/mod.rs

···

       26
       26
        
               has_scope: true,

     

       27
       27
        
           },

     

       28
       28
        
           Macro {

     

       29
       29
       -
               symbol: "repeat",   // Outputs what its give x number of times

     

       29
       29
       +
               symbol: "repeat", // Outputs what its give x number of times

     

       30
       30
        
               expand: macro_repeat,

     

       31
       31
       -
               has_scope: true

     

       32
       32
       -
           }

     

       31
       31
       +
               has_scope: true,

     

       32
       32
       +
           },

     

       33
       33
        
       ];

+25 -10

src/macros/simple_blocks.rs

···

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

     

       1
       1
       +
       use crate::{

     

       2
       2
       +
           projectparse::ProjectContext,

     

       3
       3
       +
           types::{InputFile, Token},

     

       4
       4
       +
       };

     

       2
       5
        
       

     

       3
       3
       -
       pub fn macro_comment(_file: &mut InputFile, _args: &Vec<String>, _scope: &[Token]) -> Vec<Token> {

     

       6
       6
       +
       pub fn macro_comment(

     

       7
       7
       +
           _file: &mut InputFile,

     

       8
       8
       +
           _context: &mut ProjectContext,

     

       9
       9
       +
           _args: &Vec<String>,

     

       10
       10
       +
           _scope: &[Token],

     

       11
       11
       +
       ) -> Vec<Token> {

     

       4
       12
        
           return Vec::new();

     

       5
       13
        
       }

     

       6
       14
        
       

     

       7
       7
       -
       pub fn macro_null(_file: &mut InputFile, _args: &Vec<String>, scope: &[Token]) -> Vec<Token> {

     

       15
       15
       +
       pub fn macro_null(

     

       16
       16
       +
           _file: &mut InputFile,

     

       17
       17
       +
           _context: &mut ProjectContext,

     

       18
       18
       +
           _args: &Vec<String>,

     

       19
       19
       +
           scope: &[Token],

     

       20
       20
       +
       ) -> Vec<Token> {

     

       8
       21
        
           let mut tokens = Vec::new();

     

       9
       22
        
           for tok in scope {

     

       10
       23
        
               tokens.push(tok.clone());

     
···

       12
       25
        
           return tokens;

     

       13
       26
        
       }

     

       14
       27
        
       

     

       15
       15
       -
       pub fn macro_repeat(_file: &mut InputFile, args: &Vec<String>, scope: &[Token]) -> Vec<Token> {

     

       28
       28
       +
       pub fn macro_repeat(

     

       29
       29
       +
           _file: &mut InputFile,

     

       30
       30
       +
           _context: &mut ProjectContext,

     

       31
       31
       +
           args: &Vec<String>,

     

       32
       32
       +
           scope: &[Token],

     

       33
       33
       +
       ) -> Vec<Token> {

     

       16
       34
        
           let mut count = 0;

     

       17
       17
       -
           if args.len() > 0

     

       18
       18
       -
           {

     

       35
       35
       +
           if args.len() > 0 {

     

       19
       36
        
               count = args[0].parse().unwrap_or(0);

     

       20
       37
        
           }

     

       21
       38
        
       

     

       22
       39
        
           let mut tokens = Vec::new();

     

       23
       23
       -
           for _i in 0..count

     

       24
       24
       -
           {

     

       25
       25
       -
               for tok in scope

     

       26
       26
       -
               {

     

       40
       40
       +
           for _i in 0..count {

     

       41
       41
       +
               for tok in scope {

     

       27
       42
        
                   tokens.push(tok.clone());

     

       28
       43
        
               }

     

       29
       44
        
           }

+23 -23

src/main.rs

···

       1
       1
        
       mod macros;

     

       2
       2
       +
       mod projectparse;

     

       2
       3
        
       mod stringtools;

     

       3
       4
        
       mod types;

     

       4
       5
        
       

     

       5
       6
        
       use macros::MACRO_LIST;

     

       6
       7
        
       use markdown::{to_html_with_options, CompileOptions, Options};

     

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

     

       7
       9
        
       use std::{

     

       8
       10
        
           env,

     

       9
       11
        
           fs::{self, File},

     
···

       19
       21
        
       static DELIMITERS: [char; 10] = [' ', '\n', '\t', '(', ')', '{', '}', '\\', '\'', '\"'];

     

       20
       22
        
       

     

       21
       23
        
       fn main() {

     

       22
       22
       -
           let mut files: Vec<types::InputFile> = Vec::new();

     

       23
       23
       -
           let mut args: Vec<String> = env::args().collect();

     

       24
       24
       -
           args.remove(0);

     

       25
       25
       -
       

     

       26
       26
       -
           for file in args.iter() {

     

       27
       27
       -
               let mut new_file = types::InputFile::new();

     

       28
       28
       -
               new_file.filename_input = file.to_string();

     

       29
       29
       -
               new_file.filename_skidout = file.to_string() + ".skidout";

     

       30
       30
       -
               new_file.filename_htmlout = file.to_string() + ".html";

     

       31
       31
       -
               files.push(new_file);

     

       32
       32
       -
           }

     

       33
       33
       -
           println!("{:?}", args);

     

       34
       34
       -
           for f in &mut files {

     

       35
       35
       -
               process_file(f);

     

       24
       24
       +
           let mut project = parse_project(env::current_dir().unwrap().as_path());

     

       25
       25
       +
           for group in &mut project.filegroups {

     

       26
       26
       +
               for infile in &mut group.files {

     

       27
       27
       +
                   process_file(infile, &mut project.context);

     

       28
       28
       +
               }

     

       36
       29
        
           }

     

       37
       30
        
       }

     

       38
       31
        
       

     

       39
       39
       -
       fn process_file(file: &mut InputFile) {

     

       40
       40
       -
           let contents = fs::read_to_string(&file.filename_input).expect("File unreadable or missing");

     

       32
       32
       +
       fn process_file(file: &mut InputFile, context: &mut ProjectContext) {

     

       33
       33
       +
           //}, context: &mut ProjectContext) {

     

       34
       34
       +
           let contents = fs::read_to_string(&file.file_input).expect("File unreadable or missing");

     

       41
       35
        
           //println!("{}\n {}", f.filename_out, contents);

     

       42
       36
        
       

     

       43
       37
        
           //file.tokens = strings_to_tokens(split_keep_delimiters(contents), file.filename_input.clone());

     

       44
       44
       -
           file.tokens = split_to_tokens(contents, file.filename_input.clone());

     

       38
       38
       +
           file.tokens = split_to_tokens(contents, context.index_of_file(&file.file_input));

     

       45
       39
        
           //let mut escaped = false;

     

       46
       40
        
       

     

       47
       41
        
           while file.working_index < file.tokens.len() {

     
···

       64
       58
        
       

     

       65
       59
        
                   if symbol.len() > 2 {

     

       66
       60
        
                       let mut ephemeral = false;

     

       67
       67
       -
                       let same_file = file.tokens[file.working_index].origin_file != file.filename_input;

     

       61
       61
       +
                       let same_file = file.tokens[file.working_index].origin_file

     

       62
       62
       +
                           != context.index_of_file(&file.file_input);

     

       68
       63
        
       

     

       69
       64
        
                       // Inversely Ephemeral

     

       70
       65
        
                       if symbol.starts_with("!&") {

     
···

       96
       91
        
                                           &file.tokens[(file.working_index + args_tokcount)..],

     

       97
       92
        
                                       );

     

       98
       93
        
                                       println!("{}", block_tokcount);

     

       99
       99
       -
                                       expansion = (m.expand)(file, &args, &block[..]);

     

       94
       94
       +
                                       expansion = (m.expand)(file, context, &args, &block[..]);

     

       100
       95
        
                                   } else {

     

       101
       96
        
                                       block_tokcount = 0;

     

       102
       102
       -
                                       expansion = (m.expand)(file, &args, &Vec::new()[..]);

     

       97
       97
       +
                                       expansion = (m.expand)(file, context, &args, &Vec::new()[..]);

     

       103
       98
        
                                   }

     

       104
       99
        
                               }

     

       105
       100
        
       

     
···

       135
       130
        
           for t in &file.tokens {

     

       136
       131
        
               skid_output += &t.contents;

     

       137
       132
        
           }

     

       138
       138
       -
           fs::write(&file.filename_skidout, &skid_output).expect("Couldn't write skid to file");

     

       133
       133
       +
           fs::write(&file.file_skidout, &skid_output).expect("Couldn't write skid to file");

     

       139
       134
        
       

     

       140
       135
        
           //let html_output = markdown::to_html(&skid_output);

     

       141
       136
        
           let html_output = markdown::to_html_with_options(

     
···

       150
       145
        
               },

     

       151
       146
        
           )

     

       152
       147
        
           .unwrap();

     

       153
       153
       -
           fs::write(&file.filename_htmlout, &html_output).expect("Couldn't write html to file");

     

       154
       154
       -
           println!("{} written.", file.filename_htmlout);

     

       148
       148
       +
           fs::write(&file.file_htmlout, &html_output).expect("Couldn't write html to file");

     

       149
       149
       +
           println!(

     

       150
       150
       +
               "{} written.",

     

       151
       151
       +
               file.file_htmlout

     

       152
       152
       +
                   .to_str()

     

       153
       153
       +
                   .unwrap_or("Couldnt Unwrap htmlout name")

     

       154
       154
       +
           );

     

       155
       155
        
       }

+183

src/projectparse.rs

···

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

     

       2
       2
       +
       use std::{

     

       3
       3
       +
           any::Any,

     

       4
       4
       +
           fs,

     

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

     

       6
       6
       +
           os::unix::process,

     

       7
       7
       +
           path::{Path, PathBuf},

     

       8
       8
       +
           string,

     

       9
       9
       +
       };

     

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

     

       11
       11
       +
       

     

       12
       12
       +
       pub struct Project {

     

       13
       13
       +
           pub filegroups: Vec<FileGroup>,

     

       14
       14
       +
           pub settings: ProjectSettings,

     

       15
       15
       +
           pub context: ProjectContext,

     

       16
       16
       +
       }

     

       17
       17
       +
       

     

       18
       18
       +
       pub struct FileGroup {

     

       19
       19
       +
           pub name: String,

     

       20
       20
       +
           pub files: Vec<InputFile>,

     

       21
       21
       +
           pub pre_insert: PathBuf,

     

       22
       22
       +
           pub post_insert: PathBuf,

     

       23
       23
       +
           pub process: bool,

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       26
       26
       +
       pub struct ProjectSettings {

     

       27
       27
       +
           pub input_folder: PathBuf,

     

       28
       28
       +
           pub output_folder: PathBuf,

     

       29
       29
       +
           pub global_pre_insert: PathBuf,

     

       30
       30
       +
           pub global_post_insert: PathBuf,

     

       31
       31
       +
       }

     

       32
       32
       +
       

     

       33
       33
       +
       pub struct ProjectContext {

     

       34
       34
       +
           pub filemap: Vec<PathBuf>, // mapped to index

     

       35
       35
       +
       }

     

       36
       36
       +
       

     

       37
       37
       +
       macro_rules! get_table_bool_or_default {

     

       38
       38
       +
           ($table:ident, $key:expr, $default:expr) => {

     

       39
       39
       +
               $table

     

       40
       40
       +
                   .get($key)

     

       41
       41
       +
                   .unwrap_or(&toml::Value::try_from($default).unwrap())

     

       42
       42
       +
                   .as_bool()

     

       43
       43
       +
                   .unwrap_or($default)

     

       44
       44
       +
           };

     

       45
       45
       +
       }

     

       46
       46
       +
       

     

       47
       47
       +
       macro_rules! get_table_string_or_default {

     

       48
       48
       +
           ($table:ident, $key:expr, $default:expr) => {

     

       49
       49
       +
               // $table

     

       50
       50
       +
               //     .get($key)

     

       51
       51
       +
               //     .unwrap_or(&toml::Value::try_from($default).unwrap())

     

       52
       52
       +
               //     .as_str()

     

       53
       53
       +
               //     .unwrap_or($default)

     

       54
       54
       +
               if $table.contains_key($key) {

     

       55
       55
       +
                   $table.get($key).unwrap().as_str().unwrap()

     

       56
       56
       +
               } else {

     

       57
       57
       +
                   $default

     

       58
       58
       +
               }

     

       59
       59
       +
           };

     

       60
       60
       +
       }

     

       61
       61
       +
       

     

       62
       62
       +
       pub fn parse_project(tomlpath: &Path) -> Project {

     

       63
       63
       +
           let tomlfile = fs::read_to_string(tomlpath).expect("Project file unreadable or missing.");

     

       64
       64
       +
       

     

       65
       65
       +
           let mut project: Project = Project {

     

       66
       66
       +
               filegroups: Vec::new(),

     

       67
       67
       +
               settings: ProjectSettings {

     

       68
       68
       +
                   input_folder: PathBuf::new(),

     

       69
       69
       +
                   output_folder: PathBuf::new(),

     

       70
       70
       +
                   global_pre_insert: PathBuf::new(),

     

       71
       71
       +
                   global_post_insert: PathBuf::new(),

     

       72
       72
       +
               },

     

       73
       73
       +
               context: ProjectContext {

     

       74
       74
       +
                   filemap: Vec::new(),

     

       75
       75
       +
               },

     

       76
       76
       +
           };

     

       77
       77
       +
           let config = tomlfile

     

       78
       78
       +
               .parse::<Table>()

     

       79
       79
       +
               .expect("Project file not in propper toml format");

     

       80
       80
       +
           let settings_section = config["settings"]

     

       81
       81
       +
               .as_table()

     

       82
       82
       +
               .expect("Project file missing [settings] section");

     

       83
       83
       +
           let filegroups_section = config["fileGroups"]

     

       84
       84
       +
               .as_table()

     

       85
       85
       +
               .expect("Project file contains no file groups ");

     

       86
       86
       +
       

     

       87
       87
       +
           let project_root = tomlpath

     

       88
       88
       +
               .parent()

     

       89
       89
       +
               .expect("Project file unreadable or missing.");

     

       90
       90
       +
       

     

       91
       91
       +
           project.settings.input_folder = PathBuf::from(get_table_string_or_default!(

     

       92
       92
       +
               settings_section,

     

       93
       93
       +
               "inputFolder",

     

       94
       94
       +
               "skid"

     

       95
       95
       +
           ));

     

       96
       96
       +
       

     

       97
       97
       +
           project.settings.output_folder = PathBuf::from(get_table_string_or_default!(

     

       98
       98
       +
               settings_section,

     

       99
       99
       +
               "outputFolder",

     

       100
       100
       +
               "content"

     

       101
       101
       +
           ));

     

       102
       102
       +
       

     

       103
       103
       +
           project.settings.global_pre_insert = project_root.join(get_table_string_or_default!(

     

       104
       104
       +
               settings_section,

     

       105
       105
       +
               "preInsertGlobal",

     

       106
       106
       +
               ""

     

       107
       107
       +
           ));

     

       108
       108
       +
           project.settings.global_post_insert = project_root.join(get_table_string_or_default!(

     

       109
       109
       +
               settings_section,

     

       110
       110
       +
               "postInsertGlobal",

     

       111
       111
       +
               ""

     

       112
       112
       +
           ));

     

       113
       113
       +
       

     

       114
       114
       +
           for (k, v) in filegroups_section {

     

       115
       115
       +
               if !v.is_table() {

     

       116
       116
       +
                   continue;

     

       117
       117
       +
               }

     

       118
       118
       +
               let filegroup_def: &toml::map::Map<String, toml::Value> = v.as_table().unwrap();

     

       119
       119
       +
               let name = k.clone();

     

       120
       120
       +
               let pre_insert = get_table_string_or_default!(filegroup_def, "preInsert", "");

     

       121
       121
       +
               let post_insert = get_table_string_or_default!(filegroup_def, "postInsert", "");

     

       122
       122
       +
               let process = get_table_bool_or_default!(filegroup_def, "process", false);

     

       123
       123
       +
       

     

       124
       124
       +
               let recurse_find = get_table_bool_or_default!(filegroup_def, "recursiveFind", false);

     

       125
       125
       +
       

     

       126
       126
       +
               let dir = get_table_string_or_default!(filegroup_def, "folder", "");

     

       127
       127
       +
       

     

       128
       128
       +
               let mut group = FileGroup {

     

       129
       129
       +
                   files: Vec::new(),

     

       130
       130
       +
                   name: k.clone(),

     

       131
       131
       +
                   pre_insert: pre_insert.into(),

     

       132
       132
       +
                   post_insert: post_insert.into(),

     

       133
       133
       +
                   process,

     

       134
       134
       +
               };

     

       135
       135
       +
       

     

       136
       136
       +
               if filegroup_def.contains_key("files") {

     

       137
       137
       +
                   let file_array = filegroup_def["files"].as_array().unwrap_or_else(|| {

     

       138
       138
       +
                       panic!("'files' section of fileGroup.{} needs to be an array", k)

     

       139
       139
       +
                   });

     

       140
       140
       +
                   for file in file_array {

     

       141
       141
       +
                       let filename = file.as_str().unwrap_or_else(|| {

     

       142
       142
       +
                           panic!(

     

       143
       143
       +
                               "'files' section of fileGroup.{} needs to only contain strings",

     

       144
       144
       +
                               k

     

       145
       145
       +
                           )

     

       146
       146
       +
                       });

     

       147
       147
       +
                       let mut new_file = crate::types::InputFile::new();

     

       148
       148
       +
                       new_file.file_input = project.settings.input_folder.clone();

     

       149
       149
       +
                       new_file.file_input.push(filename);

     

       150
       150
       +
                       group.files.push(new_file);

     

       151
       151
       +
                   }

     

       152
       152
       +
               }

     

       153
       153
       +
           }

     

       154
       154
       +
       

     

       155
       155
       +
           return project;

     

       156
       156
       +
       }

     

       157
       157
       +
       

     

       158
       158
       +
       pub trait FileIndexing {

     

       159
       159
       +
           fn index_of_file(&mut self, f: &PathBuf) -> usize;

     

       160
       160
       +
           fn file_for_index(&self, i: usize) -> Option<&PathBuf>;

     

       161
       161
       +
       }

     

       162
       162
       +
       

     

       163
       163
       +
       impl FileIndexing for ProjectContext {

     

       164
       164
       +
           fn index_of_file(&mut self, f: &PathBuf) -> usize {

     

       165
       165
       +
               let mut cannonical = f.canonicalize().unwrap();

     

       166
       166
       +
               let mut index = 0;

     

       167
       167
       +
               for p in &self.filemap {

     

       168
       168
       +
                   if cannonical == *p {

     

       169
       169
       +
                       return index;

     

       170
       170
       +
                   }

     

       171
       171
       +
                   index = index + 1;

     

       172
       172
       +
               }

     

       173
       173
       +
               self.filemap.push(cannonical);

     

       174
       174
       +
               self.filemap.len()

     

       175
       175
       +
           }

     

       176
       176
       +
       

     

       177
       177
       +
           fn file_for_index(&self, i: usize) -> Option<&PathBuf> {

     

       178
       178
       +
               if i >= self.filemap.len() {

     

       179
       179
       +
                   return None;

     

       180
       180
       +
               }

     

       181
       181
       +
               return Some(&self.filemap[i]);

     

       182
       182
       +
           }

     

       183
       183
       +
       }

+40 -55

src/stringtools.rs

···

       1
       1
        
       use core::fmt;

     

       2
       2
       -
       use std::{

     

       3
       3
       -
           ascii::escape_default, f32::consts::E, fmt::Arguments, ops::Index, process::exit, thread::sleep,

     

       4
       4
       -
       };

     

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

     

       5
       3
        
       

     

       6
       4
        
       use super::DELIMITERS;

     

       7
       5
        
       use crate::types::Token;

     
···

       9
       7
        
       pub fn collect_arguments(tokens: &[Token]) -> (Vec<String>, usize) {

     

       10
       8
        
           // Arguments vec and number of tokens consumed

     

       11
       9
        
           //let mut output = Vec::new();

     

       12
       12
       -
           // let mut split_tokens = Vec::new();

     

       13
       13
       -
           // for tok in tokens {

     

       14
       14
       -
           //     for s in split_keep_delimiters(tok.contents.clone()) {

     

       15
       15
       -
           //         split_tokens.push(s);

     

       16
       16
       -
           //     }

     

       17
       17
       -
           //}

     

       10
       10
       +
           let mut split_tokens = Vec::new();

     

       11
       11
       +
           for tok in tokens {

     

       12
       12
       +
               for s in split_keep_delimiters(tok.contents.clone()) {

     

       13
       13
       +
                   split_tokens.push(s);

     

       14
       14
       +
               }

     

       15
       15
       +
           }

     

       18
       16
        
       

     

       19
       17
        
           let mut quoted: bool = false;

     

       20
       18
        
           let mut entered: bool = false;

     
···

       23
       21
        
       

     

       24
       22
        
           let mut in_token_count = 0;

     

       25
       23
        
       

     

       26
       26
       -
           for tok in tokens {

     

       24
       24
       +
           for tok in split_tokens {

     

       27
       25
        
               in_token_count += 1; // This could be a problem if it something got split above..

     

       28
       28
       -
               let contents = &tok.contents;

     

       29
       29
       -
               if contents.starts_with([' ', '\t']) && !quoted {

     

       26
       26
       +
               if tok.starts_with([' ', '\t']) && !quoted {

     

       30
       27
        
                   continue;

     

       31
       28
        
               }

     

       32
       29
        
       

     

       33
       33
       -
               if !entered && contents.starts_with('(') {

     

       30
       30
       +
               if !entered && tok.starts_with('(') {

     

       34
       31
        
                   entered = true;

     

       35
       32
        
                   continue;

     

       36
       33
        
               }

     
···

       39
       36
        
                   continue;

     

       40
       37
        
               }

     

       41
       38
        
       

     

       42
       42
       -
               if !quoted && contents.starts_with(')') {

     

       39
       39
       +
               if !quoted && tok.starts_with(')') {

     

       43
       40
        
                   break;

     

       44
       41
        
               }

     

       45
       42
        
       

     

       46
       43
        
               let mut i = 0;

     

       47
       47
       -
               while i < contents.len() {

     

       48
       48
       -
                   let c = contents.chars().nth(i).unwrap();

     

       44
       44
       +
               while i < tok.len() {

     

       45
       45
       +
                   let c = tok.chars().nth(i).unwrap();

     

       49
       46
        
                   i += 1;

     

       50
       47
        
       

     

       51
       48
        
                   if c == '\"' {

     
···

       79
       76
        
           // maybe have the Token struct contain scope level later?

     

       80
       77
        
           for tok in tokens {

     

       81
       78
        
               tokens_consumed += 1;

     

       82
       82
       -
       

     

       83
       83
       -
               println!(

     

       84
       84
       -
                   "Collecting: \"{}\" is brak: {}",

     

       85
       85
       -
                   tok.contents,

     

       86
       86
       -
                   tok.contents == "{"

     

       87
       87
       -
               );

     

       88
       88
       -
               // println!(

     

       89
       89
       -
               //     "ebrack: {}, scope: {}, entered: {}, escaped: {}",

     

       90
       90
       -
               //     entering_bracket_count, scope_count, entered, escaped

     

       91
       91
       -
               //);

     

       92
       79
        
               if !entered {

     

       93
       80
        
                   if tok.contents.is_only_whitespace() {

     

       94
       81
        
                       continue;

     
···

       96
       83
        
                   if tok.contents != "{"

     

       97
       84
        
                   // Expected block start, got garbage

     

       98
       85
        
                   {

     

       99
       99
       -
                       println!("Expected \'{{{{{{\' got \'{}\'", tok.contents);

     

       100
       86
        
                       return (Vec::new(), 0);

     

       101
       87
        
                   }

     

       102
       88
        
               }

     
···

       110
       96
        
               }

     

       111
       97
        
       

     

       112
       98
        
               // Scope Start

     

       113
       113
       -
       

     

       114
       99
        
               if tok.contents == "{" {

     

       115
       100
        
                   entering_bracket_count += 1;

     

       101
       101
       +
                   if entering_bracket_count == 3 {

     

       102
       102
       +
                       scope_count += 1;

     

       103
       103
       +
                       entering_bracket_count = 0;

     

       104
       104
       +
                       if !entered {

     

       105
       105
       +
                           entered = true;

     

       106
       106
       +
                       }

     

       107
       107
       +
                   }

     

       116
       108
        
               } else {

     

       117
       109
        
                   entering_bracket_count = 0;

     

       118
       110
        
               }

     
···

       121
       113
        
                   exiting_bracket_count += 1;

     

       122
       114
        
                   if exiting_bracket_count == 3 {

     

       123
       115
        
                       scope_count -= 1;

     

       124
       124
       -
                       exiting_bracket_count = 0;

     

       125
       125
       -
                       if scope_count == 0 {

     

       126
       126
       -
                           //pop the last 2 brackets off and return

     

       127
       127
       -
                           block.pop();

     

       128
       128
       -
                           block.pop();

     

       129
       129
       -
                           break;

     

       130
       130
       -
                       }

     

       116
       116
       +
                       entering_bracket_count = 0;

     

       131
       117
        
                   }

     

       132
       118
        
               } else {

     

       133
       133
       -
                   exiting_bracket_count = 0;

     

       119
       119
       +
                   entering_bracket_count = 0;

     

       134
       120
        
               }

     

       135
       121
        
               if tok.contents == "\\" {

     

       136
       122
        
                   escaped = true;

     

       137
       123
        
               } else {

     

       138
       138
       -
                   if entered {

     

       139
       139
       -
                       block.push(tok.clone());

     

       140
       140
       -
                   }

     

       141
       141
       -
               }

     

       142
       142
       -
               if entering_bracket_count == 3 {

     

       143
       143
       -
                   scope_count += 1;

     

       144
       144
       -
                   entering_bracket_count = 0;

     

       145
       145
       -
       

     

       146
       146
       -
                   entered = true;

     

       124
       124
       +
                   block.push(tok.clone());

     

       147
       125
        
               }

     

       148
       126
        
           }

     

       149
       127
        
           return (block, tokens_consumed);

     
···

       169
       147
        
           return output;

     

       170
       148
        
       }

     

       171
       149
        
       

     

       172
       172
       -
       pub fn strings_to_tokens(in_strings: Vec<String>, origin_file: String) -> Vec<Token> {

     

       150
       150
       +
       pub fn strings_to_tokens(in_strings: Vec<String>, origin_file: usize) -> Vec<Token> {

     

       173
       151
        
           let mut tokens = Vec::new();

     

       174
       152
        
           let mut line_count: u32 = 1;

     

       175
       153
        
       

     
···

       180
       158
        
                       line_count += 1;

     

       181
       159
        
                   }

     

       182
       160
        
               }

     

       183
       183
       -
               let token: Token = Token::new(str, origin_file.clone(), current_line);

     

       161
       161
       +
               let token: Token = Token::new(str, origin_file, current_line);

     

       184
       162
        
               tokens.push(token);

     

       185
       163
        
           }

     

       186
       164
        
       

     
···

       189
       167
        
       

     

       190
       168
        
       // Need to do some special case stuff so you can macros without spaces between

     

       191
       169
        
       // (something like "stuff!insert(..)" is split to ["stuff","!insert(..)"] so it can be acted on later)

     

       192
       192
       -
       pub fn split_to_tokens(instr: String, origin_file: String) -> Vec<Token> {

     

       170
       170
       +
       pub fn split_to_tokens(instr: String, origin_file: usize) -> Vec<Token> {

     

       193
       171
        
           let split = split_keep_delimiters(instr);

     

       194
       172
        
           let mut new_split: Vec<String> = Vec::new();

     

       195
       173
        
           for s in split {

     
···

       207
       185
        
           return strings_to_tokens(new_split, origin_file);

     

       208
       186
        
       }

     

       209
       187
        
       

     

       188
       188
       +
       pub fn next_nonwhitespace_token(tokens: &Vec<Token>, index: usize) -> (bool, usize) {

     

       189
       189
       +
           while index < tokens.len() {

     

       190
       190
       +
               if tokens[index].contents.is_only_whitespace() {

     

       191
       191
       +
                   continue;

     

       192
       192
       +
               }

     

       193
       193
       +
               return (true, index);

     

       194
       194
       +
           }

     

       195
       195
       +
           return (false, 0);

     

       196
       196
       +
       }

     

       197
       197
       +
       

     

       198
       198
       +
       //trim whitespace from the ends

     

       210
       199
        
       pub fn trim_whitespace_tokens(tokens: &[Token]) -> &[Token] {

     

       211
       200
        
           let mut start: usize = 0;

     

       212
       201
        
           let mut end: usize = tokens.len();

     
···

       214
       203
        
               if !tok.contents.is_only_whitespace() {

     

       215
       204
        
                   break;

     

       216
       205
        
               }

     

       217
       217
       -
               start += 1;

     

       206
       206
       +
               start = start + 1;

     

       218
       207
        
           }

     

       219
       208
        
       

     

       220
       209
        
           for tok in tokens.iter().rev() {

     

       210
       210
       +
               end = end - 1;

     

       221
       211
        
               if !tok.contents.is_only_whitespace() {

     

       222
       212
        
                   break;

     

       223
       213
        
               }

     

       224
       224
       -
               end -= 1;

     

       225
       214
        
           }

     

       226
       215
        
       

     

       227
       227
       -
           if start < end {

     

       228
       228
       -
               return &tokens[start..end];

     

       229
       229
       -
           } else {

     

       230
       230
       -
               return &[];

     

       231
       231
       -
           }

     

       216
       216
       +
           return &tokens[start..end];

     

       232
       217
        
       }

     

       233
       218
        
       

     

       234
       219
        
       pub trait OnlyWhitespace {

+12 -25

src/types.rs

···

       1
       1
       -
       use std::sync::Mutex;

     

       1
       1
       +
       use std::path::PathBuf;

     

       2
       2
       +
       

     

       3
       3
       +
       use crate::projectparse::ProjectContext;

     

       2
       4
        
       

     

       3
       5
        
       pub struct Token {

     

       4
       6
        
           pub contents: String,

     

       5
       5
       -
           pub origin_file: String, //TODO: make this an index so we dont have the same string in memory for every single word

     

       7
       7
       +
           pub origin_file: usize,

     

       6
       8
        
           pub line_number: u32,

     

       7
       7
       -
       }

     

       8
       8
       -
       

     

       9
       9
       -
       pub enum BlockEdgeType {

     

       10
       10
       -
           FileStart,

     

       11
       11
       -
           FileEnd,

     

       12
       12
       -
           Start,

     

       13
       13
       -
           End,

     

       14
       14
       -
       }

     

       15
       15
       -
       

     

       16
       16
       -
       // A 'Block' is what im calling the enclosed scope of a macro

     

       17
       17
       -
       pub struct BlockEdge {

     

       18
       18
       -
           pub edge_type: BlockEdgeType,

     

       19
       19
       -
           pub tokens_to_next_edge: u64,

     

       20
       9
        
       }

     

       21
       10
        
       

     

       22
       11
        
       pub struct InputFile {

     

       23
       23
       -
           pub filename_input: String,

     

       24
       24
       -
           pub filename_skidout: String,

     

       25
       25
       -
           pub filename_htmlout: String,

     

       12
       12
       +
           pub file_input: PathBuf,

     

       13
       13
       +
           pub file_skidout: PathBuf,

     

       14
       14
       +
           pub file_htmlout: PathBuf,

     

       26
       15
        
           pub tokens: Vec<Token>,

     

       27
       16
        
           pub working_index: usize,

     

       28
       28
       -
           pub block_edges: Vec<BlockEdge>,

     

       29
       17
        
       }

     

       30
       18
        
       

     

       31
       31
       -
       type MacroExpansion = fn(&mut InputFile, &Vec<String>, &[Token]) -> Vec<Token>;

     

       19
       19
       +
       type MacroExpansion = fn(&mut InputFile, &mut ProjectContext, &Vec<String>, &[Token]) -> Vec<Token>;

     

       32
       20
        
       pub struct Macro<'a> {

     

       33
       21
        
           pub symbol: &'a str,

     

       34
       22
        
           pub expand: MacroExpansion,

     
···

       38
       26
        
       impl InputFile {

     

       39
       27
        
           pub fn new() -> InputFile {

     

       40
       28
        
               InputFile {

     

       41
       41
       -
                   filename_input: "".to_string(),

     

       42
       42
       -
                   filename_skidout: "".to_string(),

     

       43
       43
       -
                   filename_htmlout: "".to_string(),

     

       29
       29
       +
                   file_input: "".into(),

     

       30
       30
       +
                   file_skidout: "".into(),

     

       31
       31
       +
                   file_htmlout: "".into(),

     

       44
       32
        
                   tokens: Vec::new(),

     

       45
       33
        
                   working_index: 0,

     

       46
       46
       -
                   block_edges: Vec::new(),

     

       47
       34
        
               }

     

       48
       35
        
           }

     

       49
       36
        
       }

     

       50
       37
        
       

     

       51
       38
        
       impl Token {

     

       52
       52
       -
           pub fn new(contents: String, origin_file: String, line_number: u32) -> Token {

     

       39
       39
       +
           pub fn new(contents: String, origin_file: usize, line_number: u32) -> Token {

     

       53
       40
        
               Token {

     

       54
       41
        
                   contents: contents,

     

       55
       42
        
                   origin_file: origin_file,