commit db26e9ab9e29d9e4617682a5984e11b20cc4ef02 · tholps.site/skidmark

+8 -8

src/macros/insert.rs

···

       13
       13
        
       

     

       14
       14
        
       pub fn macro_insert(

     

       15
       15
        
           _file: &mut InputFile,

     

       16
       16
       -
           _origin_index: usize,

     

       16
       16
       +
           origin_index: usize,

     

       17
       17
        
           origin_line: usize,

     

       18
       18
       -
           _context: &mut ProjectContext,

     

       18
       18
       +
           context: &mut ProjectContext,

     

       19
       19
        
           args: &Vec<String>,

     

       20
       20
        
           _scope: &[Token],

     

       21
       21
        
       ) -> Vec<Token> {

     

       22
       22
       -
           let origin_file = _context

     

       23
       23
       -
               .file_for_index(_origin_index)

     

       22
       22
       +
           let origin_file = context

     

       23
       23
       +
               .file_for_index(origin_index)

     

       24
       24
        
               .expect("Macro 'Insert' was given a bad origin index")

     

       25
       25
        
               .clone();

     

       26
       26
        
           if args.len() != 1 {

     

       27
       27
        
               println!(

     

       28
       28
       -
                   "{:?}:{} ;Insert only accepts 1 argument, got given {} ({:?})",

     

       28
       28
       +
                   "[ERROR] {:?}:{} ;Insert only accepts 1 argument, got given {} ({:?})",

     

       29
       29
        
                   origin_file.to_str(),

     

       30
       30
        
                   origin_line,

     

       31
       31
        
                   args.len(),

     
···

       57
       57
        
           }

     

       58
       58
        
       

     

       59
       59
        
           if search_from_root {

     

       60
       60
       -
               let mut include_path = _context.input_folder.clone();

     

       60
       60
       +
               let mut include_path = context.input_folder.clone();

     

       61
       61
        
               include_path.push(&arg);

     

       62
       62
        
       

     

       63
       63
        
               if include_path.exists() && include_path.is_file() {

     
···

       67
       67
        
           }

     

       68
       68
        
       

     

       69
       69
        
           if !ok {

     

       70
       70
       -
               println!("\"{:?}\": Insert was unable to find the file \"{}\" relative to its origin or in project root.", origin_file.to_str(), arg);

     

       70
       70
       +
               println!("[ERROR] \"{:?}\": Insert was unable to find the file \"{}\" relative to its origin or in project root.", origin_file.to_str(), arg);

     

       71
       71
        
               exit(1);

     

       72
       72
        
           }

     

       73
       73
        
       

     
···

       79
       79
        
           let split_output = split_keep_delimiters(output);

     

       80
       80
        
           return strings_to_tokens(

     

       81
       81
        
               split_output,

     

       82
       82
       -
               _context.index_of_file(&PathBuf::from(&include_file)),

     

       82
       82
       +
               context.index_of_file(&PathBuf::from(&include_file)),

     

       83
       83
        
           );

     

       84
       84
        
       }

+7 -2

src/macros/mod.rs

···

       5
       5
        
       use super::types::Macro;

     

       6
       6
        
       

     

       7
       7
        
       use insert::macro_insert;

     

       8
       8
       -
       use simple_blocks::{macro_comment, macro_section, macro_repeat};

     

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

     

       9
       9
        
       use simple_macros::{macro_clear, macro_time};

     

       10
       10
        
       use template::macro_template;

     

       11
       11
        
       

     

       12
       12
       -
       pub static MACRO_LIST: [Macro<'_>; 7] = [

     

       12
       12
       +
       pub static MACRO_LIST: &'static [Macro<'_>] = &[

     

       13
       13
        
           // Unscoped

     

       14
       14
        
           Macro {

     

       15
       15
        
               symbol: "insert", // Inserts another file

     
···

       45
       45
        
           Macro {

     

       46
       46
        
               symbol: "template",

     

       47
       47
        
               expand: macro_template,

     

       48
       48
       +
               has_scope: true,

     

       49
       49
       +
           },

     

       50
       50
       +
           Macro {

     

       51
       51
       +
               symbol: "skip",

     

       52
       52
       +
               expand: macro_skip,

     

       48
       53
        
               has_scope: true,

     

       49
       54
        
           },

     

       50
       55
        
       ];

+1 -2

src/macros/simple_blocks.rs

···

       29
       29
        
           return tokens;

     

       30
       30
        
       }

     

       31
       31
        
       

     

       32
       32
       -
       pub fn macro_preformatted(

     

       32
       32
       +
       pub fn macro_skip(

     

       33
       33
        
           _file: &mut InputFile,

     

       34
       34
        
           _origin_index: usize,

     

       35
       35
        
           _origin_line: usize,

     
···

       37
       37
        
           _args: &Vec<String>,

     

       38
       38
        
           scope: &[Token],

     

       39
       39
        
       ) -> Vec<Token> {

     

       40
       40
       -
       

     

       41
       40
        
           Vec::new()

     

       42
       41
        
       }

     

       43
       42

+5 -5

src/macros/template.rs

···

       79
       79
        
           for t in &file.templates {

     

       80
       80
        
               if t.symbol == args[0] {

     

       81
       81
        
                   println!(

     

       82
       82
       -
                       "{:?}:{} ; Attempted template redefinition of \"{}\"",

     

       82
       82
       +
                       "[ERROR] {:?}:{} ; Attempted template redefinition of \"{}\"",

     

       83
       83
        
                       context.file_for_index(origin_index).unwrap(),

     

       84
       84
        
                       origin_line,

     

       85
       85
        
                       args[0]

     
···

       88
       88
        
               }

     

       89
       89
        
           }

     

       90
       90
        
       

     

       91
       91
       -
           for t in &MACRO_LIST {

     

       91
       91
       +
           for t in MACRO_LIST {

     

       92
       92
        
               if t.symbol == args[0] {

     

       93
       93
        
                   println!(

     

       94
       94
       -
                       "{:?}:{} ; Attempted to make a template using a reserved name \"{}\"",

     

       94
       94
       +
                       "[ERROR] {:?}:{} ; Attempted to make a template using a reserved name \"{}\"",

     

       95
       95
        
                       context.file_for_index(origin_index).unwrap(),

     

       96
       96
        
                       origin_line,

     

       97
       97
        
                       args[0]

     
···

       107
       107
        
               }

     

       108
       108
        
               if param.contains_whitespace() {

     

       109
       109
        
                   println!(

     

       110
       110
       -
                       "{:?}:{} ; Attempted to make a template with a parameter that contains whitespace \"{}\"",

     

       110
       110
       +
                       "[ERROR] {:?}:{} ; Attempted to make a template with a parameter that contains whitespace \"{}\"",

     

       111
       111
        
                       context.file_for_index(origin_index).unwrap(),

     

       112
       112
        
                       origin_line,

     

       113
       113
        
                       param

     
···

       118
       118
        
       

     

       119
       119
        
           if used_params < args.len() - 1 {

     

       120
       120
        
               println!(

     

       121
       121
       -
                   "{:?}:{} ; Template definition of \"{}\" has {} paramters but only uses {}",

     

       121
       121
       +
                   "[ERROR] {:?}:{} ; Template definition of \"{}\" has {} paramters but only uses {}",

     

       122
       122
        
                   context.file_for_index(origin_index).unwrap(),

     

       123
       123
        
                   origin_line,

     

       124
       124
        
                   args[0],

+35 -9

src/main.rs

···

       19
       19
        
       };

     

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

     

       21
       21
        
       

     

       22
       22
       -
       static DELIMITERS: [char; 12] = [

     

       23
       23
       -
           ' ', '\n', '\t', '(', ')', '{', '}', '[', ']', '\\', '\'', '\"',

     

       22
       22
       +
       static DELIMITERS: &'static [char] = &[

     

       23
       23
       +
           ' ', '\n', '\t', '(', ')', '{', '}', '[', ']', '\\', '\'', '\"', ';',

     

       24
       24
        
       ];

     

       25
       25
        
       

     

       26
       26
        
       fn main() {

     
···

       32
       32
        
           while !project_path.exists() || project_path.is_dir() {

     

       33
       33
        
               let ok = project_folder.pop();

     

       34
       34
        
               if !ok {

     

       35
       35
       -
                   println!("No skidmark.toml project file found in this folder or ancestors.");

     

       35
       35
       +
                   println!("[ERROR] No skidmark.toml project file found in this folder or ancestors.");

     

       36
       36
        
                   exit(1);

     

       37
       37
        
               }

     

       38
       38
        
               project_path = project_folder.clone();

     
···

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

     

       70
       70
        
               //look for macros or blocks

     

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

     

       72
       72
       +
       

     

       73
       73
       +
               if file.tokens[file.working_index].contents.len() == 0 {

     

       74
       74
       +
                   file.working_index += 1;

     

       75
       75
       +
                   continue;

     

       76
       76
       +
               }

     

       72
       77
        
       

     

       73
       78
        
               if file.tokens[file.working_index].contents == "\\" {

     

       79
       79
       +
                   file.tokens[file.working_index].contents = "".into();

     

       74
       80
        
                   file.working_index += 2;

     

       81
       81
       +
                   //println!("Hit backslash");

     

       75
       82
        
                   continue;

     

       76
       83
        
               }

     

       77
       84
        
       

     
···

       100
       107
        
                       }

     

       101
       108
        
       

     

       102
       109
        
                       // Check if its a macro

     

       103
       103
       -
                       for m in &MACRO_LIST {

     

       110
       110
       +
                       for m in MACRO_LIST {

     

       104
       111
        
                           if &symbol[prefix_len..] == m.symbol {

     

       105
       112
        
                               matched_macro = true;

     

       106
       113
        
                               //println!("Found a macro ({})", m.symbol);

     
···

       109
       116
        
                                   collect_arguments(&file.tokens[file.working_index..]);

     

       110
       117
        
                               let expansion: Vec<Token>;

     

       111
       118
        
                               let block_tokcount: usize;

     

       112
       112
       -
       

     

       113
       119
        
                               if m.has_scope {

     

       114
       120
        
                                   //println!("is scoped.");

     

       115
       115
       -
                                   let block: Vec<Token>;

     

       116
       116
       -
                                   (block, block_tokcount) =

     

       121
       121
       +
       

     

       122
       122
       +
                                   let block_opt =

     

       117
       123
        
                                       collect_block(&file.tokens[(file.working_index + args_tokcount)..]);

     

       124
       124
       +
                                   if block_opt.is_none() {

     

       125
       125
       +
                                       println!(

     

       126
       126
       +
                                           "[ERROR] {:?}:{} ;Malformed block",

     

       127
       127
       +
                                           file.tokens[file.working_index].origin_file,

     

       128
       128
       +
                                           file.tokens[file.working_index].line_number

     

       129
       129
       +
                                       );

     

       130
       130
       +
                                       exit(1);

     

       131
       131
       +
                                   }

     

       132
       132
       +
                                   let block: Vec<Token>;

     

       133
       133
       +
                                   (block, block_tokcount) = block_opt.unwrap();

     

       118
       134
        
       

     

       119
       135
        
                                   if ephemeral {

     

       120
       136
        
                                       expansion = Vec::new();

     
···

       174
       190
        
                               if m.has_scope {

     

       175
       191
        
                                   //println!("is scoped.");

     

       176
       192
        
                                   let block: Vec<Token>;

     

       177
       177
       -
                                   (block, block_tokcount) =

     

       193
       193
       +
                                   let block_opt =

     

       178
       194
        
                                       collect_block(&file.tokens[(file.working_index + args_tokcount)..]);

     

       195
       195
       +
                                   if block_opt.is_none() {

     

       196
       196
       +
                                       println!(

     

       197
       197
       +
                                           "[ERROR] {:?}:{} ;Malformed block",

     

       198
       198
       +
                                           file.tokens[file.working_index].origin_file,

     

       199
       199
       +
                                           file.tokens[file.working_index].line_number

     

       200
       200
       +
                                       );

     

       201
       201
       +
                                       exit(1);

     

       202
       202
       +
                                   }

     

       203
       203
       +
       

     

       204
       204
       +
                                   (block, block_tokcount) = block_opt.unwrap();

     

       179
       205
        
       

     

       180
       206
        
                                   if ephemeral {

     

       181
       207
        
                                       expansion = Vec::new();

     
···

       259
       285
        
           .unwrap();

     

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

     

       261
       287
        
           print!(

     

       262
       262
       -
               "{} written.\n\n",

     

       288
       288
       +
               "[OK] {} written.\n\n",

     

       263
       289
        
               file.file_htmlout

     

       264
       290
        
                   .to_str()

     

       265
       291
        
                   .unwrap_or("Couldnt Unwrap htmlout name")

+41 -19

src/stringtools.rs

···

       58
       58
        
           return (args, in_token_count);

     

       59
       59
        
       }

     

       60
       60
        
       

     

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

     

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

     

       62
       62
        
           let mut entered = false;

     

       63
       63
        
           let mut tokens_consumed: usize = 0;

     

       64
       64
        
           let mut entering_bracket_count = 0;

     
···

       70
       70
        
       

     

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

     

       72
       72
        
           // maybe have the Token struct contain scope level later?

     

       73
       73
       +
           let mut escaped_tok: Token = Token::new("\\".into(), 0, 0);

     

       73
       74
        
           for tok in tokens {

     

       74
       75
        
               tokens_consumed += 1;

     

       75
       76
        
               if !entered {

     
···

       85
       86
        
                       //     print!("{} ", t.contents);

     

       86
       87
        
                       // }

     

       87
       88
        
                       // exit(1);

     

       88
       88
       -
                       return (Vec::new(), 0);

     

       89
       89
       +
                       return None;

     

       89
       90
        
                   }

     

       90
       91
        
               }

     

       91
       92
        
       

     

       92
       92
       -
               if escaped {

     

       93
       93
       -
                   escaped = false;

     

       94
       94
       -
                   entering_bracket_count = 0;

     

       95
       95
       -
                   exiting_bracket_count = 0;

     

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

     

       97
       97
       -
                   continue;

     

       98
       98
       -
               }

     

       93
       93
       +
               let mut escaped_used = false;

     

       99
       94
        
       

     

       100
       95
        
               // Scope Start

     

       101
       101
       -
               if tok.contents == "{" {

     

       96
       96
       +
               if tok.contents == "{" && !escaped {

     

       102
       97
        
                   entering_bracket_count += 1;

     

       103
       98
        
       

     

       104
       99
        
                   if entering_bracket_count == 3 {

     
···

       110
       105
        
                   }

     

       111
       106
        
               } else {

     

       112
       107
        
                   entering_bracket_count = 0;

     

       108
       108
       +
                   if escaped {

     

       109
       109
       +
                       escaped_used = true;

     

       110
       110
       +
                   }

     

       113
       111
        
               }

     

       114
       112
        
               // Scope End

     

       115
       115
       -
               if tok.contents == "}" {

     

       113
       113
       +
               if tok.contents == "}" && !escaped {

     

       116
       114
        
                   exiting_bracket_count += 1;

     

       117
       115
        
                   if exiting_bracket_count == 3 {

     

       118
       116
        
                       scope_count -= 1;

     
···

       123
       121
        
                   }

     

       124
       122
        
               } else {

     

       125
       123
        
                   exiting_bracket_count = 0;

     

       124
       124
       +
                   if escaped {

     

       125
       125
       +
                       escaped_used = true;

     

       126
       126
       +
                   }

     

       127
       127
       +
               }

     

       128
       128
       +
       

     

       129
       129
       +
               if escaped_used {

     

       130
       130
       +
                   escaped = false;

     

       131
       131
       +
                   block.push(escaped_tok.clone());

     

       126
       132
        
               }

     

       127
       133
        
       

     

       128
       134
        
               if tok.contents == "\\" {

     

       129
       135
        
                   escaped = true;

     

       136
       136
       +
                   escaped_tok = tok.clone();

     

       130
       137
        
               } else {

     

       131
       138
        
                   block.push(tok.clone());

     

       132
       139
        
               }

     

       133
       140
        
           }

     

       134
       141
        
       

     

       142
       142
       +
           if scope_count != 0 {

     

       143
       143
       +
               return None;

     

       144
       144
       +
           }

     

       145
       145
       +
       

     

       135
       146
        
           // if block.len() == 6

     

       136
       147
        
           // // things get ugly if its empty

     

       137
       148
        
           // {

     
···

       146
       157
        
           // pop brackets, bad and ugly but idgaf

     

       147
       158
        
           block.drain(..3);

     

       148
       159
        
           block.drain(block.len() - 3..);

     

       149
       149
       -
           return (block, tokens_consumed);

     

       160
       160
       +
           return Some((block, tokens_consumed));

     

       150
       161
        
       }

     

       151
       162
        
       

     

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

     
···

       162
       173
        
                       output.push(token.to_string());

     

       163
       174
        
                   }

     

       164
       175
        
                   output.push(ending.to_string());

     

       176
       176
       +
                   //println!("({}, {})", token.to_string(), ending.to_string())

     

       165
       177
        
               } else {

     

       166
       178
        
                   output.push(s.to_string());

     

       167
       179
        
               }

     
···

       174
       186
        
           let mut line_count = 1;

     

       175
       187
        
       

     

       176
       188
        
           for str in in_strings {

     

       189
       189
       +
               if str.len() == 0 {

     

       190
       190
       +
                   continue;

     

       191
       191
       +
               }

     

       192
       192
       +
       

     

       177
       193
        
               let current_line = line_count;

     

       178
       194
        
               for char in str.chars() {

     

       179
       195
        
                   if char == '\n' {

     
···

       193
       209
        
           let split = split_keep_delimiters(instr);

     

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

     

       195
       211
        
           for s in split {

     

       196
       196
       -
               let prefix_offset = s.find(&['!', '&']).unwrap_or(s.len() + 1);

     

       197
       197
       -
               if prefix_offset != 0 && prefix_offset != s.len() + 1 {

     

       198
       198
       -
                   let (first, second) = s.split_at(prefix_offset);

     

       199
       199
       -
                   println!("\"{}\", \"{}\"", first, second);

     

       200
       200
       -
                   new_split.push(first.to_string());

     

       201
       201
       -
                   new_split.push(second.to_string());

     

       212
       212
       +
               let prefix_offset = s.find(&['!', '&']);

     

       213
       213
       +
               if prefix_offset.is_some() {

     

       214
       214
       +
                   let (first, second) = s.split_at(prefix_offset.unwrap());

     

       215
       215
       +
                   //println!("\"{}\", \"{}\"", first, second);

     

       216
       216
       +
                   if first.len() > 0 {

     

       217
       217
       +
                       new_split.push(first.to_string());

     

       218
       218
       +
                   }

     

       219
       219
       +
                   if second.len() > 0 {

     

       220
       220
       +
                       new_split.push(second.to_string());

     

       221
       221
       +
                   }

     

       202
       222
        
               } else {

     

       203
       203
       -
                   new_split.push(s);

     

       223
       223
       +
                   if s.len() > 0 {

     

       224
       224
       +
                       new_split.push(s);

     

       225
       225
       +
                   }

     

       204
       226
        
               }

     

       205
       227
        
               //sleep(std::time::Duration::from_millis(10));

     

       206
       228
        
           }