Skip to content

parser: support hex integer notation #101

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
Nov 30, 2020
Merged

parser: support hex integer notation #101

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
3 changes: 0 additions & 3 deletions conformance/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,6 @@ cc_binary(
"--skip_test=fields/qualified_identifier_resolution/map_field_select",
"--skip_test=fields/qualified_identifier_resolution/ident_with_longest_prefix_check",
# New conformance tests awaiting synchronization.
"--skip_test=basic/self_eval_nonzeroish/self_eval_int_hex",
"--skip_test=basic/self_eval_nonzeroish/self_eval_int_hex_negative",
"--skip_test=basic/self_eval_nonzeroish/self_eval_uint_hex",
"--skip_test=basic/functions/unbound",
"--skip_test=basic/functions/unbound_is_runtime_error",
"--skip_test=comparisons/eq_literal/not_eq_list_false_vs_types",
Expand Down
3 changes: 3 additions & 0 deletions parser/parser_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ std::vector<TestInfo> test_cases = {
{"0u", "0u^#1:uint64#"},
{"23u", "23u^#1:uint64#"},
{"24u", "24u^#1:uint64#"},
{"0xAu", "10u^#1:uint64#"},
{"-0xA", "-10^#1:int64#"},
{"0xA", "10^#1:int64#"},
{"-1", "-1^#1:int64#"},
{"4--4",
"_-_(\n"
Expand Down
13 changes: 11 additions & 2 deletions parser/visitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "absl/strings/numbers.h"
#include "absl/strings/str_format.h"
#include "absl/strings/str_join.h"
#include "absl/strings/match.h"
#include "common/escaping.h"
#include "common/operators.h"
#include "parser/balancer.h"
Expand Down Expand Up @@ -400,9 +401,13 @@ antlrcpp::Any ParserVisitor::visitInt(CelParser::IntContext* ctx) {
if (ctx->sign) {
value = ctx->sign->getText();
}
int base = 10;
if (absl::StartsWith(ctx->tok->getText(), "0x")) {
base = 16;
}
value += ctx->tok->getText();
int64_t int_value;
if (absl::SimpleAtoi(value, &int_value)) {
if (absl::numbers_internal::safe_strto64_base(value, &int_value, base)) {
return sf_->newLiteralInt(ctx, int_value);
} else {
return sf_->reportError(ctx, "invalid int literal");
Expand All @@ -415,8 +420,12 @@ antlrcpp::Any ParserVisitor::visitUint(CelParser::UintContext* ctx) {
if (!value.empty()) {
value.resize(value.size() - 1);
}
int base = 10;
if (absl::StartsWith(value, "0x")) {
base = 16;
}
uint64_t uint_value;
if (absl::SimpleAtoi(value, &uint_value)) {
if (absl::numbers_internal::safe_strtou64_base(value, &uint_value, base)) {
return sf_->newLiteralUint(ctx, uint_value);
} else {
return sf_->reportError(ctx, "invalid uint literal");
Expand Down