carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 20:40:11 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Changed sized_type_literal parsing logic to not crash (with CARBON_CHECK) and instead report an error with YYERROR (#2102)

Browse Source
This commit is contained in:
pk19604014
2022-08-25 09:09:15 -07:00
committed by GitHub
parent 98d95cd188
commit a937d911cb
3 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/syntax/parser.ypp
+13 -6
View File
@@ -59,9 +59,9 @@
#include <cstdlib>
#include <vector>
#include "common/check.h"
#include "explorer/syntax/parse_and_lex_context.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/raw_ostream.h"
} // %code top
@@ -349,11 +349,18 @@ primary_expression:
{ $$ = arena->New<BoolLiteral>(context.source_loc(), false); }
| sized_type_literal
{
int val;
CARBON_CHECK(llvm::to_integer(llvm::StringRef($1).substr(1), val));
CARBON_CHECK($1[0] == 'i' && val == 32)
<< "Only i32 is supported for now: " << $1;
$$ = arena->New<IntTypeLiteral>(context.source_loc());
int val = 0;
if (!llvm::to_integer(llvm::StringRef($1).substr(1), val)) {
context.RecordSyntaxError(
llvm::formatv("Invalid type literal: {0}", $1));
YYERROR;
} else if ($1[0] != 'i' || val != 32) {
context.RecordSyntaxError(
llvm::formatv("Only i32 is supported for now: {0}", $1));
YYERROR;
} else {
$$ = arena->New<IntTypeLiteral>(context.source_loc());
}
}
| SELF
// TODO: Should we create a new TypeLiteral for `Self`?
explorer/testdata/basic_syntax/fail_invalid_integer_type.carbon
Vendored
+17
View File
@@ -0,0 +1,17 @@
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
// RUN: %{not} %{explorer} %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
// RUN: %{not} %{explorer} --parser_debug --trace_file=- %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes %s
// AUTOUPDATE: %{explorer} %s
package ExplorerTest api;
fn Main() -> i32 {
// CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_invalid_integer_type.carbon:[[@LINE+1]]: Invalid type literal: i11111111111111111111111111
var x: i11111111111111111111111111 = 1;
return 0;
}
explorer/testdata/basic_syntax/fail_unsupported_integer_type.carbon
Vendored
+17
View File
@@ -0,0 +1,17 @@
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
// RUN: %{not} %{explorer} %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
// RUN: %{not} %{explorer} --parser_debug --trace_file=- %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes %s
// AUTOUPDATE: %{explorer} %s
package ExplorerTest api;
fn Main() -> i32 {
// CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/basic_syntax/fail_unsupported_integer_type.carbon:[[@LINE+1]]: Only i32 is supported for now: i64
var x: i64 = 1;
return 0;
}