Changeset 35664ec in git

Timestamp:

May 3, 2005, 4:30:09 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '23b0a9c07070b684aa12355009488dc00d9501e3')

Children:

762bfd45c4210aff6f5f912140dfdf36131213c9

Parents:

2e6eac218988a6cdb89b0be44b0a24dd62ac41a7

Message:

*hannes: help for packages,xx::yy, proc from dyn. modules


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

File:

• Singular/fehelp.cc (modified) (3 diffs)

Singular/fehelp.cc

@@ -4 +4 @@
 /*
 * ABSTRACT: help system
-* versin $Id: fehelp.cc,v 1.41 2005-05-02 16:31:55 Singular Exp $
+* versin $Id: fehelp.cc,v 1.42 2005-05-03 14:30:09 Singular Exp $
 */
 
@@ -637 +637 @@
 }
 
+// test for h being a string and print it
+static void hePrintHelpStr(const idhdl hh,const char *id,const char *pa)
+{
+  if ((hh!=NULL) && (IDTYP(hh)==STRING_CMD))
+  {
+    PrintS(IDSTRING(hh));
+    PrintLn();
+  }
+  else
+    Print("`%s` not found in package %s\n",id,pa);
+}
 // try to find the help string as a loaded procedure or library
 // if found, display the help and return TRUE
@@ -642 +653 @@
 static BOOLEAN heOnlineHelp(char* s)
 {
-#ifdef HAVE_NS
   idhdl h=IDROOT->get(s,myynest);
-#else
-  idhdl h=idroot->get(s,myynest);
-#endif /* HAVE_NS */
+  char *ss;
 
   // try help for a procedure
-  if ((h!=NULL) && (IDTYP(h)==PROC_CMD))
-  {
-    char *lib=iiGetLibName(IDPROC(h));
-    if((lib!=NULL)&&(*lib!='\0'))
-    {
-      Print("// proc %s from lib %s\n",s,lib);
-      s=iiGetLibProcBuffer(IDPROC(h), 0);
-      if (s!=NULL)
-      {
-        PrintS(s);
-        omFree((ADDRESS)s);
-      }
-      return TRUE;
+  if (h!=NULL)
+  {
+    if  (IDTYP(h)==PROC_CMD)
+    {
+      char *lib=iiGetLibName(IDPROC(h));
+      if((lib!=NULL)&&(*lib!='\0'))
+      {
+        Print("// proc %s from lib %s\n",s,lib);
+        s=iiGetLibProcBuffer(IDPROC(h), 0);
+        if (s!=NULL)
+        {
+          PrintS(s);
+          omFree((ADDRESS)s);
+        }
+        return TRUE;
+      }
+      else
+      {
+        char s_help[200];
+        strcpy(s_help,s);
+        strcat(s_help,"_help");
+        idhdl hh=IDROOT->get(s_help,0);
+        hePrintHelpStr(hh,s_help,"Top");
+      }
+    }
+    else if (IDTYP(h)==PACKAGE_CMD)
+    {
+      idhdl hh=IDPACKAGE(h)->idroot->get("info",0);
+      hePrintHelpStr(hh,"info",s);
+    }
+    else if ((ss=strstr(s,"::"))!=NULL)
+    {
+      *ss='\0';
+      ss+=2;
+      h=ggetid(s);
+      if (h!=NULL)
+      {      
+        Print("help for %s from package %\n",ss,s);
+        char s_help[200];
+        strcpy(s_help,ss);
+        strcat(s_help,"_help");
+        idhdl hh=IDPACKAGE(h)->idroot->get(s_help,0);
+        hePrintHelpStr(hh,s_help,s);
+      }
+      else Print("package %s not found\n",s); 
     }
     return FALSE;