(parser) fix: remove unexistant keywords

Author: t-webber

src/lexer/types/keywords.rs

@@ -68,7 +68,6 @@ impl_keywords!(
     Int Type "int",
     Long Type "long",
     Null Literal "NULL",
-    Nullptr Literal "nullptr",
     Register Storage "register",
     Restrict Storage "restrict",
     Return Control "return",
@@ -82,8 +81,6 @@ impl_keywords!(
     ThreadLocal Storage "thread_local",
     True Literal "true",
     Typedef Storage "typedef",
-    Typeof Operator "typeof",
-    TypeofUnqual Operator "typeof_unqual",
     Union Type "union",
     Unsigned Type "unsigned",
     Void Type "void",

src/parser/keyword/functions.rs

@@ -17,39 +17,13 @@ pub enum FunctionKeyword {
     ///
     /// Yields the size in bytes of the object representation of the argument
     /// (the argument is of type type).
-    // TODO: works without parens
+    // TODO: works without parents
     Sizeof,
     /// Static assert
     ///
     /// The constant expression is evaluated at compile time and compared to
     /// zero.
     StaticAssert,
-    /// Type of
-    ///
-    /// Returns the type of a variable, *with* the qualifiers
-    ///
-    /// # Examples
-    ///
-    /// `typeof(const int)` is `const int`
-    ///
-    /// ```c
-    /// static long int a;
-    /// typeof(a) b = 1; // b is of type `static long int`
-    /// ```
-    Typeof,
-    /// Type of unqualified
-    ///
-    /// Returns the type of a variable, *without* the qualifiers
-    ///
-    /// # Examples
-    ///
-    /// `typeof(const int)` is `int`
-    ///
-    /// ```c
-    /// static long int a;
-    /// typeof(a) b = 1; // b is of type `long int`
-    /// ```
-    TypeofUnqual,
 }
 
 impl PushInNode for FunctionKeyword {
@@ -68,7 +42,5 @@ display!(
         Self::Alignof => "alignof".fmt(f),
         Self::Sizeof => "sizeof".fmt(f),
         Self::StaticAssert => "static_assert".fmt(f),
-        Self::Typeof => "typeof".fmt(f),
-        Self::TypeofUnqual => "typeof_unqual".fmt(f),
     }
 );

src/parser/keyword/mod.rs

@@ -43,7 +43,7 @@ pub fn handle_keyword(
         KeywordParsing::CtrlFlow(_)
         | KeywordParsing::False
         | KeywordParsing::Func(_)
-        | KeywordParsing::Nullptr
+        | KeywordParsing::Null
         | KeywordParsing::True => AstPushContext::None,
     };
     if current.can_push_leaf_with_ctx(ast_push_ctx) {

src/parser/keyword/sort.rs

@@ -104,7 +104,7 @@ pub enum KeywordParsing {
     /// Function keyword: `sizeof`, `static_assert`, ...
     Func(Func),
     /// `NULL` constant
-    Nullptr,
+    Null,
     /// Keywords that need to be pushed in an existing control flow block
     Pushable(PushableKeyword),
     /// Boolean constant `true`
@@ -117,7 +117,7 @@ impl PushInNode for KeywordParsing {
             Self::Func(func) => func.push_in_node(node),
             Self::Attr(attr) => attr.push_in_node(node),
             Self::CtrlFlow(ctrl) => ctrl.push_in_node(node),
-            Self::Nullptr => node.push_block_as_leaf(Ast::Leaf(Literal::Nullptr)),
+            Self::Null => node.push_block_as_leaf(Ast::Leaf(Literal::Null)),
             Self::True => node.push_block_as_leaf(Ast::Leaf(Literal::ConstantBool(true))),
             Self::False => node.push_block_as_leaf(Ast::Leaf(Literal::ConstantBool(false))),
             Self::Pushable(pushable) => pushable.push_in_node(node),
@@ -132,11 +132,9 @@ impl TryFrom<(Keyword, Context)> for KeywordParsing {
             // constants
             Keyword::True => Self::True,
             Keyword::False => Self::False,
-            Keyword::Null | Keyword::Nullptr => Self::Nullptr,
+            Keyword::Null => Self::Null,
             // functions
             Keyword::Sizeof => Self::Func(Func::Sizeof),
-            Keyword::Typeof => Self::Func(Func::Typeof),
-            Keyword::TypeofUnqual => Self::Func(Func::TypeofUnqual),
             Keyword::Alignof | Keyword::UAlignof => Self::Func(Func::Alignof),
             Keyword::StaticAssert | Keyword::UStaticAssert => Self::Func(Func::StaticAssert),
             // pushable

src/parser/literal.rs

@@ -34,7 +34,7 @@ pub enum Literal {
     /// Boolean constant: `true` or `false`
     ConstantBool(bool),
     /// `NULL` constant
-    Nullptr,
+    Null,
     /// Number constant
     Number(Number),
     /// String constant
@@ -46,7 +46,7 @@ display!(
     self,
     f,
     match self {
-        Self::Nullptr => "NULL".fmt(f),
+        Self::Null => "NULL".fmt(f),
         Self::Char(val) => write!(f, "'{val}'"),
         Self::Str(val) => write!(f, "\"{val}\""),
         Self::Number(val) => val.fmt(f),