Changeset da3870ad in OpenModelica


Ignore:
Timestamp:
2021-04-09T13:56:04+02:00 (3 years ago)
Author:
Per Östlund <perost86@…>
Parents:
723951b
git-author:
Per Östlund <perost86@…> (04/09/21 13:36:38)
git-committer:
Per Östlund <perost86@…> (04/09/21 13:56:04)
Message:

Fix class extends of short class definition

  • Remove special case for class extends of short class definitions, it's wrong and the normal case works for them anyway.
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • OMCompiler/Compiler/NFFrontEnd/NFInst.mo

    r0953e25 rda3870ad  
    13221322          Class.setPrefixes(prefs, orig_cls);
    13231323
    1324       // Class extends of a long class declaration.
    1325       case (Class.EXPANDED_CLASS(), Class.PARTIAL_CLASS())
     1324      // Class extends of a normal class.
     1325      case (_, Class.PARTIAL_CLASS())
    13261326        algorithm
    13271327          node_ty := InstNodeType.BASE_CLASS(InstNode.parent(orig_node), InstNode.definition(orig_node));
     
    13291329          rdcl_cls.elements := ClassTree.setClassExtends(orig_node, rdcl_cls.elements);
    13301330          rdcl_cls.modifier := Modifier.merge(outerMod, rdcl_cls.modifier);
    1331           rdcl_cls.prefixes := prefs;
    1332         then
    1333           rdcl_cls;
    1334 
    1335       // Class extends of a short class declaration.
    1336       case (Class.EXPANDED_DERIVED(), Class.PARTIAL_CLASS())
    1337         algorithm
    13381331          rdcl_cls.prefixes := prefs;
    13391332        then
  • testsuite/flattening/modelica/scodeinst/Makefile

    r4e6ee9f8 rda3870ad  
    203203ClassExtends7.mo \
    204204ClassExtends8.mo \
     205ClassExtends9.mo \
    205206ClassExtendsBuiltin1.mo \
    206207ClassExtendsBuiltin2.mo \
Note: See TracChangeset for help on using the changeset viewer.