more c_type weirdness

eclipse-che4z · Sep 17, 2021 · a9b8173 · a9b8173
1 parent d36512e
commit a9b8173
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 5 deletions.
diff --git a/parser_library/src/expressions/conditional_assembly/ca_expression.h b/parser_library/src/expressions/conditional_assembly/ca_expression.h
@@ -41,6 +41,7 @@ enum class character_expression_purpose
 {
     assignment,
     left_side_of_comparison,
+    function_parameter,
 };
 
 // base class for conditional assembly expressions

diff --git a/parser_library/src/expressions/conditional_assembly/ca_operator_binary.cpp b/parser_library/src/expressions/conditional_assembly/ca_operator_binary.cpp
@@ -84,7 +84,7 @@ void ca_function_binary_operator::resolve_expression_tree(context::SET_t_enum ki
     if (expr_kind != kind)
         add_diagnostic(diagnostic_op::error_CE004(expr_range));
     else if ((function == ca_expr_ops::FIND || function == ca_expr_ops::INDEX)
-        && !left_expr->is_character_expression(character_expression_purpose::left_side_of_comparison))
+        && !left_expr->is_character_expression(character_expression_purpose::function_parameter))
         add_diagnostic(diagnostic_op::error_CE004(left_expr->expr_range));
     else
     {

diff --git a/parser_library/src/expressions/conditional_assembly/ca_operator_unary.cpp b/parser_library/src/expressions/conditional_assembly/ca_operator_unary.cpp
@@ -65,7 +65,15 @@ void ca_function_unary_operator::resolve_expression_tree(context::SET_t_enum kin
     if (expr_kind != kind)
         add_diagnostic(diagnostic_op::error_CE004(expr_range));
     else
-        expr->resolve_expression_tree(ca_common_expr_policy::get_operands_type(function, kind));
+    {
+        auto param_type = ca_common_expr_policy::get_operands_type(function, kind);
+        expr->resolve_expression_tree(param_type);
+
+        // TODO: additional types?
+        if (param_type == context::SET_t_enum::C_TYPE
+            && !expr->is_character_expression(character_expression_purpose::function_parameter))
+            expr->add_diagnostic(diagnostic_op::error_CE017_character_expression_expected(expr->expr_range));
+    }
 }
 
 context::SET_t ca_function_unary_operator::operation(context::SET_t operand, const evaluation_context& eval_ctx) const

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_expr_list.cpp b/parser_library/src/expressions/conditional_assembly/terms/ca_expr_list.cpp
@@ -64,7 +64,11 @@ void ca_expr_list::collect_diags() const
         collect_diags_from_child(*expr);
 }
 
-bool ca_expr_list::is_character_expression(character_expression_purpose) const { return false; }
+bool ca_expr_list::is_character_expression(character_expression_purpose purpose) const
+{
+    return purpose == character_expression_purpose::assignment && expr_list.size() == 1
+        && expr_list.front()->is_character_expression(purpose);
+}
 
 void ca_expr_list::apply(ca_expr_visitor& visitor) const { visitor.visit(*this); }
 

diff --git a/parser_library/src/expressions/conditional_assembly/terms/ca_function.cpp b/parser_library/src/expressions/conditional_assembly/terms/ca_function.cpp
@@ -70,14 +70,27 @@ void ca_function::resolve_expression_tree(context::SET_t_enum kind)
         else
         {
             for (auto&& expr : parameters)
+            {
                 expr->resolve_expression_tree(param_kind);
+
+                // TODO: other parameter types?
+                if (param_kind == context::SET_t_enum::C_TYPE)
+                {
+                    if (!expr->is_character_expression(character_expression_purpose::function_parameter))
+                        expr->add_diagnostic(
+                            diagnostic_op::error_CE017_character_expression_expected(expr->expr_range));
+                }
+            }
         }
     }
 }
 
 void ca_function::collect_diags() const
 {
-    // nothing to collect
+    for (auto&& expr : parameters)
+        collect_diags_from_child(*expr);
+    if (duplication_factor)
+        collect_diags_from_child(*duplication_factor);
 }
 
 bool ca_function::is_character_expression(character_expression_purpose purpose) const

diff --git a/parser_library/test/expressions/ca_expr_list_test.cpp b/parser_library/test/expressions/ca_expr_list_test.cpp
@@ -112,7 +112,7 @@ TEST(ca_expr_list, is_character_expression)
     // ('low')
     ca_expr_list expr_list(std::move(list), range());
 
-    EXPECT_FALSE(expr_list.is_character_expression(character_expression_purpose::assignment));
+    EXPECT_TRUE(expr_list.is_character_expression(character_expression_purpose::assignment));
     EXPECT_FALSE(expr_list.is_character_expression(character_expression_purpose::left_side_of_comparison));
 }
 

diff --git a/parser_library/test/expressions/character_expression_test.cpp b/parser_library/test/expressions/character_expression_test.cpp
@@ -144,6 +144,8 @@ TEST(character_expresssion, single_operand_with_spaces)
 &C1 SETC UPPER( 'A' )
 &C2 SETC UPPER( 'A')
 &C3 SETC UPPER('A' )
+&C4 SETC UPPER('&C1') 
+&C5 SETC (UPPER '&C1')
 )";
     analyzer a(input);
     a.analyze();
@@ -154,6 +156,23 @@ TEST(character_expresssion, single_operand_with_spaces)
     SETCEQ("C1", "A");
     SETCEQ("C2", "A");
     SETCEQ("C3", "A");
+    SETCEQ("C4", "A");
+    SETCEQ("C5", "A");
+}
+
+TEST(character_expresssion, single_operand_fail)
+{
+    for (std::string input : {
+             "&C SETC UPPER(&C)",
+             "&C SETC (UPPER &C)",
+         })
+    {
+        analyzer a(input);
+        a.analyze();
+
+        a.collect_diags();
+        EXPECT_FALSE(a.diags().empty());
+    }
 }
 
 TEST(character_expresssion, zero_length_substring)