Skip to content

Commit

Permalink
- Fix RML crap
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6721 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@sjoelund
sjoelund committed Oct 30, 2010
1 parent 5b9fee1 commit f8172a6
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 61 deletions.
1 change: 0 additions & 1 deletion Compiler/ConnectUtil.mo
View file
Expand Up @@ -64,7 +64,6 @@ protected import Debug;
protected import Error;
protected import Dump;
protected import PrefixUtil;
protected import System;

public
type Env = Env.Env;
Expand Down
108 changes: 50 additions & 58 deletions Compiler/ValuesUtil.mo
View file
Expand Up @@ -1445,49 +1445,45 @@ algorithm
outValueLst:=
matchcontinue (inValue,inValueLst)
local
list<Value> r1,r2,vals,rest;
list<Value> v1,v2,vals,rest;
Value sval;
Integer v1,v2;
Real v2_1,v1_1;
Integer i1,i2;
Real r2,r1;
list<Integer> dims;
case (sval,(Values.ARRAY(valueLst = vals, dimLst = dims) :: rest))
equation
r1 = powScalarArrayelt(sval, vals);
r2 = powScalarArrayelt(sval, rest);
v1 = powScalarArrayelt(sval, vals);
v2 = powScalarArrayelt(sval, rest);
then
(Values.ARRAY(r1,dims) :: r2);
case ((sval as Values.INTEGER(integer = v1)),(Values.INTEGER(integer = v2) :: rest))
local Real r1;
(Values.ARRAY(v1,dims) :: v2);
case ((sval as Values.INTEGER(integer = i1)),(Values.INTEGER(integer = i2) :: rest))
equation
v1_1=intReal(v1);
v2_1=intReal(v2);
r1 = v1_1 ^. v2_1;
r2 = powScalarArrayelt(sval, rest);
r1=intReal(i1);
r2=intReal(i2);
r1 = r1 ^. r2;
v2 = powScalarArrayelt(sval, rest);
then
(Values.REAL(r1) :: r2);
case ((sval as Values.REAL(real = v1)),(Values.INTEGER(integer = v2) :: rest))
local Real r1,v1;
(Values.REAL(r1) :: v2);
case ((sval as Values.REAL(real = r1)),(Values.INTEGER(integer = i2) :: rest))
equation
v2_1 = intReal(v2);
r1 = v1 ^. v2_1;
r2 = powScalarArrayelt(sval, rest);
r2 = intReal(i2);
r1 = r1 ^. r2;
v2 = powScalarArrayelt(sval, rest);
then
(Values.REAL(r1) :: r2);
case ((sval as Values.INTEGER(integer = v1)),(Values.REAL(real = v2) :: rest))
local Real r1,v2;
(Values.REAL(r1) :: v2);
case ((sval as Values.INTEGER(integer = i1)),(Values.REAL(real = r2) :: rest))
equation
v1_1 = intReal(v1);
r1 = v1_1 ^. v2;
r2 = powScalarArrayelt(sval, rest);
r1 = intReal(i1);
r1 = r1 ^. r2;
v2 = powScalarArrayelt(sval, rest);
then
(Values.REAL(r1) :: r2);
case ((sval as Values.REAL(real = v1)),(Values.REAL(real = v2) :: rest))
local Real r1,v1,v2;
(Values.REAL(r1) :: v2);
case ((sval as Values.REAL(real = r1)),(Values.REAL(real = r2) :: rest))
equation
r1 = v1 ^. v2;
r2 = powScalarArrayelt(sval, rest);
r1 = r1 ^. r2;
v2 = powScalarArrayelt(sval, rest);
then
(Values.REAL(r1) :: r2);
(Values.REAL(r1) :: v2);
case (_,{}) then {};
end matchcontinue;
end powScalarArrayelt;
Expand All @@ -1503,47 +1499,43 @@ algorithm
outValueLst:=
matchcontinue (inValue,inValueLst)
local
list<Value> r1,r2,vals,rest;
list<Value> v1,v2,vals,rest;
Value sval;
Integer v1,v2;
Real v2_1,v1_1;
Integer i1,i2;
Real r1,r2;
list<Integer> dims;
case (sval,(Values.ARRAY(valueLst = vals, dimLst = dims) :: rest))
equation
r1 = subArrayeltScalar(sval, vals);
r2 = subArrayeltScalar(sval, rest);
v1 = subArrayeltScalar(sval, vals);
v2 = subArrayeltScalar(sval, rest);
then
(Values.ARRAY(r1,dims) :: r2);
case ((sval as Values.INTEGER(integer = v1)),(Values.INTEGER(integer = v2) :: rest))
local Integer r1;
(Values.ARRAY(v1,dims) :: v2);
case ((sval as Values.INTEGER(integer = i1)),(Values.INTEGER(integer = i2) :: rest))
equation
r1 = v2-v1;
r2 = subArrayeltScalar(sval, rest);
i1 = i2-i1;
v2 = subArrayeltScalar(sval, rest);
then
(Values.INTEGER(r1) :: r2);
case ((sval as Values.REAL(real = v1)),(Values.INTEGER(integer = v2) :: rest))
local Real r1,v1;
(Values.INTEGER(i1) :: v2);
case ((sval as Values.REAL(real = r1)),(Values.INTEGER(integer = i2) :: rest))
equation
v2_1 = intReal(v2);
r1 = v2_1 -. v1;
r2 = subArrayeltScalar(sval, rest);
r2 = intReal(i2);
r1 = r2 -. r1;
v2 = subArrayeltScalar(sval, rest);
then
(Values.REAL(r1) :: r2);
case ((sval as Values.INTEGER(integer = v1)),(Values.REAL(real = v2) :: rest))
local Real r1,v2;
(Values.REAL(r1) :: v2);
case ((sval as Values.INTEGER(integer = i1)),(Values.REAL(real = r2) :: rest))
equation
v1_1 = intReal(v1);
r1 = v2 -. v1_1;
r2 = subArrayeltScalar(sval, rest);
r1 = intReal(i1);
r1 = r2 -. r1;
v2 = subArrayeltScalar(sval, rest);
then
(Values.REAL(r1) :: r2);
case ((sval as Values.REAL(real = v1)),(Values.REAL(real = v2) :: rest))
local Real r1,v1,v2;
(Values.REAL(r1) :: v2);
case ((sval as Values.REAL(real = r1)),(Values.REAL(real = r2) :: rest))
equation
r1 = v2 -. v1;
r2 = subArrayeltScalar(sval, rest);
r1 = r2 -. r1;
v2 = subArrayeltScalar(sval, rest);
then
(Values.REAL(r1) :: r2);
(Values.REAL(r1) :: v2);
case (_,{}) then {};
end matchcontinue;
end subArrayeltScalar;
Expand Down
2 changes: 0 additions & 2 deletions Compiler/XMLDump.mo
View file
Expand Up @@ -88,7 +88,6 @@ public import RTOpts;

protected import Algorithm;
protected import BackendDAEUtil;
protected import BackendDAEOptimize;
protected import BackendDAETransform;
protected import BackendVariable;
protected import ComponentReference;
Expand All @@ -101,7 +100,6 @@ protected import Print;
protected import Util;
protected import DAEDump;
protected import ValuesUtil;
protected import System;


protected constant String HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
Expand Down

0 comments on commit f8172a6

Please sign in to comment.