Changeset 97cc98 in git

Timestamp:

May 21, 2014, 4:47:50 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

84cd3d365f785ff9e8bd9fca359fdfc851c34cc6

Parents:

d3164ca160e3818318c66dd58ea2bf57a44a5147

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-05-21 16:47:50+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-05-21 16:48:50+02:00

Message:

constistent names for blackboxDefaultOp*

Location:

Singular

Files:

• blackbox.cc (modified) (2 diffs)
• blackbox.h (modified) (1 diff)
• dyn_modules/bigintm/bigintm.cc (modified) (2 diffs)
• newstruct.cc (modified) (2 diffs)
• pyobject.cc (modified) (1 diff)

Singular/blackbox.cc

@@ -86 +86 @@
 }
 
-BOOLEAN blackbox_default_Op3(int op,leftv /*l*/, leftv r1,leftv /*r2*/, leftv /*r3*/)
-{
-  return TRUE;
-}
-
-BOOLEAN blackbox_default_OpM(int op,leftv res, leftv args)
+BOOLEAN blackboxDefaultOp3(int op,leftv /*l*/, leftv r1,leftv /*r2*/, leftv /*r3*/)
+{
+  return TRUE;
+}
+
+BOOLEAN blackboxDefaultOpM(int op,leftv res, leftv args)
 {
   if (op==LIST_CMD)
@@ -159 +159 @@
     if (bb->blackbox_Op1==NULL)     bb->blackbox_Op1=blackboxDefaultOp1;
     if (bb->blackbox_Op2==NULL)     bb->blackbox_Op2=blackboxDefaultOp2;
-    if (bb->blackbox_Op3==NULL)     bb->blackbox_Op3=blackbox_default_Op3;
-    if (bb->blackbox_OpM==NULL)     bb->blackbox_OpM=blackbox_default_OpM;
+    if (bb->blackbox_Op3==NULL)     bb->blackbox_Op3=blackboxDefaultOp3;
+    if (bb->blackbox_OpM==NULL)     bb->blackbox_OpM=blackboxDefaultOpM;
     if (bb->blackbox_CheckAssign==NULL) bb->blackbox_CheckAssign=blackbox_default_Check;
     if (bb->blackbox_serialize==NULL) bb->blackbox_serialize=blackbox_default_serialize;

Singular/blackbox.h

@@ -61 +61 @@
 
 /// default procedure blackboxDefaultOp3, to be called as "default:" branch
-BOOLEAN blackbox_default_Op3(int op,leftv l, leftv r1,leftv r2, leftv r3);
+BOOLEAN blackboxDefaultOp3(int op,leftv l, leftv r1,leftv r2, leftv r3);
 
 /// default procedure blackboxDefaultOpM, to be called as "default:" branch
-BOOLEAN blackbox_default_OpM(int op,leftv l, leftv r);
+BOOLEAN blackboxDefaultOpM(int op,leftv l, leftv r);
 
 /// default procedure blackbox_default_Print: print the string

Singular/dyn_modules/bigintm/bigintm.cc

@@ -256 +256 @@
 
     default:
-      return blackbox_default_OpM(op, res, args);
-  }
-  return blackbox_default_OpM(op, res, args);
+      return blackboxDefaultOpM(op, res, args);
+  }
+  return blackboxDefaultOpM(op, res, args);
 }
 
@@ -296 +296 @@
     b->blackbox_Op1=bigintm_Op1;
     b->blackbox_Op2=bigintm_Op2;
-    //b->blackbox_Op3=blackbox_default_Op3;
+    //b->blackbox_Op3=blackboxDefaultOp3;
     b->blackbox_OpM=bigintm_OpM;
 

Singular/newstruct.cc

@@ -510 +510 @@
     }
   }
-  return blackbox_default_OpM(op,res,args);
+  return blackboxDefaultOpM(op,res,args);
 }
 
@@ -682 +682 @@
   b->blackbox_Op1=newstruct_Op1;
   b->blackbox_Op2=newstruct_Op2;
-  //b->blackbox_Op3=blackbox_default_Op3;
+  //b->blackbox_Op3=blackboxDefaultOp3;
   b->blackbox_OpM=newstruct_OpM;
   b->blackbox_CheckAssign=newstruct_CheckAssign;

Singular/pyobject.cc

@@ -590 +590 @@
     return FALSE;
 
-  return blackbox_default_Op3(op, res, arg1, arg2, arg3);
+  return blackboxDefaultOp3(op, res, arg1, arg2, arg3);
 }