Skip to content

Commit

Permalink
- small fix to extends from basic type.
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13717 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Oct 30, 2012
1 parent 1d312ab commit 3d3c19e
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions Compiler/FrontEnd/SCodeInstShortcut.mo
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,7 @@ algorithm
SCode.Visibility visibility;
Option<SCode.Annotation> ann;
InstInfo ii;
Boolean isBasic;

case (SCode.EXTENDS(path, visibility, smod, ann, info),
_, _, _, _, _, _)
Expand All @@ -838,14 +839,18 @@ algorithm
smod = SCodeMod.removeRedeclaresFromMod(smod);

name = Absyn.pathStringReplaceDot(path, "$");
name = "'" +& name +& "$ext_" +& SCodeEnv.getEnvName(inEnv) +& "'";
isBasic = isBasicType(name);
name = Util.if_(
isBasic,
name,
"'" +& name +& "$ext_" +& SCodeEnv.getEnvName(inEnv) +& "'");

cls::classes = classes;
cls = SCode.setClassName(name, cls);
classes = cls::classes;

cls = SCode.EXTENDS(Absyn.IDENT(name), visibility, smod, ann, info);
classes = listAppend(classes, {cls});
classes = Util.if_(isBasic, {cls}, listAppend(classes, {cls}));
then
(classes, ii);

Expand Down

0 comments on commit 3d3c19e

Please sign in to comment.