Changeset c4041ef in git for Singular/iplib.cc


Ignore:
Timestamp:
Dec 10, 1998, 9:50:34 AM (25 years ago)
Author:
Kai Krüger <krueger@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
d6cc54d5042c325dfc0aff249e09bd0002ede0e2
Parents:
1c17b6ea37bc2da88a8ab9e39b3f382098c1a1db
Message:
Bug fix for loading libraries without namespaces


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

Legend:

Unmodified
Added
Removed

  • Singular/iplib.cc

    r1c17b6 rc4041ef  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: iplib.cc,v 1.45 1998-12-09 16:40:23 Singular Exp $ */
     4/* $Id: iplib.cc,v 1.46 1998-12-10 08:50:34 krueger Exp $ */
    55/*
    66* ABSTRACT: interpreter: LIB and help
    … …  
    1010#include <stdio.h>
    1111#include <string.h>
    12 //#include <ctype.h>
     12#include <ctype.h>
    1313#include <sys/stat.h>
    1414
    … …  
    5050#endif
    5151
     52//int IsCmd(char *n, int tok);
    5253char mytolower(char c);
    5354
    … …  
    592593
    593594/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
    594 static BOOLEAN iiLoadLIB(FILE *fp, char *libnamebuf,
     595static BOOLEAN iiLoadLIB(FILE *fp, char *libnamebuf, char *newlib,
    595596                         idhdl pl, BOOLEAN autoexport, BOOLEAN tellerror);
    596597
    … …  
    639640  }
    640641  namespaceroot->push(IDPACKAGE(packhdl), IDID(packhdl));
    641   LoadResult = iiLoadLIB(fp, libnamebuf, packhdl, FALSE, FALSE);
     642  LoadResult = iiLoadLIB(fp, libnamebuf, IDPACKAGE(packhdl)->libname,
     643                         packhdl, FALSE, FALSE);
    642644  namespaceroot->pop();
    643645#else /* HAVE_NAMESPACES */
    … …  
    761763  }
    762764  namespaceroot->push(IDPACKAGE(pl), IDID(pl));
    763   LoadResult = iiLoadLIB(fp, libnamebuf, pl, autoexport, tellerror);
     765  LoadResult = iiLoadLIB(fp, libnamebuf, newlib, pl, autoexport, tellerror);
    764766#else /* HAVE_NAMESPACES */
    765   LoadResult = iiLoadLIB(fp, libnamebuf, NULL, FALSE, tellerror);
     767  LoadResult = iiLoadLIB(fp, libnamebuf, newlib, NULL, FALSE, tellerror);
    766768#endif /* HAVE_NAMESPACES */
    767769 
    768770#ifdef HAVE_NAMESPACES
    769771  if(!LoadResult) IDPACKAGE(pl)->loaded = TRUE;
    770   close(fp);
     772  fclose(fp);
    771773  namespaceroot->pop();
    772774#endif /* HAVE_NAMESPACES */
    … …  
    780782
    781783/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
    782 static BOOLEAN iiLoadLIB(FILE *fp, char *libnamebuf,
     784static BOOLEAN iiLoadLIB(FILE *fp, char *libnamebuf, char*newlib,
    783785             idhdl pl, BOOLEAN autoexport, BOOLEAN tellerror)
    784786{
    785787  char buf[256];
    786   char *newlib = IDPACKAGE(pl)->libname;
    787788  extern FILE *yylpin;
    788789  libstackv ls_start = library_stack;
    … …  
    11261127lib_types type_of_LIB(char *newlib, char *libnamebuf)
    11271128{
    1128   unsigned char buf[HOWMANY+1]; /* one extra for terminating '\0' */
     1129  char  buf[HOWMANY+1]; /* one extra for terminating '\0' */
    11291130  struct stat sb;
    11301131  int nbytes = 0;
    … …  
    11601161 
    11611162  lib_type_end:
    1162   close(fp);
     1163  fclose(fp);
    11631164  return LT;
    11641165}
Note: See TracChangeset for help on using the changeset viewer.