commit 186d52d5258fab6e5886a0b1c205004b6f9831d1 · tholps.site/skidmark

+3 -3

src/macros/mod.rs

···

       1
       1
       -
       pub mod simple_macros;

     

       2
       1
        
       pub mod insert;

     

       3
       2
        
       pub mod simple_blocks;

     

       3
       3
       +
       pub mod simple_macros;

     

       4
       4
        
       pub mod template;

     

       5
       5
        
       use super::types::Macro;

     

       6
       6
        
       

     

       7
       7
       -
       use simple_macros::{macro_clear, macro_time};

     

       8
       7
        
       use insert::macro_insert;

     

       9
       8
        
       use simple_blocks::{macro_comment, macro_null, macro_repeat};

     

       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] = [

     
···

       24
       24
        
           Macro {

     

       25
       25
        
               symbol: "time",

     

       26
       26
        
               expand: macro_time,

     

       27
       27
       -
               has_scope:false,

     

       27
       27
       +
               has_scope: false,

     

       28
       28
        
           },

     

       29
       29
        
           // Scoped

     

       30
       30
        
           Macro {

+4 -4

src/macros/simple_macros.rs

···

       33
       33
        
       

     

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

     

       35
       35
        
               let origin_file = context

     

       36
       36
       -
               .file_for_index(origin_index)

     

       37
       37
       -
               .expect("Macro 'Time' was given a bad origin index")

     

       38
       38
       -
               .clone();

     

       36
       36
       +
                   .file_for_index(origin_index)

     

       37
       37
       +
                   .expect("Macro 'Time' was given a bad origin index")

     

       38
       38
       +
                   .clone();

     

       39
       39
        
               println!(

     

       40
       40
        
                   "{:?}:{} ;Time only accepts 1 argument, got given {} ({:?})",

     

       41
       41
        
                   origin_file.to_str(),

     
···

       47
       47
        
           }

     

       48
       48
        
       

     

       49
       49
        
           return split_to_tokens(t.format(&args[0]).to_string(), origin_index);

     

       50
       50
       -
       }
     

       50
       50
       +
       }

+1 -2

src/macros/template.rs

···

       40
       40
        
       

     

       41
       41
        
               let mut output = self.tokens.clone();

     

       42
       42
        
       

     

       43
       43
       -
               for tok in &mut output

     

       44
       44
       -
               {

     

       43
       43
       +
               for tok in &mut output {

     

       45
       44
        
                   tok.origin_file = origin_index;

     

       46
       45
        
               }

     

       47
       46

+1 -5

src/stringtools.rs

···

       40
       40
        
                   break;

     

       41
       41
        
               }

     

       42
       42
        
       

     

       43
       43
       -
               let mut i = 0;

     

       44
       44
       -
               while i < tok.chars().count() {

     

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

     

       46
       46
       -
                   i += 1;

     

       47
       47
       -
       

     

       43
       43
       +
               for c in tok.chars() {

     

       48
       44
        
                   if c == '\"' {

     

       49
       45
        
                       quoted = !quoted;

     

       50
       46
        
                       continue;