Improve complex binop and add .real, .imag attributes
#232
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -1014,13 +1014,42 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> { | |||||
| al, right->base.loc, right, ASR::cast_kindType::RealToReal, | ||||||
| left_type, nullptr)); | ||||||
| } | ||||||
| } else if (ASRUtils::is_complex(*left_type) && ASRUtils::is_complex(*right_type)) { | ||||||
| bool is_l64 = ASR::down_cast<ASR::Complex_t>(left_type)->m_kind == 8; | ||||||
| bool is_r64 = ASR::down_cast<ASR::Complex_t>(right_type)->m_kind == 8; | ||||||
| if (is_assign) { | ||||||
| if (is_l64 != is_r64) { | ||||||
| // here we need to cast to left type strictly | ||||||
| return ASR::down_cast<ASR::expr_t>(ASR::make_ImplicitCast_t( | ||||||
| al, right->base.loc, right, ASR::cast_kindType::ComplexToComplex, | ||||||
| left_type, nullptr)); | ||||||
| } | ||||||
| } else if (is_l64 && !is_r64) { | ||||||
| return ASR::down_cast<ASR::expr_t>(ASR::make_ImplicitCast_t( | ||||||
| al, right->base.loc, right, ASR::cast_kindType::ComplexToComplex, | ||||||
| left_type, nullptr)); | ||||||
| } | ||||||
| } else if (!is_assign && ASRUtils::is_real(*left_type) && ASRUtils::is_integer(*right_type)) { | ||||||
| return ASR::down_cast<ASR::expr_t>(ASR::make_ImplicitCast_t( | ||||||
| al, right->base.loc, right, ASR::cast_kindType::IntegerToReal, | ||||||
| left_type, nullptr)); | ||||||
| } else if (is_assign && ASRUtils::is_real(*left_type) && ASRUtils::is_integer(*right_type)) { | ||||||
| throw SemanticError("Assigning integer to float is not supported", | ||||||
| right->base.loc); | ||||||
| } else if (ASRUtils::is_complex(*left_type) && !ASRUtils::is_complex(*right_type)) { | ||||||
| if (ASRUtils::is_real(*right_type)) { | ||||||
| return ASR::down_cast<ASR::expr_t>(ASR::make_ImplicitCast_t( | ||||||
| al, right->base.loc, right, ASR::cast_kindType::RealToComplex, | ||||||
| left_type, nullptr)); | ||||||
| } else if (ASRUtils::is_integer(*right_type)) { | ||||||
| return ASR::down_cast<ASR::expr_t>(ASR::make_ImplicitCast_t( | ||||||
| al, right->base.loc, right, ASR::cast_kindType::IntegerToComplex, | ||||||
| left_type, nullptr)); | ||||||
| } else { | ||||||
| std::string rtype = ASRUtils::type_to_str(right_type); | ||||||
| throw SemanticError("Casting " + rtype + " to complex is not Implemented", | ||||||
| right->base.loc); | ||||||
| } | ||||||
| } | ||||||
| return right; | ||||||
| } | ||||||
|
|
@@ -1065,6 +1094,49 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> { | |||||
| } | ||||||
| } | ||||||
|
|
||||||
| void visit_Attribute(const AST::Attribute_t &x) { | ||||||
| if (AST::is_a<AST::Name_t>(*x.m_value)) { | ||||||
| std::string value = AST::down_cast<AST::Name_t>(x.m_value)->m_id; | ||||||
| ASR::symbol_t *t = current_scope->scope[value]; | ||||||
| if (!t) { | ||||||
| throw SemanticError("'" + value + "' is not defined in the scope", | ||||||
| x.base.base.loc); | ||||||
| } | ||||||
| if (ASR::is_a<ASR::Variable_t>(*t)) { | ||||||
| ASR::Variable_t *var = ASR::down_cast<ASR::Variable_t>(t); | ||||||
| LFORTRAN_ASSERT(var->m_value); | ||||||
|
There was a problem hiding this comment. Presently this fails on the following check: def test():
x: c64
x = 2 + 3j
a: f64
a = x.imagASR: This might be because we are keeping value as |
||||||
| if (ASR::is_a<ASR::ConstantComplex_t>(*var->m_value)) { | ||||||
| std::string attr = x.m_attr; | ||||||
| if (attr == "imag") { | ||||||
| double val = ASR::down_cast<ASR::ConstantComplex_t>(var->m_value)->m_im; | ||||||
| ASR::ttype_t *type = ASRUtils::TYPE(ASR::make_Real_t(al, x.base.base.loc, | ||||||
| 8, nullptr, 0)); | ||||||
| tmp = ASR::make_ConstantReal_t(al, x.base.base.loc, val, type); | ||||||
| } else if (attr == "real") { | ||||||
| double val = ASR::down_cast<ASR::ConstantComplex_t>(var->m_value)->m_im; | ||||||
|
There was a problem hiding this comment. Will fix this:
Suggested change
|
||||||
| ASR::ttype_t *type = ASRUtils::TYPE(ASR::make_Real_t(al, x.base.base.loc, | ||||||
| 8, nullptr, 0)); | ||||||
| tmp = ASR::make_ConstantReal_t(al, x.base.base.loc, val, type); | ||||||
| } else { | ||||||
| throw SemanticError("'" + attr + "' is not implemented for Complex type", | ||||||
| x.base.base.loc); | ||||||
| } | ||||||
|
|
||||||
| } else { | ||||||
| throw SemanticError("Only Complex type supported for now in Attribute", | ||||||
| x.base.base.loc); | ||||||
| } | ||||||
| } else { | ||||||
| throw SemanticError("Only Variable type is supported for now in Attribute", | ||||||
| x.base.base.loc); | ||||||
| } | ||||||
|
|
||||||
| } else { | ||||||
| throw SemanticError("Only Name is supported for now in Attribute", | ||||||
| x.base.base.loc); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| void visit_Assert(const AST::Assert_t &x) { | ||||||
| this->visit_expr(*x.m_test); | ||||||
| ASR::expr_t *test = ASRUtils::EXPR(tmp); | ||||||
|
|
@@ -1392,8 +1464,10 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> { | |||||
| value)); | ||||||
| } | ||||||
| } | ||||||
| } else if((ASRUtils::is_integer(*left_type) || ASRUtils::is_real(*left_type) || | ||||||
| ASRUtils::is_complex(*left_type)) && | ||||||
| (ASRUtils::is_integer(*right_type) || ASRUtils::is_real(*right_type) || | ||||||
| ASRUtils::is_complex(*right_type))) { | ||||||
| left = implicitcast_helper(ASRUtils::expr_type(right), left); | ||||||
| right = implicitcast_helper(ASRUtils::expr_type(left), right); | ||||||
| dest_type = ASRUtils::expr_type(left); | ||||||
|
|
@@ -1467,8 +1541,6 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> { | |||||
| value); | ||||||
| return; | ||||||
|
|
||||||
| } else if (ASRUtils::is_logical(*left_type) && ASRUtils::is_logical(*right_type)) { | ||||||
| dest_type = left_type; | ||||||
| } else { | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| (TranslationUnit (SymbolTable 1 {main_program: (Program (SymbolTable 4 {}) main_program [] []), test: (Subroutine (SymbolTable 3 {x: (Variable 3 x Local () () Default (Complex 8 []) Source Public Required .false.), y: (Variable 3 y Local () () Default (Complex 8 []) Source Public Required .false.), z: (Variable 3 z Local () () Default (Complex 8 []) Source Public Required .false.)}) test [] [(= (Var 3 x) (BinOp (ImplicitCast (ConstantInteger 2 (Integer 4 [])) IntegerToComplex (Complex 8 []) ()) Add (ConstantComplex 0.000000 3.000000 (Complex 8 [])) (Complex 8 []) () ()) ()) (= (Var 3 y) (BinOp (ImplicitCast (ConstantInteger 5 (Integer 4 [])) IntegerToComplex (Complex 8 []) ()) Add (ConstantComplex 0.000000 5.000000 (Complex 8 [])) (Complex 8 []) () ()) ()) (= (Var 3 z) (BinOp (Var 3 x) Add (Var 3 y) (Complex 8 []) () ()) ()) (= (Var 3 z) (BinOp (Var 3 x) Sub (Var 3 y) (Complex 8 []) () ()) ()) (= (Var 3 z) (BinOp (ImplicitCast (ConstantInteger 2 (Integer 4 [])) IntegerToComplex (Complex 8 []) ()) Mul (Var 3 x) (Complex 8 []) () ()) ())] Source Public Implementation () .false. .false.), test_complex: (Subroutine (SymbolTable 2 {b: (Variable 2 b Local () () Default (Logical 1 []) Source Public Required .false.), c: (Variable 2 c Local () () Default (Complex 4 []) Source Public Required .false.), c1: (Variable 2 c1 Local () () Default (Complex 4 []) Source Public Required .false.), c2: (Variable 2 c2 Local () () Default (Complex 4 []) Source Public Required .false.), c3: (Variable 2 c3 Local () () Default (Complex 8 []) Source Public Required .false.)}) test_complex [] [(= (Var 2 c) (ImplicitCast (ConstantComplex 0.000000 0.000000 (Complex 8 [])) ComplexToComplex (Complex 4 []) ()) ()) (= (Var 2 c) (ImplicitCast (ConstantComplex 3.400000 0.000000 (Complex 8 [])) ComplexToComplex (Complex 4 []) ()) ()) (= (Var 2 c) (ImplicitCast (ConstantComplex 5.000000 4.300000 (Complex 8 [])) ComplexToComplex (Complex 4 []) ()) ()) (= (Var 2 c) (ImplicitCast (ConstantComplex 1.000000 0.000000 (Complex 8 [])) ComplexToComplex (Complex 4 []) ()) ()) (= (Var 2 c1) (ImplicitCast (ConstantComplex 3.000000 4.000000 (Complex 8 [])) ComplexToComplex (Complex 4 []) ()) ()) (= (Var 2 c2) (ImplicitCast (ConstantComplex 2.000000 4.500000 (Complex 8 [])) ComplexToComplex (Complex 4 []) ()) ()) (= (Var 2 c3) (ConstantComplex 3.000000 4.000000 (Complex 8 [])) ()) (= (Var 2 b) (Compare (Var 2 c1) NotEq (Var 2 c2) (Logical 4 []) () ()) ()) (= (Var 2 b) (Compare (ImplicitCast (Var 2 c1) ComplexToComplex (Complex 8 []) ()) Eq (Var 2 c3) (Logical 4 []) () ()) ()) (= (Var 2 c) (BinOp (Var 2 c1) Add (Var 2 c2) (Complex 4 []) () ()) ()) (= (Var 2 c) (BinOp (Var 2 c2) Sub (Var 2 c1) (Complex 4 []) () ()) ()) (= (Var 2 c) (BinOp (Var 2 c1) Mul (Var 2 c2) (Complex 4 []) () ()) ()) (= (Var 2 c) (ImplicitCast (BinOp (ConstantComplex 1.000000 2.000000 (Complex 8 [])) Pow (ConstantComplex 3.345340 4.867868 (Complex 8 [])) (Complex 8 []) (ConstantComplex 0.015553 0.065561 (Complex 8 [])) ()) ComplexToComplex (Complex 4 []) ()) ()) (= (Var 2 c) (ImplicitCast (BinOp (ConstantComplex 1.000000 2.000000 (Complex 8 [])) Mul (ConstantComplex 3.000000 4.000000 (Complex 8 [])) (Complex 8 []) (ConstantComplex -5.000000 10.000000 (Complex 8 [])) ()) ComplexToComplex (Complex 4 []) ()) ()) (= (Var 2 c) (ImplicitCast (BinOp (ConstantComplex 4.000000 5.000000 (Complex 8 [])) Sub (ConstantComplex 3.000000 4.000000 (Complex 8 [])) (Complex 8 []) (ConstantComplex 1.000000 1.000000 (Complex 8 [])) ()) ComplexToComplex (Complex 4 []) ()) ())] Source Public Implementation () .false. .false.)}) []) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| (TranslationUnit (SymbolTable 1 {main_program: (Program (SymbolTable 3 {}) main_program [] []), test_UnaryOp: (Subroutine (SymbolTable 2 {a: (Variable 2 a Local () () Default (Integer 4 []) Source Public Required .false.), b: (Variable 2 b Local () () Default (Logical 1 []) Source Public Required .false.), b1: (Variable 2 b1 Local () () Default (Logical 1 []) Source Public Required .false.), b2: (Variable 2 b2 Local () () Default (Logical 1 []) Source Public Required .false.), b3: (Variable 2 b3 Local () () Default (Logical 1 []) Source Public Required .false.), c: (Variable 2 c Local () () Default (Complex 4 []) Source Public Required .false.), f: (Variable 2 f Local () () Default (Real 4 []) Source Public Required .false.)}) test_UnaryOp [] [(= (Var 2 a) (UnaryOp UAdd (ConstantInteger 4 (Integer 4 [])) (Integer 4 []) (ConstantInteger 4 (Integer 4 []))) ()) (= (Var 2 a) (UnaryOp USub (ConstantInteger 500 (Integer 4 [])) (Integer 4 []) (ConstantInteger -500 (Integer 4 []))) ()) (= (Var 2 a) (UnaryOp Invert (ConstantInteger 5 (Integer 4 [])) (Integer 4 []) (ConstantInteger -6 (Integer 4 []))) ()) (= (Var 2 b) (UnaryOp Not (ConstantInteger 5 (Integer 4 [])) (Integer 4 []) (ConstantLogical .false. (Logical 4 []))) ()) (= (Var 2 b) (UnaryOp Not (UnaryOp USub (ConstantInteger 1 (Integer 4 [])) (Integer 4 []) (ConstantInteger -1 (Integer 4 []))) (Integer 4 []) (ConstantLogical .false. (Logical 4 []))) ()) (= (Var 2 b) (UnaryOp Not (ConstantInteger 0 (Integer 4 [])) (Integer 4 []) (ConstantLogical .true. (Logical 4 []))) ()) (= (Var 2 f) (ImplicitCast (UnaryOp UAdd (ConstantReal 1.000000 (Real 8 [])) (Real 8 []) (ConstantReal 1.000000 (Real 8 []))) RealToReal (Real 4 []) ()) ()) (= (Var 2 f) (ImplicitCast (UnaryOp USub (ConstantReal 183745.534000 (Real 8 [])) (Real 8 []) (ConstantReal -183745.534000 (Real 8 []))) RealToReal (Real 4 []) ()) ()) (= (Var 2 b1) (ConstantLogical .true. (Logical 1 [])) ()) (= (Var 2 b2) (UnaryOp Not (ConstantLogical .false. (Logical 1 [])) (Logical 1 []) (ConstantLogical .true. (Logical 4 []))) ()) (= (Var 2 b3) (UnaryOp Not (Var 2 b2) (Logical 1 []) ()) ()) (= (Var 2 a) (UnaryOp UAdd (ConstantLogical .true. (Logical 1 [])) (Logical 1 []) (ConstantInteger 1 (Integer 4 []))) ()) (= (Var 2 a) (UnaryOp USub (ConstantLogical .false. (Logical 1 [])) (Logical 1 []) (ConstantInteger 0 (Integer 4 []))) ()) (= (Var 2 a) (UnaryOp Invert (ConstantLogical .true. (Logical 1 [])) (Logical 1 []) (ConstantInteger -2 (Integer 4 []))) ()) (= (Var 2 c) (ImplicitCast (UnaryOp UAdd (ConstantComplex 1.000000 2.000000 (Complex 8 [])) (Complex 8 []) (ConstantComplex 1.000000 2.000000 (Complex 8 []))) ComplexToComplex (Complex 4 []) ()) ()) (= (Var 2 c) (ImplicitCast (UnaryOp USub (ConstantComplex 3.000000 65.000000 (Complex 8 [])) (Complex 8 []) (ConstantComplex -3.000000 -65.000000 (Complex 8 []))) ComplexToComplex (Complex 4 []) ()) ()) (= (Var 2 b1) (UnaryOp Not (ConstantComplex 3.000000 4.000000 (Complex 8 [])) (Complex 8 []) (ConstantLogical .false. (Logical 4 []))) ()) (= (Var 2 b2) (UnaryOp Not (ConstantComplex 0.000000 0.000000 (Complex 8 [])) (Complex 8 []) (ConstantLogical .true. (Logical 4 []))) ())] Source Public Implementation () .false. .false.)}) []) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will change this to