Changeset 6babcbc in git


Ignore:
Timestamp:
Dec 7, 2012, 3:54:51 PM (12 years ago)
Author:
Alexander Dreyer <adreyer@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '45e267b9942dec9429fe249ce3e5e44ab80a6a3a')
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:
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    r906062 r6babcbc  
    206206
    207207/*============= proc =======================*/
    208 static BOOLEAN jjLOAD(leftv res, leftv v, BOOLEAN autoexport = FALSE);
    209208static int iiTabIndex(const jjValCmdTab dArithTab, const int len, const int op);
    210209static Subexpr jjMakeSub(leftv e);
     
    25082507static BOOLEAN jjLOAD2(leftv res, leftv, leftv v)
    25092508{
    2510   return jjLOAD(res, v,TRUE);
     2509  return jjLOAD((char*)v->Data(),TRUE);
    25112510}
    25122511static BOOLEAN jjLOAD_E(leftv res, leftv v, leftv u)
     
    25142513  char * s=(char *)u->Data();
    25152514  if(strcmp(s, "with")==0)
    2516     return jjLOAD(res, v, TRUE);
     2515    return jjLOAD((char*)v->Data(), TRUE);
    25172516  WerrorS("invalid second argument");
    25182517  WerrorS("load(\"libname\" [,\"with\"]);");
     
    43754374static BOOLEAN jjLOAD1(leftv res, leftv v)
    43764375{
    4377   return jjLOAD(res, v,FALSE);
     4376  return jjLOAD((char*)v->Data(),FALSE);
    43784377}
    43794378static BOOLEAN jjLISTRING(leftv res, leftv v)
     
    51515150  return FALSE;
    51525151}
    5153 static BOOLEAN jjLOAD(leftv, leftv v, BOOLEAN autoexport)
    5154 {
    5155   char * s=(char *)v->CopyD();
     5152
     5153BOOLEAN jjLOAD(char *s, BOOLEAN autoexport)
     5154{
    51565155  char libnamebuf[256];
    51575156  lib_types LT = type_of_LIB(s, libnamebuf);
     
    52065205  }
    52075206  return TRUE;
    5208 }
    5209 
    5210 BOOLEAN jjLOADLIB(const char* libname, BOOLEAN autoexport)
    5211 {
    5212   leftv v =  (leftv)omAlloc0Bin(sleftv_bin);
    5213   v->data = (char*)libname;
    5214   v->rtyp = STRING_CMD;
    5215   BOOLEAN res = jjLOAD(NULL, v, autoexport);
    5216   omFreeBin(v, sleftv_bin);
    5217 
    5218   return res;
    52195207}
    52205208
  • Singular/ipshell.h

    r906062 r6babcbc  
    6868   if  no, returns FALSE
    6969*/
     70/// load lib/module given in v
     71BOOLEAN jjLOAD(char *s, BOOLEAN autoexport = FALSE);
    7072BOOLEAN iiLocateLib(const char* lib, char* where);
    7173leftv   iiMap(map theMap, const char * what);
  • Singular/pyobject_setup.cc

    r906062 r6babcbc  
    4040static BOOLEAN pyobject_load()
    4141{
    42   BOOLEAN jjLOADLIB(const char* libname, BOOLEAN autoexport);
    43   return jjLOADLIB("pyobject.so", TRUE);
     42  return jjLOAD("pyobject.so", TRUE);
    4443}
    4544#endif
Note: See TracChangeset for help on using the changeset viewer.