Changeset f9ffa1 in git


Ignore:
Timestamp:
Feb 13, 2009, 10:16:27 AM (15 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
6719771b2432b6b9921cf8f82aec25750ca176b8
Parents:
7ef4c2b8c31bc2f9174394d9ecaeb2e409b9e587
Message:
*hannes: better name check via rNameCheck


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

Legend:

Unmodified
Added
Removed

  • Singular/ipshell.cc

    r7ef4c2 rf9ffa1  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ipshell.cc,v 1.201 2009-01-07 15:04:33 Singular Exp $ */
     4/* $Id: ipshell.cc,v 1.202 2009-02-13 09:16:27 Singular Exp $ */
    55/*
    66* ABSTRACT:
    … …  
    20212021    goto rCompose_err;
    20222022  }
    2023   rNameCheck(R);
    20242023  // ------------------------ ORDER ------------------------------
    20252024  if (L->m[2].Typ()==LIST_CMD)
    … …  
    22412240    goto rCompose_err;
    22422241  }
     2242  rNameCheck(R);
    22432243  // ------------------------ Q-IDEAL ------------------------
    22442244  rComplete(R);
    … …  
    48534853
    48544854  /* check names and parameters for conflicts ------------------------- */
    4855   {
    4856     int i,j;
    4857     for(i=0;i<R->P; i++)
    4858     {
    4859       for(j=0;j<R->N;j++)
    4860       {
    4861         if (strcmp(R->parameter[i],R->names[j])==0)
    4862         {
    4863           Werror("parameter %d conflicts with variable %d",i+1,j+1);
    4864           goto rInitError;
    4865         }
    4866       }
    4867     }
    4868   }
    4869   rNameCheck(R);
     4855  rNameCheck(R); // conflicting variables will be renamed
    48704856  /* ordering -------------------------------------------------------------*/
    48714857  if (rSleftvOrdering2Ordering(ord, R))
Note: See TracChangeset for help on using the changeset viewer.