Merge pull request #437 from hdamron17/preprocessor-whitespace

Close #356 - Add whitespace token for preprocessor
jyn514 · May 25, 2020 · 1d2ffce · 1d2ffce
2 parents 5afd5ac + 23bc8a1
commit 1d2ffce
Show file tree

Hide file tree

Showing 9 changed files with 288 additions and 69 deletions.
diff --git a/src/data/error.rs b/src/data/error.rs
@@ -455,6 +455,12 @@ pub enum CppError {
     #[error("expected expression for #if")]
     EmptyExpression,
 
+    #[error("macro name missing")]
+    ExpectedMacroId,
+
+    #[error("missing {0} in {1}")]
+    Expected(&'static str, &'static str),
+
     /// A `#define` occured without an identifier following.
     #[error("macro name missing")]
     EmptyDefine,

diff --git a/src/data/lex.rs b/src/data/lex.rs
@@ -190,6 +190,8 @@ pub enum Token {
     Literal(Literal),
     Id(InternedStr),
 
+    Whitespace(String),
+
     // Misc
     Ellipsis,
     StructDeref, // ->
@@ -353,6 +355,8 @@ impl std::fmt::Display for Token {
             Id(id) => write!(f, "{}", id),
             Keyword(k) => write!(f, "{}", k),
 
+            Whitespace(s) => write!(f, "{}", s),
+
             Ellipsis => write!(f, "..."),
             StructDeref => write!(f, "->"),
             Hash => write!(f, "#"),