Skip to content

Fix type of char literals in C mode #662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2025
+55 −30
Merged

Fix type of char literals in C mode #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions src/parser/cxx/parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,16 +424,20 @@ auto Parser::parse_literal(ExpressionAST*& yyast) -> bool {

auto prefix = ast->literal->components().prefix;

if (prefix == "u8")
ast->type = control_->getChar8Type();
else if (prefix == "u")
ast->type = control_->getChar16Type();
else if (prefix == "U")
ast->type = control_->getChar32Type();
else if (prefix == "L")
ast->type = control_->getWideCharType();
else
ast->type = control_->getCharType();
if (is_parsing_cxx()) {
if (prefix == "u8")
ast->type = control_->getChar8Type();
else if (prefix == "u")
ast->type = control_->getChar16Type();
else if (prefix == "U")
ast->type = control_->getChar32Type();
else if (prefix == "L")
ast->type = control_->getWideCharType();
else
ast->type = control_->getCharType();
} else {
ast->type = control_->getIntType();
}

return true;
}
Expand Down Expand Up @@ -540,9 +544,12 @@ auto Parser::parse_literal(ExpressionAST*& yyast) -> bool {
static_cast<const StringLiteral*>(unit->literal(literalLoc));

if (unit->tokenKind(literalLoc) == TokenKind::T_STRING_LITERAL) {
ast->type = control_->getBoundedArrayType(
control_->add_const(control_->getCharType()),
ast->literal->stringValue().size() + 1);
const Type* elementType = control_->getCharType();
if (is_parsing_cxx()) elementType = control_->add_const(elementType);

auto extent = ast->literal->stringValue().size() + 1;

ast->type = control_->getBoundedArrayType(elementType, extent);

ast->valueCategory = ValueCategory::kLValue;
}
Expand Down
28 changes: 14 additions & 14 deletions tests/unit_tests/ast/generic_selection_01.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// clang-format off
// RUN: %cxx -verify -fcheck -ast-dump -xc %s | %filecheck %s --match-full-lines
// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
// clang-format on

int main() {
Expand Down Expand Up @@ -30,33 +30,33 @@ int main() {
// CHECK-NEXT: type-id: type-id
// CHECK-NEXT: type-specifier-list
// CHECK-NEXT: void-type-specifier
// CHECK-NEXT: expression: generic-selection-expression [lvalue const char [8]]
// CHECK-NEXT: expression: generic-selection-expression [lvalue char [8]]
// CHECK-NEXT: matched-assoc-index: 0
// CHECK-NEXT: expression: int-literal-expression [prvalue int]
// CHECK-NEXT: literal: 1
// CHECK-NEXT: generic-association-list
// CHECK-NEXT: default-generic-association
// CHECK-NEXT: expression: string-literal-expression [lvalue const char [8]]
// CHECK-NEXT: expression: string-literal-expression [lvalue char [8]]
// CHECK-NEXT: literal: "default"
// CHECK-NEXT: expression-statement
// CHECK-NEXT: expression: cast-expression [prvalue void]
// CHECK-NEXT: type-id: type-id
// CHECK-NEXT: type-specifier-list
// CHECK-NEXT: void-type-specifier
// CHECK-NEXT: expression: generic-selection-expression [lvalue const char [4]]
// CHECK-NEXT: expression: generic-selection-expression [lvalue char [4]]
// CHECK-NEXT: matched-assoc-index: 1
// CHECK-NEXT: expression: int-literal-expression [prvalue int]
// CHECK-NEXT: literal: 1
// CHECK-NEXT: generic-association-list
// CHECK-NEXT: default-generic-association
// CHECK-NEXT: expression: string-literal-expression [lvalue const char [8]]
// CHECK-NEXT: expression: string-literal-expression [lvalue char [8]]
// CHECK-NEXT: literal: "default"
// CHECK-NEXT: type-generic-association
// CHECK-NEXT: type-id: type-id
// CHECK-NEXT: type-specifier-list
// CHECK-NEXT: integral-type-specifier
// CHECK-NEXT: specifier: int
// CHECK-NEXT: expression: string-literal-expression [lvalue const char [4]]
// CHECK-NEXT: expression: string-literal-expression [lvalue char [4]]
// CHECK-NEXT: literal: "int"
// CHECK-NEXT: type-generic-association
// CHECK-NEXT: type-id: type-id
Expand All @@ -67,14 +67,14 @@ int main() {
// CHECK-NEXT: declarator: declarator
// CHECK-NEXT: ptr-op-list
// CHECK-NEXT: pointer-operator
// CHECK-NEXT: expression: string-literal-expression [lvalue const char [12]]
// CHECK-NEXT: expression: string-literal-expression [lvalue char [12]]
// CHECK-NEXT: literal: "const char*"
// CHECK-NEXT: expression-statement
// CHECK-NEXT: expression: cast-expression [prvalue void]
// CHECK-NEXT: type-id: type-id
// CHECK-NEXT: type-specifier-list
// CHECK-NEXT: void-type-specifier
// CHECK-NEXT: expression: generic-selection-expression [lvalue const char [4]]
// CHECK-NEXT: expression: generic-selection-expression [lvalue char [4]]
// CHECK-NEXT: matched-assoc-index: 0
// CHECK-NEXT: expression: int-literal-expression [prvalue int]
// CHECK-NEXT: literal: 1
Expand All @@ -84,7 +84,7 @@ int main() {
// CHECK-NEXT: type-specifier-list
// CHECK-NEXT: integral-type-specifier
// CHECK-NEXT: specifier: int
// CHECK-NEXT: expression: string-literal-expression [lvalue const char [4]]
// CHECK-NEXT: expression: string-literal-expression [lvalue char [4]]
// CHECK-NEXT: literal: "int"
// CHECK-NEXT: type-generic-association
// CHECK-NEXT: type-id: type-id
Expand All @@ -95,17 +95,17 @@ int main() {
// CHECK-NEXT: declarator: declarator
// CHECK-NEXT: ptr-op-list
// CHECK-NEXT: pointer-operator
// CHECK-NEXT: expression: string-literal-expression [lvalue const char [12]]
// CHECK-NEXT: expression: string-literal-expression [lvalue char [12]]
// CHECK-NEXT: literal: "const char*"
// CHECK-NEXT: default-generic-association
// CHECK-NEXT: expression: string-literal-expression [lvalue const char [8]]
// CHECK-NEXT: expression: string-literal-expression [lvalue char [8]]
// CHECK-NEXT: literal: "default"
// CHECK-NEXT: expression-statement
// CHECK-NEXT: expression: cast-expression [prvalue void]
// CHECK-NEXT: type-id: type-id
// CHECK-NEXT: type-specifier-list
// CHECK-NEXT: void-type-specifier
// CHECK-NEXT: expression: generic-selection-expression [lvalue const char [4]]
// CHECK-NEXT: expression: generic-selection-expression [lvalue char [4]]
// CHECK-NEXT: matched-assoc-index: 0
// CHECK-NEXT: expression: int-literal-expression [prvalue int]
// CHECK-NEXT: literal: 1
Expand All @@ -115,7 +115,7 @@ int main() {
// CHECK-NEXT: type-specifier-list
// CHECK-NEXT: integral-type-specifier
// CHECK-NEXT: specifier: int
// CHECK-NEXT: expression: string-literal-expression [lvalue const char [4]]
// CHECK-NEXT: expression: string-literal-expression [lvalue char [4]]
// CHECK-NEXT: literal: "int"
// CHECK-NEXT: type-generic-association
// CHECK-NEXT: type-id: type-id
Expand All @@ -126,5 +126,5 @@ int main() {
// CHECK-NEXT: declarator: declarator
// CHECK-NEXT: ptr-op-list
// CHECK-NEXT: pointer-operator
// CHECK-NEXT: expression: string-literal-expression [lvalue const char [12]]
// CHECK-NEXT: expression: string-literal-expression [lvalue char [12]]
// CHECK-NEXT: literal: "const char*"
13 changes: 13 additions & 0 deletions tests/unit_tests/sema/char_c_01.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// RUN: %cxx %s

char ch = 'a';

_Static_assert(_Generic(ch, int: 123, char: 321) == 321);

_Static_assert(_Generic('a', int: 123, char: 321) == 123);

_Static_assert(_Generic("str", char*: 123, const char*: 321) == 123);

_Static_assert(_Generic(true ? "str" : (const char*)0,
char*: 123,
const char*: 321) == 321);
11 changes: 8 additions & 3 deletions tests/unit_tests/sema/typeof_01.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
// RUN: %cxx -xc -verify -fcheck -dump-symbols %s | %filecheck %s
// RUN: %cxx -verify -dump-symbols %s | %filecheck %s

typeof('x') c;
char ch;

typeof(ch) c1;
typeof('x') c2;
typeof(0) i;

// CHECK: variable char c
// CHECK: variable char ch
// CHECK-NEXT: variable char c1
// CHECK-NEXT: variable int c2
// CHECK-NEXT: variable int i
Loading