@@ -429,28 +429,27 @@ Entity ENTITYput_superclass( Entity entity ) {
429429 /* find the first parent that has attributes (in the parent or any of its
430430 ancestors). Make super point at that parent and print warnings for
431431 all the rest of the parents. DAS */
432- LISTdo ( l , e , Entity )
433- /* if there's no super class yet,
434- or if the entity super class [the variable] super is pointing at
435- doesn't have any attributes: make super point at the current parent.
436- As soon as the parent pointed to by super has attributes, stop
437- assigning super and print ignore messages for the remaining parents.
438- */
439- if ( ( ! super ) || ( ! ENTITYhas_explicit_attributes ( super ) ) ) {
440- ignore = super ;
441- super = e ;
442- ++ super_cnt ;
443- } else {
444- ignore = e ;
445- }
446- if ( ignore ) {
447- printf ( "WARNING: multiple inheritance not implemented.\n" );
448- printf ( "\tin ENTITY %s\n\tSUPERTYPE %s IGNORED.\n\n" ,
449- ENTITYget_name ( entity ), ENTITYget_name ( e ) );
450- }
451- LISTod ;
432+ LISTdo ( l , e , Entity ) {
433+ /* if there's no super class yet,
434+ or if the entity super class [the variable] super is pointing at
435+ doesn't have any attributes: make super point at the current parent.
436+ As soon as the parent pointed to by super has attributes, stop
437+ assigning super and print ignore messages for the remaining parents.
438+ */
439+ if ( ( ! super ) || ( ! ENTITYhas_explicit_attributes ( super ) ) ) {
440+ ignore = super ;
441+ super = e ;
442+ ++ super_cnt ;
443+ } else {
444+ ignore = e ;
445+ }
446+ if ( ignore ) {
447+ printf ( "WARNING: multiple inheritance not implemented.\n" );
448+ printf ( "\tin ENTITY %s\n\tSUPERTYPE %s IGNORED.\n\n" ,
449+ ENTITYget_name ( entity ), ENTITYget_name ( e ) );
450+ }
451+ } LISTod
452452 }
453-
454453 tag = ( EntityTag ) malloc ( sizeof ( struct EntityTag_ ) );
455454 tag -> superclass = super ;
456455 TYPEput_clientData ( ENTITYget_type ( entity ), tag );
0 commit comments