Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add support for base in int() #2338

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 2 commits into from
Sep 27, 2023
Merged

Add support for base in int() #2338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6285596
Add support for base in int()
AkshayWarrier Sep 26, 2023
2d818a5
Merge branch 'main' into akshaywarrier/int-with-base
AkshayWarrier Sep 26, 2023
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
8 changes: 8 additions & 0 deletions integration_tests/test_str_to_int.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,12 @@ def f():
i = i32(int(s))
assert i == -1234

assert i32(int("01010",10)) == 1010
assert i32(int("01010",2)) == 10
assert i32(int("Beef",16)) == 48879
assert i32(int("0xE",16)) == 14
assert i32(int("0xE",0)) == 14
assert i32(int("123",0)) == 123
assert i32(int("0bE",16)) == 190

f()
107 changes: 79 additions & 28 deletions src/lpython/semantics/python_intrinsic_eval.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,89 @@ struct IntrinsicNodeHandler {
const Location &loc) {
ASR::expr_t *arg = nullptr, *value = nullptr;
ASR::ttype_t *type = nullptr;
if (args.size() > 1) {
throw SemanticError("Either 0 or 1 argument is expected in 'int()'",
if (args.size() > 2) {
throw SemanticError("'int()' takes at most 2 arguments (" + std::to_string(args.size()) + " given)",
loc);
}
if (args.size() > 0) {
if (args.size() >= 1) {
arg = args[0].m_value;
type = ASRUtils::expr_type(arg);
if (ASRUtils::is_character(*type)) {
int32_t base;
if (args.size() == 1) {
base = 10;
} else {
arg = args[1].m_value;
type = ASRUtils::expr_type(arg);
if (ASRUtils::is_integer(*type)) {
base = ASR::down_cast<ASR::IntegerConstant_t>(
ASRUtils::expr_value(arg))->m_n;
if ((base != 0 && base < 2) || base > 36) {
throw SemanticError("int() base must be >= 2 and <= 36, or 0", loc);
}
} else {
throw SemanticError("'" + ASRUtils::type_to_str_python(type) + "' object cannot be interpreted as an integer",
arg->base.loc);
}
}
arg = args[0].m_value;
type = ASRUtils::expr_type(arg);
ASR::ttype_t *to_type = ASRUtils::TYPE(ASR::make_Integer_t(al, loc, 8));
if (ASRUtils::expr_value(arg) != nullptr) {
char *c = ASR::down_cast<ASR::StringConstant_t>(
ASRUtils::expr_value(arg))->m_s;
int ival = 0;
bool zero_based = false;
char *ch = c;
if (*ch == '-') {
ch++;
}
if (base == 0) {
zero_based = true;
if (*ch == '0') {
ch++;
if (*ch == 'x' || *ch == 'X') {
base = 16;
ch++;
} else if (*ch == 'o' || *ch == 'O') {
base = 8;
ch++;
} else if (*ch == 'b' || *ch == 'B') {
base = 2;
ch++;
}
} else {
base = 10;
}
} else {
if (*ch == '0' &&
((base == 16 && (ch[1] == 'x'|| ch[1] == 'X')) ||
(base == 8 && (ch[1] == 'o' || ch[1] == 'O')) ||
(base == 2 && (ch[1] == 'b' || ch[1] == 'B')))) {
ch += 2;
}
}
while (*ch) {
if (*ch == '.') {
throw SemanticError("invalid literal for int() with base " + std::to_string(zero_based ? 0: base) + ": '" + std::string(c) + "'", arg->base.loc);
}
if (!((*ch >= '0' && (*ch <= std::min((int)'9', '0' + base - 1))) || (*ch >= 'A' && (*ch < 'A' + base - 10)) || (*ch >= 'a' && (*ch < 'a' + base - 10)))) {
throw SemanticError("invalid literal for int() with base " + std::to_string(zero_based ? 0: base) + ": '" + std::string(c) + "'", arg->base.loc);
}
ch++;
}
ival = std::stoi(c,0,base);
return (ASR::asr_t *)ASR::down_cast<ASR::expr_t>(ASR::make_IntegerConstant_t(al,
loc, ival, to_type));
}
return (ASR::asr_t *)ASR::down_cast<ASR::expr_t>(ASR::make_Cast_t(
al, loc, arg, ASR::cast_kindType::CharacterToInteger,
to_type, value));
} else {
if (args.size() == 2) {
throw SemanticError("int() can't convert non-string with explicit base", loc);
}
}
}
ASR::ttype_t *to_type = ASRUtils::TYPE(ASR::make_Integer_t(al, loc, 8));
if (!arg) {
Expand All @@ -71,31 +147,6 @@ struct IntrinsicNodeHandler {
return (ASR::asr_t *)ASR::down_cast<ASR::expr_t>(ASR::make_Cast_t(
al, loc, arg, ASR::cast_kindType::RealToInteger,
to_type, value));
} else if (ASRUtils::is_character(*type)) {
if (ASRUtils::expr_value(arg) != nullptr) {
char *c = ASR::down_cast<ASR::StringConstant_t>(
ASRUtils::expr_value(arg))->m_s;
int ival = 0;
char *ch = c;
if (*ch == '-') {
ch++;
}
while (*ch) {
if (*ch == '.') {
throw SemanticError("invalid literal for int() with base 10: '"+ std::string(c) + "'", arg->base.loc);
}
if (*ch < '0' || *ch > '9') {
throw SemanticError("invalid literal for int() with base 10: '"+ std::string(c) + "'", arg->base.loc);
}
ch++;
}
ival = std::stoi(c);
return (ASR::asr_t *)ASR::down_cast<ASR::expr_t>(ASR::make_IntegerConstant_t(al,
loc, ival, to_type));
}
return (ASR::asr_t *)ASR::down_cast<ASR::expr_t>(ASR::make_Cast_t(
al, loc, arg, ASR::cast_kindType::CharacterToInteger,
to_type, value));
} else if (ASRUtils::is_logical(*type)) {
if (ASRUtils::expr_value(arg) != nullptr) {
int32_t ival = ASR::down_cast<ASR::LogicalConstant_t>(
Expand Down