| … | |
… | |
| 307 | ob1->optimise (); |
307 | ob1->optimise (); |
| 308 | ob2->optimise (); |
308 | ob2->optimise (); |
| 309 | |
309 | |
| 310 | if (ob1->self || ob2->self) |
310 | if (ob1->self || ob2->self) |
| 311 | { |
311 | { |
| 312 | int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0; |
312 | int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0; |
| 313 | int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0; |
313 | int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0; |
| 314 | |
314 | |
| 315 | if (k1 != k2) |
315 | if (k1 != k2) |
| 316 | return 0; |
316 | return 0; |
| 317 | else if (k1 == 0) |
317 | else if (k1 == 0) |
| 318 | return 1; |
318 | return 1; |
| … | |
… | |
| 1150 | merge_ob (object *op, object *top) |
1150 | merge_ob (object *op, object *top) |
| 1151 | { |
1151 | { |
| 1152 | if (!op->nrof) |
1152 | if (!op->nrof) |
| 1153 | return 0; |
1153 | return 0; |
| 1154 | |
1154 | |
| 1155 | if (top) |
1155 | if (!top) |
| 1156 | for (top = op; top && top->above; top = top->above) |
1156 | for (top = op; top && top->above; top = top->above) |
| 1157 | ; |
1157 | ; |
| 1158 | |
1158 | |
| 1159 | for (; top; top = top->below) |
1159 | for (; top; top = top->below) |
| 1160 | { |
1160 | { |
