Changeset 06da87 in git


Ignore:
Timestamp:
Oct 29, 1998, 2:11:46 PM (26 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c7af8613769b29c741d6c338945669719f1fc4f8')
Children:
87ad7067f0f1d74350324466fd57922b22177aa0
Parents:
14ca45d33d8683584d8e75512958680e762ba286
Message:
*hannes: fixed preimage bug


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

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    r14ca45 r06da87  
    37443744static BOOLEAN jjPREIMAGE(leftv res, leftv u, leftv v, leftv w)
    37453745{
    3746   idhdl h,rr;
     3746  idhdl h;
     3747  ring rr;
    37473748  map mapping;
    37483749
    3749   rr=(idhdl)u->data;
    3750   if ((h=IDRING(rr)->idroot->get(v->name,myynest))!=NULL)
     3750  if ((v->name==NULL) || (w->name==NULL))
     3751  {
     3752    WerrorS("2. and 3. argument must have a name");
     3753    return TRUE;
     3754  }
     3755  rr=(ring)u->Data();
     3756  const char *ring_name=u->Name();
     3757  if ((h=rr->idroot->get(v->name,myynest))!=NULL)
    37513758  {
    37523759    if (h->typ==MAP_CMD)
     
    37663773  else
    37673774  {
    3768     Werror("`%s` is not defined in `%s`",v->name,u->name);
     3775    Werror("`%s` is not defined in `%s`",v->name,ring_name);
    37693776    return TRUE;
    37703777  }
    3771   if ((h=IDRING(rr)->idroot->get(w->name,myynest))!=NULL)
     3778  if ((h=rr->idroot->get(w->name,myynest))!=NULL)
    37723779  {
    37733780    if (h->typ==IDEAL_CMD)
    37743781    {
    3775       res->data=(char *)maGetPreimage(IDRING(rr),mapping,IDIDEAL(h));
     3782      res->data=(char *)maGetPreimage(rr,mapping,IDIDEAL(h));
    37763783    }
    37773784    else
     
    37833790  else
    37843791  {
    3785     Werror("`%s` is not defined in `%s`",w->name,u->name);
     3792    Werror("`%s` is not defined in `%s`",w->name,ring_name);
    37863793    return TRUE;
    37873794  }
     
    44504457  if(u->Typ()==PACKAGE_CMD)
    44514458  {
    4452     Print("export to package\n");
     4459    PrintS("export to package\n");
    44534460    while(v->next!=NULL)
    44544461    {
     
    44664473{
    44674474  BOOLEAN nok=FALSE;
    4468   Print("jjIMPORT_FROM()\n");
     4475  PrintS("jjIMPORT_FROM()\n");
    44694476  if(v->rtyp==NSHDL)
    44704477  {
    4471     Print("Import from toplevel\n");
     4478    PrintS("Import from toplevel\n");
    44724479//While-schleife!!!
    44734480    return FALSE;
Note: See TracChangeset for help on using the changeset viewer.