diff options
| author | clean | 2000-06-13 14:00:06 +0000 |
|---|---|---|
| committer | clean | 2000-06-13 14:00:06 +0000 |
| commit | 212223e34324061f8ccefa8c239b9e0ecfd4d1fa (patch) | |
| tree | 4f462a2ae8cb777a989d41e10f935944463061f2 | |
| parent | bugfix: the type unification algorithm used to generate types for new functio... (diff) | |
fixed bug in boolean case expressions of which first alt may fail
git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@158 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
| -rw-r--r-- | frontend/convertcases.icl | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/frontend/convertcases.icl b/frontend/convertcases.icl index 22ee76a..cd18fb4 100644 --- a/frontend/convertcases.icl +++ b/frontend/convertcases.icl @@ -709,8 +709,14 @@ where // convert_boolean_case_into_guard bound_vars group_index common_defs default_ptr guard [ alt : alts ] case_default case_info_ptr ci convert_boolean_case_into_guard bound_vars group_index common_defs has_default guard [ alt : alts ] case_default case_info_ptr ci # (guard, ci) = convertRootExpression bound_vars group_index common_defs cHasNoDefault guard ci - # (sign_of_then_part, then_part, ci) = convert_boolean_guard bound_vars group_index common_defs alt ci - (opt_else_part, ci) = convert_to_else_part bound_vars group_index common_defs has_default sign_of_then_part alts case_default ci + /* JVG: changed 13-6-2000 + # (sign_of_then_part, then_part, ci) = convert_boolean_guard bound_vars group_index common_defs alt ci + (opt_else_part, ci) = convert_to_else_part bound_vars group_index common_defs has_default sign_of_then_part alts case_default ci + */ + # sign_of_then_part = case alt of {{bp_value=BVB bool} -> bool}; + # (opt_else_part, ci) = convert_to_else_part bound_vars group_index common_defs has_default sign_of_then_part alts case_default ci + # (sign_of_then_part, then_part, ci) = convert_boolean_case_then_part bound_vars group_index common_defs default_ptr alt opt_else_part has_default ci + /**/ // = (Conditional { if_cond = { con_positive = sign_of_then_part, con_expression = guard }, if_then = then_part, if_else = opt_else_part }, ci) = (build_conditional sign_of_then_part guard then_part opt_else_part, ci) where @@ -737,6 +743,11 @@ where # (bp_expr, ci) = convertRootExpression bound_vars group_index common_defs cHasNoDefault bp_expr ci = (bool, bp_expr, ci) + convert_boolean_case_then_part bound_vars group_index common_defs default_ptr {bp_value=BVB bool,bp_expr} opt_else_part has_default ci=:{ci_expr_heap} + # (EI_CaseTypeAndRefCounts case_type _, ci_expr_heap) = readPtr case_info_ptr ci_expr_heap + # (default_ptr, ci_expr_heap) = makePtrToDefault opt_else_part case_type.ct_result_type has_default ci_expr_heap + # (bp_expr, ci) = convertRootExpression bound_vars group_index common_defs default_ptr bp_expr {ci & ci_expr_heap=ci_expr_heap} + = (bool, bp_expr, ci) convertRootExpression bound_vars group_index common_defs _ expr ci = convertCases bound_vars group_index common_defs expr ci |