|
Lines 171-180
Link Here
|
| 171 |
shadows.remove( name ); |
171 |
shadows.remove( name ); |
| 172 |
h.remove( name ); |
172 |
h.remove( name ); |
| 173 |
|
173 |
|
| 174 |
// remove the inherited type definition, a new one will be |
174 |
if( kind.startsWith( "type" ) ) |
| 175 |
// added soon under this name! Addition of this line fixes |
175 |
{ |
| 176 |
// bug #345 |
176 |
// remove the inherited type definition, a new one will be |
| 177 |
TypeMap.removeDefinition( name ); |
177 |
// added soon under this name! Addition of this line fixes |
|
|
178 |
// bug #345 |
| 179 |
TypeMap.removeDefinition( name ); |
| 180 |
} |
| 178 |
} |
181 |
} |
| 179 |
} |
182 |
} |
| 180 |
|
183 |
|
|
Lines 354-359
Link Here
|
| 354 |
key.substring( key.lastIndexOf( '.' ) ), |
357 |
key.substring( key.lastIndexOf( '.' ) ), |
| 355 |
anc ); |
358 |
anc ); |
| 356 |
} |
359 |
} |
|
|
360 |
else |
| 361 |
{ |
| 362 |
if( logger.isDebugEnabled() ) { |
| 363 |
logger.debug("- NameTable.inherit " + kind + " from: " + key); |
| 364 |
} |
| 365 |
} |
| 366 |
|
| 357 |
|
367 |
|
| 358 |
if( !isDefined( key ) ) |
368 |
if( !isDefined( key ) ) |
| 359 |
throw new RuntimeException( "CompilerError!" ); |
369 |
throw new RuntimeException( "CompilerError!" ); |