Changeset 316fa3 in git for Singular/fehelp.cc

Timestamp:

Jul 2, 2002, 3:24:55 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

75d7c7ae96c7b7aea216ce91c6f3ce9d7020ed06

Parents:

5486955b7fd0f14aa5ab71ed118e2e118f66f0ba

Message:

*hannes: help for c-proc: a start with dummy help


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

File:

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

Singular/fehelp.cc

@@ -117 +117 @@
   if (str == NULL) {heBrowserHelp(NULL); return;}
 
+  BOOLEAN key_is_regexp = (strchr(str, '*') != NULL);
+#ifdef HAVE_NS
+  if (!key_is_regexp)
+  {
+    // test for help mod::p;
+    char *cc=strstr(str,"::");
+    if ((cc!=NULL) && (cc!=str))
+    {
+      char *cc=strstr(str,"::");
+      *cc='\0';
+      cc+=2;
+      idhdl pack=basePack->idroot->get(str,0);
+      if (IDTYP(pack)==PACKAGE_CMD)
+      {
+        package save=currPack;
+        currPack=IDPACKAGE(pack);
+        BOOLEAN r=heOnlineHelp(cc);
+        currPack=save;
+        if (r) return;
+        else
+        {
+          cc-=2; *cc=':';
+        }
+      }
+    }
+  }
+#endif
   if (strlen(str) > MAX_HE_ENTRY_LENGTH - 2)  // need room for extra **
     str[MAX_HE_ENTRY_LENGTH - 3] = '\0';
 
-  BOOLEAN key_is_regexp = (strchr(str, '*') != NULL);
   heEntry_s hentry;
   char* idxfile = feResource('x' /*"IdxFile"*/);
@@ -548 +574 @@
   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);
-      }
+    procinfo *p=IDPROC(h);
+#ifdef HAVE_NS
+    if (p->language==LANG_SINGULAR)
+#endif
+    {
+      char *lib=iiGetLibName(p /*IDPROC(h)*/);
+      if((lib!=NULL)&&(*lib!='\0'))
+      {
+        Print("// proc %s from lib %s\n",s,lib);
+        s=iiGetLibProcBuffer(p /*IDPROC(h)*/, 0);
+        if (s!=NULL)
+        {
+          PrintS(s);
+          omFree((ADDRESS)s);
+        }
+        return TRUE;
+     }
+    }
+#ifdef HAVE_NS
+    else if (p->language==LANG_C)
+    {
+      Print("// c-proc %s\n",s);
       return TRUE;
     }
+#endif
     return FALSE;
   }