From 92bab910203495666c6bbb4504fc1286a8278b94 Mon Sep 17 00:00:00 2001
From: Shautvast <shautvast@gmail.com>
Date: Tue, 7 Jan 2025 15:58:35 +0100
Subject: [PATCH] Rename 'markup' to 'structure'

---
 examples/bank_architecture/bank.vis | 2 +-
 grammar.txt                         | 4 ++--
 src/lib.rs                          | 2 +-
 src/parser.rs                       | 6 +++---
 src/tokens.rs                       | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/bank_architecture/bank.vis b/examples/bank_architecture/bank.vis
index 1887b45..2889de1 100644
--- a/examples/bank_architecture/bank.vis
+++ b/examples/bank_architecture/bank.vis
@@ -1,4 +1,4 @@
-markup {
+structure {
   lanes {
     functions {
       calc: "Calculation"
diff --git a/grammar.txt b/grammar.txt
index 740bc9e..74a7fa3 100644
--- a/grammar.txt
+++ b/grammar.txt
@@ -1,5 +1,5 @@
-vis: markup | styles
-markup: "markup:" nodes
+vis: structure styles
+structure: "structure:" nodes
 elements: "{" element* "}"
 element: node | edge
 node: (id (":" title)? nodes?) | edgenode
diff --git a/src/lib.rs b/src/lib.rs
index 0d86b24..ae0a71c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,7 +8,7 @@ mod tokens;
 
 #[derive(Debug)]
 pub struct Vis {
-    pub markup: Vec<Element>,
+    pub structure: Vec<Element>,
     pub styles: Vec<StyleNode>,
 }
 
diff --git a/src/parser.rs b/src/parser.rs
index 620d90e..4574b9d 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -13,7 +13,7 @@ pub fn parse_vis(contents: &str) -> anyhow::Result<Vis> {
     let mut parser = Parser::new(tokens);
 
     Ok(Vis {
-        markup: parser.markup()?,
+        structure: parser.structure()?,
         styles: parser.styles()?,
     })
 }
@@ -28,8 +28,8 @@ impl Parser {
         Self { tokens, current: 0 }
     }
 
-    fn markup(&mut self) -> anyhow::Result<Vec<Element>> {
-        if self.match_token(Markup) {
+    fn structure(&mut self) -> anyhow::Result<Vec<Element>> {
+        if self.match_token(Structure) {
             self.elements()
         } else {
             Ok(vec![])
diff --git a/src/tokens.rs b/src/tokens.rs
index 41f436b..cd240a9 100644
--- a/src/tokens.rs
+++ b/src/tokens.rs
@@ -4,7 +4,7 @@ use TokenType::*;
 
 pub const KEYWORDS: LazyCell<HashMap<&str, TokenType>> = LazyCell::new(|| {
     let mut m = HashMap::new();
-    m.insert("markup", Markup);
+    m.insert("structure", Structure);
     m.insert("styles", Styles);
     m.insert("group", Group);
     m.insert("px", Px);
@@ -46,7 +46,7 @@ pub enum TokenType {
     Str,
     Number,
     Minus,
-    Markup,
+    Structure,
     Styles,
     Group,
     Eof,