From 75e6dbfbe6cbd3c3245c825627881a16bfbd6c5d Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Sat, 3 Oct 2020 11:18:25 +0200
Subject: =?UTF-8?q?Rename=20bold/italic=20to=20strong/emph=20=E2=9C=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/parse/mod.rs   | 4 ++--
 src/parse/tests.rs | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/parse')

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]]"   => );
-- 
cgit v1.2.3