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

Commit 4d89e7f

Browse files
perostOpenModelica-Hudson
authored andcommitted
[NF] Fix FBuiltin.getBasicTypes for NF.
- ExternalObject is defined in ModelicaBuiltin in the NF and should not be added by FBuiltin.getBasicTypes when -d=newInst is set. Belonging to [master]: - #2363
1 parent 5680ad3 commit 4d89e7f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Compiler/FFrontEnd/FBuiltin.mo

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,12 @@ protected constant SCode.Element objectiveVarComp =
307307
SCode.noComment, NONE(), Absyn.dummyInfo);
308308

309309
protected constant list<SCode.Element> basicTypes = {clockType, rlType, intType, strType, boolType, enumType, ExternalObjectType, realType, integerType, stringType, booleanType, uncertaintyType};
310+
protected constant list<SCode.Element> basicTypesNF = {clockType, rlType, intType, strType, boolType, enumType, realType, integerType, stringType, booleanType, uncertaintyType};
310311

311312
public function getBasicTypes
312313
output list<SCode.Element> tys;
313314
algorithm
314-
tys := basicTypes;
315+
tys := if Flags.isSet(Flags.SCODE_INST) then basicTypesNF else basicTypes;
315316
end getBasicTypes;
316317

317318
public function variableIsBuiltin

0 commit comments

Comments
 (0)