Changeset 7ce950 in git


Ignore:
Timestamp:
Oct 28, 1998, 1:05:30 PM (26 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c7af8613769b29c741d6c338945669719f1fc4f8')
Children:
7df4ee5876f48915cd9d017b3ee3c6513e70a1f7
Parents:
7a64c23452a1f4d3583604b384a494dd35296bab
Message:
* hannes: POSIX-fixes, part 1


git-svn-id: file:///usr/local/Singular/svn/trunk@2606 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    r7a64c2 r7ce950  
    12101210  u->name=NULL;
    12111211#ifdef HAVE_NAMESPACES
    1212   if(u->req_packhdl != NULL) {
     1212  if(u->req_packhdl != NULL)
     1213  {
    12131214    namespaceroot->push( IDPACKAGE(u->req_packhdl), IDID(u->req_packhdl));
    12141215    syMake(res,n);
     
    12281229#ifdef HAVE_NAMESPACES
    12291230  BOOLEAN needpop=FALSE;
    1230  
    1231   if(u->req_packhdl != NULL) {
     1231
     1232  if(u->req_packhdl != NULL)
     1233  {
    12321234    namespaceroot->push( IDPACKAGE(u->req_packhdl), IDID(u->req_packhdl));
    12331235    needpop = TRUE;
    12341236  }
    12351237#endif /* HAVE_NAMESPACES */
    1236  
     1238
    12371239  for (i=0;i<iv->length(); i++)
    12381240  {
     
    44364438    idhdl h = namespaceroot->root->get(ns->name, 0, TRUE);
    44374439    Print("Export to '%s', lev %d\n", ns->name, ns->myynest);
    4438     while(v->next!=NULL) {
     4440    while(v->next!=NULL)
     4441    {
    44394442      nok = iiInternalExport(v->next, ns->myynest, h);
    44404443      if(nok) { return nok; }
    4441      
     4444
    44424445      v = v->next;
    44434446    }
    44444447    return FALSE;
    44454448  }
    4446   if(u->Typ()==PACKAGE_CMD) {
     4449  if(u->Typ()==PACKAGE_CMD)
     4450  {
    44474451    Print("export to package\n");
    4448     while(v->next!=NULL) {
     4452    while(v->next!=NULL)
     4453    {
    44494454      nok = iiInternalExport(v->next, 0, u->data);
    44504455      if(nok) return nok;
     
    44624467  BOOLEAN nok=FALSE;
    44634468  Print("jjIMPORT_FROM()\n");
    4464   if(v->rtyp==NSHDL) {
     4469  if(v->rtyp==NSHDL)
     4470  {
    44654471    Print("Import from toplevel\n");
    44664472//While-schleife!!!
    44674473    return FALSE;
    44684474  }
    4469   if(v->Typ()==PACKAGE_CMD) {
     4475  if(v->Typ()==PACKAGE_CMD)
     4476  {
    44704477    Print("Import from package %s\n", v->name);
    4471     while(v->next!=NULL) {
     4478    while(v->next!=NULL)
     4479    {
    44724480      //nok = iiInternalImport(v->next, 0, v->data);
    44734481      if(nok) return nok;
     
    44784486}
    44794487
     4488#ifdef HAVE_NAMESPACES
    44804489static BOOLEAN jjUNLOAD(leftv res, leftv v)
    44814490{
    4482   if(v->Typ()==PACKAGE_CMD) {
     4491  if(v->Typ()==PACKAGE_CMD)
     4492  {
    44834493    char *typ;
    44844494    idhdl h = (idhdl)v->data;
    4485     package d=v->Data();
    4486     switch (d->language) {
    4487         case LANG_C:        typ="object";   break;
    4488         case LANG_SINGULAR:
    4489         case LANG_NONE:     
    4490         default:
    4491           killhdl(h);
     4495    package d=(package)v->Data();
     4496    switch (d->language)
     4497    {
     4498      case LANG_C:
     4499        typ="object";
     4500        break;
     4501      case LANG_SINGULAR:
     4502      case LANG_NONE:
     4503      default:
     4504        killhdl(h);
    44924505    }
    44934506    return FALSE;
     
    44954508  return TRUE;
    44964509}
    4497 
     4510#endif
    44984511/*=================== operations with many arg.: table =================*/
    44994512/* number_of_args:  -1: any, -2: any >0, .. */
  • Singular/ipid.cc

    r7a64c2 r7ce950  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ipid.cc,v 1.22 1998-10-26 11:11:16 krueger Exp $ */
     4/* $Id: ipid.cc,v 1.23 1998-10-28 12:05:29 Singular Exp $ */
    55
    66/*
     
    745745void iiname2hdl(char *name, idhdl *pck, idhdl *h)
    746746{
    747   char *q = index(name, ':');
     747  char *q = strchr(name, ':');
    748748  char *p, *i;
    749749
     
    792792}
    793793
     794#if 0
    794795char *getnamelev()
    795796{
     
    798799  return(buf);
    799800}
     801// warning: address of local variable `buf' returned
     802#endif
    800803
    801804namehdl namerec::push(package pack, char *name, int nesting, BOOLEAN init)
  • Singular/ipshell.cc

    r7a64c2 r7ce950  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ipshell.cc,v 1.28 1998-10-22 13:11:12 krueger Exp $ */
     4/* $Id: ipshell.cc,v 1.29 1998-10-28 12:05:30 Singular Exp $ */
    55/*
    66* ABSTRACT:
     
    328328#ifdef HAVE_NAMESPACES
    329329      idhdl pack;
    330       if(index(what, ':')!= NULL)
     330      if(strchr(what, ':')!= NULL)
    331331        iiname2hdl(what, &pack, &h);
    332332      else h = ggetid(what);
Note: See TracChangeset for help on using the changeset viewer.