Changeset 986225e in git

Timestamp:

Feb 28, 2012, 7:36:33 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

f3461d3772d28f7027b79e44c285fd1c7c8ff603

Parents:

de0a2a63707154c996bdb17673b41439c4a047f6

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-28 19:36:33+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-05 17:42:52+01:00

Message:

minor changes to syzextra

chg: variable function installation  (ADD)
add: listvar to the test

Location:

dyn_modules/syzextra

Files:

• mod_main.cc (modified) (2 diffs)
• syzextra.tst (modified) (3 diffs)

dyn_modules/syzextra/mod_main.cc

@@ -22 +22 @@
 
 #include <Singular/ipid.h> 
+#include <Singular/ipshell.h> // For iiAddCproc
+
 // extern coeffs coeffs_BIGINT
 
@@ -794 +796 @@
 int mod_init(SModulFunctions* psModulFunctions) 
 {
+#define ADD0(A,B,C,D,E) A(B, (char*)C, D, E)
+// #define ADD(A,B,C,D,E) ADD0(iiAddCproc, "", C, D, E)
+  #define ADD(A,B,C,D,E) ADD0(A->iiAddCproc, B, C, D, E)
+  ADD(psModulFunctions, currPack->libname, "DetailedPrint", FALSE, DetailedPrint);
+  ADD(psModulFunctions, currPack->libname, "leadmonom", FALSE, leadmonom);
+  ADD(psModulFunctions, currPack->libname, "leadcomp", FALSE, leadcomp);
+  ADD(psModulFunctions, currPack->libname, "leadrawexp", FALSE, leadrawexp);
+
+
+  ADD(psModulFunctions, currPack->libname, "ISUpdateComponents", FALSE, ISUpdateComponents);
+  ADD(psModulFunctions, currPack->libname, "SetInducedReferrence", FALSE, SetInducedReferrence);
+  ADD(psModulFunctions, currPack->libname, "GetInducedData", FALSE, GetInducedData);
+  ADD(psModulFunctions, currPack->libname, "SetSyzComp", FALSE, SetSyzComp);
+  ADD(psModulFunctions, currPack->libname, "MakeInducedSchreyerOrdering", FALSE, MakeInducedSchreyerOrdering);
+  ADD(psModulFunctions, currPack->libname, "MakeSyzCompOrdering", FALSE, MakeSyzCompOrdering);
   
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"DetailedPrint",FALSE, DetailedPrint);
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"leadmonom",FALSE, leadmonom);
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"leadcomp",FALSE, leadcomp);
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"leadrawexp",FALSE, leadrawexp);
-
-
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"ISUpdateComponents",FALSE, ISUpdateComponents);
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"SetInducedReferrence",FALSE, SetInducedReferrence);
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"GetInducedData",FALSE, GetInducedData);
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"SetSyzComp",FALSE, SetSyzComp);
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"MakeInducedSchreyerOrdering",FALSE, MakeInducedSchreyerOrdering);
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"MakeSyzCompOrdering",FALSE, MakeSyzCompOrdering);
-  
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"noop",FALSE, noop);
+  ADD(psModulFunctions, currPack->libname, "noop", FALSE, noop);
  
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"idPrepare",FALSE, idPrepare);
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"reduce_syz",FALSE, reduce_syz);
-
-  psModulFunctions->iiAddCproc(currPack->libname,(char*)"p_Content",FALSE, _p_Content);
-
-  //  psModulFunctions->iiAddCproc(currPack->libname,(char*)"",FALSE, );
-  
+  ADD(psModulFunctions, currPack->libname, "idPrepare", FALSE, idPrepare);
+  ADD(psModulFunctions, currPack->libname, "reduce_syz", FALSE, reduce_syz);
+
+  ADD(psModulFunctions, currPack->libname, "p_Content", FALSE, _p_Content);
+
+  //  ADD(psModulFunctions, currPack->libname, "", FALSE, );
+#undef ADD  
   return 0;
 }

dyn_modules/syzextra/syzextra.tst

@@ -1 +1 @@
 "ndebug?: ", system("with", "ndebug");
 "om_ndebug?: ", system("with", "om_ndebug");
+
+listvar(Top);
 
 if( system("with", "ndebug") )
@@ -6 +8 @@
   "Loading the Release version!";
   LIB("syzextra.so");
+  listvar(Syzextra);
 }
 else
@@ -11 +14 @@
   "Loading the Debug version!";
   LIB("syzextra_g.so");
+  listvar(Syzextra_g);
 }
+
 
 noop();