Move checking of id expressions out of the Parser

Author: robertoraggi

src/parser/cxx/binder.cc

@@ -691,4 +691,14 @@ auto Binder::instantiate(SimpleTemplateIdAST* templateId) -> Symbol* {
   return symbol;
 }
 
+void Binder::bind(IdExpressionAST* ast) {
+  if (ast->unqualifiedId) {
+    auto name = get_name(control(), ast->unqualifiedId);
+    const Name* componentName = name;
+    if (auto templateId = name_cast<TemplateId>(name))
+      componentName = templateId->name();
+    ast->symbol = Lookup{scope()}(ast->nestedNameSpecifier, componentName);
+  }
+}
+
 }  // namespace cxx

src/parser/cxx/binder.h

@@ -125,6 +125,8 @@ class Binder {
 
   void bind(TypeIdAST* ast, const Decl& decl);
 
+  void bind(IdExpressionAST* ast);
+
   [[nodiscard]] auto instantiate(SimpleTemplateIdAST* templateId) -> Symbol*;
 
   [[nodiscard]] auto resolve(NestedNameSpecifierAST* nestedNameSpecifier,

src/parser/cxx/parser.cc

@@ -836,29 +836,10 @@ auto Parser::parse_id_expression(IdExpressionAST*& yyast,
   ast->unqualifiedId = unqualifiedId;
   ast->isTemplateIntroduced = isTemplateIntroduced;
 
-  if (unqualifiedId) {
-    auto name = get_name(control_, unqualifiedId);
-    const Name* componentName = name;
-    if (auto templateId = name_cast<TemplateId>(name))
-      componentName = templateId->name();
-    ast->symbol = Lookup{scope()}(nestedNameSpecifier, componentName);
-  }
+  binder_.bind(ast);
 
   if (ctx == IdExpressionContext::kExpression) {
-    if (ast->symbol) {
-      if (auto conceptSymbol = symbol_cast<ConceptSymbol>(ast->symbol)) {
-        ast->type = control_->getBoolType();
-        ast->valueCategory = ValueCategory::kPrValue;
-      } else {
-        ast->type = control_->remove_reference(ast->symbol->type());
-
-        if (auto enumerator = symbol_cast<EnumeratorSymbol>(ast->symbol)) {
-          ast->valueCategory = ValueCategory::kPrValue;
-        } else {
-          ast->valueCategory = ValueCategory::kLValue;
-        }
-      }
-    }
+    check(ast);
   }
 
   return true;

src/parser/cxx/type_checker.cc

@@ -239,7 +239,23 @@ void TypeChecker::Visitor::operator()(NestedExpressionAST* ast) {
   ast->valueCategory = ast->expression->valueCategory;
 }
 
-void TypeChecker::Visitor::operator()(IdExpressionAST* ast) {}
+void TypeChecker::Visitor::operator()(IdExpressionAST* ast) {
+  if (ast->symbol) {
+    if (auto conceptSymbol = symbol_cast<ConceptSymbol>(ast->symbol)) {
+      ast->type = control()->getBoolType();
+      ast->valueCategory = ValueCategory::kPrValue;
+    } else {
+      ast->type = control()->remove_reference(ast->symbol->type());
+
+      if (ast->symbol->isEnumOrScopedEnum() ||
+          ast->symbol->isNonTypeParameter()) {
+        ast->valueCategory = ValueCategory::kPrValue;
+      } else {
+        ast->valueCategory = ValueCategory::kLValue;
+      }
+    }
+  }
+}
 
 void TypeChecker::Visitor::operator()(LambdaExpressionAST* ast) {}
 

tests/unit_tests/ast/new_expression_01.cc

@@ -63,7 +63,7 @@ auto make(void* where, T init) {
 // CHECK-NEXT:                        expression: new-expression
 // CHECK-NEXT:                          new-placement: new-placement
 // CHECK-NEXT:                            expression-list
-// CHECK-NEXT:                              id-expression [lvalue void*]
+// CHECK-NEXT:                              id-expression
 // CHECK-NEXT:                                unqualified-id: name-id
 // CHECK-NEXT:                                  identifier: where
 // CHECK-NEXT:                          type-specifier-list
@@ -73,7 +73,7 @@ auto make(void* where, T init) {
 // CHECK-NEXT:                          new-initalizer: new-braced-initializer
 // CHECK-NEXT:                            braced-init-list: braced-init-list
 // CHECK-NEXT:                              expression-list
-// CHECK-NEXT:                                id-expression [lvalue T]
+// CHECK-NEXT:                                id-expression
 // CHECK-NEXT:                                  unqualified-id: name-id
 // CHECK-NEXT:                                    identifier: init
 // CHECK-NEXT:              declaration-statement
@@ -90,7 +90,7 @@ auto make(void* where, T init) {
 // CHECK-NEXT:                        expression: new-expression
 // CHECK-NEXT:                          new-placement: new-placement
 // CHECK-NEXT:                            expression-list
-// CHECK-NEXT:                              id-expression [lvalue void*]
+// CHECK-NEXT:                              id-expression
 // CHECK-NEXT:                                unqualified-id: name-id
 // CHECK-NEXT:                                  identifier: where
 // CHECK-NEXT:                          type-specifier-list
@@ -99,6 +99,6 @@ auto make(void* where, T init) {
 // CHECK-NEXT:                                identifier: T
 // CHECK-NEXT:                          new-initalizer: new-paren-initializer
 // CHECK-NEXT:                            expression-list
-// CHECK-NEXT:                              id-expression [lvalue T]
+// CHECK-NEXT:                              id-expression
 // CHECK-NEXT:                                unqualified-id: name-id
 // CHECK-NEXT:                                  identifier: init

tests/unit_tests/ast/template_lambda_01.cc

@@ -83,9 +83,9 @@ struct S {
 // CHECK-NEXT:                                      return-statement
 // CHECK-NEXT:                                        expression: binary-expression
 // CHECK-NEXT:                                          op: +
-// CHECK-NEXT:                                          left-expression: id-expression [lvalue T1]
+// CHECK-NEXT:                                          left-expression: id-expression
 // CHECK-NEXT:                                            unqualified-id: name-id
 // CHECK-NEXT:                                              identifier: a
-// CHECK-NEXT:                                          right-expression: id-expression [lvalue T2]
+// CHECK-NEXT:                                          right-expression: id-expression
 // CHECK-NEXT:                                            unqualified-id: name-id
 // CHECK-NEXT:                                              identifier: b