Skip to content

Commit 6f118e9

Browse files
committed
Add Adrian's generic AvlTree to the backend
1 parent 8f06694 commit 6f118e9

File tree

4 files changed

+1059
-4
lines changed

4 files changed

+1059
-4
lines changed

Compiler/FrontEnd/SCodeUtil.mo

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2727,9 +2727,11 @@ algorithm
27272727
then ();
27282728
case (Absyn.TCOMPLEX(typeSpecs=tss),_)
27292729
equation
2730-
str = Absyn.typeSpecString(ts);
2731-
Error.addSourceMessage(Error.TCOMPLEX_MULTIPLE_NAMES,{str},info);
2732-
List.map1_0(tss, checkTypeSpec, info);
2730+
if listMember(ts.path, {Absyn.IDENT("list"),Absyn.IDENT("List"),Absyn.IDENT("array"),Absyn.IDENT("Array"),Absyn.IDENT("polymorphic"),Absyn.IDENT("Option")}) then
2731+
str = Absyn.typeSpecString(ts);
2732+
Error.addSourceMessage(Error.TCOMPLEX_MULTIPLE_NAMES,{str},info);
2733+
List.map1_0(tss, checkTypeSpec, info);
2734+
end if;
27332735
then ();
27342736
end match;
27352737
end checkTypeSpec;

Compiler/Template/SCodeDumpTpl.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ template dumpRestrictionTypeVars(SCode.Restriction restriction)
682682
::=
683683
match restriction
684684
case R_UNIONTYPE(__) then
685-
(if typeVars then ("<" + (typeVars |> tv => tv ; separator=";") + ">"))
685+
(if typeVars then ("<" + (typeVars |> tv => tv ; separator=",") + ">"))
686686
else ""
687687
end dumpRestrictionTypeVars;
688688

0 commit comments

Comments
 (0)