Changeset 6babcbc in git

Timestamp:

Dec 7, 2012, 3:54:51 PM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

fabb38f32d9ea08fa7e3ff4bf33e0ec7fbf4ab73

Parents:

90606248d583c5fc68e2935f8e617bf697e3814b

git-author:

Alexander Dreyer <adreyer@gmx.de>2012-12-07 15:54:51+01:00

git-committer:

Alexander Dreyer <adreyer@gmx.de>2012-12-10 17:46:50+01:00

Message:

Partially cherry-picking from master's commit 489fe5a: new jjLOAD syntax

Location:

Singular

Files:

• iparith.cc (modified) (6 diffs)
• ipshell.h (modified) (1 diff)
• pyobject_setup.cc (modified) (1 diff)

Singular/iparith.cc

@@ -206 +206 @@
 
 /*============= proc =======================*/
-static BOOLEAN jjLOAD(leftv res, leftv v, BOOLEAN autoexport = FALSE);
 static int iiTabIndex(const jjValCmdTab dArithTab, const int len, const int op);
 static Subexpr jjMakeSub(leftv e);
@@ -2508 +2507 @@
 static BOOLEAN jjLOAD2(leftv res, leftv, leftv v)
 {
-  return jjLOAD(res, v,TRUE);
+  return jjLOAD((char*)v->Data(),TRUE);
 }
 static BOOLEAN jjLOAD_E(leftv res, leftv v, leftv u)
@@ -2514 +2513 @@
   char * s=(char *)u->Data();
   if(strcmp(s, "with")==0)
-    return jjLOAD(res, v, TRUE);
+    return jjLOAD((char*)v->Data(), TRUE);
   WerrorS("invalid second argument");
   WerrorS("load(\"libname\" [,\"with\"]);");
@@ -4375 +4374 @@
 static BOOLEAN jjLOAD1(leftv res, leftv v)
 {
-  return jjLOAD(res, v,FALSE);
+  return jjLOAD((char*)v->Data(),FALSE);
 }
 static BOOLEAN jjLISTRING(leftv res, leftv v)
@@ -5151 +5150 @@
   return FALSE;
 }
-static BOOLEAN jjLOAD(leftv, leftv v, BOOLEAN autoexport)
-{
-  char * s=(char *)v->CopyD();
+
+BOOLEAN jjLOAD(char *s, BOOLEAN autoexport)
+{
   char libnamebuf[256];
   lib_types LT = type_of_LIB(s, libnamebuf);
@@ -5206 +5205 @@
   }
   return TRUE;
-}
-
-BOOLEAN jjLOADLIB(const char* libname, BOOLEAN autoexport)
-{
-  leftv v =  (leftv)omAlloc0Bin(sleftv_bin);
-  v->data = (char*)libname;
-  v->rtyp = STRING_CMD;
-  BOOLEAN res = jjLOAD(NULL, v, autoexport); 
-  omFreeBin(v, sleftv_bin);
-
-  return res;
 }
 

Singular/ipshell.h

@@ -68 +68 @@
    if  no, returns FALSE
 */
+/// load lib/module given in v
+BOOLEAN jjLOAD(char *s, BOOLEAN autoexport = FALSE);
 BOOLEAN iiLocateLib(const char* lib, char* where);
 leftv   iiMap(map theMap, const char * what);

Singular/pyobject_setup.cc

@@ -40 +40 @@
 static BOOLEAN pyobject_load()
 {
-  BOOLEAN jjLOADLIB(const char* libname, BOOLEAN autoexport);
-  return jjLOADLIB("pyobject.so", TRUE);
+  return jjLOAD("pyobject.so", TRUE);
 }
 #endif