Changeset 122d49 in git for MP

Timestamp:

Sep 25, 2000, 5:18:26 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

ff4e34fa88e2957ee964d2e38c9e058cf143c963

Parents:

1be9b035074ff3a5a5a889ae801c65a517bf18d2

Message:

ANSI C++ clean


git-svn-id: file:///usr/local/Singular/svn/trunk@4636 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

MP/MPT

Files:

• MPT.h (modified) (4 diffs)
• MPT_Get.cc (modified) (1 diff)
• MPT_GetPoly.cc (modified) (2 diffs)
• MPT_PolyManips.cc (modified) (1 diff)
• MPT_TreeManips.cc (modified) (4 diffs)

MP/MPT/MPT.h

@@ -103 +103 @@
 /* For the following, we assume that sizeof(void *) >= sizeof(type) */
 #define MP_BOOLEAN_T(arg)      ((MP_Boolean_t) (MP_UINT32_T(arg)))
+#define MP_ARG_BOOLEAN_T(arg)  ((MPT_Arg_t)((MP_Boolean_t) (MP_UINT32_T(arg))))
 #define MP_COMMON_T(arg)       ((MP_Common_t)  (MP_UINT32_T(arg)))
+#define MP_ARG_COMMON_T(arg)   ((MPT_Arg_t)((MP_Common_t)  (MP_UINT32_T(arg))))
 #define MP_SINT8_T(arg)        ((MP_Sint8_t)  (MP_SINT32_T(arg)))
+#define MP_ARG_SINT8_T(arg)    ((MPT_Arg_t)((MP_Sint8_t)  (MP_SINT32_T(arg))))
 #define MP_UINT8_T(arg)        ((MP_Uint8_t) (MP_UINT32_T(arg)))
+#define MP_ARG_UINT8_T(arg)    ((MPT_Arg_t)((MP_Uint8_t) (MP_UINT32_T(arg))))
 #define MP_SINT32_T(arg)       ((MP_Sint32_t) (arg))
+#define MP_ARG_SINT32_T(arg)   ((MPT_Arg_t)((MP_Sint32_t) (arg)))
 #define MP_UINT32_T(arg)       ((MP_Uint32_t) (arg))
+#define MP_ARG_UINT32_T(arg)   ((MPT_Arg_t)((MP_Uint32_t) (arg)))
 #define MP_REAL32_T(arg)       ((MP_Real32_t)  (arg))
+#define MP_ARG_REAL32_T(arg)   ((MPT_Arg_t)((MP_Real32_t)  (arg)))
 #ifndef __64_BIT__
 /* sizeof(void *) < sizeof(MP_Real64_t) */
@@ -116 +123 @@
 #define MP_REAL64_T(arg)       ((MP_Real64_t)  (arg))
 #endif
+#define MP_ARG_REAL64_T(arg)   ((MPT_Arg_t)MP_REAL64_T(arg))
 #define MP_APINT_T(arg)        ((MP_ApInt_t) (arg))
+#define MP_ARG_APINT_T(arg)    ((MPT_Arg_t)((MP_ApInt_t) (arg)))
 #define MP_APREAL_T(arg)       ((MP_ApReal_t) (arg))
+#define MP_ARG_APREAL_T(arg)   ((MPT_Arg_t)((MP_ApReal_t) (arg)))
 #define MP_STRING_T(arg)       ((char *)   (arg))
+#define MP_ARG_STRING_T(arg)   ((MPT_Arg_t)((char *)   (arg)))
 #define MPT_ARG_T(arg)         ((MPT_Arg_t) (arg))
 
@@ -130 +141 @@
 /* For user defined Meta types or unspecified types */
 #define MPT_TREE_PT(arg)       ((MPT_Tree_pt) arg)
-
 
 /* And here are Macros tofor dealing with MPT_Arg_pt's */
@@ -538 +548 @@
 do                                                                  \
 {                                                                   \
-  if ((cond) != MP_Success) return MPT_SetError(MPT_MP_Failure);    \
+  if (((MP_Status_t) (cond)) != MP_Success) return MPT_SetError(MPT_MP_Failure);    \
 } while (0)
 

MP/MPT/MPT_Get.cc

@@ -128 +128 @@
                              &(node->numchild)));
 
-  MP_COMMON_T(node->nvalue) = cvalue;
+  node->nvalue = MP_ARG_COMMON_T(cvalue);
   /* Get the node value, if necessary */
   type = node->type;

MP/MPT/MPT_GetPoly.cc

@@ -133 +133 @@
     vtree->node->numannot = 0;
     vtree->node->annots = NULL;
-    MP_COMMON_T(vtree->node->nvalue) = MP_CopBasicList;
+    vtree->node->nvalue = MP_ARG_COMMON_T(MP_CopBasicList);
     if (temp_tree != NULL)
     {
@@ -175 +175 @@
       nnode->nvalue = (MPT_Arg_t) IMP_RawMemAllocFnc(12*sizeof(char));
       sprintf((char *) nnode->nvalue, "x%ld", i);
-      MPT_TREE_PT(nargs[i]) = ntree;
+      nargs[i] = MPT_ARG_T(ntree);
     }
 

MP/MPT/MPT_PolyManips.cc

@@ -208 +208 @@
                            non_zero + 1);
       margs = mtree->args;
-      MPT_TREE_PT(margs[0]) = ctree;
+      margs[0] = MPT_ARG_T(ctree);
 
       for (j=0, k=1; k<=non_zero; j++)

MP/MPT/MPT_TreeManips.cc

@@ -220 +220 @@
       {
         MP_Uint32_t *uint32_array = MP_UINT32_PT(args);
-        MP_UINT32_T(new_tree->node->nvalue) = uint32_array[0];
-        MPT_TREE_PT(args[0]) = new_tree;
+        new_tree->node->nvalue = MP_ARG_UINT32_T(uint32_array[0]);
+        args[0] = MPT_ARG_T(new_tree);
         for (i=1; i<nc; i++)
         {
           MPT_CpyTree(&n_tree, new_tree);
-          MP_UINT32_T(n_tree->node->nvalue) = uint32_array[i];
-          MPT_TREE_PT(args[i]) = n_tree;
+          n_tree->node->nvalue = MP_ARG_UINT32_T(uint32_array[i]);
+          args[i] = MPT_ARG_T(n_tree);
         }
         return args;
@@ -235 +235 @@
         MPT_Arg_pt new_args
           = (MPT_Arg_pt) IMP_MemAllocFnc(nc*sizeof(MPT_Arg_t));
-        MP_UINT8_T(new_tree->node->nvalue) = uint8_array[0];
-        MPT_TREE_PT(new_args[0]) = new_tree;
+        new_tree->node->nvalue = MP_ARG_UINT8_T(uint8_array[0]);
+        new_args[0] = MPT_ARG_T(new_tree);
         for (i=1; i<nc; i++)
         {
           MPT_CpyTree(&n_tree, new_tree);
-          MP_UINT8_T(n_tree->node->nvalue) = uint8_array[i];
-          MPT_TREE_PT(new_args[i]) = n_tree;
+          n_tree->node->nvalue = MP_ARG_UINT8_T(uint8_array[i]);
+          new_args[i] = MPT_ARG_T(n_tree);
         }
         IMP_MemFreeFnc(args, nc*sizeof(MP_Uint8_t));
@@ -256 +256 @@
 #endif
         MP_REAL64_T(new_tree->node->nvalue) = real64_array[i];
-        MPT_TREE_PT(new_args[0]) = new_tree;
+        new_args[0] = MPT_ARG_T(new_tree);
         for (i=1; i<nc; i++)
         {
           MPT_CpyTree(&n_tree, new_tree);
           MP_REAL64_T(n_tree->node->nvalue) = real64_array[i];
-          MPT_TREE_PT(args[i]) = n_tree;
+          args[i] = MPT_ARG_T(n_tree);
         }
         IMP_MemFreeFnc(args, nc*sizeof(MP_Real64_t));
@@ -270 +270 @@
     /* else we go step by step */
     for (i=0; i<nc; i++)
-      MPT_TREE_PT(args[i]) = MPT_UntypespecArg(args[i], typespec);
+      args[i] = MPT_ARG_T(MPT_UntypespecArg(args[i], typespec));
 
     return args;