diff options
author | Lars Wirzenius <liw@liw.fi> | 2022-08-06 04:59:36 +0000 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2022-08-06 04:59:36 +0000 |
commit | 454368dfbf11dad54567f004b94db90118bfc0b2 (patch) | |
tree | 14136e465198ea574f85d696698067aab0dc7a90 /src/token.rs | |
parent | 97b2307e4ae2223fb2f9020bfa49e0e8924a268f (diff) | |
parent | be85bae2e516ce3b2b7874e94e5bb4fea6c30754 (diff) | |
download | riki-454368dfbf11dad54567f004b94db90118bfc0b2.tar.gz |
Merge branch 'dummy-directives' into 'main'
fix: single-quoted values may also contain newlines
See merge request larswirzenius/riki!37
Diffstat (limited to 'src/token.rs')
-rw-r--r-- | src/token.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/token.rs b/src/token.rs index 76cd7b4..5109ce1 100644 --- a/src/token.rs +++ b/src/token.rs @@ -33,9 +33,9 @@ impl Default for TokenPatterns { fn default() -> Self { Self { plain: Regex::new(r#"(?P<value>[^\[]+)"#).unwrap(), - word: Regex::new(r#"[-._/[:alpha:][:digit:]]+"#).unwrap(), + word: Regex::new(r#"[-.:_/[:alpha:][:digit:]]+"#).unwrap(), spaces: Regex::new(r#"([[:space:]]|\n)+"#).unwrap(), - single_quoted: Regex::new(r#""(?P<value>.*?)""#).unwrap(), + single_quoted: Regex::new(r#""(?P<value>(.|\n)*?)""#).unwrap(), triple_quoted: Regex::new(r#""""(?P<value>(.|\n)*?)""""#).unwrap(), } } |