summaryrefslogtreecommitdiff
path: root/src/syntax/lit.rs
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2020-12-31 17:05:00 +0100
committerLaurenz <laurmaedje@gmail.com>2020-12-31 17:48:56 +0100
commit4069f0744dc24c05d5a6fd6d0530984c4c7ff881 (patch)
tree64fb7211e638462779b03b4ae5b2ea0cc25d23d7 /src/syntax/lit.rs
parentba3d43f7b2a18984be27f3d472884a19f3adce4c (diff)
Parsing improvements 🧽
- Simplified scanner code - Peek eagerly - Skip whitespace and comments automatically in header mode - Parse simple block expressions - Move literal definitions into expression module - Raw resolving tests
Diffstat (limited to 'src/syntax/lit.rs')
-rw-r--r--src/syntax/lit.rs54
1 files changed, 0 insertions, 54 deletions
diff --git a/src/syntax/lit.rs b/src/syntax/lit.rs
deleted file mode 100644
index 84d5c6f4..00000000
--- a/src/syntax/lit.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-//! Literals.
-
-use super::*;
-use crate::color::RgbaColor;
-use crate::eval::DictKey;
-use crate::geom::Unit;
-
-/// A literal.
-#[derive(Debug, Clone, PartialEq)]
-pub enum Lit {
- /// A identifier literal: `left`.
- Ident(Ident),
- /// A boolean literal: `true`, `false`.
- Bool(bool),
- /// An integer literal: `120`.
- Int(i64),
- /// A floating-point literal: `1.2`, `10e-4`.
- Float(f64),
- /// A length literal: `12pt`, `3cm`.
- Length(f64, Unit),
- /// A percent literal: `50%`.
- ///
- /// _Note_: `50%` is stored as `50.0` here, but as `0.5` in the
- /// corresponding [value](crate::geom::Relative).
- Percent(f64),
- /// A color literal: `#ffccee`.
- Color(RgbaColor),
- /// A string literal: `"hello!"`.
- Str(String),
- /// A dictionary literal: `(false, 12cm, greeting: "hi")`.
- Dict(LitDict),
- /// A content literal: `{*Hello* there!}`.
- Content(SynTree),
-}
-
-/// A dictionary literal: `(false, 12cm, greeting: "hi")`.
-#[derive(Debug, Default, Clone, PartialEq)]
-pub struct LitDict(pub Vec<LitDictEntry>);
-
-/// An entry in a dictionary literal: `false` or `greeting: "hi"`.
-#[derive(Debug, Clone, PartialEq)]
-pub struct LitDictEntry {
- /// The key of the entry if there was one: `greeting`.
- pub key: Option<Spanned<DictKey>>,
- /// The value of the entry: `"hi"`.
- pub expr: Spanned<Expr>,
-}
-
-impl LitDict {
- /// Create an empty dict literal.
- pub fn new() -> Self {
- Self::default()
- }
-}