summaryrefslogtreecommitdiff
path: root/src/parse
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2020-10-03 11:18:25 +0200
committerLaurenz <laurmaedje@gmail.com>2020-10-03 11:18:25 +0200
commit75e6dbfbe6cbd3c3245c825627881a16bfbd6c5d (patch)
tree587b57e5ab09b72ca0d2a5c25cf2cb8f8579303e /src/parse
parent730715c064294337ee9befc3b9332d45eb74818f (diff)
Rename bold/italic to strong/emph ✏
Diffstat (limited to 'src/parse')
-rw-r--r--src/parse/mod.rs4
-rw-r--r--src/parse/tests.rs8
2 files changed, 5 insertions, 7 deletions
diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index 395090af..42102bf5 100644
--- a/src/parse/mod.rs
+++ b/src/parse/mod.rs
@@ -62,8 +62,8 @@ fn node(p: &mut Parser, at_start: bool) -> Option<Spanned<SynNode>> {
Token::LineComment(_) | Token::BlockComment(_) => return None,
// Markup.
- Token::Star => SynNode::ToggleBolder,
- Token::Underscore => SynNode::ToggleItalic,
+ Token::Star => SynNode::Strong,
+ Token::Underscore => SynNode::Emph,
Token::Backslash => SynNode::Linebreak,
Token::Hashtag => {
if at_start {
diff --git a/src/parse/tests.rs b/src/parse/tests.rs
index a1b1fb13..feff2b9a 100644
--- a/src/parse/tests.rs
+++ b/src/parse/tests.rs
@@ -13,9 +13,7 @@ use crate::syntax::*;
// ------------------------------ Construct Syntax Nodes ------------------------------ //
use Decoration::*;
-use SynNode::{
- Linebreak as L, Parbreak as P, Space as S, ToggleBolder as B, ToggleItalic as I,
-};
+use SynNode::{Emph as E, Linebreak as L, Parbreak as P, Space as S, Strong as B};
fn T(text: &str) -> SynNode {
SynNode::Text(text.to_string())
@@ -230,7 +228,7 @@ fn test_parse_simple_nodes() {
t!("" => );
t!("hi" => T("hi"));
t!("*hi" => B, T("hi"));
- t!("hi_" => T("hi"), I);
+ t!("hi_" => T("hi"), E);
t!("hi you" => T("hi"), S, T("you"));
t!("special~name" => T("special"), T("\u{00A0}"), T("name"));
t!("special\\~name" => T("special"), T("~"), T("name"));
@@ -415,7 +413,7 @@ fn test_parse_values() {
v!("\"a\n[]\\\"string\"" => Str("a\n[]\"string"));
// Content.
- v!("{_hi_}" => Tree![I, T("hi"), I]);
+ v!("{_hi_}" => Tree![E, T("hi"), E]);
e!("[val: {_hi_}]" => );
v!("[hi]" => Tree![F!("hi")]);
e!("[val: [hi]]" => );