Skip to content

Commit bc0bce8

Browse files
author
Peter Aronsson
committed
- Reverted (constrain is used in the old multibody library and MathCore uses it.) Testcase will be added later today.
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5220 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 7dac186 commit bc0bce8

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Compiler/Builtin.mo

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3482,6 +3482,8 @@ algorithm
34823482
env = Env.extendFrameT(env, "sqrt", sqrtreal2real);
34833483
env = Env.extendFrameT(env, "mod", realReal2real);
34843484
env = Env.extendFrameT(env, "mod", intInt2int);
3485+
env = Env.extendFrameT(env, "constrain", realrealreal2real);
3486+
env = Env.extendFrameT(env, "constrain", array1dimrealarray1dimrealarray1dimreal2array1dimreal);
34853487
/*
34863488
env = Env.extendFrameT(env, "semiLinear", realRealReal2real);
34873489
env = Env.extendFrameT(env, "delay", realReal2real);

Compiler/Codegen.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@ protected function isBuiltinFunction
12821282
takes an Absyn.path and returns true if the name matches a modelica builtin function"
12831283
input Absyn.Path path;
12841284
output Boolean b;
1285-
list<String> builtins = { "delay","smooth","size","ndims","zeros","ones","fill","max","min","transpose","array","sum","product","pre","initial","terminal","floor","ceil","abs","sqrt","div","integer","mod","rem","diagonal","differentiate","simplify","noEvent","edge","sign","der","sample","change","cat","identity","vector","scalar","cross","String","skew"};
1285+
list<String> builtins = { "delay","smooth","size","ndims","zeros","ones","fill","max","min","transpose","array","sum","product","pre","initial","terminal","floor","ceil","abs","sqrt","div","integer","mod","rem","diagonal","differentiate","simplify","noEvent","edge","sign","der","sample","change","cat","identity","vector","scalar","cross","String","skew","constrain" };
12861286

12871287
algorithm
12881288
out := matchcontinue(path)

0 commit comments

Comments
 (0)