Skip to content

Commit

Permalink
Merge pull request lfortran#4487 from Pranavchiku/integer-boz
Browse files Browse the repository at this point in the history 
refactor: fold `IntegerBOZ` inside `IntegerConstant` and remove it.
  • Loading branch information
@Pranavchiku
Pranavchiku authored Jul 12, 2024
2 parents bdc0210 + 651b482 commit 1509514
Show file tree
Hide file tree
Showing 808 changed files with 8,388 additions and 8,442 deletions.
11 changes: 3 additions & 8 deletions src/lfortran/semantics/ast_common_visitor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4107,12 +4107,6 @@ class CommonVisitor : public AST::BaseVisitor<Derived> {
} else {
throw SemanticError("int(...) must have 1 or 2 arguments", loc);
}
if (ASR::is_a<ASR::IntegerBOZ_t>(*args[0].m_value)) {
// Things like `int(b'01011101')` are skipped for now
// They are converted in comptime_eval. We should probably
// just convert them here instead.
return nullptr;
}
return LFortran::CommonVisitorMethods::comptime_intrinsic_int(args[0].m_value, arg1, al, loc, compiler_options);
} else {
return nullptr;
Expand Down Expand Up @@ -7628,8 +7622,9 @@ class CommonVisitor : public AST::BaseVisitor<Derived> {
}
std::string boz_str = s.substr(2, s.size() - 2);
int64_t boz_int = std::stoll(boz_str, nullptr, base);
tmp = ASR::make_IntegerBOZ_t(al, x.base.base.loc, boz_int,
boz_type, nullptr);
ASR::ttype_t* int_type = ASRUtils::TYPE(ASR::make_Integer_t(al, x.base.base.loc, compiler_options.po.default_integer_kind));
tmp = ASR::make_IntegerConstant_t(al, x.base.base.loc, boz_int,
int_type, boz_type);
}

void visit_Num(const AST::Num_t &x) {
Expand Down
7 changes: 1 addition & 6 deletions src/lfortran/semantics/comptime_eval.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,8 @@ struct IntrinsicProcedures {
}
}

static ASR::expr_t *eval_int(Allocator &al, const Location &loc, Vec<ASR::expr_t*> &args, const CompilerOptions &compiler_options) {
static ASR::expr_t *eval_int(Allocator &al, const Location &loc, Vec<ASR::expr_t*> &args, const CompilerOptions &/*compiler_options*/) {
ASR::expr_t* int_expr = args[0];
if( int_expr->type == ASR::exprType::IntegerBOZ ) {
ASR::IntegerBOZ_t *boz_expr = ASR::down_cast<ASR::IntegerBOZ_t>(int_expr);
ASR::ttype_t* tmp_int_type = ASRUtils::TYPE(ASR::make_Integer_t(al, loc, compiler_options.po.default_integer_kind));
return ASR::down_cast<ASR::expr_t>(ASR::make_IntegerConstant_t(al, loc, boz_expr->m_v, tmp_int_type));;
}
ASR::ttype_t* int_type = ASRUtils::expr_type(int_expr);
int int_kind = ASRUtils::extract_kind_from_ttype_t(int_type);
if (ASR::is_a<ASR::Integer_t>(*int_type)) {
Expand Down
4 changes: 2 additions & 2 deletions src/lfortran/tests/test_llvm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ end function)";
LCompilers::SymbolTable::reset_global_counter();
LCompilers::ASR::TranslationUnit_t* asr = TRY(LCompilers::LFortran::ast_to_asr(al, *tu,
diagnostics, nullptr, false, compiler_options));
CHECK(LCompilers::pickle(*asr) == "(TranslationUnit (SymbolTable 1 {f: (Function (SymbolTable 2 {f: (Variable 2 f [] ReturnVar () () Default (Integer 4) () Source Public Required .false.)}) f (FunctionType [] (Integer 4) Source Implementation () .false. .false. .false. .false. .false. [] .false.) [] [] [(Assignment (Var 2 f) (IntegerConstant 5 (Integer 4)) ())] (Var 2 f) Public .false. .false. ())}) [])");
CHECK(LCompilers::pickle(*asr) == "(TranslationUnit (SymbolTable 1 {f: (Function (SymbolTable 2 {f: (Variable 2 f [] ReturnVar () () Default (Integer 4) () Source Public Required .false.)}) f (FunctionType [] (Integer 4) Source Implementation () .false. .false. .false. .false. .false. [] .false.) [] [] [(Assignment (Var 2 f) (IntegerConstant 5 (Integer 4) Decimal) ())] (Var 2 f) Public .false. .false. ())}) [])");

// ASR -> LLVM
LCompilers::LLVMEvaluator e;
Expand Down Expand Up @@ -418,7 +418,7 @@ end function)";
// AST -> ASR
LCompilers::ASR::TranslationUnit_t* asr = TRY(LCompilers::LFortran::ast_to_asr(al, *tu,
diagnostics, nullptr, false, compiler_options));
CHECK(LCompilers::pickle(*asr) == "(TranslationUnit (SymbolTable 3 {f: (Function (SymbolTable 4 {f: (Variable 4 f [] ReturnVar () () Default (Integer 4) () Source Public Required .false.)}) f (FunctionType [] (Integer 4) Source Implementation () .false. .false. .false. .false. .false. [] .false.) [] [] [(Assignment (Var 4 f) (IntegerConstant 4 (Integer 4)) ())] (Var 4 f) Public .false. .false. ())}) [])");
CHECK(LCompilers::pickle(*asr) == "(TranslationUnit (SymbolTable 3 {f: (Function (SymbolTable 4 {f: (Variable 4 f [] ReturnVar () () Default (Integer 4) () Source Public Required .false.)}) f (FunctionType [] (Integer 4) Source Implementation () .false. .false. .false. .false. .false. [] .false.) [] [] [(Assignment (Var 4 f) (IntegerConstant 4 (Integer 4) Decimal) ())] (Var 4 f) Public .false. .false. ())}) [])");
// ASR -> LLVM
LCompilers::LLVMEvaluator e;
LCompilers::PassManager lpm;
Expand Down
5 changes: 2 additions & 3 deletions src/libasr/ASR.asdl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ expr
| EnumConstructor(symbol dt_sym, expr* args, ttype type, expr? value)
| UnionTypeConstructor(symbol dt_sym, expr* args, ttype type, expr? value)
| ImpliedDoLoop(expr* values, expr var, expr start, expr end, expr? increment, ttype type, expr? value)
| IntegerConstant(int n, ttype type)
| IntegerBOZ(int v, integerboz intboz_type, ttype? type)
| IntegerConstant(int n, ttype type, integerboz intboz_type)
| IntegerBitNot(expr arg, ttype type, expr? value)
| IntegerUnaryMinus(expr arg, ttype type, expr? value)
| IntegerCompare(expr left, cmpop op, expr right, ttype type, expr? value)
Expand Down Expand Up @@ -230,7 +229,7 @@ binop = Add | Sub | Mul | Div | Pow | BitAnd | BitOr | BitXor | BitLShift | BitR
reduction_op = ReduceAdd | ReduceSub | ReduceMul | ReduceMIN | ReduceMAX
logicalbinop = And | Or | Xor | NEqv | Eqv
cmpop = Eq | NotEq | Lt | LtE | Gt | GtE
integerboz = Binary | Hex | Octal
integerboz = Binary | Hex | Octal | Decimal
arraybound = LBound | UBound
arraystorage = RowMajor | ColMajor
string_format_kind = FormatFortran | FormatC | FormatPythonPercent | FormatPythonFString | FormatPythonFormat
Expand Down
4 changes: 3 additions & 1 deletion src/libasr/asdl_cpp.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,8 @@ def visitConstructor(self, cons, base, extra_attributes):
args.append("size_t n_%s" % (f.name))
lines.append("n->n_%s = n_%s;" % (f.name, f.name))
self.emit("};", 1)
if ( cons.name == "IntegerConstant" ):
args[-1] += " = ASR::integerbozType::Decimal"
self.emit("static inline %s_t* make_%s_t(%s) {" % (subs["mod"],
cons.name, ", ".join(args)), 1)
self.emit( "%s_t *n;" % cons.name, 2)
Expand Down Expand Up @@ -2602,7 +2604,7 @@ def make_visitor(self, name, fields):
return ASR::down_cast<ASR::Variable_t>(s)->m_value;
}""" \
% (name, name), 2, new_line=False)
elif name.endswith("Constant") or name == "IntegerBOZ":
elif name.endswith("Constant"):
self.emit("case ASR::exprType::%s: { return f; }"\
% (name), 2, new_line=False)
else:
Expand Down
15 changes: 3 additions & 12 deletions src/libasr/asr_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,6 @@ static inline bool is_value_constant(ASR::expr_t *a_value) {
}
switch ( a_value->type ) {
case ASR::exprType::IntegerConstant:
case ASR::exprType::IntegerBOZ:
case ASR::exprType::UnsignedIntegerConstant:
case ASR::exprType::RealConstant:
case ASR::exprType::ComplexConstant:
Expand Down Expand Up @@ -1380,11 +1379,6 @@ static inline bool extract_value(ASR::expr_t* value_expr, T& value) {
value = (T) const_int->m_n;
break;
}
case ASR::exprType::IntegerBOZ: {
ASR::IntegerBOZ_t* int_boz = ASR::down_cast<ASR::IntegerBOZ_t>(value_expr);
value = (T) int_boz->m_v;
break;
}
case ASR::exprType::UnsignedIntegerConstant: {
ASR::UnsignedIntegerConstant_t* const_int = ASR::down_cast<ASR::UnsignedIntegerConstant_t>(value_expr);
value = (T) const_int->m_n;
Expand Down Expand Up @@ -5461,8 +5455,7 @@ static inline void Call_t_body(Allocator& al, ASR::symbol_t* a_name,
ASR::FunctionType_t* func_type = get_FunctionType(a_name);

for( size_t i = 0; i < n_args; i++ ) {
if( a_args[i].m_value == nullptr ||
ASR::is_a<ASR::IntegerBOZ_t>(*a_args[i].m_value) ) {
if( a_args[i].m_value == nullptr ) {
continue;
}
ASR::expr_t* arg = a_args[i].m_value;
Expand Down Expand Up @@ -5690,8 +5683,7 @@ static inline ASR::asr_t* make_IntrinsicElementalFunction_t_util(
ASR::ttype_t* a_type, ASR::expr_t* a_value) {

for( size_t i = 0; i < n_args; i++ ) {
if( a_args[i] == nullptr ||
ASR::is_a<ASR::IntegerBOZ_t>(*a_args[i]) ) {
if( a_args[i] == nullptr ) {
continue;
}
ASR::expr_t* arg = a_args[i];
Expand All @@ -5713,8 +5705,7 @@ static inline ASR::asr_t* make_IntrinsicArrayFunction_t_util(
ASR::ttype_t* a_type, ASR::expr_t* a_value) {

for( size_t i = 0; i < n_args; i++ ) {
if( a_args[i] == nullptr ||
ASR::is_a<ASR::IntegerBOZ_t>(*a_args[i]) ) {
if( a_args[i] == nullptr ) {
continue;
}
ASR::expr_t* arg = a_args[i];
Expand Down
3 changes: 1 addition & 2 deletions src/libasr/codegen/asr_to_fortran.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1355,6 +1355,7 @@ class ASRToFortranVisitor : public ASR::BaseVisitor<ASRToFortranVisitor>
}

void visit_IntegerConstant(const ASR::IntegerConstant_t &x) {
// TODO: handle IntegerBOZ
src = std::to_string(x.m_n);
int kind = ASRUtils::extract_kind_from_ttype_t(x.m_type);
if (kind != 4) {
Expand All @@ -1365,8 +1366,6 @@ class ASRToFortranVisitor : public ASR::BaseVisitor<ASRToFortranVisitor>
last_expr_precedence = Precedence::Ext;
}

// void visit_IntegerBOZ(const ASR::IntegerBOZ_t &x) {}

// void visit_IntegerBitNot(const ASR::IntegerBitNot_t &x) {}

void visit_IntegerUnaryMinus(const ASR::IntegerUnaryMinus_t &x) {
Expand Down
2 changes: 2 additions & 0 deletions src/libasr/pickle.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ class ASRPickleVisitor :
}
s.append(" ");
this->visit_ttype(*x.m_type);
s.append(" ");
this->visit_integerbozType(x.m_intboz_type);
s.append(")");
}
void visit_Module(const ASR::Module_t &x) {
Expand Down
2 changes: 1 addition & 1 deletion tests/reference/asr-allocate_01-f3446f6.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"outfile": null,
"outfile_hash": null,
"stdout": "asr-allocate_01-f3446f6.stdout",
"stdout_hash": "0d6ddeb653e2f54859ac75982db40527ecbabd7d3b458836f5e24668",
"stdout_hash": "cdc3cba54e4ecf4f87e29c52338ba458acb7216cd271a1887db0edfc",
"stderr": null,
"stderr_hash": null,
"returncode": 0
Expand Down
Loading

0 comments on commit 1509514

Please sign in to comment.