6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-09-29 17:56:21 +00:00
Code Issues Projects Releases Wiki Activity

Minor rearrangements to make the code more robust in case of errors.

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@549 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz 2000-12-04 20:39:17 +00:00
parent e131b6e432
commit cd6f591d11
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc65/compile.c
View File

@ -219,7 +219,7 @@ static void Parse (void)
}
/* Function declaration? */
if (IsTypeFunc (Decl.Type)) {
if (Entry && IsTypeFunc (Entry->Type)) {
/* Function */
if (!comma) {

8
src/cc65/symtab.c
View File

@ -609,7 +609,7 @@ SymEntry* AddLabelSym (const char* Name, unsigned Flags)
if ((Entry->Flags & SC_DEF) != 0 && (Flags & SC_DEF) != 0) {
/* Trying to define the label more than once */
Error ("Label `%s' is defined more than once", Name);
}
}
Entry->Flags |= Flags;
} else {
@ -696,6 +696,7 @@ SymEntry* AddGlobalSym (const char* Name, type* Type, unsigned Flags)
TypeCmp (Type+DECODE_SIZE+1, EType+DECODE_SIZE+1) < TC_EQUAL) {
/* Types not identical: Conflicting types */
Error ("Conflicting types for `%s'", Name);
return Entry;
} else {
/* Check if we have a size in the existing definition */
if (ESize == 0) {
@ -708,14 +709,15 @@ SymEntry* AddGlobalSym (const char* Name, type* Type, unsigned Flags)
/* New type must be identical */
if (TypeCmp (EType, Type) < TC_EQUAL) {
Error ("Conflicting types for `%s'", Name);
}
return Entry;
}
/* In case of a function, use the new type descriptor, since it
* contains pointers to the new symbol tables that are needed if
* an actual function definition follows.
*/
if (IsTypeFunc (Type)) {
CopyEncode (Type+1, EType+1);
CopyEncode (Type+1, EType+1);
}
}