From 7f8f225cb3cb44367d731c544f7ce1eebdb97dd5 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Thu, 3 Sep 2020 19:16:19 +0200 Subject: =?UTF-8?q?Split=20up=20parser=20into=20multiple=20files=20?= =?UTF-8?q?=F0=9F=A7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Splits up into: - escaping: resolving of escape sequences - parser: the parsing code - tests: all integrated parsing tests Also moves Ident from the root syntax module into the tree module. --- src/syntax/tree.rs | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'src/syntax/tree.rs') diff --git a/src/syntax/tree.rs b/src/syntax/tree.rs index 94dfc124..715db109 100644 --- a/src/syntax/tree.rs +++ b/src/syntax/tree.rs @@ -4,7 +4,7 @@ use std::fmt::{self, Debug, Formatter}; use super::decoration::Decoration; use super::span::{SpanVec, Spanned}; -use super::Ident; +use super::tokens::is_identifier; use crate::color::RgbaColor; use crate::compute::table::{SpannedEntry, Table}; use crate::compute::value::{TableValue, Value}; @@ -157,6 +157,32 @@ impl Debug for Expr { } } +/// An identifier as defined by unicode with a few extra permissible characters. +#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Hash)] +pub struct Ident(pub String); + +impl Ident { + /// Create a new identifier from a string checking that it is a valid. + pub fn new(ident: impl AsRef + Into) -> Option { + if is_identifier(ident.as_ref()) { + Some(Self(ident.into())) + } else { + None + } + } + + /// Return a reference to the underlying string. + pub fn as_str(&self) -> &str { + self.0.as_str() + } +} + +impl Debug for Ident { + fn fmt(&self, f: &mut Formatter) -> fmt::Result { + write!(f, "`{}`", self.0) + } +} + /// A table of expressions. /// /// # Example -- cgit v1.2.3