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

Commit 12ee163

Browse files
perostOpenModelica-Hudson
authored andcommitted
[NF] Minor fixes.
Belonging to [master]: - #2801
1 parent 6ac3d32 commit 12ee163

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Compiler/NFFrontEnd/NFCall.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,7 @@ protected
10621062
next_origin := ExpOrigin.setFlag(origin, ExpOrigin.SUBEXPRESSION);
10631063

10641064
for arg in call.arguments loop
1065-
(arg, arg_ty, arg_var) := Typing.typeExp(arg, origin, info);
1065+
(arg, arg_ty, arg_var) := Typing.typeExp(arg, next_origin, info);
10661066
typedArgs := (arg, arg_ty, arg_var) :: typedArgs;
10671067
end for;
10681068

@@ -1071,7 +1071,7 @@ protected
10711071
typedNamedArgs := {};
10721072
for narg in call.named_args loop
10731073
(name,arg) := narg;
1074-
(arg, arg_ty, arg_var) := Typing.typeExp(arg, origin, info);
1074+
(arg, arg_ty, arg_var) := Typing.typeExp(arg, next_origin, info);
10751075
typedNamedArgs := (name, arg, arg_ty, arg_var) :: typedNamedArgs;
10761076
end for;
10771077

Compiler/NFFrontEnd/NFTyping.mo

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,6 +1089,12 @@ algorithm
10891089
then
10901090
(e1, ty, var1);
10911091

1092+
case Expression.CAST()
1093+
algorithm
1094+
next_origin := ExpOrigin.setFlag(origin, ExpOrigin.SUBEXPRESSION);
1095+
then
1096+
typeExp(exp.exp, next_origin, info);
1097+
10921098
// Subscripted expressions are assumed to already be typed.
10931099
case Expression.SUBSCRIPTED_EXP()
10941100
then (exp, exp.ty, Expression.variability(exp));

0 commit comments

Comments
 (0)