Skip to content
This repository has been archived by the owner on May 18, 2019. It is now read-only.

Commit

Permalink
[NF] Fix typing of when conditions.
Browse files Browse the repository at this point in the history
- Use the correct origin when typing when conditions, so they're not
  considered to be inside the when body.

Belonging to [master]:
  - #2780
  - OpenModelica/OpenModelica-testsuite#1073
  • Loading branch information
perost authored and OpenModelica-Hudson committed Nov 9, 2018
1 parent 144493f commit 088d435
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Compiler/NFFrontEnd/NFTyping.mo
Expand Up @@ -2350,7 +2350,7 @@ algorithm
match br
case Equation.Branch.BRANCH(condition = cond, body = body)
algorithm
(e1, var) := typeCondition(cond, next_origin, eq.source,
(e1, var) := typeCondition(cond, origin, eq.source,
Error.WHEN_CONDITION_TYPE_ERROR, allowVector = true);
eqs1 := list(typeEquation(beq, next_origin) for beq in body);
then
Expand Down

0 comments on commit 088d435

Please sign in to comment.