commit 86bf06e72f204d6ff7d0d9579cbdb2a9b3c887fa · tholps.site/skidmark

+17 -4

src/main.rs

···

       7
       7
        
           include::{self, macro_include},

     

       8
       8
        
           MACRO_LIST,

     

       9
       9
        
       };

     

       10
       10
       +
       use markdown::{to_html_with_options, CompileOptions, Options};

     

       10
       11
        
       use std::{

     

       11
       12
        
           env,

     

       12
       13
        
           fs::{self, File},

     

       13
       14
        
           io::Write,

     

       14
       15
        
           process::{exit, Output},

     

       15
       16
        
       };

     

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

     

       17
       17
       +
       use stringtools::{collect_arguments, split_keep_delimiters, split_to_tokens, strings_to_tokens};

     

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

     

       18
       18
       -
       use markdown::{to_html_with_options, CompileOptions, Options};

     

       19
       19
        
       

     

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

     

       21
       21
        
       

     
···

       41
       41
        
           let contents = fs::read_to_string(&file.filename_input).expect("File unreadable or missing");

     

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

     

       43
       43
        
       

     

       44
       44
       -
           file.tokens = strings_to_tokens(split_keep_delimiters(contents), file.filename_input.clone());

     

       44
       44
       +
           //file.tokens = strings_to_tokens(split_keep_delimiters(contents), file.filename_input.clone());

     

       45
       45
       +
           file.tokens = split_to_tokens(contents, file.filename_input.clone());

     

       45
       46
        
       

     

       46
       47
        
           let mut index = 0;

     

       47
       48
        
       

     
···

       95
       96
        
           }

     

       96
       97
        
           fs::write(&file.filename_skidout, &skid_output).expect("Couldn't write skid to file");

     

       97
       98
        
       

     

       98
       98
       -
           let html_output = markdown::to_html_with_options(&skid_output, &Options::gfm()).unwrap();

     

       99
       99
       +
           //let html_output = markdown::to_html(&skid_output);

     

       100
       100
       +
           let html_output = markdown::to_html_with_options(

     

       101
       101
       +
               &skid_output,

     

       102
       102
       +
               &Options {

     

       103
       103
       +
                   compile: CompileOptions {

     

       104
       104
       +
                       allow_dangerous_html: true,

     

       105
       105
       +
                       allow_dangerous_protocol: true,

     

       106
       106
       +
                       ..CompileOptions::gfm()

     

       107
       107
       +
                   },

     

       108
       108
       +
                   ..Options::gfm()

     

       109
       109
       +
               },

     

       110
       110
       +
           )

     

       111
       111
       +
           .unwrap();

     

       99
       112
        
           fs::write(&file.filename_htmlout, &html_output).expect("Couldn't write html to file");

     

       100
       113
        
       }

+27 -7

src/stringtools.rs

···

       1
       1
        
       use core::fmt;

     

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

     

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

     

       3
       3
        
       

     

       4
       4
        
       use super::DELIMITERS;

     

       5
       5
        
       use crate::types::Token;

     
···

       81
       81
        
           return output;

     

       82
       82
        
       }

     

       83
       83
        
       

     

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

     

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

     

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

     

       86
       86
       -
           let mut linecount: u32 = 1;

     

       86
       86
       +
           let mut line_count: u32 = 1;

     

       87
       87
        
       

     

       88
       88
       -
           for str in instrings {

     

       89
       89
       -
               let currentline = linecount;

     

       88
       88
       +
           for str in in_strings {

     

       89
       89
       +
               let current_line = line_count;

     

       90
       90
        
               for char in str.chars() {

     

       91
       91
        
                   if char == '\n' {

     

       92
       92
       -
                       linecount += 1;

     

       92
       92
       +
                       line_count += 1;

     

       93
       93
        
                   }

     

       94
       94
        
               }

     

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

     

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

     

       96
       96
        
               tokens.push(token);

     

       97
       97
        
           }

     

       98
       98
        
       

     

       99
       99
        
           return tokens;

     

       100
       100
        
       }

     

       101
       101
       +
       

     

       102
       102
       +
       // Need to do some special case stuff so you can macros without spaces between

     

       103
       103
       +
       pub fn split_to_tokens(instr: String, origin_file: String) -> Vec<Token> {

     

       104
       104
       +
           let split = split_keep_delimiters(instr);

     

       105
       105
       +
           let mut new_split: Vec<String> = Vec::new();

     

       106
       106
       +
           for s in split {

     

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

     

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

     

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

     

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

     

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

     

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

     

       113
       113
       +
               } else {

     

       114
       114
       +
                   new_split.push(s);

     

       115
       115
       +
               }

     

       116
       116
       +
               //sleep(std::time::Duration::from_millis(10));

     

       117
       117
       +
           }

     

       118
       118
       +
           return strings_to_tokens(new_split, origin_file);

     

       119
       119
       +
       }

     

       120
       120
       +
       

     

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

     

       102
       122
        
           while index < tokens.len() {

     

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