Changeset 6481ef in git

Timestamp:

Aug 15, 2019, 12:06:18 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

43d23c46c518748a9f4fa43d4d8d51ff7fe69354

Parents:

0df1e4b7ec46069716a679405c785e40c8dd99e9

Message:

error messages

File:

• Singular/ipshell.cc (modified) (2 diffs)

Singular/ipshell.cc

@@ -2403 +2403 @@
         {
           ch=TRUE;
-          Warn("name conflict var(%d) and var(%d): `%s`, rename to `@%s`",i+1,j+1,R->names[i],R->names[i]);
+          Warn("name conflict var(%d) and var(%d): `%s`, rename to `@%s`in >>%s<<\nin %s:%d",i+1,j+1,R->names[i],R->names[i],my_yylinebuf,currentVoice->filename,yylineno);
           omFree(R->names[j]);
           R->names[j]=(char *)omAlloc(2+strlen(R->names[i]));
@@ -2418 +2418 @@
       if (strcmp(rParameter(R)[i],R->names[j])==0)
       {
-        Warn("name conflict par(%d) and var(%d): `%s`, renaming the VARIABLE to `@@(%d)`in >>%s<<\nin %s:%d",i+1,j+1,R->names[j],i+1,my_yylinebuf,currentVoice->filename,yylineno);
+        Warn("name conflict par(%d) and var(%d): `%s`, rename the VARIABLE to `@@(%d)`in >>%s<<\nin %s:%d",i+1,j+1,R->names[j],i+1,my_yylinebuf,currentVoice->filename,yylineno);
 //        omFree(rParameter(R)[i]);
 //        rParameter(R)[i]=(char *)omAlloc(10);