dump.c |
1 | 1 | /* |
2 | 2 | * dump.c - Dump objects in the native FPD format |
3 | 3 | * |
4 | | * Written 2009-2011 by Werner Almesberger |
5 | | * Copyright 2009-2011 by Werner Almesberger |
| 4 | * Written 2009-2012 by Werner Almesberger |
| 5 | * Copyright 2009-2012 by Werner Almesberger |
6 | 6 | * |
7 | 7 | * This program is free software; you can redistribute it and/or modify |
8 | 8 | * it under the terms of the GNU General Public License as published by |
... | ... | |
488 | 488 | y = unparse(vec->y); |
489 | 489 | if (vec->name) |
490 | 490 | s = stralloc_printf("vec %s(%s, %s)", base, x, y); |
491 | | else { |
| 491 | else |
492 | 492 | s = stralloc_printf("vec %s(%s, %s)", base, x, y); |
493 | | } |
494 | 493 | free(x); |
495 | 494 | free(y); |
496 | 495 | return s; |
expr.c |
1 | 1 | /* |
2 | 2 | * expr.c - Expressions and values |
3 | 3 | * |
4 | | * Written 2009, 2010 by Werner Almesberger |
5 | | * Copyright 2009, 2010 by Werner Almesberger |
| 4 | * Written 2009, 2010, 2012 by Werner Almesberger |
| 5 | * Copyright 2009, 2010, 2012 by Werner Almesberger |
6 | 6 | * |
7 | 7 | * This program is free software; you can redistribute it and/or modify |
8 | 8 | * it under the terms of the GNU General Public License as published by |
... | ... | |
443 | 443 | while (is_id_char(*s, s == s0)) |
444 | 444 | s++; |
445 | 445 | if (s == s0) { |
446 | | if (*s) |
| 446 | if (*s) { |
447 | 447 | goto invalid; |
448 | | else { |
| 448 | } else { |
449 | 449 | fail("incomplete variable name"); |
450 | 450 | goto fail; |
451 | 451 | } |
... | ... | |
472 | 472 | var_unique = unique(var); |
473 | 473 | free(var); |
474 | 474 | value_string = eval_string_var(frame, var_unique); |
475 | | if (value_string) |
| 475 | if (value_string) { |
476 | 476 | value_len = strlen(value_string); |
477 | | else { |
| 477 | } else { |
478 | 478 | value = eval_var(frame, var_unique); |
479 | 479 | if (is_undef(value)) { |
480 | 480 | fail("undefined variable \"%s\"", var_unique); |
file.c |
1 | 1 | /* |
2 | 2 | * file.c - File handling |
3 | 3 | * |
4 | | * Written 2009-2011 by Werner Almesberger |
5 | | * Copyright 2009-2011 by Werner Almesberger |
| 4 | * Written 2009-2012 by Werner Almesberger |
| 5 | * Copyright 2009-2012 by Werner Almesberger |
6 | 6 | * |
7 | 7 | * This program is free software; you can redistribute it and/or modify |
8 | 8 | * it under the terms of the GNU General Public License as published by |
... | ... | |
91 | 91 | /* save to temporary file */ |
92 | 92 | |
93 | 93 | slash = strrchr(s, '/'); |
94 | | if (!slash) |
| 94 | if (!slash) { |
95 | 95 | tmp = stralloc_printf("~%s", s); |
96 | | else { |
| 96 | } else { |
97 | 97 | *slash = 0; |
98 | 98 | tmp = stralloc_printf("%s/~%s", s, slash+1); |
99 | 99 | *slash = '/'; |
... | ... | |
148 | 148 | |
149 | 149 | void save_fpd(void) |
150 | 150 | { |
151 | | if (save_file_name) |
| 151 | if (save_file_name) { |
152 | 152 | save_with_backup(save_file_name, dump, NULL); |
153 | | else { |
| 153 | } else { |
154 | 154 | if (!dump(stdout, NULL)) |
155 | 155 | perror("stdout"); |
156 | 156 | } |
fpd.y |
2 | 2 | /* |
3 | 3 | * fpd.y - FootPrint Definition language |
4 | 4 | * |
5 | | * Written 2009-2011 by Werner Almesberger |
6 | | * Copyright 2009-2011 by Werner Almesberger |
| 5 | * Written 2009-2012 by Werner Almesberger |
| 6 | * Copyright 2009-2012 by Werner Almesberger |
7 | 7 | * |
8 | 8 | * This program is free software; you can redistribute it and/or modify |
9 | 9 | * it under the terms of the GNU General Public License as published by |
... | ... | |
252 | 252 | struct obj *obj; |
253 | 253 | struct frame *frame; |
254 | 254 | |
255 | | if (!frame_name) |
| 255 | if (!frame_name) { |
256 | 256 | frame = curr_frame; |
257 | | else { |
| 257 | } else { |
258 | 258 | frame = find_frame(frame_name); |
259 | 259 | if (!frame) { |
260 | 260 | yyerrorf("unknown frame \"%s\"", frame_name); |
gui_frame.c |
1 | 1 | /* |
2 | 2 | * gui_frame.c - GUI, frame window |
3 | 3 | * |
4 | | * Written 2009, 2010 by Werner Almesberger |
5 | | * Copyright 2009, 2010 by Werner Almesberger |
| 4 | * Written 2009, 2010, 2012 by Werner Almesberger |
| 5 | * Copyright 2009, 2010, 2012 by Werner Almesberger |
6 | 6 | * |
7 | 7 | * This program is free software; you can redistribute it and/or modify |
8 | 8 | * it under the terms of the GNU General Public License as published by |
... | ... | |
616 | 616 | |
617 | 617 | status_set_type_x(NULL, "value ="); |
618 | 618 | value_string = eval_str(expr, frame); |
619 | | if (value_string) |
| 619 | if (value_string) { |
620 | 620 | status_set_x(NULL, "\"%s\"", value_string); |
621 | | else { |
| 621 | } else { |
622 | 622 | value = eval_num(expr, frame); |
623 | 623 | if (is_undef(value)) |
624 | 624 | status_set_x(NULL, "undefined"); |
... | ... | |
1701 | 1701 | case 1: |
1702 | 1702 | if (is_dragging(frame)) |
1703 | 1703 | return FALSE; |
1704 | | if (active_frame != frame) |
| 1704 | if (active_frame != frame) { |
1705 | 1705 | select_frame(frame); |
1706 | | else { |
| 1706 | } else { |
1707 | 1707 | if (active_frame->name) { |
1708 | 1708 | edit_nothing(); |
1709 | 1709 | edit_frame(frame); |
gui_inst.c |
1 | 1 | /* |
2 | 2 | * gui_inst.c - GUI, instance functions |
3 | 3 | * |
4 | | * Written 2009-2011 by Werner Almesberger |
5 | | * Copyright 2009-2011 by Werner Almesberger |
| 4 | * Written 2009-2012 by Werner Almesberger |
| 5 | * Copyright 2009-2012 by Werner Almesberger |
6 | 6 | * |
7 | 7 | * This program is free software; you can redistribute it and/or modify |
8 | 8 | * it under the terms of the GNU General Public License as published by |
... | ... | |
79 | 79 | gp[i].x = points[i].x; |
80 | 80 | gp[i].y = points[i].y; |
81 | 81 | } |
82 | | if (fill) |
| 82 | if (fill) { |
83 | 83 | gdk_draw_polygon(DA, gc, fill, gp, n_points); |
84 | | else { |
| 84 | } else { |
85 | 85 | gdk_draw_line(DA, gc, gp[0].x, gp[0].y, gp[1].x, gp[1].y); |
86 | 86 | gdk_draw_line(DA, gc, gp[1].x, gp[1].y, gp[2].x, gp[2].y); |
87 | 87 | } |
... | ... | |
359 | 359 | if (h > w) { |
360 | 360 | r = w/2; |
361 | 361 | draw_arc(DA, gc, fill, min.x+r, max.y-r, r, 180, 0); |
362 | | if (fill) |
| 362 | if (fill) { |
363 | 363 | gdk_draw_rectangle(DA, gc, fill, |
364 | 364 | min.x, min.y+r, w, h-2*r); |
365 | | else { |
| 365 | } else { |
366 | 366 | gdk_draw_line(DA, gc, min.x, min.y+r, min.x, max.y-r); |
367 | 367 | gdk_draw_line(DA, gc, max.x, min.y+r, max.x, max.y-r); |
368 | 368 | } |
... | ... | |
370 | 370 | } else { |
371 | 371 | r = h/2; |
372 | 372 | draw_arc(DA, gc, fill, min.x+r, min.y+r, r, 90, 270); |
373 | | if (fill) |
| 373 | if (fill) { |
374 | 374 | gdk_draw_rectangle(DA, gc, fill, |
375 | 375 | min.x+r, min.y, w-2*r, h); |
376 | | else { |
| 376 | } else { |
377 | 377 | gdk_draw_line(DA, gc, min.x+r, min.y, max.x-r, min.y); |
378 | 378 | gdk_draw_line(DA, gc, min.x+r, max.y, max.x-r, max.y); |
379 | 379 | } |
gui_tool.c |
1 | 1 | /* |
2 | 2 | * gui_tool.c - GUI, tool bar |
3 | 3 | * |
4 | | * Written 2009-2011 by Werner Almesberger |
5 | | * Copyright 2009-2011 by Werner Almesberger |
| 4 | * Written 2009-2012 by Werner Almesberger |
| 5 | * Copyright 2009-2012 by Werner Almesberger |
6 | 6 | * |
7 | 7 | * This program is free software; you can redistribute it and/or modify |
8 | 8 | * it under the terms of the GNU General Public License as published by |
... | ... | |
556 | 556 | if (a2 < a1) |
557 | 557 | a2 += 360.0; |
558 | 558 | |
559 | | if (i != 2) |
| 559 | if (i != 2) { |
560 | 560 | r_save = r; |
561 | | else { |
| 561 | } else { |
562 | 562 | r_save = hypot(to.x-c.x, to.y-c.y); |
563 | 563 | if (r > r_save) |
564 | 564 | r_save = r; |
... | ... | |
1025 | 1025 | tool_cancel_drag(); |
1026 | 1026 | if (state.new && ops->end_new_raw) |
1027 | 1027 | return ops->end_new_raw(state.new, to); |
1028 | | if (state.new && ops->find_point) |
| 1028 | if (state.new && ops->find_point) { |
1029 | 1029 | end = ops->find_point(to); |
1030 | | else { |
| 1030 | } else { |
1031 | 1031 | if (state.inst && state.inst->ops->find_point) |
1032 | 1032 | end = state.inst->ops->find_point(state.inst, to); |
1033 | 1033 | else |