Root/
Source at commit ac535d6e03c221d389a798af55f096f92c9bf3ff created 13 years 11 months ago. By werner, Deleting things often left measurements behind. Fixed these bugs, enhanced %del to also delete frames and items in other frames than the current one, and added the corresponding regression tests. | |
---|---|
1 | /* |
2 | * delete.c - Object deletion |
3 | * |
4 | * Written 2009, 2010 by Werner Almesberger |
5 | * Copyright 2009, 2010 by Werner Almesberger |
6 | * |
7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by |
9 | * the Free Software Foundation; either version 2 of the License, or |
10 | * (at your option) any later version. |
11 | */ |
12 | |
13 | |
14 | #include <stdlib.h> |
15 | #include <assert.h> |
16 | |
17 | #include "util.h" |
18 | #include "error.h" |
19 | #include "expr.h" |
20 | #include "obj.h" |
21 | #include "delete.h" |
22 | |
23 | |
24 | static struct deletion { |
25 | enum del_type { |
26 | dt_vec, |
27 | dt_obj, |
28 | dt_frame, |
29 | dt_table, |
30 | dt_row, |
31 | dt_column, |
32 | dt_loop, |
33 | } type; |
34 | union { |
35 | struct { |
36 | struct frame *ref; |
37 | struct frame *prev; |
38 | } frame; |
39 | struct { |
40 | struct vec *ref; |
41 | struct vec *prev; |
42 | } vec; |
43 | struct { |
44 | struct obj *ref; |
45 | struct obj *prev; |
46 | } obj; |
47 | struct { |
48 | struct table *ref; |
49 | struct table *prev; |
50 | } table; |
51 | struct { |
52 | struct row *ref; |
53 | struct row *prev; |
54 | } row; |
55 | struct column { |
56 | struct var *var; |
57 | struct value *values; |
58 | struct table *table; |
59 | int n; |
60 | } col; |
61 | struct { |
62 | struct loop *ref; |
63 | struct loop *prev; |
64 | } loop; |
65 | } u; |
66 | int group; |
67 | struct deletion *next; |
68 | } *deletions = NULL; |
69 | |
70 | static int groups = 0; |
71 | |
72 | |
73 | static void do_delete_vec(struct vec *vec); |
74 | static void do_delete_obj(struct obj *obj); |
75 | |
76 | |
77 | /* ----- helper functions -------------------------------------------------- */ |
78 | |
79 | |
80 | static struct deletion *new_deletion(enum del_type type) |
81 | { |
82 | struct deletion *del; |
83 | |
84 | del = alloc_type(struct deletion); |
85 | del->type = type; |
86 | del->group = groups; |
87 | del->next = deletions; |
88 | deletions = del; |
89 | return del; |
90 | } |
91 | |
92 | |
93 | static void reset_active_ref(struct frame *ref) |
94 | { |
95 | const struct frame *frame; |
96 | struct obj *obj = NULL; |
97 | |
98 | for (frame = frames; frame; frame = frame->next) |
99 | for (obj = frame->objs; obj; obj = obj->next) |
100 | if (obj->type == ot_frame && obj->u.frame.ref == ref) |
101 | break; |
102 | ref->active_ref = obj; |
103 | } |
104 | |
105 | |
106 | /* ----- vectors ----------------------------------------------------------- */ |
107 | |
108 | |
109 | static void destroy_vec(struct vec *vec) |
110 | { |
111 | free_expr(vec->x); |
112 | free_expr(vec->y); |
113 | free(vec); |
114 | } |
115 | |
116 | |
117 | static void delete_vecs_by_ref(struct vec *vecs, const struct vec *ref) |
118 | { |
119 | while (vecs) { |
120 | if (vecs->base == ref) |
121 | do_delete_vec(vecs); |
122 | vecs = vecs->next; |
123 | } |
124 | } |
125 | |
126 | |
127 | static int obj_has_ref(const struct obj *obj, const struct vec *ref) |
128 | { |
129 | if (obj->base == ref) |
130 | return 1; |
131 | switch (obj->type) { |
132 | case ot_frame: |
133 | return 0; |
134 | case ot_line: |
135 | return obj->u.line.other == ref; |
136 | case ot_rect: |
137 | return obj->u.rect.other == ref; |
138 | case ot_pad: |
139 | return obj->u.pad.other == ref; |
140 | case ot_hole: |
141 | return obj->u.hole.other == ref; |
142 | case ot_arc: |
143 | return obj->u.arc.start == ref || obj->u.arc.end == ref; |
144 | case ot_meas: |
145 | return obj->u.meas.high == ref; |
146 | default: |
147 | abort(); |
148 | } |
149 | } |
150 | |
151 | |
152 | static void delete_objs_by_ref(struct obj **objs, const struct vec *ref) |
153 | { |
154 | struct obj *obj; |
155 | |
156 | for (obj = *objs; obj; obj = obj->next) |
157 | if (obj_has_ref(obj, ref)) |
158 | do_delete_obj(obj); |
159 | } |
160 | |
161 | |
162 | static void do_delete_vec(struct vec *vec) |
163 | { |
164 | struct vec *walk, *prev; |
165 | struct deletion *del; |
166 | |
167 | prev = NULL; |
168 | for (walk = vec->frame->vecs; walk != vec; walk = walk->next) |
169 | prev = walk; |
170 | if (prev) |
171 | prev->next = vec->next; |
172 | else |
173 | vec->frame->vecs = vec->next; |
174 | del = new_deletion(dt_vec); |
175 | del->u.vec.ref = vec; |
176 | del->u.vec.prev = prev; |
177 | |
178 | delete_vecs_by_ref(vec->frame->vecs, vec); |
179 | delete_objs_by_ref(&vec->frame->objs, vec); |
180 | delete_objs_by_ref(&root_frame->objs, vec); /* catch measurements */ |
181 | } |
182 | |
183 | |
184 | void delete_vec(struct vec *vec) |
185 | { |
186 | groups++; |
187 | do_delete_vec(vec); |
188 | } |
189 | |
190 | |
191 | static void undelete_vec(struct vec *vec, struct vec *prev) |
192 | { |
193 | if (prev) { |
194 | assert(vec->next == prev->next); |
195 | prev->next = vec; |
196 | } else { |
197 | assert(vec->next == vec->frame->vecs); |
198 | vec->frame->vecs = vec; |
199 | } |
200 | } |
201 | |
202 | |
203 | /* ----- objects ----------------------------------------------------------- */ |
204 | |
205 | |
206 | static void destroy_obj(struct obj *obj) |
207 | { |
208 | switch (obj->type) { |
209 | case ot_frame: |
210 | if (obj->u.frame.ref->active_ref == obj) |
211 | reset_active_ref(obj->u.frame.ref); |
212 | break; |
213 | case ot_pad: |
214 | free(obj->u.pad.name); |
215 | break; |
216 | case ot_hole: |
217 | break; |
218 | case ot_line: |
219 | if (obj->u.line.width) |
220 | free_expr(obj->u.line.width); |
221 | break; |
222 | case ot_rect: |
223 | if (obj->u.rect.width) |
224 | free_expr(obj->u.rect.width); |
225 | break; |
226 | case ot_arc: |
227 | if (obj->u.arc.width) |
228 | free_expr(obj->u.arc.width); |
229 | break; |
230 | case ot_meas: |
231 | if (obj->u.meas.label) |
232 | free(obj->u.meas.label); |
233 | if (obj->u.meas.offset) |
234 | free_expr(obj->u.meas.offset); |
235 | break; |
236 | default: |
237 | abort(); |
238 | } |
239 | free(obj); |
240 | } |
241 | |
242 | |
243 | static void do_delete_obj(struct obj *obj) |
244 | { |
245 | struct obj *walk, *prev; |
246 | struct deletion *del; |
247 | |
248 | prev = NULL; |
249 | for (walk = obj->frame->objs; walk != obj; walk = walk->next) |
250 | prev = walk; |
251 | if (prev) |
252 | prev->next = obj->next; |
253 | else |
254 | obj->frame->objs = obj->next; |
255 | del = new_deletion(dt_obj); |
256 | del->u.obj.ref = obj; |
257 | del->u.obj.prev = prev; |
258 | if (obj->type == ot_frame && obj->u.frame.ref->active_ref == obj) |
259 | reset_active_ref(obj->u.frame.ref); |
260 | } |
261 | |
262 | |
263 | void delete_obj(struct obj *obj) |
264 | { |
265 | groups++; |
266 | do_delete_obj(obj); |
267 | } |
268 | |
269 | |
270 | static void undelete_obj(struct obj *obj, struct obj *prev) |
271 | { |
272 | if (prev) { |
273 | assert(obj->next == prev->next); |
274 | prev->next = obj; |
275 | } else { |
276 | assert(obj->next == obj->frame->objs); |
277 | obj->frame->objs = obj; |
278 | } |
279 | } |
280 | |
281 | |
282 | |
283 | /* ----- rows -------------------------------------------------------------- */ |
284 | |
285 | |
286 | static void destroy_row(struct row *row) |
287 | { |
288 | struct value *next_value; |
289 | |
290 | while (row->values) { |
291 | next_value = row->values->next; |
292 | free_expr(row->values->expr); |
293 | free(row->values); |
294 | row->values = next_value; |
295 | } |
296 | free(row); |
297 | } |
298 | |
299 | |
300 | void delete_row(struct row *row) |
301 | { |
302 | struct deletion *del; |
303 | struct row *walk, *prev; |
304 | |
305 | groups++; |
306 | prev = NULL; |
307 | for (walk = row->table->rows; walk != row; walk = walk->next) |
308 | prev = walk; |
309 | if (prev) |
310 | prev->next = row->next; |
311 | else |
312 | row->table->rows = row->next; |
313 | del = new_deletion(dt_row); |
314 | del->u.row.ref = row; |
315 | del->u.row.prev = prev; |
316 | } |
317 | |
318 | |
319 | static void undelete_row(struct row *row, struct row *prev) |
320 | { |
321 | if (prev) { |
322 | assert(row->next == prev->next); |
323 | prev->next = row; |
324 | } else { |
325 | assert(row->next == row->table->rows); |
326 | row->table->rows = row; |
327 | } |
328 | } |
329 | |
330 | |
331 | /* ----- columns ----------------------------------------------------------- */ |
332 | |
333 | |
334 | void delete_column(struct table *table, int n) |
335 | { |
336 | struct deletion *del; |
337 | struct column *col; |
338 | struct var **var; |
339 | struct row *row; |
340 | struct value **next, **value; |
341 | int i; |
342 | |
343 | groups++; |
344 | |
345 | del = new_deletion(dt_column); |
346 | col = &del->u.col; |
347 | col->table = table; |
348 | col->n = n; |
349 | |
350 | var = &table->vars; |
351 | for (i = 0; i != n; i++) |
352 | var = &(*var)->next; |
353 | col->var = *var; |
354 | *var = (*var)->next; |
355 | |
356 | next = &col->values; |
357 | for (row = table->rows; row; row = row->next) { |
358 | value = &row->values; |
359 | for (i = 0; i != n; i++) |
360 | value = &(*value)->next; |
361 | *next = *value; |
362 | *value = (*value)->next; |
363 | next = &(*next)->next; |
364 | } |
365 | *next = NULL; |
366 | } |
367 | |
368 | |
369 | static void undelete_column(const struct column *col) |
370 | { |
371 | struct var **var; |
372 | struct row *row; |
373 | struct value **anchor, *value, *next; |
374 | int i; |
375 | |
376 | var = &col->table->vars; |
377 | for (i = 0; i != col->n; i++) |
378 | var = &(*var)->next; |
379 | col->var->next = *var; |
380 | *var = col->var; |
381 | |
382 | value = col->values; |
383 | for (row = col->table->rows; row; row = row->next) { |
384 | anchor = &row->values; |
385 | for (i = 0; i != col->n; i++) |
386 | anchor = &(*anchor)->next; |
387 | next = value->next; |
388 | value->next = *anchor; |
389 | *anchor = value; |
390 | value = next; |
391 | } |
392 | } |
393 | |
394 | |
395 | /* ----- tables ------------------------------------------------------------ */ |
396 | |
397 | |
398 | static void destroy_table(struct table *table) |
399 | { |
400 | struct var *next_var; |
401 | |
402 | while (table->vars) { |
403 | next_var = table->vars->next; |
404 | free(table->vars); |
405 | table->vars = next_var; |
406 | } |
407 | while (table->rows) { |
408 | delete_row(table->rows); |
409 | destroy(); |
410 | } |
411 | free(table); |
412 | } |
413 | |
414 | |
415 | void delete_table(struct table *table) |
416 | { |
417 | struct frame *frame = table->vars->frame; |
418 | struct deletion *del; |
419 | struct table *walk, *prev; |
420 | |
421 | groups++; |
422 | prev = NULL; |
423 | for (walk = frame->tables; walk != table; walk = walk->next) |
424 | prev = walk; |
425 | if (prev) |
426 | prev->next = table->next; |
427 | else |
428 | frame->tables = table->next; |
429 | del = new_deletion(dt_table); |
430 | del->u.table.ref = table; |
431 | del->u.table.prev = prev; |
432 | } |
433 | |
434 | |
435 | static void undelete_table(struct table *table, struct table *prev) |
436 | { |
437 | struct frame *frame = table->vars->frame; |
438 | |
439 | if (prev) { |
440 | assert(table->next == prev->next); |
441 | prev->next = table; |
442 | } else { |
443 | assert(table->next == frame->tables); |
444 | frame->tables = table; |
445 | } |
446 | } |
447 | |
448 | |
449 | /* ----- loops ------------------------------------------------------------- */ |
450 | |
451 | |
452 | static void destroy_loop(struct loop *loop) |
453 | { |
454 | free_expr(loop->from.expr); |
455 | free_expr(loop->to.expr); |
456 | free(loop); |
457 | } |
458 | |
459 | |
460 | void delete_loop(struct loop *loop) |
461 | { |
462 | struct frame *frame = loop->var.frame; |
463 | struct deletion *del; |
464 | struct loop *walk, *prev; |
465 | |
466 | groups++; |
467 | prev = NULL; |
468 | for (walk = frame->loops; walk != loop; walk = walk->next) |
469 | prev = walk; |
470 | if (prev) |
471 | prev->next = loop->next; |
472 | else |
473 | frame->loops = loop->next; |
474 | del = new_deletion(dt_loop); |
475 | del->u.loop.ref = loop; |
476 | del->u.loop.prev = prev; |
477 | } |
478 | |
479 | |
480 | static void undelete_loop(struct loop *loop, struct loop *prev) |
481 | { |
482 | struct frame *frame = loop->var.frame; |
483 | |
484 | if (prev) { |
485 | assert(loop->next == prev->next); |
486 | prev->next = loop; |
487 | } else { |
488 | assert(loop->next == frame->loops); |
489 | frame->loops = loop; |
490 | } |
491 | } |
492 | |
493 | |
494 | /* ----- frames ------------------------------------------------------------ */ |
495 | |
496 | |
497 | static void destroy_frame(struct frame *frame) |
498 | { |
499 | while (frame->tables) { |
500 | delete_table(frame->tables); |
501 | destroy(); |
502 | } |
503 | while (frame->loops) { |
504 | delete_loop(frame->loops); |
505 | destroy(); |
506 | } |
507 | while (frame->vecs) { |
508 | delete_vec(frame->vecs); |
509 | destroy(); |
510 | } |
511 | while (frame->objs) { |
512 | delete_obj(frame->objs); |
513 | destroy(); |
514 | } |
515 | free(frame); |
516 | } |
517 | |
518 | |
519 | static void delete_references(const struct frame *ref) |
520 | { |
521 | struct frame *frame; |
522 | struct obj *obj; |
523 | |
524 | for (frame = frames; frame; frame = frame->next) |
525 | for (obj = frame->objs; obj; obj = obj->next) |
526 | switch (obj->type) { |
527 | case ot_frame: |
528 | if (obj->u.frame.ref == ref) |
529 | do_delete_obj(obj); |
530 | break; |
531 | case ot_meas: |
532 | if (obj->base->frame == ref || |
533 | obj->u.meas.high->frame == ref) |
534 | do_delete_obj(obj); |
535 | break; |
536 | default: |
537 | break; |
538 | } |
539 | for (obj = ref->objs; obj; obj = obj->next) |
540 | if (obj->type == ot_frame) |
541 | if (obj->u.frame.ref->active_ref == obj) |
542 | reset_active_ref(obj->u.frame.ref); |
543 | } |
544 | |
545 | |
546 | void delete_frame(struct frame *frame) |
547 | { |
548 | struct deletion *del; |
549 | |
550 | groups++; |
551 | |
552 | del = new_deletion(dt_frame); |
553 | del->u.frame.ref = frame; |
554 | del->u.frame.prev = frame->prev; |
555 | |
556 | if (frame->next) |
557 | frame->next->prev = frame->prev; |
558 | if (frame->prev) |
559 | frame->prev->next = frame->next; |
560 | else |
561 | frames = frame->next; |
562 | |
563 | delete_references(frame); |
564 | } |
565 | |
566 | |
567 | static void undelete_frame(struct frame *frame, struct frame *prev) |
568 | { |
569 | if (prev) { |
570 | assert(frame->next == prev->next); |
571 | prev->next = frame; |
572 | } else { |
573 | assert(frame->next == frames); |
574 | frames = frame; |
575 | } |
576 | frame->next->prev = frame; |
577 | } |
578 | |
579 | |
580 | /* ----- destroy/undelete interface ---------------------------------------- */ |
581 | |
582 | |
583 | static void destroy_one(void) |
584 | { |
585 | struct deletion *del; |
586 | |
587 | del = deletions; |
588 | switch (del->type) { |
589 | case dt_vec: |
590 | destroy_vec(del->u.vec.ref); |
591 | break; |
592 | case dt_obj: |
593 | destroy_obj(del->u.obj.ref); |
594 | break; |
595 | case dt_frame: |
596 | destroy_frame(del->u.frame.ref); |
597 | break; |
598 | case dt_loop: |
599 | destroy_loop(del->u.loop.ref); |
600 | break; |
601 | case dt_table: |
602 | destroy_table(del->u.table.ref); |
603 | break; |
604 | case dt_row: |
605 | destroy_row(del->u.row.ref); |
606 | break; |
607 | case dt_column: |
608 | abort(); /* @@@ later */ |
609 | break; |
610 | default: |
611 | abort(); |
612 | } |
613 | deletions = del->next; |
614 | free(del); |
615 | } |
616 | |
617 | |
618 | void destroy(void) |
619 | { |
620 | int group; |
621 | |
622 | assert(deletions); |
623 | group = deletions->group; |
624 | while (deletions && deletions->group == group) |
625 | destroy_one(); |
626 | } |
627 | |
628 | |
629 | static int undelete_one(void) |
630 | { |
631 | struct deletion *del; |
632 | |
633 | if (!deletions) |
634 | return 0; |
635 | del = deletions; |
636 | switch (del->type) { |
637 | case dt_vec: |
638 | undelete_vec(del->u.vec.ref, del->u.vec.prev); |
639 | break; |
640 | case dt_obj: |
641 | undelete_obj(del->u.obj.ref, del->u.obj.prev); |
642 | break; |
643 | case dt_frame: |
644 | undelete_frame(del->u.frame.ref, del->u.frame.prev); |
645 | break; |
646 | case dt_loop: |
647 | undelete_loop(del->u.loop.ref, del->u.loop.prev); |
648 | break; |
649 | case dt_table: |
650 | undelete_table(del->u.table.ref, del->u.table.prev); |
651 | break; |
652 | case dt_row: |
653 | undelete_row(del->u.row.ref, del->u.row.prev); |
654 | break; |
655 | case dt_column: |
656 | undelete_column(&del->u.col); |
657 | break; |
658 | default: |
659 | abort(); |
660 | } |
661 | deletions = del->next; |
662 | free(del); |
663 | return 1; |
664 | } |
665 | |
666 | |
667 | int undelete(void) |
668 | { |
669 | int group; |
670 | |
671 | if (!deletions) |
672 | return 0; |
673 | group = deletions->group; |
674 | while (deletions && deletions->group == group) |
675 | undelete_one(); |
676 | return 1; |
677 | } |
678 | |
679 | |
680 | void purge(void) |
681 | { |
682 | while (deletions) |
683 | destroy(); |
684 | } |
685 |
Branches:
master