Changeset 9eb3048 in git

Timestamp:

Jul 9, 2013, 10:29:22 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4bd32dfef92ec9f5ed8dceee82d14318ae147107')

Children:

741c7090dd3b618a24f57b75f1a21c3a19ce119f

Parents:

86919e90eae002225109c1b5b9d94a6544b1a907

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-07-09 22:29:22+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-07-09 22:31:47+02:00

Message:

Minor improvements&fixes to builtins

Location:

Singular

Files:

• ipid.cc (modified) (2 diffs)
• iplib.cc (modified) (3 diffs)
• mod_lib.cc (modified) (1 diff)
• mod_lib.h (modified) (1 diff)

Singular/ipid.cc

@@ -7 +7 @@
 */
 
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
+
 #include <kernel/mod2.h>
+
 #include <omalloc/omalloc.h>
-#include <Singular/tok.h>
+
 #include <misc/options.h>
-#include <Singular/ipshell.h>
 #include <misc/intvec.h>
-#include <kernel/febase.h>
+
 #include <coeffs/numbers.h>
 #include <coeffs/bigintmat.h>
+
+#include <polys/matpol.h>
+#include <polys/monomials/ring.h>
+
+#include <kernel/febase.h>
 #include <kernel/longrat.h>
 #include <kernel/polys.h>
-#include <polys/monomials/ring.h>
 #include <kernel/ideals.h>
-#include <polys/matpol.h>
+#include <kernel/syz.h>
+
+#include <Singular/tok.h>
+#include <Singular/ipshell.h>
 #include <Singular/lists.h>
 #include <Singular/attrib.h>
 #include <Singular/links/silink.h>
-#include <kernel/syz.h>
 #include <Singular/ipid.h>
 #include <Singular/blackbox.h>
@@ -36 +41 @@
 #include <polys/mod_raw.h>
 #endif /* HAVE_DYNAMIC_LOADING */
+
+#include <string.h>
 
 omBin sip_command_bin = omGetSpecBin(sizeof(sip_command));

Singular/iplib.cc

@@ -733 +733 @@
 }
 
-int staticdemo_mod_init(SModulFunctions*){ PrintS("init of staticdemo\n"); }
+int staticdemo_mod_init(SModulFunctions*){ PrintS("init of staticdemo\n"); return (0); }
 
 #define SI_GET_BUILTIN_MOD_INIT(name) \
-  int name##_mod_init(SModulFunctions*); \
-  if (strcmp(libname, #name ".so") == 0) {  return name##_mod_init; }
+  int SI_MOD_INIT(name)(SModulFunctions*); \
+  if (strcmp(libname, #name ".so") == 0) {  return SI_MOD_INIT(name); }
 
 
@@ -1109 +1109 @@
   return TRUE;
 #else
+/*
   typedef int (*fktn_t)(int(*iiAddCproc)(const char *libname, const char *procname,
                                BOOLEAN pstatic,
                                BOOLEAN(*func)(leftv res, leftv v)));
+*/
   SModulFunc_t fktn;
   idhdl pl;
@@ -1188 +1190 @@
   int iiAddCproc(const char *libname, const char *procname, BOOLEAN pstatic,
                  BOOLEAN(*func)(leftv res, leftv v));
+/*
   typedef int (*fktn_t)(int(*iiAddCproc)(const char *libname, const char *procname,
                                BOOLEAN pstatic,
                                BOOLEAN(*func)(leftv res, leftv v)));
+*/
   // SModulFunc_t fktn;
   idhdl pl;

Singular/mod_lib.cc

@@ -19 +19 @@
 #define SI_BUILTIN_LIBSTR(name) (char*) #name ".so",
 
-char* si_builtin_libs[]={ SI_FOREACH_BUILTIN(SI_BUILTIN_LIBSTR)  NULL };
+const char * const si_builtin_libs[] = { SI_FOREACH_BUILTIN(SI_BUILTIN_LIBSTR) NULL };
 
 #undef SI_BUILTIN_LIBSTR

Singular/mod_lib.h

@@ -6 +6 @@
 #include <polys/mod_raw.h>  /* for lib_types */
 
+lib_types type_of_LIB(char *newlib, char *fullname);
 
 #ifdef EMBED_PYTHON
-#define SI_BUILTIN_PYOBJECT(add) add(pyobject)
+#define SI_BUILTIN_PYOBJECT(add) add(pyobject) add(syzextra)
 #else
 #define SI_BUILTIN_PYOBJECT(add) 
 #endif
-lib_types type_of_LIB(char *newlib, char *fullname);
 
 /// Data for @c type_of_LIB to determine built-in modules,
 /// use @c add(name) to add built-in library to macro
 #define SI_FOREACH_BUILTIN(add)\
-  add(staticdemo)\
-  SI_BUILTIN_PYOBJECT(add)
+    add(staticdemo)\
+    SI_BUILTIN_PYOBJECT(add)
 
 #define SI_MOD_INIT(name) name##_mod_init