Merge pull request #2065 from Shaikh-Ubaid/support_expr_in_assert

Support expression as message in assert

Author: certik

integration_tests/CMakeLists.txt

@@ -416,6 +416,8 @@ RUN(NAME expr_13             LABELS llvm c
 RUN(NAME expr_14             LABELS cpython llvm c)
 RUN(NAME expr_15             LABELS cpython llvm c)
 RUN(NAME expr_16             LABELS cpython c)
+RUN(NAME expr_17             LABELS cpython llvm c)
+RUN(NAME expr_18    FAIL     LABELS cpython llvm c)
 
 RUN(NAME expr_01u            LABELS cpython llvm c NOFAST)
 RUN(NAME expr_02u            LABELS cpython llvm c NOFAST)

integration_tests/expr_17.py

@@ -0,0 +1,16 @@
+from lpython import i32, f64
+
+def main0():
+    a: i32 = 4
+    b: i32 = 3
+    c: i32 = 12
+    assert a * b == c, a * b
+
+    d: f64 = 0.4
+    e: f64 = 2.5
+    f: f64 = 1.0
+    assert abs((d * e) - f) <= 1e-6, abs((d * e) - f)
+
+    assert a == b + 1, "Failed: a == b + 1"
+
+main0()

integration_tests/expr_18.py

@@ -0,0 +1,9 @@
+from lpython import i32, f64
+
+def main0():
+    a: i32 = 4
+    b: i32 = 3
+    c: i32 = 12
+    assert a * b != c, "Error: 3 * 4 equals 12"
+
+main0()

src/libasr/codegen/asr_to_c.cpp

@@ -1066,19 +1066,50 @@ R"(    // Initialise Numpy
         std::string out = indent;
         bracket_open++;
         visit_expr(*x.m_test);
+        std::string test_condition = src;
         if (ASR::is_a<ASR::SymbolicCompare_t>(*x.m_test)){
             out = symengine_src;
             symengine_src = "";
             out += indent;
         }
         if (x.m_msg) {
+            this->visit_expr(*x.m_msg);
+            std::string tmp_gen = "";
+            ASR::ttype_t* value_type = ASRUtils::expr_type(x.m_msg);
+            if( ASR::is_a<ASR::List_t>(*value_type) ||
+                ASR::is_a<ASR::Tuple_t>(*value_type)) {
+                std::string p_func = c_ds_api->get_print_func(value_type);
+                tmp_gen += indent + p_func + "(" + src + ");\n";
+            } else {
+                tmp_gen += "\"";
+                tmp_gen += c_ds_api->get_print_type(value_type, ASR::is_a<ASR::ArrayItem_t>(*x.m_msg));
+                tmp_gen += "\", ";
+                if( ASRUtils::is_array(value_type) ) {
+                    src += "->data";
+                }
+                if(ASR::is_a<ASR::SymbolicExpression_t>(*value_type)) {
+                    src += symengine_src;
+                    symengine_src = "";
+                }
+                if (ASR::is_a<ASR::Complex_t>(*value_type)) {
+                    tmp_gen += "creal(" + src + ")";
+                    tmp_gen += ", ";
+                    tmp_gen += "cimag(" + src + ")";
+                } else if(ASR::is_a<ASR::SymbolicExpression_t>(*value_type)){
+                    tmp_gen += "basic_str(" + src + ")";
+                    if(ASR::is_a<ASR::Var_t>(*x.m_msg)) {
+                        symengine_queue.pop();
+                    }
+                } else {
+                    tmp_gen += src;
+                }
+            }
             out += "ASSERT_MSG(";
-            out += src + ", ";
-            visit_expr(*x.m_msg);
-            out += src + ");\n";
+            out += test_condition + ", ";
+            out += tmp_gen + ");\n";
         } else {
             out += "ASSERT(";
-            out += src + ");\n";
+            out += test_condition + ");\n";
         }
         bracket_open--;
         src = check_tmp_buffer() + out;