Skip to content

Commit

Permalink
- Removing more old syntax
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6395 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@sjoelund
sjoelund committed Oct 17, 2010
1 parent 1fee03b commit aba5bfd
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 39 deletions.
2 changes: 1 addition & 1 deletion Compiler/Ceval.mo
View file
Expand Up @@ -5891,7 +5891,7 @@ public function get1 "help function to get"
algorithm
(value,indx):= matchcontinue (key,hashTable)
local
Integer hval,hashindx,indx,indx_1,bsize,n;
Integer hval,hashindx,indx_1,bsize,n;
list<tuple<Key,Integer>> indexes;
Value v;
array<list<tuple<Key,Integer>>> hashvec;
Expand Down
8 changes: 4 additions & 4 deletions Compiler/HashTable.mo
View file
Expand Up @@ -162,7 +162,7 @@ public function nullHashTable "
list<Option<tuple<Key,Value>>> lst;
array<Option<tuple<Key,Value>>> emptyarr;
algorithm
arr := fill({}, 0);
arr := arrayCreate(0, {});
emptyarr := listArray({});
hashTable := HASHTABLE(arr,VALUE_ARRAY(0,0,emptyarr),0,0);
end nullHashTable;
Expand All @@ -178,10 +178,10 @@ public function emptyHashTable "
list<Option<tuple<Key,Value>>> lst;
array<Option<tuple<Key,Value>>> emptyarr;
algorithm
arr := fill({}, 1000);
arr := arrayCreate(1000, {});
// lst := Util.listFill(NONE, 100);
// emptyarr := listArray(lst);
emptyarr := fill(NONE(), 100);
emptyarr := arrayCreate(100, NONE());
hashTable := HASHTABLE(arr,VALUE_ARRAY(0,100,emptyarr),1000,0);
end emptyHashTable;

Expand Down Expand Up @@ -380,7 +380,7 @@ algorithm
(value,indx):=
matchcontinue (key,hashTable)
local
Integer hval,hashindx,indx,indx_1,bsize,n;
Integer hval,hashindx,indx_1,bsize,n;
list<tuple<Key,Integer>> indexes;
Value v;
array<list<tuple<Key,Integer>>> hashvec;
Expand Down
6 changes: 3 additions & 3 deletions Compiler/HashTable2.mo
View file
Expand Up @@ -89,8 +89,8 @@ public function emptyHashTable "
list<Option<tuple<Key,Value>>> lst;
array<Option<tuple<Key,Value>>> emptyarr;
algorithm
arr := fill({}, 1000);
emptyarr := fill(NONE(), 100);
arr := arrayCreate(1000, {});
emptyarr := arrayCreate(100, NONE());
hashTable := HASHTABLE(arr,VALUE_ARRAY(0,100,emptyarr),1000,0);
end emptyHashTable;

Expand Down Expand Up @@ -244,7 +244,7 @@ algorithm
(value,indx):=
matchcontinue (key,hashTable)
local
Integer hval,hashindx,indx,indx_1,bsize,n;
Integer hval,hashindx,indx_1,bsize,n;
list<tuple<Key,Integer>> indexes;
Value v;
array<list<tuple<Key,Integer>>> hashvec;
Expand Down
6 changes: 3 additions & 3 deletions Compiler/HashTable3.mo
View file
Expand Up @@ -90,10 +90,10 @@ public function emptyHashTable "
list<Option<tuple<Key,Value>>> lst;
array<Option<tuple<Key,Value>>> emptyarr;
algorithm
arr := fill({}, 1000);
arr := arrayCreate(1000, {});
// lst := Util.listFill(NONE, 100);
// emptyarr := listArray(lst);
emptyarr := fill(NONE(), 100);
emptyarr := arrayCreate(100, NONE());
hashTable := HASHTABLE(arr,VALUE_ARRAY(0,100,emptyarr),1000,0);
end emptyHashTable;

Expand Down Expand Up @@ -207,7 +207,7 @@ algorithm
(value,indx):=
matchcontinue (key,hashTable)
local
Integer hval,hashindx,indx,indx_1,bsize,n;
Integer hval,hashindx,indx_1,bsize,n;
list<tuple<Key,Integer>> indexes;
Value v;
array<list<tuple<Key,Integer>>> hashvec;
Expand Down
6 changes: 3 additions & 3 deletions Compiler/HashTable4.mo
View file
Expand Up @@ -112,10 +112,10 @@ public function emptyHashTable "
list<Option<tuple<Key,Value>>> lst;
array<Option<tuple<Key,Value>>> emptyarr;
algorithm
arr := fill({}, 1000);
arr := arrayCreate(1000, {});
// lst := Util.listFill(NONE, 100);
// emptyarr := listArray(lst);
emptyarr := fill(NONE(), 100);
emptyarr := arrayCreate(100, NONE());
hashTable := HASHTABLE(arr,VALUE_ARRAY(0,100,emptyarr),1000,0);
end emptyHashTable;

Expand Down Expand Up @@ -279,7 +279,7 @@ algorithm
(value,indx):=
matchcontinue (key,hashTable)
local
Integer hval,hashindx,indx,indx_1,bsize,n;
Integer hval,hashindx,indx_1,bsize,n;
list<tuple<Key,Integer>> indexes;
Value v;
array<list<tuple<Key,Integer>>> hashvec;
Expand Down
6 changes: 3 additions & 3 deletions Compiler/HashTable5.mo
View file
Expand Up @@ -118,10 +118,10 @@ public function emptyHashTable "
list<Option<tuple<Key,Value>>> lst;
array<Option<tuple<Key,Value>>> emptyarr;
algorithm
arr := fill({}, 1000);
arr := arrayCreate(1000, {});
// lst := Util.listFill(NONE, 100);
// emptyarr := listArray(lst);
emptyarr := fill(NONE(), 100);
emptyarr := arrayCreate(100, NONE());
hashTable := HASHTABLE(arr,VALUE_ARRAY(0,100,emptyarr),1000,0);
end emptyHashTable;

Expand Down Expand Up @@ -285,7 +285,7 @@ algorithm
(value,indx):=
matchcontinue (key,hashTable)
local
Integer hval,hashindx,indx,indx_1,bsize,n;
Integer hval,hashindx,indx_1,bsize,n;
list<tuple<Key,Integer>> indexes;
Value v;
array<list<tuple<Key,Integer>>> hashvec;
Expand Down
6 changes: 3 additions & 3 deletions Compiler/HashTable6.mo
View file
Expand Up @@ -137,7 +137,7 @@ public function nullHashTable "
list<Option<tuple<Key,Value>>> lst;
array<Option<tuple<Key,Value>>> emptyarr;
algorithm
arr := fill({}, 0);
arr := arrayCreate(0, {});
emptyarr := listArray({});
hashTable := HASHTABLE(arr,VALUE_ARRAY(0,0,emptyarr),0,0);
end nullHashTable;
Expand All @@ -153,7 +153,7 @@ public function emptyHashTable "
list<Option<tuple<Key,Value>>> lst;
array<Option<tuple<Key,Value>>> emptyarr;
algorithm
arr := fill({}, 1000);
arr := arrayCreate(1000, {});
lst := Util.listFill(NONE, 100);
emptyarr := listArray(lst);
hashTable := HASHTABLE(arr,VALUE_ARRAY(0,100,emptyarr),1000,0);
Expand Down Expand Up @@ -351,7 +351,7 @@ algorithm
(value,indx):=
matchcontinue (key,hashTable)
local
Integer hval,hashindx,indx,indx_1,bsize,n;
Integer hval,hashindx,indx_1,bsize,n;
list<tuple<Key,Integer>> indexes;
Value v;
array<list<tuple<Key,Integer>>> hashvec;
Expand Down
6 changes: 3 additions & 3 deletions Compiler/HashTableCG.mo
View file
Expand Up @@ -111,10 +111,10 @@ public function emptyHashTable "
list<Option<tuple<Key,Value>>> lst;
array<Option<tuple<Key,Value>>> emptyarr;
algorithm
arr := fill({}, 1000);
arr := arrayCreate(1000, {});
// lst := Util.listFill(NONE, 100);
// emptyarr := listArray(lst);
emptyarr := fill(NONE(), 100);
emptyarr := arrayCreate(100, NONE());
hashTable := HASHTABLE(arr,VALUE_ARRAY(0,100,emptyarr),1000,0);
end emptyHashTable;

Expand Down Expand Up @@ -240,7 +240,7 @@ protected function get1 "help function to get"
algorithm
(value,indx) := matchcontinue (key,hashTable)
local
Integer hval,hashindx,indx,indx_1,bsize,n;
Integer hval,hashindx,indx_1,bsize,n;
list<tuple<Key,Integer>> indexes;
Value v;
array<list<tuple<Key,Integer>>> hashvec;
Expand Down
8 changes: 4 additions & 4 deletions Compiler/HashTableStringToPath.mo
View file
Expand Up @@ -129,7 +129,7 @@ public function nullHashTable "
list<Option<tuple<Key,Value>>> lst;
array<Option<tuple<Key,Value>>> emptyarr;
algorithm
arr := fill({}, 0);
arr := arrayCreate(0, {});
emptyarr := listArray({});
hashTable := HASHTABLE(arr,VALUE_ARRAY(0,0,emptyarr),0,0);
end nullHashTable;
Expand All @@ -145,10 +145,10 @@ public function emptyHashTable "
list<Option<tuple<Key,Value>>> lst;
array<Option<tuple<Key,Value>>> emptyarr;
algorithm
arr := fill({}, 1000);
arr := arrayCreate(1000, {});
// lst := Util.listFill(NONE, 100);
// emptyarr := listArray(lst);
emptyarr := fill(NONE(), 100);
emptyarr := arrayCreate(100, NONE());
hashTable := HASHTABLE(arr,VALUE_ARRAY(0,100,emptyarr),1000,0);
end emptyHashTable;

Expand Down Expand Up @@ -344,7 +344,7 @@ algorithm
(value,indx):=
matchcontinue (key,hashTable)
local
Integer hval,hashindx,indx,indx_1,bsize,n;
Integer hval,hashindx,indx_1,bsize,n;
list<tuple<Key,Integer>> indexes;
Value v;
array<list<tuple<Key,Integer>>> hashvec;
Expand Down
2 changes: 1 addition & 1 deletion Compiler/InnerOuter.mo
View file
Expand Up @@ -2234,7 +2234,7 @@ public function get1 "help function to get"
algorithm
(value, indx) := matchcontinue (key,hashTable)
local
Integer hval,hashindx,indx,indx_1,bsize,n;
Integer hval,hashindx,indx_1,bsize,n;
list<tuple<Key,Integer>> indexes;
Value v;
array<list<tuple<Key,Integer>>> hashvec;
Expand Down
6 changes: 3 additions & 3 deletions Compiler/Inst.mo
View file
Expand Up @@ -14303,8 +14303,8 @@ public function emptyInstHashTable
list<Option<tuple<Key,Value>>> lst;
array<Option<tuple<Key,Value>>> emptyarr;
algorithm
arr := fill({}, 1000);
emptyarr := fill(NONE(), 100);
arr := arrayCreate(1000, {});
emptyarr := arrayCreate(100, NONE());
hashTable := HASHTABLE(arr,VALUE_ARRAY(0,100,emptyarr),1000,0);
end emptyInstHashTable;

Expand Down Expand Up @@ -14462,7 +14462,7 @@ public function get1 "help function to get"
algorithm
(value,indx):= matchcontinue (key,hashTable)
local
Integer hval,hashindx,indx,indx_1,bsize,n;
Integer hval,hashindx,indx_1,bsize,n;
list<tuple<Key,Integer>> indexes;
Value v;
array<list<tuple<Key,Integer>>> hashvec;
Expand Down
15 changes: 7 additions & 8 deletions Compiler/VarTransform.mo
View file
Expand Up @@ -886,7 +886,7 @@ algorithm
outRepl:=
matchcontinue (repl,inSrc,inDst)
local
DAE.ComponentRef src,src_1,dst_1;
DAE.ComponentRef src,src_1;
DAE.Exp dst,dst_1,olddst;
HashTable2.HashTable ht,ht_1;
HashTable3.HashTable invHt,invHt_1;
Expand Down Expand Up @@ -1116,9 +1116,8 @@ algorithm
outRepl:=
matchcontinue (repl,inSrc,inDst)
local
DAE.ComponentRef src,src_1,dst_1;
DAE.ComponentRef src,src_1;
DAE.Exp dst,dst_1,olddst;
VariableReplacements repl;
HashTable2.HashTable ht,ht_1;
HashTable3.HashTable invHt,invHt_1;
String s1,s2,s3,s4,s;
Expand Down Expand Up @@ -1252,7 +1251,7 @@ algorithm
(outRepl,outSrc,outDst):=
matchcontinue (repl,src,dst)
local
VariableReplacements repl_1,repl_2,repl;
VariableReplacements repl_1,repl_2;
DAE.ComponentRef src_1,src_2;
DAE.Exp dst_1,dst_2,dst_3;
case (repl,src,dst)
Expand Down Expand Up @@ -1280,7 +1279,7 @@ algorithm
matchcontinue (repl,src,dst)
local
list<DAE.ComponentRef> lst;
VariableReplacements repl_1,repl,singleRepl;
VariableReplacements repl_1,singleRepl;
HashTable2.HashTable ht;
HashTable3.HashTable invHt;
DAE.Exp dst_1;
Expand Down Expand Up @@ -1336,9 +1335,9 @@ algorithm
(outRepl,outSrc,outDst):=
matchcontinue (repl,src,dst)
local
DAE.ComponentRef src,src_1;
DAE.Exp newdst,dst_1,dst;
VariableReplacements repl_1,repl;
DAE.ComponentRef src_1;
DAE.Exp newdst,dst_1;
VariableReplacements repl_1;
HashTable2.HashTable ht;
HashTable3.HashTable invHt;
// for rule a->b1+..+bn, replace all b1 to bn's in the expression;
Expand Down

0 comments on commit aba5bfd

Please sign in to comment.