commit fdd1aaef3255ae2beeed5e338130ac54b8e6c1c2 · tholps.site/skidmark

.gitignore

Cargo.toml

···

       1
       1
       +
       [package]

     

       2
       2
       +
       name = "skidmark"

     

       3
       3
       +
       version = "0.1.0"

     

       4
       4
       +
       edition = "2021"

     

       5
       5
       +
       

     

       6
       6
       +
       [dependencies]

     

       7
       7
       +
       markdown = "0.3.0"

a.sk

···

       1
       1
       +
       Skidmark progress: functions are prefixed with '!'

     

       2
       2
       +
       theres currently only one so far and its !include("b.sk")

     

       3
       3
       +

b.sk

···

       1
       1
       +
       used to include files inside other files, isnt that cool?

     

       2
       2
       +
       

     

       3
       3
       +
       Functions prefixed with '&' are "Ephemeral" and will only be expanded if it comes from within the same file thats being proccessed

     

       4
       4
       +
       &include("c.sk")

c.sk

src/blocktypes/mod.rs

···

       1
       1
       +
       //pub mod include;

+10

src/error.rs

···

       1
       1
       +
       pub fn exit_error(msg : String)

     

       2
       2
       +
       {

     

       3
       3
       +
           println!("[Error]" + msg);

     

       4
       4
       +
           exit(1);

     

       5
       5
       +
       }

     

       6
       6
       +
       

     

       7
       7
       +
       pub fn warn(msg: String)

     

       8
       8
       +
       {

     

       9
       9
       +
           

     

       10
       10
       +
       }

+17

src/macros/include.rs

···

       1
       1
       +
       use std::{env::Args, fs};

     

       2
       2
       +
       

     

       3
       3
       +
       use crate::{

     

       4
       4
       +
           stringtools::{split_keep_delimiters, strings_to_tokens},

     

       5
       5
       +
           types::{InputFile, Token},

     

       6
       6
       +
       };

     

       7
       7
       +
       

     

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

     

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

     

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

     

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

     

       12
       12
       +
               output.pop();

     

       13
       13
       +
           } //remove trailing newline

     

       14
       14
       +
       

     

       15
       15
       +
           let split_output = split_keep_delimiters(output);

     

       16
       16
       +
           return strings_to_tokens(split_output, args[0].clone());

     

       17
       17
       +
       }

+10

src/macros/mod.rs

···

       1
       1
       +
       pub mod include;

     

       2
       2
       +
       use super::types::Macro;

     

       3
       3
       +
       

     

       4
       4
       +
       use include::macro_include;

     

       5
       5
       +
       

     

       6
       6
       +
       pub static MACRO_LIST: [Macro<'_>; 1] = [Macro {

     

       7
       7
       +
           symbol: "include",

     

       8
       8
       +
           expand: macro_include,

     

       9
       9
       +
           //always_ephemeral: false,

     

       10
       10
       +
       }];

+95

src/main.rs

···

       1
       1
       +
       mod blocktypes;

     

       2
       2
       +
       mod macros;

     

       3
       3
       +
       mod stringtools;

     

       4
       4
       +
       mod types;

     

       5
       5
       +
       

     

       6
       6
       +
       use macros::{

     

       7
       7
       +
           include::{self, macro_include},

     

       8
       8
       +
           MACRO_LIST,

     

       9
       9
       +
       };

     

       10
       10
       +
       use std::{

     

       11
       11
       +
           env,

     

       12
       12
       +
           fs::{self, File},

     

       13
       13
       +
           io::Write,

     

       14
       14
       +
           process::{exit, Output},

     

       15
       15
       +
       };

     

       16
       16
       +
       use stringtools::{collect_arguments, split_keep_delimiters, strings_to_tokens};

     

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

     

       18
       18
       +
       

     

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

     

       20
       20
       +
       

     

       21
       21
       +
       fn main() {

     

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

     

       23
       23
       +
           let mut args: Vec<String> = env::args().collect();

     

       24
       24
       +
           args.remove(0);

     

       25
       25
       +
       

     

       26
       26
       +
           for file in args.iter() {

     

       27
       27
       +
               let mut new_file = types::InputFile::new();

     

       28
       28
       +
               new_file.filename_in = file.to_string();

     

       29
       29
       +
               new_file.filename_out = file.to_string() + ".out";

     

       30
       30
       +
               files.push(new_file);

     

       31
       31
       +
           }

     

       32
       32
       +
           println!("{:?}", args);

     

       33
       33
       +
           for f in &mut files {

     

       34
       34
       +
               process_file(f);

     

       35
       35
       +
           }

     

       36
       36
       +
       }

     

       37
       37
       +
       

     

       38
       38
       +
       fn process_file(file: &mut InputFile) {

     

       39
       39
       +
           let contents = fs::read_to_string(&file.filename_in).expect("File unreadable or missing");

     

       40
       40
       +
           //println!("{}\n {}", f.filename_out, contents);

     

       41
       41
       +
       

     

       42
       42
       +
           file.tokens = strings_to_tokens(split_keep_delimiters(contents), file.filename_in.clone());

     

       43
       43
       +
       

     

       44
       44
       +
           let mut index = 0;

     

       45
       45
       +
       

     

       46
       46
       +
           while index < file.tokens.len() {

     

       47
       47
       +
               //look for macros or blocks

     

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

     

       49
       49
       +
       

     

       50
       50
       +
               if file.tokens[index].contents.starts_with(['!', '&']) {

     

       51
       51
       +
                   let mut matched = false;

     

       52
       52
       +
       

     

       53
       53
       +
                   for m in &MACRO_LIST {

     

       54
       54
       +
                       if &file.tokens[index].contents.trim()[1..] == m.symbol {

     

       55
       55
       +
                           matched = true;

     

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

     

       57
       57
       +
                           let mut ephemeral = false;

     

       58
       58
       +
                           if file.tokens[index].contents.starts_with('&')

     

       59
       59
       +
                               && file.tokens[index].origin_file != file.filename_in

     

       60
       60
       +
                           {

     

       61
       61
       +
                               println!("Skipping Ephermal macro from included file.");

     

       62
       62
       +
                               ephemeral = true;

     

       63
       63
       +
                           }

     

       64
       64
       +
       

     

       65
       65
       +
                           let (args, tokcount) = collect_arguments(&file.tokens[index..]);

     

       66
       66
       +
                           let expansion: Vec<Token>;

     

       67
       67
       +
                           if ephemeral {

     

       68
       68
       +
                               expansion = Vec::new();

     

       69
       69
       +
                           } else {

     

       70
       70
       +
                               expansion = (m.expand)(&file, &args);

     

       71
       71
       +
                           }

     

       72
       72
       +
                           file.tokens.remove(index);

     

       73
       73
       +
                           file.tokens.splice(index..(index + tokcount - 1), expansion);

     

       74
       74
       +
                       }

     

       75
       75
       +
                   }

     

       76
       76
       +
       

     

       77
       77
       +
                   // for b in  &BLOCK_LIST {}

     

       78
       78
       +
       

     

       79
       79
       +
                   if !matched {

     

       80
       80
       +
                       println!(

     

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

     

       82
       82
       +
                           file.tokens[index].contents.trim()

     

       83
       83
       +
                       );

     

       84
       84
       +
                   }

     

       85
       85
       +
               }

     

       86
       86
       +
       

     

       87
       87
       +
               index += 1;

     

       88
       88
       +
           }

     

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

     

       90
       90
       +
           let mut full_output: String = "".to_string();

     

       91
       91
       +
           for t in &file.tokens {

     

       92
       92
       +
               full_output += &t.contents;

     

       93
       93
       +
           }

     

       94
       94
       +
           fs::write(&file.filename_out, full_output).expect("Couldn't write to file");

     

       95
       95
       +
       }

+124

src/stringtools.rs

···

       1
       1
       +
       use core::fmt;

     

       2
       2
       +
       use std::{fmt::Arguments, ops::Index, process::exit};

     

       3
       3
       +
       

     

       4
       4
       +
       use super::DELIMITERS;

     

       5
       5
       +
       use crate::types::Token;

     

       6
       6
       +
       

     

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

     

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

     

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

     

       10
       10
       +
           for tok in tokens {

     

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

     

       12
       12
       +
                   split_tokens.push(s);

     

       13
       13
       +
               }

     

       14
       14
       +
           }

     

       15
       15
       +
       

     

       16
       16
       +
           let mut quoted: bool = false;

     

       17
       17
       +
           let mut entered: bool = false;

     

       18
       18
       +
           let mut arg = "".to_string();

     

       19
       19
       +
           let mut args: Vec<String> = Vec::new();

     

       20
       20
       +
       

     

       21
       21
       +
           let mut in_token_count = 0;

     

       22
       22
       +
       

     

       23
       23
       +
           for tok in split_tokens {

     

       24
       24
       +
               in_token_count += 1;

     

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

     

       26
       26
       +
                   continue;

     

       27
       27
       +
               }

     

       28
       28
       +
       

     

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

     

       30
       30
       +
                   entered = true;

     

       31
       31
       +
                   continue;

     

       32
       32
       +
               }

     

       33
       33
       +
       

     

       34
       34
       +
               if !entered {

     

       35
       35
       +
                   continue;

     

       36
       36
       +
               }

     

       37
       37
       +
       

     

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

     

       39
       39
       +
                   break;

     

       40
       40
       +
               }

     

       41
       41
       +
       

     

       42
       42
       +
               let mut i = 0;

     

       43
       43
       +
               while i < tok.len() {

     

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

     

       45
       45
       +
                   i += 1;

     

       46
       46
       +
       

     

       47
       47
       +
                   if c == '\"' {

     

       48
       48
       +
                       quoted = !quoted;

     

       49
       49
       +
                       continue;

     

       50
       50
       +
                   }

     

       51
       51
       +
       

     

       52
       52
       +
                   arg.push(c);

     

       53
       53
       +
               }

     

       54
       54
       +
       

     

       55
       55
       +
               if !quoted {

     

       56
       56
       +
                   args.push(arg.clone());

     

       57
       57
       +
                   arg.clear();

     

       58
       58
       +
               }

     

       59
       59
       +
           }

     

       60
       60
       +
       

     

       61
       61
       +
           return (args, in_token_count);

     

       62
       62
       +
       }

     

       63
       63
       +
       

     

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

     

       65
       65
       +
       // clean it up a bit here

     

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

     

       67
       67
       +
           let split: Vec<&str> = instr.split_inclusive(DELIMITERS).collect();

     

       68
       68
       +
           let mut output = Vec::new();

     

       69
       69
       +
       

     

       70
       70
       +
           for s in split {

     

       71
       71
       +
               if s.ends_with(DELIMITERS) {

     

       72
       72
       +
                   let (token, ending) = s.split_at(s.len() - 1);

     

       73
       73
       +
                   if token.len() > 0 {

     

       74
       74
       +
                       output.push(token.to_string());

     

       75
       75
       +
                   }

     

       76
       76
       +
                   output.push(ending.to_string());

     

       77
       77
       +
               } else {

     

       78
       78
       +
                   output.push(s.to_string());

     

       79
       79
       +
               }

     

       80
       80
       +
           }

     

       81
       81
       +
           return output;

     

       82
       82
       +
       }

     

       83
       83
       +
       

     

       84
       84
       +
       pub fn strings_to_tokens(instrings: Vec<String>, origin_file: String) -> Vec<Token> {

     

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

     

       86
       86
       +
           let mut linecount: u32 = 1;

     

       87
       87
       +
       

     

       88
       88
       +
           for str in instrings {

     

       89
       89
       +
               let currentline = linecount;

     

       90
       90
       +
               for char in str.chars() {

     

       91
       91
       +
                   if char == '\n' {

     

       92
       92
       +
                       linecount += 1;

     

       93
       93
       +
                   }

     

       94
       94
       +
               }

     

       95
       95
       +
               let token: Token = Token::new(str, origin_file.clone(), currentline);

     

       96
       96
       +
               tokens.push(token);

     

       97
       97
       +
           }

     

       98
       98
       +
       

     

       99
       99
       +
           return tokens;

     

       100
       100
       +
       }

     

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

     

       102
       102
       +
           while index < tokens.len() {

     

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

     

       104
       104
       +
                   continue;

     

       105
       105
       +
               }

     

       106
       106
       +
               return (true, index);

     

       107
       107
       +
           }

     

       108
       108
       +
           return (false, 0);

     

       109
       109
       +
       }

     

       110
       110
       +
       

     

       111
       111
       +
       pub trait IsDelimiter {

     

       112
       112
       +
           fn is_delimiter(&self) -> bool;

     

       113
       113
       +
       }

     

       114
       114
       +
       

     

       115
       115
       +
       impl IsDelimiter for char {

     

       116
       116
       +
           fn is_delimiter(&self) -> bool {

     

       117
       117
       +
               for d in DELIMITERS {

     

       118
       118
       +
                   if *self == d {

     

       119
       119
       +
                       return true;

     

       120
       120
       +
                   }

     

       121
       121
       +
               }

     

       122
       122
       +
               return false;

     

       123
       123
       +
           }

     

       124
       124
       +
       }

+61

src/types.rs

···

       1
       1
       +
       use std::sync::Mutex;

     

       2
       2
       +
       

     

       3
       3
       +
       pub struct Token {

     

       4
       4
       +
           pub contents: String,

     

       5
       5
       +
           pub origin_file: String,

     

       6
       6
       +
           pub line_number: u32,

     

       7
       7
       +
       }

     

       8
       8
       +
       

     

       9
       9
       +
       pub enum BlockEdgeType {

     

       10
       10
       +
           FileStart,

     

       11
       11
       +
           FileEnd,

     

       12
       12
       +
           Start,

     

       13
       13
       +
           End,

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       // A 'Block' is what im calling the enclosed scope of a macro

     

       17
       17
       +
       pub struct BlockEdge {

     

       18
       18
       +
           pub edge_type: BlockEdgeType,

     

       19
       19
       +
           pub tokens_to_next_edge: u64,

     

       20
       20
       +
       }

     

       21
       21
       +
       

     

       22
       22
       +
       pub struct InputFile {

     

       23
       23
       +
           pub filename_in: String,

     

       24
       24
       +
           pub filename_out: String,

     

       25
       25
       +
           pub tokens: Vec<Token>,

     

       26
       26
       +
           pub block_edges: Vec<BlockEdge>,

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

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

     

       30
       30
       +
       pub struct Macro<'a> {

     

       31
       31
       +
           pub symbol: &'a str,

     

       32
       32
       +
           pub expand: MacroExpansion,

     

       33
       33
       +
           //pub always_ephemeral: bool, // This wont be included from other files

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       36
       36
       +
       impl InputFile {

     

       37
       37
       +
           pub fn new() -> InputFile {

     

       38
       38
       +
               InputFile {

     

       39
       39
       +
                   filename_in: "".to_string(),

     

       40
       40
       +
                   filename_out: "".to_string(),

     

       41
       41
       +
                   tokens: Vec::new(),

     

       42
       42
       +
                   block_edges: Vec::new(),

     

       43
       43
       +
               }

     

       44
       44
       +
           }

     

       45
       45
       +
       }

     

       46
       46
       +
       

     

       47
       47
       +
       impl Token {

     

       48
       48
       +
           pub fn new(contents: String, origin_file: String, line_number: u32) -> Token {

     

       49
       49
       +
               Token {

     

       50
       50
       +
                   contents: contents,

     

       51
       51
       +
                   origin_file: origin_file,

     

       52
       52
       +
                   line_number: line_number,

     

       53
       53
       +
               }

     

       54
       54
       +
           }

     

       55
       55
       +
       }

     

       56
       56
       +
       

     

       57
       57
       +
       impl ToString for Token {

     

       58
       58
       +
           fn to_string(&self) -> String {

     

       59
       59
       +
               return self.contents.clone();

     

       60
       60
       +
           }

     

       61
       61
       +
       }