commit 39e5639e33a12143d8d4dc72b79e1a9c61e9ff19 · tholps.site/skidmark

-1

src/blocktypes/mod.rs

···

       1
       -
       //pub mod include;

···

       0

+1 -1

src/macros/clear.rs

···

       3
        
           types::{InputFile, Token},

     

       4
        
       };

     

       5
        
       

     

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

     

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

     

       8
        
           _file.working_index = 0;

     

       9
        
           return Vec::new();

···

       3
        
           types::{InputFile, Token},

     

       4
        
       };

     

       5
        
       

     

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

     

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

     

       8
        
           _file.working_index = 0;

     

       9
        
           return Vec::new();

+1 -1

src/macros/include.rs

···

       5
        
           types::{InputFile, Token},

     

       6
        
       };

     

       7
        
       

     

       8
       -
       pub fn macro_include(_file: &mut InputFile, args: &Vec<String>) -> Vec<Token> {

     

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

     

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

     

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

···

       5
        
           types::{InputFile, Token},

     

       6
        
       };

     

       7
        
       

     

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

     

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

     

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

     

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

+19 -3

src/macros/mod.rs

···

       1
        
       pub mod clear;

     

       2
        
       pub mod include;

     

       0
        
       
     

       3
        
       use super::types::Macro;

     

       4
        
       

     

       5
        
       use clear::macro_clear;

     

       6
        
       use include::macro_include;

     

       0
        
       
     

       7
        
       

     

       8
       -
       pub static MACRO_LIST: [Macro<'_>; 2] = [

     

       0
        
       
     

       9
        
           Macro {

     

       10
       -
               symbol: "include",

     

       11
        
               expand: macro_include,

     

       0
        
       
     

       12
        
           },

     

       13
        
           Macro {

     

       14
       -
               symbol: "clear",

     

       15
        
               expand: macro_clear,

     

       0
        
       
     

       16
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       17
        
       ];

···

       1
        
       pub mod clear;

     

       2
        
       pub mod include;

     

       3
       +
       pub mod simple_blocks;

     

       4
        
       use super::types::Macro;

     

       5
        
       

     

       6
        
       use clear::macro_clear;

     

       7
        
       use include::macro_include;

     

       8
       +
       use simple_blocks::{macro_comment, macro_repeat};

     

       9
        
       

     

       10
       +
       pub static MACRO_LIST: [Macro<'_>; 4] = [

     

       11
       +
           // Unscoped

     

       12
        
           Macro {

     

       13
       +
               symbol: "include", // Inserts another file

     

       14
        
               expand: macro_include,

     

       15
       +
               has_scope: false,

     

       16
        
           },

     

       17
        
           Macro {

     

       18
       +
               symbol: "clear", // Clears text buffer

     

       19
        
               expand: macro_clear,

     

       20
       +
               has_scope: false,

     

       21
        
           },

     

       22
       +
           // Scoped

     

       23
       +
           Macro {

     

       24
       +
               symbol: "comment", // Nothing

     

       25
       +
               expand: macro_comment,

     

       26
       +
               has_scope: true,

     

       27
       +
           },

     

       28
       +
           Macro {

     

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

     

       30
       +
               expand: macro_repeat,

     

       31
       +
               has_scope: true

     

       32
       +
           }

     

       33
        
       ];

+31

src/macros/simple_blocks.rs

···

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

     

       2
       +
       

     

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

     

       4
       +
           return Vec::new();

     

       5
       +
       }

     

       6
       +
       

     

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

     

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

     

       9
       +
           for tok in scope {

     

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

     

       11
       +
           }

     

       12
       +
           return tokens;

     

       13
       +
       }

     

       14
       +
       

     

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

     

       16
       +
           let mut count = 0;

     

       17
       +
           if args.len() > 0

     

       18
       +
           {

     

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

     

       20
       +
           }

     

       21
       +
       

     

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

     

       23
       +
           for _i in 0..count

     

       24
       +
           {

     

       25
       +
               for tok in scope

     

       26
       +
               {

     

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

     

       28
       +
               }

     

       29
       +
           }

     

       30
       +
           return tokens;

     

       31
       +
       }

+41 -13

src/main.rs

···

       1
       -
       mod blocktypes;

     

       2
        
       mod macros;

     

       3
        
       mod stringtools;

     

       4
        
       mod types;

     
···

       11
        
           io::Write,

     

       12
        
           process::{exit, Output},

     

       13
        
       };

     

       14
       -
       use stringtools::{collect_arguments, split_keep_delimiters, split_to_tokens, strings_to_tokens};

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
       use types::{InputFile, Macro, Token};

     

       16
        
       

     

       17
       -
       static DELIMITERS: [char; 7] = [' ', '\n', '\t', '(', ')', '{', '}'];

     

       18
        
       

     

       19
        
       fn main() {

     

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

     
···

       40
        
       

     

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

     

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

     

       0
        
       
     

       43
        
       

     

       44
        
           while file.working_index < file.tokens.len() {

     

       45
        
               //look for macros or blocks

     

       46
       -
               //println!(">\"{}\"<", file.tokens[index].contents);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       47
        
       

     

       0
        
       
     

       48
        
               if file.tokens[file.working_index]

     

       49
        
                   .contents

     

       50
        
                   .starts_with(['!', '&'])

     

       51
        
               {

     

       52
       -
                   let mut matched: bool = false;

     

       53
        
                   let mut prefix_len = 1;

     

       54
        
                   let mut symbol = file.tokens[file.working_index].contents.clone();

     

       55
        
                   symbol = symbol.trim().to_string();

     
···

       71
        
                       // Check if its a macro

     

       72
        
                       for m in &MACRO_LIST {

     

       73
        
                           if &symbol[prefix_len..] == m.symbol {

     

       74
       -
                               matched = true;

     

       75
        
                               println!("Found a macro ({})", m.symbol);

     

       76
        
       

     

       77
       -
                               let (args, tokcount) =

     

       78
        
                                   collect_arguments(&file.tokens[file.working_index..]);

     

       79
        
                               let expansion: Vec<Token>;

     

       0
        
       
     

       80
        
                               if ephemeral {

     

       81
        
                                   expansion = Vec::new();

     

       0
        
       
     

       82
        
                               } else {

     

       83
       -
                                   expansion = (m.expand)(file, &args);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       84
        
                               }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       85
        
                               file.tokens.remove(file.working_index);

     

       86
        
                               file.tokens.splice(

     

       87
       -
                                   file.working_index..(file.working_index + tokcount - 1),

     

       88
       -
                                   expansion,

     

       0
        
       
     

       89
        
                               );

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       90
        
                           }

     

       91
        
                       }

     

       92
        
                       // Check if its a block

     

       93
        
                       // for b in  &BLOCK_LIST {}}

     

       94
        
                   }

     

       95
       -
                   if !matched {

     

       96
        
                       println!(

     

       97
        
                           "Token written as a function but no such function exists \"{}\"",

     

       98
        
                           file.tokens[file.working_index].contents.trim()

     

       99
        
                       );

     

       100
        
                   }

     

       101
        
               }

     

       102
       -
       

     

       103
       -
               file.working_index += 1;

     

       0
        
       
     

       104
        
           }

     

       105
        
           //println!("{:?}", file.tokens);

     

       106
        
           let mut skid_output: String = "".to_string();

···

       0
        
       
     

       1
        
       mod macros;

     

       2
        
       mod stringtools;

     

       3
        
       mod types;

     
···

       10
        
           io::Write,

     

       11
        
           process::{exit, Output},

     

       12
        
       };

     

       13
       +
       use stringtools::{

     

       14
       +
           collect_arguments, collect_block, split_keep_delimiters, split_to_tokens, strings_to_tokens,

     

       15
       +
           trim_whitespace_tokens,

     

       16
       +
       };

     

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

     

       18
        
       

     

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

     

       20
        
       

     

       21
        
       fn main() {

     

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

     
···

       42
        
       

     

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

     

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

     

       45
       +
           //let mut escaped = false;

     

       46
        
       

     

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

     

       48
        
               //look for macros or blocks

     

       49
       +
               println!(">\"{}\"<", file.tokens[file.working_index].contents);

     

       50
       +
       

     

       51
       +
               if file.tokens[file.working_index].contents == "\\" {

     

       52
       +
                   file.working_index += 2;

     

       53
       +
                   continue;

     

       54
       +
               }

     

       55
        
       

     

       56
       +
               let mut matched_macro: bool = false;

     

       57
        
               if file.tokens[file.working_index]

     

       58
        
                   .contents

     

       59
        
                   .starts_with(['!', '&'])

     

       60
        
               {

     

       0
        
       
     

       61
        
                   let mut prefix_len = 1;

     

       62
        
                   let mut symbol = file.tokens[file.working_index].contents.clone();

     

       63
        
                   symbol = symbol.trim().to_string();

     
···

       79
        
                       // Check if its a macro

     

       80
        
                       for m in &MACRO_LIST {

     

       81
        
                           if &symbol[prefix_len..] == m.symbol {

     

       82
       +
                               matched_macro = true;

     

       83
        
                               println!("Found a macro ({})", m.symbol);

     

       84
        
       

     

       85
       +
                               let (args, args_tokcount) =

     

       86
        
                                   collect_arguments(&file.tokens[file.working_index..]);

     

       87
        
                               let expansion: Vec<Token>;

     

       88
       +
                               let block_tokcount: usize;

     

       89
        
                               if ephemeral {

     

       90
        
                                   expansion = Vec::new();

     

       91
       +
                                   block_tokcount = 0;

     

       92
        
                               } else {

     

       93
       +
                                   if m.has_scope {

     

       94
       +
                                       let block: Vec<Token>;

     

       95
       +
                                       (block, block_tokcount) = collect_block(

     

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

     

       97
       +
                                       );

     

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

     

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

     

       100
       +
                                   } else {

     

       101
       +
                                       block_tokcount = 0;

     

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

     

       103
       +
                                   }

     

       104
        
                               }

     

       105
       +
       

     

       106
       +
                               let trimmed = trim_whitespace_tokens(&expansion);

     

       107
       +
       

     

       108
        
                               file.tokens.remove(file.working_index);

     

       109
        
                               file.tokens.splice(

     

       110
       +
                                   file.working_index

     

       111
       +
                                       ..(file.working_index + args_tokcount + block_tokcount - 1),

     

       112
       +
                                   trimmed.iter().cloned(),

     

       113
        
                               );

     

       114
       +
                               if expansion.len() == 0 && file.working_index > 0 {

     

       115
       +
                                   file.working_index -= 1;

     

       116
       +
                               }

     

       117
        
                           }

     

       118
        
                       }

     

       119
        
                       // Check if its a block

     

       120
        
                       // for b in  &BLOCK_LIST {}}

     

       121
        
                   }

     

       122
       +
                   if !matched_macro {

     

       123
        
                       println!(

     

       124
        
                           "Token written as a function but no such function exists \"{}\"",

     

       125
        
                           file.tokens[file.working_index].contents.trim()

     

       126
        
                       );

     

       127
        
                   }

     

       128
        
               }

     

       129
       +
               if !matched_macro {

     

       130
       +
                   file.working_index += 1;

     

       131
       +
               }

     

       132
        
           }

     

       133
        
           //println!("{:?}", file.tokens);

     

       134
        
           let mut skid_output: String = "".to_string();

+131 -28

src/stringtools.rs

···

       1
        
       use core::fmt;

     

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

     

       0
        
       
     

       0
        
       
     

       3
        
       

     

       4
        
       use super::DELIMITERS;

     

       5
        
       use crate::types::Token;

     

       6
        
       

     

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

     

       0
        
       
     

       8
        
           //let mut output = Vec::new();

     

       9
       -
           let mut split_tokens = Vec::new();

     

       10
       -
           for tok in tokens {

     

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

     

       12
       -
                   split_tokens.push(s);

     

       13
       -
               }

     

       14
       -
           }

     

       15
        
       

     

       16
        
           let mut quoted: bool = false;

     

       17
        
           let mut entered: bool = false;

     
···

       20
        
       

     

       21
        
           let mut in_token_count = 0;

     

       22
        
       

     

       23
       -
           for tok in split_tokens {

     

       24
       -
               in_token_count += 1;

     

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

     

       0
        
       
     

       26
        
                   continue;

     

       27
        
               }

     

       28
        
       

     

       29
       -
               if !entered && tok.starts_with('(') {

     

       30
        
                   entered = true;

     

       31
        
                   continue;

     

       32
        
               }

     
···

       35
        
                   continue;

     

       36
        
               }

     

       37
        
       

     

       38
       -
               if !quoted && tok.starts_with(')') {

     

       39
        
                   break;

     

       40
        
               }

     

       41
        
       

     

       42
        
               let mut i = 0;

     

       43
       -
               while i < tok.len() {

     

       44
       -
                   let c = tok.chars().nth(i).unwrap();

     

       45
        
                   i += 1;

     

       46
        
       

     

       47
        
                   if c == '\"' {

     
···

       61
        
           return (args, in_token_count);

     

       62
        
       }

     

       63
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       64
        
       // Theres no std function to have the delimiters be their own element in the out vector

     

       65
        
       // clean it up a bit here

     

       66
        
       pub fn split_keep_delimiters(instr: String) -> Vec<String> {

     
···

       100
        
       }

     

       101
        
       

     

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

     

       0
        
       
     

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

     

       104
        
           let split = split_keep_delimiters(instr);

     

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

     
···

       118
        
           return strings_to_tokens(new_split, origin_file);

     

       119
        
       }

     

       120
        
       

     

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

     

       122
       -
           while index < tokens.len() {

     

       123
       -
               if tokens[index].contents.starts_with([' ', '\t', '\n']) {

     

       124
       -
                   continue;

     

       0
        
       
     

       0
        
       
     

       125
        
               }

     

       126
       -
               return (true, index);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       127
        
           }

     

       128
       -
           return (false, 0);

     

       129
        
       }

     

       130
        
       

     

       131
       -
       pub trait IsDelimiter {

     

       132
       -
           fn is_delimiter(&self) -> bool;

     

       133
        
       }

     

       134
        
       

     

       135
       -
       impl IsDelimiter for char {

     

       136
       -
           fn is_delimiter(&self) -> bool {

     

       137
       -
               for d in DELIMITERS {

     

       138
       -
                   if *self == d {

     

       139
       -
                       return true;

     

       140
        
                   }

     

       141
        
               }

     

       142
       -
               return false;

     

       143
        
           }

     

       144
        
       }

···

       1
        
       use core::fmt;

     

       2
       +
       use std::{

     

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

     

       4
       +
       };

     

       5
        
       

     

       6
        
       use super::DELIMITERS;

     

       7
        
       use crate::types::Token;

     

       8
        
       

     

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

     

       10
       +
           // Arguments vec and number of tokens consumed

     

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

     

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

     

       13
       +
           // for tok in tokens {

     

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

     

       15
       +
           //         split_tokens.push(s);

     

       16
       +
           //     }

     

       17
       +
           //}

     

       18
        
       

     

       19
        
           let mut quoted: bool = false;

     

       20
        
           let mut entered: bool = false;

     
···

       23
        
       

     

       24
        
           let mut in_token_count = 0;

     

       25
        
       

     

       26
       +
           for tok in tokens {

     

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

     

       28
       +
               let contents = &tok.contents;

     

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

     

       30
        
                   continue;

     

       31
        
               }

     

       32
        
       

     

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

     

       34
        
                   entered = true;

     

       35
        
                   continue;

     

       36
        
               }

     
···

       39
        
                   continue;

     

       40
        
               }

     

       41
        
       

     

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

     

       43
        
                   break;

     

       44
        
               }

     

       45
        
       

     

       46
        
               let mut i = 0;

     

       47
       +
               while i < contents.len() {

     

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

     

       49
        
                   i += 1;

     

       50
        
       

     

       51
        
                   if c == '\"' {

     
···

       65
        
           return (args, in_token_count);

     

       66
        
       }

     

       67
        
       

     

       68
       +
       pub fn collect_block(tokens: &[Token]) -> (Vec<Token>, usize) {

     

       69
       +
           let mut entered = false;

     

       70
       +
           let mut tokens_consumed: usize = 0;

     

       71
       +
           let mut entering_bracket_count = 0;

     

       72
       +
           let mut exiting_bracket_count = 0;

     

       73
       +
           let mut scope_count = 0; //incremented by '{{{', decremented by '}}}'

     

       74
       +
           let mut escaped = false;

     

       75
       +
       

     

       76
       +
           let mut block: Vec<Token> = Vec::new();

     

       77
       +
       

     

       78
       +
           // We dont really care about doing anything that in the block right now

     

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

     

       80
       +
           for tok in tokens {

     

       81
       +
               tokens_consumed += 1;

     

       82
       +
       

     

       83
       +
               println!(

     

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

     

       85
       +
                   tok.contents,

     

       86
       +
                   tok.contents == "{"

     

       87
       +
               );

     

       88
       +
               // println!(

     

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

     

       90
       +
               //     entering_bracket_count, scope_count, entered, escaped

     

       91
       +
               //);

     

       92
       +
               if !entered {

     

       93
       +
                   if tok.contents.is_only_whitespace() {

     

       94
       +
                       continue;

     

       95
       +
                   }

     

       96
       +
                   if tok.contents != "{"

     

       97
       +
                   // Expected block start, got garbage

     

       98
       +
                   {

     

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

     

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

     

       101
       +
                   }

     

       102
       +
               }

     

       103
       +
       

     

       104
       +
               if escaped {

     

       105
       +
                   escaped = false;

     

       106
       +
                   entering_bracket_count = 0;

     

       107
       +
                   exiting_bracket_count = 0;

     

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

     

       109
       +
                   continue;

     

       110
       +
               }

     

       111
       +
       

     

       112
       +
               // Scope Start

     

       113
       +
       

     

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

     

       115
       +
                   entering_bracket_count += 1;

     

       116
       +
               } else {

     

       117
       +
                   entering_bracket_count = 0;

     

       118
       +
               }

     

       119
       +
               // Scope End

     

       120
       +
               if tok.contents == "}" {

     

       121
       +
                   exiting_bracket_count += 1;

     

       122
       +
                   if exiting_bracket_count == 3 {

     

       123
       +
                       scope_count -= 1;

     

       124
       +
                       exiting_bracket_count = 0;

     

       125
       +
                       if scope_count == 0 {

     

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

     

       127
       +
                           block.pop();

     

       128
       +
                           block.pop();

     

       129
       +
                           break;

     

       130
       +
                       }

     

       131
       +
                   }

     

       132
       +
               } else {

     

       133
       +
                   exiting_bracket_count = 0;

     

       134
       +
               }

     

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

     

       136
       +
                   escaped = true;

     

       137
       +
               } else {

     

       138
       +
                   if entered {

     

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

     

       140
       +
                   }

     

       141
       +
               }

     

       142
       +
               if entering_bracket_count == 3 {

     

       143
       +
                   scope_count += 1;

     

       144
       +
                   entering_bracket_count = 0;

     

       145
       +
       

     

       146
       +
                   entered = true;

     

       147
       +
               }

     

       148
       +
           }

     

       149
       +
           return (block, tokens_consumed);

     

       150
       +
       }

     

       151
       +
       

     

       152
        
       // Theres no std function to have the delimiters be their own element in the out vector

     

       153
        
       // clean it up a bit here

     

       154
        
       pub fn split_keep_delimiters(instr: String) -> Vec<String> {

     
···

       188
        
       }

     

       189
        
       

     

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

     

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

     

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

     

       193
        
           let split = split_keep_delimiters(instr);

     

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

     
···

       207
        
           return strings_to_tokens(new_split, origin_file);

     

       208
        
       }

     

       209
        
       

     

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

     

       211
       +
           let mut start: usize = 0;

     

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

     

       213
       +
           for tok in tokens {

     

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

     

       215
       +
                   break;

     

       216
        
               }

     

       217
       +
               start += 1;

     

       218
       +
           }

     

       219
       +
       

     

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

     

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

     

       222
       +
                   break;

     

       223
       +
               }

     

       224
       +
               end -= 1;

     

       225
       +
           }

     

       226
       +
       

     

       227
       +
           if start < end {

     

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

     

       229
       +
           } else {

     

       230
       +
               return &[];

     

       231
        
           }

     

       0
        
       
     

       232
        
       }

     

       233
        
       

     

       234
       +
       pub trait OnlyWhitespace {

     

       235
       +
           fn is_only_whitespace(&self) -> bool;

     

       236
        
       }

     

       237
        
       

     

       238
       +
       impl OnlyWhitespace for String {

     

       239
       +
           fn is_only_whitespace(&self) -> bool {

     

       240
       +
               for c in self.chars() {

     

       241
       +
                   if !c.is_whitespace() {

     

       242
       +
                       return false;

     

       243
        
                   }

     

       244
        
               }

     

       245
       +
               return true;

     

       246
        
           }

     

       247
        
       }

+13 -3

src/types.rs

···

       2
        
       

     

       3
        
       pub struct Token {

     

       4
        
           pub contents: String,

     

       5
       -
           pub origin_file: String,

     

       6
        
           pub line_number: u32,

     

       7
        
       }

     

       8
        
       

     
···

       28
        
           pub block_edges: Vec<BlockEdge>,

     

       29
        
       }

     

       30
        
       

     

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

     

       32
        
       pub struct Macro<'a> {

     

       33
        
           pub symbol: &'a str,

     

       34
        
           pub expand: MacroExpansion,

     

       35
       -
           //pub always_ephemeral: bool, // This wont be included from other files

     

       36
        
       }

     

       37
        
       

     

       38
        
       impl InputFile {

     
···

       63
        
               return self.contents.clone();

     

       64
        
           }

     

       65
        
       }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       2
        
       

     

       3
        
       pub struct Token {

     

       4
        
           pub contents: String,

     

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

     

       6
        
           pub line_number: u32,

     

       7
        
       }

     

       8
        
       

     
···

       28
        
           pub block_edges: Vec<BlockEdge>,

     

       29
        
       }

     

       30
        
       

     

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

     

       32
        
       pub struct Macro<'a> {

     

       33
        
           pub symbol: &'a str,

     

       34
        
           pub expand: MacroExpansion,

     

       35
       +
           pub has_scope: bool, //takes blocks of text input as well as parameters using {{...}}

     

       36
        
       }

     

       37
        
       

     

       38
        
       impl InputFile {

     
···

       63
        
               return self.contents.clone();

     

       64
        
           }

     

       65
        
       }

     

       66
       +
       

     

       67
       +
       impl Clone for Token {

     

       68
       +
           fn clone(&self) -> Self {

     

       69
       +
               return Token::new(

     

       70
       +
                   self.contents.clone(),

     

       71
       +
                   self.origin_file.clone(),

     

       72
       +
                   self.line_number,

     

       73
       +
               );

     

       74
       +
           }

     

       75
       +
       }