Changeset 36d920 in git

Timestamp:

Apr 5, 2013, 11:47:27 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')

Children:

380d25b177e88fcb4bfa2f03b368d2b6996b789f

Parents:

48e8e1c8b5ddc51c12302028a5280f3f3b8d0c03

Message:

fix: module loading, help in modules

from master

Location:

Singular

Files:

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

Singular/ipid.h

@@ -84 +84 @@
 typedef int (*SModulFunc_t)(SModulFunctions*);
 BOOLEAN load_builtin(char *newlib, BOOLEAN autoexport, SModulFunc_t init);
-void module_help_main(char *newlib,const char *help);
-void module_help_proc(char *newlib,const char *p, const char *help);
+void module_help_main(const char *newlib,const char *help);
+void module_help_proc(const char *newlib,const char *p, const char *help);
 
 /* ================================================================== */

Singular/iplib.cc

@@ -1057 +1057 @@
   idhdl h;
 
+  #ifndef NDEBUG
+  int dummy;
+  if (IsCmd(procname,dummy))
+  {
+    Werror(">>%s< is a reserved name",procname);
+    return 0;
+  }
+  #endif
+
   h = enterid(procname,0, PROC_CMD, &IDROOT, TRUE);
   if ( h!= NULL )
@@ -1217 +1226 @@
 }
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-void module_help_main(char *newlib,const char *help)
+void module_help_main(const char *newlib,const char *help)
 {
   char *plib = iiConvName(newlib);
-  idhdl pl = IDROOT->get(plib,0);
+  idhdl pl = basePack->idroot->get(plib,0);
   if ((pl==NULL)||(IDTYP(pl)!=PACKAGE_CMD))
-    Werror(">>%s<< is not a package",plib);
+    Werror(">>%s<< is not a package (trying to add package help)",plib);
   else
   {
@@ -1232 +1241 @@
   }
 }
-void module_help_proc(char *newlib,const char *p, const char *help)
+void module_help_proc(const char *newlib,const char *p, const char *help)
 {
   char *plib = iiConvName(newlib);
-  idhdl pl = IDROOT->get(plib,0);
+  idhdl pl = basePack->idroot->get(plib,0);
   if ((pl==NULL)||(IDTYP(pl)!=PACKAGE_CMD))
-    Werror(">>%s<< is not a package",plib);
+    Werror(">>%s<< is not a package(trying to add help for %s)",plib,p);
   else
   {