- Inline listEmpty and STRUCT_HDR for records

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7220 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 27, 2010 · 27c54b9 · 27c54b9
1 parent 8171d25
commit 27c54b9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/c_runtime/meta_modelica.c b/c_runtime/meta_modelica.c
@@ -361,6 +361,7 @@ int mmc_boxes_equal(void* lhs, void* rhs)
   EXIT(1);
 }
 
+/*
 mmc__uniontype__metarecord__typedef__equal_rettype
 mmc__uniontype__metarecord__typedef__equal(void* ut,int ex_ctor,int fieldNums)
 {
@@ -373,13 +374,14 @@ mmc__uniontype__metarecord__typedef__equal(void* ut,int ex_ctor,int fieldNums)
   numslots = MMC_HDRSLOTS(hdr);
   ctor = 255 & (hdr >> 2);
 
-  if (numslots == fieldNums+1 && ctor == ex_ctor+3) { /* RECORD */
+  if (numslots == fieldNums+1 && ctor == ex_ctor+3) { // RECORD
     desc = MMC_FETCH(MMC_OFFSET(MMC_UNTAGPTR(ut),1));
     return 1;
   } else {
     return 0;
   }
 }
+*/
 
 void debug__print(const char* prefix, void* any)
 {

diff --git a/c_runtime/meta_modelica.h b/c_runtime/meta_modelica.h
@@ -154,7 +154,8 @@ int mmc_boxes_equal(void*, void*);
 void mmc__unbox(modelica_metatype box, void* res);
 
 typedef modelica_boolean mmc__uniontype__metarecord__typedef__equal_rettype;
-mmc__uniontype__metarecord__typedef__equal_rettype mmc__uniontype__metarecord__typedef__equal(void*,int,int);
+#define mmc__uniontype__metarecord__typedef__equal(UT,CTOR,NFIELDS) (MMC_GETHDR(UT)==MMC_STRUCTHDR(NFIELDS+1,CTOR+3))
+/* mmc__uniontype__metarecord__typedef__equal_rettype mmc__uniontype__metarecord__typedef__equal(void*,int,int); */
 
 void debug__print(const char*,void*); /* For debugging */
 void printAny(void*); /* For debugging */

diff --git a/c_runtime/meta_modelica_builtin.cpp b/c_runtime/meta_modelica_builtin.cpp
@@ -562,10 +562,12 @@ listRest_rettype listRest(modelica_metatype lst)
   return MMC_CDR(lst);
 }
 
+/*
 listEmpty_rettype listEmpty(modelica_metatype lst)
 {
   return MMC_NILTEST(lst) ? 1 : 0;
 }
+*/
 
 listDelete_rettype listDelete(modelica_metatype lst, modelica_integer ix)
 {

diff --git a/c_runtime/meta_modelica_builtin.h b/c_runtime/meta_modelica_builtin.h
@@ -188,7 +188,7 @@ listMember_rettype listMember(modelica_metatype, modelica_metatype);
 listGet_rettype listGet(modelica_metatype, modelica_integer);
 listNth_rettype listNth(modelica_metatype, modelica_integer);
 listRest_rettype listRest(modelica_metatype);
-listEmpty_rettype listEmpty(modelica_metatype);
+#define listEmpty(LST) MMC_NILTEST(LST)
 listDelete_rettype listDelete(modelica_metatype, modelica_integer);
 #define cons(X,XS) mmc_mk_cons(X,XS)