commit 76f6ea42c198319c905741bd757eb11cd3019735 · tholps.site/skidmark

+3 -3

src/macros/mod.rs

···

       6
       6
        
       

     

       7
       7
        
       use insert::macro_insert;

     

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

     

       9
       9
       -
       use simple_macros::{macro_clear, macro_filename, macro_filename_cannonical, macro_time};

     

       9
       9
       +
       use simple_macros::{macro_clear, macro_filename, macro_filename_canonical, macro_time};

     

       10
       10
        
       use template::macro_template;

     

       11
       11
        
       

     

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

     
···

       32
       32
        
               has_scope: false,

     

       33
       33
        
           },

     

       34
       34
        
           Macro {

     

       35
       35
       -
               symbol: "filename_cannonical",

     

       36
       36
       -
               expand: macro_filename_cannonical,

     

       35
       35
       +
               symbol: "filename_canonical",

     

       36
       36
       +
               expand: macro_filename_canonical,

     

       37
       37
        
               has_scope: false,

     

       38
       38
        
           },

     

       39
       39
        
           // Scoped

+2

src/macros/simple_blocks.rs

···

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

     

       2
       2
       +
       

     

       1
       3
        
       use crate::{

     

       2
       4
        
           projectparse::ProjectContext,

     

       3
       5
        
           types::{InputFile, Token},

+1 -1

src/macros/simple_macros.rs

···

       69
       69
        
           );

     

       70
       70
        
       }

     

       71
       71
        
       

     

       72
       72
       -
       pub fn macro_filename_cannonical(

     

       72
       72
       +
       pub fn macro_filename_canonical(

     

       73
       73
        
           _file: &mut InputFile,

     

       74
       74
        
           origin_index: usize,

     

       75
       75
        
           _origin_line: usize,

+2 -2

src/projectparse.rs

···

       171
       171
        
       pub trait FileIndexing {

     

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

     

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

     

       174
       174
       -
           fn file_for_index_cannonical(&self, i: usize) -> Option<&PathBuf>;

     

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

     

       175
       175
        
       }

     

       176
       176
        
       

     

       177
       177
        
       impl FileIndexing for ProjectContext {

     
···

       196
       196
        
               return Some(path.unwrap().to_path_buf());

     

       197
       197
        
           }

     

       198
       198
        
       

     

       199
       199
       -
           fn file_for_index_cannonical(&self, i: usize) -> Option<&PathBuf> {

     

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

     

       200
       200
        
               if i >= self.filemap.len() {

     

       201
       201
        
                   return None;

     

       202
       202
        
               }