From 42564a7cf7954a8e48cd6e15425d7d08a8c61839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kat=20March=C3=A1n?= <kzm@zkat.tech>
Date: Sun, 13 Dec 2020 22:31:30 -0800
Subject: [PATCH] rename Node and NodeValue

---
 src/lib.rs    |  4 ++--
 src/node.rs   | 10 +++++-----
 src/parser.rs | 46 +++++++++++++++++++++++-----------------------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index a4e9757..a190ccf 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,13 +2,13 @@ use nom::combinator::all_consuming;
 use nom::Err;
 
 pub use crate::error::{KdlError, KdlErrorKind};
-pub use crate::node::Node;
+pub use crate::node::KdlNode;
 
 mod error;
 mod node;
 mod parser;
 
-pub fn parse_document<I>(input: I) -> Result<Vec<Node>, KdlError>
+pub fn parse_document<I>(input: I) -> Result<Vec<KdlNode>, KdlError>
 where
     I: AsRef<str>,
 {
diff --git a/src/node.rs b/src/node.rs
index d868e9c..40f3269 100644
--- a/src/node.rs
+++ b/src/node.rs
@@ -1,15 +1,15 @@
 use std::collections::HashMap;
 
 #[derive(Debug, Clone, PartialEq)]
-pub struct Node {
+pub struct KdlNode {
     pub name: String,
-    pub values: Vec<NodeValue>,
-    pub properties: HashMap<String, NodeValue>,
-    pub children: Vec<Node>,
+    pub values: Vec<KdlNodeValue>,
+    pub properties: HashMap<String, KdlNodeValue>,
+    pub children: Vec<KdlNode>,
 }
 
 #[derive(Debug, Clone, PartialEq)]
-pub enum NodeValue {
+pub enum KdlNodeValue {
     Int(i64),
     Float(f64),
     String(String),
diff --git a/src/parser.rs b/src/parser.rs
index e7e61bb..c5c8cf1 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -9,21 +9,21 @@ use nom::sequence::{delimited, pair, preceded, terminated, tuple};
 use nom::IResult;
 
 use crate::error::KdlParseError;
-use crate::node::{Node, NodeValue};
+use crate::node::{KdlNode, KdlNodeValue};
 
 /// `nodes := linespace* (node (newline document)?)?`
-pub(crate) fn nodes(input: &str) -> IResult<&str, Vec<Node>, KdlParseError<&str>> {
+pub(crate) fn nodes(input: &str) -> IResult<&str, Vec<KdlNode>, KdlParseError<&str>> {
     many0(delimited(many0(linespace), node, newline))(input)
 }
 
 #[derive(Clone)]
 enum NodeArg {
-    Value(NodeValue),
-    Property(String, NodeValue),
+    Value(KdlNodeValue),
+    Property(String, KdlNodeValue),
 }
 
 /// `node := identifier (node-space node-argument)* (node-space node-document)?`
-pub(crate) fn node(input: &str) -> IResult<&str, Node, KdlParseError<&str>> {
+pub(crate) fn node(input: &str) -> IResult<&str, KdlNode, KdlParseError<&str>> {
     let (input, tag) = identifier(input)?;
     let (input, args) = many0(preceded(node_space, node_arg))(input)?;
     let (input, children) = opt(preceded(node_space, node_children))(input)?;
@@ -32,7 +32,7 @@ pub(crate) fn node(input: &str) -> IResult<&str, Node, KdlParseError<&str>> {
         .partition(|arg| matches!(arg, NodeArg::Value(_)));
     Ok((
         input,
-        Node {
+        KdlNode {
             name: tag,
             children: children.unwrap_or_else(Vec::new),
             values: values
@@ -77,7 +77,7 @@ fn node_arg(input: &str) -> IResult<&str, NodeArg, KdlParseError<&str>> {
 }
 
 /// `prop := identifier '=' value`
-fn property(input: &str) -> IResult<&str, (String, NodeValue), KdlParseError<&str>> {
+fn property(input: &str) -> IResult<&str, (String, KdlNodeValue), KdlParseError<&str>> {
     let (input, key) = identifier(input)?;
     let (input, _) = tag("=")(input)?;
     let (input, val) = node_value(input)?;
@@ -85,18 +85,18 @@ fn property(input: &str) -> IResult<&str, (String, NodeValue), KdlParseError<&st
 }
 
 /// `value := string | raw_string | number | boolean | 'null'`
-fn node_value(input: &str) -> IResult<&str, NodeValue, KdlParseError<&str>> {
+fn node_value(input: &str) -> IResult<&str, KdlNodeValue, KdlParseError<&str>> {
     alt((
-        map(string, NodeValue::String),
-        map(raw_string, |s| NodeValue::String(s.into())),
+        map(string, KdlNodeValue::String),
+        map(raw_string, |s| KdlNodeValue::String(s.into())),
         number,
         boolean,
-        value(NodeValue::Null, tag("null")),
+        value(KdlNodeValue::Null, tag("null")),
     ))(input)
 }
 
 /// `node-children := '{' nodes '}'`
-fn node_children(input: &str) -> IResult<&str, Vec<Node>, KdlParseError<&str>> {
+fn node_children(input: &str) -> IResult<&str, Vec<KdlNode>, KdlParseError<&str>> {
     delimited(tag("{"), nodes, tag("}"))(input)
 }
 
@@ -156,13 +156,13 @@ fn raw_string(input: &str) -> IResult<&str, &str, KdlParseError<&str>> {
 }
 
 /// `number := decimal | hex | octal | binary`
-fn number(input: &str) -> IResult<&str, NodeValue, KdlParseError<&str>> {
+fn number(input: &str) -> IResult<&str, KdlNodeValue, KdlParseError<&str>> {
     alt((
-        map(integer, NodeValue::Int),
-        map(hexadecimal, NodeValue::Int),
-        map(octal, NodeValue::Int),
-        map(binary, NodeValue::Int),
-        map(float, NodeValue::Float),
+        map(integer, KdlNodeValue::Int),
+        map(hexadecimal, KdlNodeValue::Int),
+        map(octal, KdlNodeValue::Int),
+        map(binary, KdlNodeValue::Int),
+        map(float, KdlNodeValue::Float),
     ))(input)
 }
 
@@ -250,10 +250,10 @@ fn binary(input: &str) -> IResult<&str, i64, KdlParseError<&str>> {
 }
 
 /// `boolean := 'true' | 'false'`
-fn boolean(input: &str) -> IResult<&str, NodeValue, KdlParseError<&str>> {
+fn boolean(input: &str) -> IResult<&str, KdlNodeValue, KdlParseError<&str>> {
     alt((
-        value(NodeValue::Boolean(true), tag("true")),
-        value(NodeValue::Boolean(false), tag("false")),
+        value(KdlNodeValue::Boolean(true), tag("true")),
+        value(KdlNodeValue::Boolean(false), tag("false")),
     ))(input)
 }
 
@@ -412,8 +412,8 @@ mod tests {
 
     #[test]
     fn test_boolean() {
-        assert_eq!(boolean("true"), Ok(("", NodeValue::Boolean(true))));
-        assert_eq!(boolean("false"), Ok(("", NodeValue::Boolean(false))));
+        assert_eq!(boolean("true"), Ok(("", KdlNodeValue::Boolean(true))));
+        assert_eq!(boolean("false"), Ok(("", KdlNodeValue::Boolean(false))));
         assert!(boolean("blah").is_err());
     }