+7

src/macros/mod.rs

reviewed

··· 55 55 min_args: 0, 56 56 max_args: 1, 57 57 }, 58 58 + Macro { 59 59 + symbol: "groupname", 60 60 + expansion: macro_groupname, 61 61 + takes_block: false, 62 62 + min_args: 0, 63 63 + max_args: 0, 64 64 + }, 58 65 // Scoped 59 66 Macro { 60 67 symbol: "comment", // Removes its block

+11

src/macros/simple_macros.rs

reviewed

··· 120 120 reminder_skid(context, origin_index, origin_line, &args[0]); 121 121 Vec::new() 122 122 } 123 123 + 124 124 + pub fn macro_groupname( 125 125 + origin_index: usize, 126 126 + _origin_line: usize, 127 127 + context: &mut Project, 128 128 + skid_context: &mut SkidContext, 129 129 + _args: &Vec<String>, 130 130 + _scope: &[Token], 131 131 + ) -> Vec<Token> { 132 132 + split_to_tokens(context.filegroups[skid_context.group_id].name.clone(), origin_index) 133 133 + }

+1 -1

src/main.rs

reviewed

··· 88 88 .expect("File unreadable or missing"); 89 89 let tokens = split_to_tokens(contents, project.index_of_file(&file_input)); 90 90 91 91 - let mut skid_context = SkidContext::new(project.index_of_file(&file_input)); 91 91 + let mut skid_context = SkidContext::new(project.index_of_file(&file_input), i); 92 92 write_file( 93 93 &project.filegroups[i].files[k].file_skidout.clone(), 94 94 &project.filegroups[i].files[k].file_out.clone(),

+1 -1

src/stringtools.rs

reviewed

··· 294 294 if ret.is_err() { 295 295 error_skid( 296 296 proj_context, 297 297 - tokens[0].origin_index, 297 297 + tokens[0].template_origin, 298 298 tokens[0].origin_line, 299 299 &ret.err()?.to_string(), 300 300 );

+3 -1

src/types.rs

reviewed

··· 33 33 pub struct SkidContext { 34 34 pub templates: Vec<SkidTemplate>, 35 35 pub file_id: usize, 36 36 + pub group_id: usize, 36 37 pub lua: Lua, 37 38 } 38 39 39 40 impl SkidContext { 40 40 - pub fn new(file_id: usize) -> SkidContext { 41 41 + pub fn new(file_id: usize, group_id: usize) -> SkidContext { 41 42 SkidContext { 42 43 templates: Vec::new(), 43 44 file_id, 45 45 + group_id, 44 46 lua: Lua::new(), 45 47 } 46 48 }