Trivernis
/
snekdown
mirror of https://github.com/Trivernis/snekdown.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change image syntax

Browse Source
pull/1/head
trivernis 5 years ago
parent d8f12df8e6
commit e32073fb4b
5 changed files with 120 additions and 70 deletions
Show Stats Download Patch File Download Diff File

52
Cargo.lock generated
Unescape Escape View File

@ -1,6 +1,58 @@
# This file is automatically @generated by Cargo. # This file is automatically @generated by Cargo.
# It is not intended for manual editing. # It is not intended for manual editing.
[[package]]
name = "aho-corasick"
version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "markdown-rs" name = "markdown-rs"
version = "0.1.0" version = "0.1.0"
dependencies = [
"regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "memchr"
version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "regex"
version = "1.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
"memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)",
"thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "regex-syntax"
version = "0.6.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "thread_local"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[metadata]
"checksum aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
"checksum regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
"checksum regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"

1
Cargo.toml
Unescape Escape View File

@ -7,3 +7,4 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
regex = "1.3.9"

6
src/elements.rs
Unescape Escape View File

@ -140,7 +140,7 @@ pub struct MonospaceText {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct Url { pub struct Url {
title: String, description: Option<String>,
url: String, url: String,
} }
@ -251,8 +251,8 @@ impl Row {
} }
impl Url { impl Url {
pub fn new(title: String, url: String) -> Self { pub fn new(description: Option<String>, url: String) -> Self {
Self { title, url } Self { description, url }
} }
} }

113
src/parser.rs
Unescape Escape View File

@ -1,5 +1,6 @@
use crate::elements::*; use crate::elements::*;
use crate::tokens::*; use crate::tokens::*;
use regex::Regex;
use std::error::Error; use std::error::Error;
use std::fmt; use std::fmt;
use std::fmt::{Display, Formatter}; use std::fmt::{Display, Formatter};
@ -73,6 +74,17 @@ impl Parser {
} }
} }
/// reverts and returns a parse error
fn revert_with_error(&mut self, index: usize) -> ParseError {
let err = ParseError::new(self.index);
if let Err(revert_err) = self.revert_to(index) {
revert_err
} else {
err
}
}
/// Skips characters until it encounters a character /// Skips characters until it encounters a character
/// that isn't an inline whitespace character /// that isn't an inline whitespace character
fn seek_inline_whitespace(&mut self) { fn seek_inline_whitespace(&mut self) {
@ -140,15 +152,10 @@ impl Parser {
self.seek_whitespace(); self.seek_whitespace();
for sq_character in sequence { for sq_character in sequence {
if !self.check_special(sq_character) { if !self.check_special(sq_character) {
let err = ParseError::new(self.index); return Err(self.revert_with_error(start_index));
self.revert_to(start_index)?;
// should work
return Err(err);
} }
if self.next_char() == None { if self.next_char() == None {
let err = ParseError::new(self.index); return Err(self.revert_with_error(start_index));
self.revert_to(start_index)?;
return Err(err);
} }
} }
if self.index > 0 { if self.index > 0 {
@ -214,12 +221,10 @@ impl Parser {
} }
} }
if size <= self.section_nesting || !self.current_char.is_whitespace() { if size <= self.section_nesting || !self.current_char.is_whitespace() {
let index = self.index;
if size <= self.section_nesting { if size <= self.section_nesting {
self.section_return = Some(size); self.section_return = Some(size);
} }
self.revert_to(start_index)?; return Err(self.revert_with_error(start_index));
return Err(ParseError::new(index));
} }
self.seek_inline_whitespace(); self.seek_inline_whitespace();
let mut header = self.parse_header()?; let mut header = self.parse_header()?;
@ -234,9 +239,7 @@ impl Parser {
self.section_nesting -= 1; self.section_nesting -= 1;
Ok(section) Ok(section)
} else { } else {
let error_index = self.index; return Err(self.revert_with_error(start_index));
self.revert_to(start_index)?;
Err(ParseError::new(error_index))
} }
} }
@ -283,9 +286,7 @@ impl Parser {
}; };
if self.check_special(&META_CLOSE) { if self.check_special(&META_CLOSE) {
if self.next_char() == None { if self.next_char() == None {
let err = ParseError::new(start_index); return Err(self.revert_with_error(start_index));
self.revert_to(start_index)?;
return Err(err);
} }
} }
let mut quote = Quote::new(metadata); let mut quote = Quote::new(metadata);
@ -301,9 +302,7 @@ impl Parser {
} }
} }
if quote.text.len() == 0 { if quote.text.len() == 0 {
let err = ParseError::new(self.index); return Err(self.revert_with_error(start_index));
self.revert_to(start_index)?;
return Err(err);
} }
Ok(quote) Ok(quote)
@ -314,19 +313,21 @@ impl Parser {
fn parse_inline_metadata(&mut self) -> Result<InlineMetadata, ParseError> { fn parse_inline_metadata(&mut self) -> Result<InlineMetadata, ParseError> {
let start_index = self.index; let start_index = self.index;
if !self.check_special(&META_OPEN) { if !self.check_special(&META_OPEN) {
// if no meta open tag is present, the parsing has failed
return Err(ParseError::new(self.index)); return Err(ParseError::new(self.index));
} }
let mut text = String::new(); let mut text = String::new();
while let Some(character) = self.next_char() { while let Some(character) = self.next_char() {
if self.check_special(&META_CLOSE) || self.check_linebreak() { if self.check_special(&META_CLOSE) || self.check_linebreak() {
// abort the parsing of the inner content when encountering a closing tag or linebreak
break; break;
} }
text.push(character); text.push(character);
} }
if self.check_linebreak() || text.len() == 0 { if self.check_linebreak() || text.len() == 0 {
let err = ParseError::new(self.index); // if there was a linebreak (the metadata wasn't closed) or there is no inner data
self.revert_to(start_index)?; // return an error
return Err(err); return Err(self.revert_with_error(start_index));
} }
Ok(InlineMetadata { data: text }) Ok(InlineMetadata { data: text })
@ -413,8 +414,7 @@ impl Parser {
if list.items.len() > 0 { if list.items.len() > 0 {
Ok(list) Ok(list)
} else { } else {
self.revert_to(start_index)?; return Err(self.revert_with_error(start_index));
Err(ParseError::new(self.index))
} }
} }
@ -425,9 +425,7 @@ impl Parser {
let level = self.index - start_index; let level = self.index - start_index;
if !self.check_special_group(&LIST_SPECIAL_CHARS) && !self.current_char.is_numeric() { if !self.check_special_group(&LIST_SPECIAL_CHARS) && !self.current_char.is_numeric() {
let err = ParseError::new(self.index); return Err(self.revert_with_error(start_index));
self.revert_to(start_index)?;
return Err(err);
} }
while let Some(character) = self.next_char() { while let Some(character) = self.next_char() {
if character.is_whitespace() { if character.is_whitespace() {
@ -435,9 +433,7 @@ impl Parser {
} }
} }
if self.next_char() == None { if self.next_char() == None {
let err = ParseError::new(self.index); return Err(self.revert_with_error(start_index));
self.revert_to(start_index)?;
return Err(err);
} }
self.seek_inline_whitespace(); self.seek_inline_whitespace();
let item = ListItem::new(self.parse_inline()?, level as u16); let item = ListItem::new(self.parse_inline()?, level as u16);
@ -451,9 +447,7 @@ impl Parser {
self.seek_whitespace(); self.seek_whitespace();
if self.check_special(&MINUS) { if self.check_special(&MINUS) {
if self.next_char() != Some(PIPE) { if self.next_char() != Some(PIPE) {
let err_index = self.index; return Err(self.revert_with_error(start_index));
self.revert_to(start_index)?;
return Err(ParseError::new(err_index));
} }
} }
while let Some(char) = self.next_char() { while let Some(char) = self.next_char() {
@ -479,13 +473,10 @@ impl Parser {
if self.check_special(&PIPE) { if self.check_special(&PIPE) {
if self.next_char() == None { if self.next_char() == None {
let err_index = self.index; return Err(self.revert_with_error(start_index));
self.revert_to(start_index)?;
return Err(ParseError::new(err_index));
} }
} else { } else {
self.revert_to(start_index)?; return Err(self.revert_with_error(start_index));
return Err(ParseError::new(self.index));
} }
let mut row = Row::new(); let mut row = Row::new();
while let Ok(element) = self.parse_inline() { while let Ok(element) = self.parse_inline() {
@ -503,12 +494,11 @@ impl Parser {
if row.cells.len() > 0 { if row.cells.len() > 0 {
Ok(row) Ok(row)
} else { } else {
let current_index = self.index; return Err(self.revert_with_error(start_index));
self.revert_to(start_index)?;
Err(ParseError::new(current_index))
} }
} }
/// parses inline definitions
fn parse_inline(&mut self) -> Result<Inline, ParseError> { fn parse_inline(&mut self) -> Result<Inline, ParseError> {
if self.index > self.text.len() { if self.index > self.text.len() {
Err(ParseError::new(self.index)) Err(ParseError::new(self.index))
@ -536,7 +526,11 @@ impl Parser {
Ok(text) Ok(text)
} }
/// parses subtext, the formatting parts of a line (Text)
fn parse_subtext(&mut self) -> Result<SubText, ParseError> { fn parse_subtext(&mut self) -> Result<SubText, ParseError> {
if self.check_linebreak() {
return Err(ParseError::new(self.index));
}
if let Ok(url) = self.parse_url() { if let Ok(url) = self.parse_url() {
return Ok(SubText::Url(url)); return Ok(SubText::Url(url));
} }
@ -590,7 +584,7 @@ impl Parser {
} }
Ok(SubText::Monospace(MonospaceText { value: plain_text })) Ok(SubText::Monospace(MonospaceText { value: plain_text }))
} }
LB | PIPE if !self.check_escaped() => Err(ParseError::new(self.index)), PIPE if !self.check_escaped() => Err(ParseError::new(self.index)), // handling of table cells
_ => Ok(SubText::Plain(self.parse_plain_text()?)), _ => Ok(SubText::Plain(self.parse_plain_text()?)),
} }
} }
@ -600,30 +594,24 @@ impl Parser {
let start_index = self.index; let start_index = self.index;
self.seek_inline_whitespace(); self.seek_inline_whitespace();
if !self.check_special(&R_BRACKET) { let mut description = String::new();
let err = ParseError::new(self.index); if self.check_special(&R_BRACKET) {
self.revert_to(start_index)?;
return Err(err);
}
let mut title = String::new();
while let Some(character) = self.next_char() { while let Some(character) = self.next_char() {
if self.check_special(&L_BRACKET) || self.check_linebreak() { if self.check_special(&L_BRACKET) || self.check_linebreak() {
break; break;
} }
title.push(character); description.push(character);
} }
if !self.check_special(&L_BRACKET) { if !self.check_special(&L_BRACKET) {
// it stopped at a linebreak or EOF // it stopped at a linebreak or EOF
let err = ParseError::new(self.index); return Err(self.revert_with_error(start_index));
self.revert_to(start_index)?; }
return Err(err);
} }
if let Some(_) = self.next_char() { if let Some(_) = self.next_char() {
if !self.check_special(&R_PARENTH) { if !self.check_special(&R_PARENTH) {
// the next char isn't the start of the encased url // the next char isn't the start of the encased url
let err = ParseError::new(self.index); return Err(self.revert_with_error(start_index));
self.revert_to(start_index)?;
return Err(err);
} }
} }
self.seek_inline_whitespace(); self.seek_inline_whitespace();
@ -635,19 +623,22 @@ impl Parser {
url.push(character); url.push(character);
} }
if !self.check_special(&L_PARENTH) || url.is_empty() { if !self.check_special(&L_PARENTH) || url.is_empty() {
let err = ParseError::new(self.index); return Err(self.revert_with_error(start_index));
self.revert_to(start_index)?;
return Err(err);
} }
parse_option!(self.next_char(), self.index); parse_option!(self.next_char(), self.index);
let matcher = Regex::new(EXPR_URI).unwrap();
if !matcher.is_match(&url) {
return Err(self.revert_with_error(start_index));
}
if title.is_empty() { if description.is_empty() {
Ok(Url::new(url.clone(), url)) Ok(Url::new(None, url))
} else { } else {
Ok(Url::new(title, url)) Ok(Url::new(Some(description), url))
} }
} }
/// parses plain text as a string until it encounters an unescaped special inline char
fn parse_plain_text(&mut self) -> Result<PlainText, ParseError> { fn parse_plain_text(&mut self) -> Result<PlainText, ParseError> {
let mut current_char = self.current_char; let mut current_char = self.current_char;
let mut characters = String::new(); let mut characters = String::new();

6
src/tokens.rs
Unescape Escape View File

@ -24,6 +24,8 @@ pub(crate) const SPECIAL_ESCAPE: char = BACKSLASH;
pub(crate) const META_OPEN: char = R_BRACKET; pub(crate) const META_OPEN: char = R_BRACKET;
pub(crate) const META_CLOSE: char = L_BRACKET; pub(crate) const META_CLOSE: char = L_BRACKET;
pub(crate) const QUOTE_START: char = GT; pub(crate) const QUOTE_START: char = GT;
pub(crate) const DESC_OPEN: char = R_BRACKET;
pub(crate) const DESC_CLOSE: char = L_BRACKET;
// groups // groups
@ -36,3 +38,7 @@ pub(crate) const LIST_SPECIAL_CHARS: [char; 4] = [MINUS, PLUS, ASTERISK, O];
// sequences // sequences
pub(crate) const SQ_CODE_BLOCK: [char; 3] = [BACKTICK, BACKTICK, BACKTICK]; pub(crate) const SQ_CODE_BLOCK: [char; 3] = [BACKTICK, BACKTICK, BACKTICK];
// expressions
pub(crate) const EXPR_URI: &str = r"^(https?://)?\w+\.\w+(.\w+)?$|^([\w, -.]+|\w:)?(/[\w, -.]+)+$";

Write Preview
Loading…
Cancel
Save