Changeset a23b8a8 in OpenModelica

Timestamp:

2014-12-11T15:19:40+01:00 (10 years ago)

Author:

Henning Kiel <h.kiel@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

5aa69a5

Parents:

9541f6e2

Message:

#3026

• Fixed some more integer array operations.

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@23734 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Location:

SimulationRuntime/c/util

Files:

• integer_array.c (modified) (5 diffs)
• integer_array.h (modified) (4 diffs)

SimulationRuntime/c/util/integer_array.c

@@ -798 +798 @@
 }
 
-void add_alloc_integer_array(const integer_array_t * a, const integer_array_t * b,integer_array_t* dest)
-{
-    clone_integer_array_spec(a,dest);
-    alloc_integer_array_data(dest);
-    add_integer_array(a,b,dest);
+integer_array_t add_alloc_integer_array(const integer_array_t a, const integer_array_t  b)
+{
+    integer_array_t dest;
+    clone_integer_array_spec(&a,&dest);
+    alloc_integer_array_data(&dest);
+    add_integer_array(&a,&b,&dest);
+    return dest;
 }
 
@@ -863 +865 @@
 }
 
-void mul_alloc_scalar_integer_array(modelica_integer a, const integer_array_t * b, integer_array_t* dest)
-{
-    clone_integer_array_spec(b,dest);
-    alloc_integer_array_data(dest);
-    mul_scalar_integer_array(a,b,dest);
+integer_array_t mul_alloc_scalar_integer_array(modelica_integer a, const integer_array_t b)
+{
+    integer_array_t dest;
+    clone_integer_array_spec(&b,&dest);
+    alloc_integer_array_data(&dest);
+    mul_scalar_integer_array(a,&b,&dest);
+    return dest;
 }
 
@@ -885 +889 @@
 }
 
-void mul_alloc_integer_array_scalar(const integer_array_t * a,modelica_integer b,integer_array_t* dest)
-{
-    clone_integer_array_spec(a,dest);
-    alloc_integer_array_data(dest);
-    mul_integer_array_scalar(a,b,dest);
+integer_array_t  mul_alloc_integer_array_scalar(const integer_array_t a,modelica_integer b)
+{
+    integer_array_t dest;
+    clone_integer_array_spec(&a,&dest);
+    alloc_integer_array_data(&dest);
+    mul_integer_array_scalar(&a,b,&dest);
+    return dest;
 }
 
@@ -1025 +1031 @@
 }
 
-void div_alloc_integer_array_scalar(const integer_array_t * a,modelica_integer b,integer_array_t* dest)
-{
-    clone_integer_array_spec(a,dest);
-    alloc_integer_array_data(dest);
-    div_integer_array_scalar(a,b,dest);
+integer_array_t div_alloc_integer_array_scalar(const integer_array_t a,modelica_integer b)
+{
+    integer_array_t dest;
+    clone_integer_array_spec(&a,&dest);
+    alloc_integer_array_data(&dest);
+    div_integer_array_scalar(&a,b,&dest);
+    return dest;
 }
 
@@ -1066 +1074 @@
 }
 
-void div_alloc_scalar_integer_array(modelica_integer a, const integer_array_t* b, integer_array_t* dest)
-{
-    clone_integer_array_spec(b,dest);
-    alloc_integer_array_data(dest);
-    div_scalar_integer_array(a,b,dest);
+integer_array_t div_alloc_scalar_integer_array(modelica_integer a, const integer_array_t b)
+{
+    integer_array_t dest;
+    clone_integer_array_spec(&b,d&est);
+    alloc_integer_array_data(&dest);
+    div_scalar_integer_array(a,&b,&dest);
 }
 

SimulationRuntime/c/util/integer_array.h

@@ -174 +174 @@
                                 modelica_integer inc,integer_array_t* dest);
 
-extern void add_alloc_integer_array(const integer_array_t * a, const integer_array_t * b,
-                                    integer_array_t* dest);
+extern integer_array_t add_alloc_integer_array(const integer_array_t a, const integer_array_t b);
 extern void add_integer_array(const integer_array_t * a, const integer_array_t * b,
                               integer_array_t* dest);
@@ -187 +186 @@
 extern void mul_scalar_integer_array(modelica_integer a,const integer_array_t * b,
                                      integer_array_t* dest);
-extern void mul_alloc_scalar_integer_array(modelica_integer a,const integer_array_t * b,
-                                           integer_array_t* dest);
+extern integer_array_t mul_alloc_scalar_integer_array(modelica_integer a,const integer_array_t b);
 
 extern void mul_integer_array_scalar(const integer_array_t * a,modelica_integer b,
                                      integer_array_t* dest);
-extern void mul_alloc_integer_array_scalar(const integer_array_t * a,modelica_integer b,
-                                           integer_array_t* dest);
+extern integer_array_t mul_alloc_integer_array_scalar(const integer_array_t a,modelica_integer b);
 
 extern modelica_integer mul_integer_scalar_product(const integer_array_t a,
@@ -210 +207 @@
 extern void div_integer_array_scalar(const integer_array_t * a,modelica_integer b,
                                      integer_array_t* dest);
-extern void div_alloc_integer_array_scalar(const integer_array_t * a,modelica_integer b,
-                                           integer_array_t* dest);
+extern integer_array_t div_alloc_integer_array_scalar(const integer_array_t a,modelica_integer b);
 
 extern void division_integer_array_scalar(threadData_t*,const integer_array_t * a,modelica_integer b,
@@ -218 +214 @@
                                                 integer_array_t* dest, const char* division_str);
 extern void div_scalar_integer_array(modelica_integer a, const integer_array_t* b, integer_array_t* dest);
-extern void div_alloc_scalar_integer_array(modelica_integer a, const integer_array_t* b, integer_array_t* dest);
+extern integer_array_t div_alloc_scalar_integer_array(modelica_integer a, const integer_array_t b);
 extern void pow_integer_array_scalar(const integer_array_t *a, modelica_integer b, integer_array_t* dest);
 extern void pow_alloc_integer_array_scalar(const integer_array* a, modelica_integer b, integer_array_t* dest);