compiler/libec: Improved error messages

diff --git a/compiler/bootstrap/libec/bootstrap/firstPass.c b/compiler/bootstrap/libec/bootstrap/firstPass.c
index 4bcde1f..d469b51 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/firstPass.c
+++ b/compiler/bootstrap/libec/bootstrap/firstPass.c
@@ -1292,7 +1292,7 @@ if(dataMember)
 dataMember->dataType = dataType;
 else
 {
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name already exists %s in class %s\n", (((void *)0))), declId->string, regClass->name);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name (%s) already exists in class %s\n", (((void *)0))), declId->string, regClass->name);
 FreeType(dataType);
 }
 }
@@ -1310,13 +1310,13 @@ if(member)
 {
 dataMember = __ecereNameSpace__ecere__com__eMember_AddDataMember(member, declId->string, typeString, 0, 0, def->memberAccess);
 if(!dataMember)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name already exists %s in member %s\n", (((void *)0))), declId->string, member->name);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name (%s) already exists in member %s\n", (((void *)0))), declId->string, member->name);
 }
 else if(regClass)
 {
 dataMember = __ecereNameSpace__ecere__com__eClass_AddDataMember(regClass, declId->string, typeString, 0, 0, def->memberAccess);
 if(!dataMember)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name already exists %s in class %s\n", (((void *)0))), declId->string, regClass->name);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name (%s) already exists in class %s\n", (((void *)0))), declId->string, regClass->name);
 }
 if(dataMember)
 dataMember->dataType = dataType;
@@ -1364,13 +1364,13 @@ if(member)
 {
 dataMember = __ecereNameSpace__ecere__com__eMember_AddDataMember(member, id->string, typeString, 0, 0, def->memberAccess);
 if(!dataMember)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name already exists %s in member %s\n", (((void *)0))), id->string, member->name);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name (%s) already exists in member %s\n", (((void *)0))), id->string, member->name);
 }
 else
 {
 dataMember = __ecereNameSpace__ecere__com__eClass_AddDataMember(regClass, id->string, typeString, 0, 0, def->memberAccess);
 if(!dataMember)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name already exists %s in class %s\n", (((void *)0))), id->string, regClass->name);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name (%s) already exists in class %s\n", (((void *)0))), id->string, regClass->name);
 }
 if(dataMember)
 dataMember->dataType = dataType;
@@ -1398,13 +1398,13 @@ if(member)
 {
 dataMember = __ecereNameSpace__ecere__com__eMember_AddDataMember(member, string, inst->_class->__anon1.__anon1.name, 0, 0, def->memberAccess);
 if(!dataMember)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name already exists %s in member %s\n", (((void *)0))), string, member->name);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name (%s) already exists in member %s\n", (((void *)0))), string, member->name);
 }
 else
 {
 dataMember = __ecereNameSpace__ecere__com__eClass_AddDataMember(regClass, string, inst->_class->__anon1.__anon1.name, 0, 0, def->memberAccess);
 if(!dataMember)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name already exists %s in class %s\n", (((void *)0))), string, regClass->name);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Member with same name (%s) already exists in class %s\n", (((void *)0))), string, regClass->name);
 }
 if(dataMember)
 dataMember->dataType = dataType;

diff --git a/compiler/libec/src/firstPass.ec b/compiler/libec/src/firstPass.ec
index eb47085..1589005 100644 (file)
--- a/compiler/libec/src/firstPass.ec
+++ b/compiler/libec/src/firstPass.ec
@@ -82,7 +82,7 @@ static void AddDefinitions(Class regClass, DataMember member, OldList definition
                               dataMember.dataType = dataType;
                            else
                            {
-                              Compiler_Error($"Member with same name already exists %s in class %s\n", declId.string, regClass.name);
+                              Compiler_Error($"Member with same name (%s) already exists in class %s\n", declId.string, regClass.name);
                               FreeType(dataType);
                            }
                         }
@@ -105,14 +105,14 @@ static void AddDefinitions(Class regClass, DataMember member, OldList definition
                                  dataMember = eMember_AddDataMember(member, declId.string,
                                     typeString, 0, 0 /*ComputeTypeSize(dataType)*/, def.memberAccess);
                                  if(!dataMember)
-                                    Compiler_Error($"Member with same name already exists %s in member %s\n", declId.string, member.name);
+                                    Compiler_Error($"Member with same name (%s) already exists in member %s\n", declId.string, member.name);
                               }
                               else if(regClass)
                               {
                                  dataMember = eClass_AddDataMember(regClass, declId.string,
                                     typeString, 0, 0 /*ComputeTypeSize(dataType)*/, def.memberAccess);
                                  if(!dataMember)
-                                    Compiler_Error($"Member with same name already exists %s in class %s\n", declId.string, regClass.name);
+                                    Compiler_Error($"Member with same name (%s) already exists in class %s\n", declId.string, regClass.name);
                               }
 
                               //delete dataTypeString;
@@ -168,14 +168,14 @@ static void AddDefinitions(Class regClass, DataMember member, OldList definition
                                  dataMember = eMember_AddDataMember(member, id.string,
                                     typeString, 0, 0 /*ComputeTypeSize(dataType)*/, def.memberAccess);
                                  if(!dataMember)
-                                    Compiler_Error($"Member with same name already exists %s in member %s\n", id.string, member.name);
+                                    Compiler_Error($"Member with same name (%s) already exists in member %s\n", id.string, member.name);
                               }
                               else
                               {
                                  dataMember = eClass_AddDataMember(regClass, id.string,
                                     typeString, 0, 0 /*ComputeTypeSize(dataType)*/, def.memberAccess);
                                  if(!dataMember)
-                                    Compiler_Error($"Member with same name already exists %s in class %s\n", id.string, regClass.name);
+                                    Compiler_Error($"Member with same name (%s) already exists in class %s\n", id.string, regClass.name);
 
                               }
 
@@ -210,14 +210,14 @@ static void AddDefinitions(Class regClass, DataMember member, OldList definition
                      {
                         dataMember = eMember_AddDataMember(member, string, inst._class.name, 0, 0 /*ComputeTypeSize(dataType)*/, def.memberAccess);
                         if(!dataMember)
-                           Compiler_Error($"Member with same name already exists %s in member %s\n", string, member.name);
+                           Compiler_Error($"Member with same name (%s) already exists in member %s\n", string, member.name);
 
                      }
                      else
                      {
                         dataMember = eClass_AddDataMember(regClass, string, inst._class.name, 0, 0 /*ComputeTypeSize(dataType)*/, def.memberAccess);
                         if(!dataMember)
-                           Compiler_Error($"Member with same name already exists %s in class %s\n", string, regClass.name);
+                           Compiler_Error($"Member with same name (%s) already exists in class %s\n", string, regClass.name);
                      }
                      if(dataMember)
                         dataMember.dataType = dataType;

diff --git a/compiler/libec/src/loadSymbols.ec b/compiler/libec/src/loadSymbols.ec
index 1ffcd44..90ec83b 100644 (file)
--- a/compiler/libec/src/loadSymbols.ec
+++ b/compiler/libec/src/loadSymbols.ec
@@ -84,7 +84,7 @@ static void ReadDataMembers(Class regClass, DataMember member, File f)
             if(member)
             {
                if(!eMember_AddDataMember(member, name, line[0] ? line : 0, 0, 0 /*size *//*type->size*/, memberAccess))
-                  ;//Compiler_Error($"Member with same name already exists %s in member %s\n", name, member->name);
+                  ;//Compiler_Error($"Member with same name (%s) already exists in member %s\n", name, member->name);
             }
             else if(regClass && regClass.type == bitClass)
             {
@@ -99,7 +99,7 @@ static void ReadDataMembers(Class regClass, DataMember member, File f)
             else if(regClass)
             {
                if(!eClass_AddDataMember(regClass, name, line[0] ? line : 0, 0, 0 /*size *//*type->size*/, memberAccess))
-                  ;//Compiler_Error($"Member with same name already exists %s in class %s\n", name, regClass.fullName);
+                  ;//Compiler_Error($"Member with same name (%s) already exists in class %s\n", name, regClass.fullName);
             }
          }
          else if(!strcmp(line, "[Struct]") || !strcmp(line, "[Union]"))
@@ -109,12 +109,12 @@ static void ReadDataMembers(Class regClass, DataMember member, File f)
             if(member)
             {
                if(!eMember_AddMember(member, dataMember))
-                  ;//Compiler_Error($"Member with same name already exists %s in member %s\n", name, member->name);
+                  ;//Compiler_Error($"Member with same name (%s) already exists in member %s\n", name, member->name);
             }
             else if(regClass)
             {
                if(!eClass_AddMember(regClass, dataMember))
-                  ;//Compiler_Error($"Member with same name already exists %s in class %s\n", name, regClass.name);
+                  ;//Compiler_Error($"Member with same name (%s) already exists in class %s\n", name, regClass.name);
             }
          }
       }