Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 4523) +++ trunk/src/Makefile.dep (revision 4524) @@ -13,8 +13,8 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ hid.h misc.h ../src_3rd/genvector/gds_char.h mymem.h create.h rtree.h \ - undo.h move.h draw.h set.h polygon.h rtree.h plugins.h hid_actions.h \ - dolists.h + undo.h move.h draw.h set.h polygon.h rtree.h math_helper.h plugins.h \ + hid_actions.h dolists.h ../src_plugins/autoplace/action.o: ../src_plugins/autoplace/action.c \ ../config.h ../src_plugins/autoplace/autoplace.h global_typedefs.h \ pcb_bool.h unit.h plugins.h set.h global_typedefs.h hid_actions.h hid.h \ @@ -30,9 +30,9 @@ list_arc.h list_text.h list_poly.h library.h rats_patch.h board.h \ list_common.h list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h \ drc.h ../src_plugins/autoplace/autoplace.h global_typedefs.h box.h \ - misc_util.h compat_misc.h compat_nls.h data.h global_element.h \ - list_element.h ht_element.h ../src_3rd/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/ht_inlines.h \ + math_helper.h misc_util.h compat_misc.h compat_nls.h data.h \ + global_element.h list_element.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ draw.h error.h layer.h intersect.h rtree.h macro.h mirror.h misc.h \ ../src_3rd/genvector/gds_char.h mymem.h move.h mymem.h rats.h netlist.h \ @@ -66,17 +66,18 @@ list_rat.h layer.h crosshair.h rubberband.h vtonpoint.h hid.h error.h \ drc.h buffer.h macro.h ../src_plugins/autoroute/autoroute.h board.h \ const.h macro.h vtroutestyle.h library.h rats_patch.h board.h box.h \ - misc_util.h create.h draw.h error.h find.h heap.h rtree.h misc.h mymem.h \ - ../src_plugins/autoroute/mtspace.h ../src_plugins/autoroute/vector.h \ - mymem.h polygon.h rtree.h rats.h netlist.h route_style.h remove.h \ - thermal.h undo.h pcb-printf.h set.h layer.h compat_nls.h ptrlist.h + math_helper.h misc_util.h create.h draw.h error.h find.h heap.h rtree.h \ + misc.h mymem.h ../src_plugins/autoroute/mtspace.h \ + ../src_plugins/autoroute/vector.h mymem.h polygon.h rtree.h rats.h \ + netlist.h route_style.h remove.h thermal.h undo.h pcb-printf.h set.h \ + layer.h compat_nls.h ptrlist.h ../src_plugins/autoroute/mtspace.o: ../src_plugins/autoroute/mtspace.c \ - ../config.h box.h global_typedefs.h pcb_bool.h unit.h global_objs.h \ - ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \ - macro.h misc_util.h heap.h rtree.h ../src_plugins/autoroute/mtspace.h \ - ../src_plugins/autoroute/vector.h + ../config.h box.h math_helper.h global_typedefs.h pcb_bool.h unit.h \ + global_objs.h ../src_3rd/genlist/gendlist.h attrib.h flag.h \ + globalconst.h polyarea.h macro.h misc_util.h heap.h rtree.h \ + ../src_plugins/autoroute/mtspace.h ../src_plugins/autoroute/vector.h ../src_plugins/autoroute/vector.o: ../src_plugins/autoroute/vector.c \ - ../config.h ../src_plugins/autoroute/vector.h macro.h + ../config.h math_helper.h ../src_plugins/autoroute/vector.h macro.h ../src_plugins/boardflip/boardflip.o: \ ../src_plugins/boardflip/boardflip.c ../config.h board.h const.h macro.h \ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \ @@ -195,8 +196,8 @@ ../src_plugins/djopt/djopt_conf.h conf.h dolists.h \ ../src_plugins/djopt/djopt_conf_fields.h ../src_plugins/export_bboard/bboard.o: \ - ../src_plugins/export_bboard/bboard.c ../config.h board.h const.h \ - macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \ + ../src_plugins/export_bboard/bboard.c ../config.h math_helper.h board.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \ @@ -243,12 +244,13 @@ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ error.h misc.h ../src_3rd/genvector/gds_char.h mymem.h rats.h netlist.h \ route_style.h buffer.h change.h draw.h set.h undo.h pcb-printf.h \ - create.h polygon.h rtree.h compat_misc.h layer.h hid.h \ + create.h polygon.h rtree.h math_helper.h compat_misc.h layer.h hid.h \ hid_draw_helpers.h hid_nogui.h hid_actions.h hid_init.h hid_attrib.h \ hid_helper.h plugins.h dolists.h ../src_plugins/export_dxf/dxf.o: ../src_plugins/export_dxf/dxf.c \ - ../config.h macro.h board.h const.h macro.h global_typedefs.h pcb_bool.h \ - unit.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ + ../config.h math_helper.h macro.h board.h const.h macro.h \ + global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \ + ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \ layer.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ @@ -306,8 +308,8 @@ ../src_plugins/export_gcode/lists.h ../src_plugins/export_gcode/trace.h \ compat_cc.h ../src_plugins/export_gerber/gerber.o: \ - ../src_plugins/export_gerber/gerber.c ../config.h board.h const.h \ - macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \ + ../src_plugins/export_gerber/gerber.c ../config.h math_helper.h board.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \ @@ -385,7 +387,7 @@ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \ list_arc.h list_text.h list_poly.h library.h rats_patch.h board.h \ list_common.h list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h \ - drc.h data.h global_element.h list_element.h ht_element.h \ + drc.h math_helper.h data.h global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ misc.h ../src_3rd/genvector/gds_char.h mymem.h error.h buffer.h create.h \ @@ -456,19 +458,19 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h globalconst.h board.h const.h macro.h \ - vtroutestyle.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ - flag.h polyarea.h layer.h list_line.h list_arc.h list_text.h list_poly.h \ - library.h rats_patch.h board.h list_common.h list_pad.h list_pin.h \ - list_rat.h vtonpoint.h hid.h error.h drc.h data.h global_element.h \ - list_element.h ht_element.h ../src_3rd/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ - layer.h misc.h mymem.h pcb-printf.h hid.h hid_nogui.h hid_draw_helpers.h \ - ../src_plugins/export_ps/ps.h hid_init.h hid_attrib.h hid_helper.h \ - hid_flags.h hid_color.h + ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h board.h \ + const.h macro.h vtroutestyle.h global_objs.h \ + ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h layer.h \ + list_line.h list_arc.h list_text.h list_poly.h library.h rats_patch.h \ + board.h list_common.h list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h \ + error.h drc.h data.h global_element.h list_element.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ + crosshair.h rubberband.h buffer.h layer.h misc.h mymem.h pcb-printf.h \ + hid.h hid_nogui.h hid_draw_helpers.h ../src_plugins/export_ps/ps.h \ + hid_init.h hid_attrib.h hid_helper.h hid_flags.h hid_color.h ../src_plugins/export_ps/ps.o: ../src_plugins/export_ps/ps.c ../config.h \ - board.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ - vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ + math_helper.h board.h const.h macro.h global_typedefs.h pcb_bool.h \ + unit.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \ layer.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ @@ -497,16 +499,16 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h globalconst.h board.h const.h macro.h \ - vtroutestyle.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ - flag.h polyarea.h layer.h list_line.h list_arc.h list_text.h list_poly.h \ - library.h rats_patch.h board.h list_common.h list_pad.h list_pin.h \ - list_rat.h vtonpoint.h hid.h error.h drc.h data.h global_element.h \ - list_element.h ht_element.h ../src_3rd/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ - error.h misc.h mymem.h layer.h misc_util.h compat_misc.h plugins.h hid.h \ - hid_nogui.h hid_draw_helpers.h hid_init.h hid_attrib.h hid_color.h \ - hid_helper.h hid_flags.h dolists.h + ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h board.h \ + const.h macro.h vtroutestyle.h global_objs.h \ + ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h layer.h \ + list_line.h list_arc.h list_text.h list_poly.h library.h rats_patch.h \ + board.h list_common.h list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h \ + error.h drc.h data.h global_element.h list_element.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ + crosshair.h rubberband.h buffer.h error.h misc.h mymem.h layer.h \ + misc_util.h compat_misc.h plugins.h hid.h hid_nogui.h hid_draw_helpers.h \ + hid_init.h hid_attrib.h hid_color.h hid_helper.h hid_flags.h dolists.h ../src_plugins/export_test/export_test.o: \ ../src_plugins/export_test/export_test.c ../config.h conf_core.h conf.h \ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ @@ -535,15 +537,16 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h globalconst.h board.h const.h macro.h \ - vtroutestyle.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ - flag.h polyarea.h layer.h list_line.h list_arc.h list_text.h list_poly.h \ - library.h rats_patch.h board.h list_common.h list_pad.h list_pin.h \ - list_rat.h vtonpoint.h hid.h error.h drc.h data.h global_element.h \ - list_element.h ht_element.h ../src_3rd/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ - error.h misc.h mymem.h pcb-printf.h plugins.h compat_misc.h hid.h \ - hid_nogui.h hid_attrib.h hid_helper.h hid_init.h + ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h board.h \ + const.h macro.h vtroutestyle.h global_objs.h \ + ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h layer.h \ + list_line.h list_arc.h list_text.h list_poly.h library.h rats_patch.h \ + board.h list_common.h list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h \ + error.h drc.h data.h global_element.h list_element.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ + crosshair.h rubberband.h buffer.h error.h misc.h mymem.h pcb-printf.h \ + plugins.h compat_misc.h hid.h hid_nogui.h hid_attrib.h hid_helper.h \ + hid_init.h ../src_plugins/fontmode/fontmode.o: ../src_plugins/fontmode/fontmode.c \ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \ pcb-printf.h ../src_3rd/genvector/gds_char.h \ @@ -755,7 +758,7 @@ ../src_plugins/hid_gtk/ghid-propedit.h conf_core.h conf.h pcb-printf.h \ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ event.h compat_misc.h ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - create.h compat_nls.h polygon.h rtree.h + create.h compat_nls.h polygon.h rtree.h math_helper.h ../src_plugins/hid_gtk/ghid-route-style-selector.o: \ ../src_plugins/hid_gtk/ghid-route-style-selector.c ../config.h \ conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ @@ -1123,10 +1126,10 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h globalconst.h crosshair.h rubberband.h \ - global_objs.h ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h \ - vtonpoint.h hid.h error.h drc.h data.h global_element.h list_pin.h \ - list_pad.h list_line.h list_arc.h list_element.h ht_element.h \ + ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h crosshair.h \ + rubberband.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h flag.h \ + polyarea.h vtonpoint.h hid.h error.h drc.h data.h global_element.h \ + list_pin.h list_pad.h list_line.h list_arc.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ list_common.h list_text.h list_poly.h list_rat.h layer.h crosshair.h \ buffer.h misc.h mymem.h action_helper.h set.h pcb-printf.h misc_util.h \ @@ -1281,9 +1284,9 @@ ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h hid_cfg_action.h \ action_helper.h buffer.h change.h copy.h create.h crosshair.h draw.h \ error.h plug_io.h find.h insert.h line.h mymem.h layer.h move.h \ - pcb-printf.h polygon.h rtree.h rats.h netlist.h route_style.h remove.h \ - rotate.h rubberband.h search.h misc_util.h select.h operation.h set.h \ - undo.h free_atexit.h paths.h \ + pcb-printf.h polygon.h rtree.h math_helper.h rats.h netlist.h \ + route_style.h remove.h rotate.h rubberband.h search.h misc_util.h \ + select.h operation.h set.h undo.h free_atexit.h paths.h \ ../src_plugins/hid_gtk/gui-icons-mode-buttons.data \ ../src_plugins/hid_gtk/gui-icons-misc.data \ ../src_plugins/hid_gtk/win_place.h hid_attrib.h hid_actions.h \ @@ -1386,8 +1389,8 @@ vtroutestyle.h library.h rats_patch.h board.h \ ../src_plugins/hid_lesstif/stdarg.h ../src_plugins/hid_lesstif/main.o: ../src_plugins/hid_lesstif/main.c \ - ../src_plugins/hid_lesstif/xincludes.h ../config.h conf_core.h conf.h \ - global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ + ../src_plugins/hid_lesstif/xincludes.h ../config.h math_helper.h \ + conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ @@ -1492,12 +1495,12 @@ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ error.h misc.h ../src_3rd/genvector/gds_char.h mymem.h rats.h netlist.h \ route_style.h buffer.h change.h draw.h set.h undo.h pcb-printf.h \ - create.h polygon.h rtree.h compat_misc.h compat_nls.h action_helper.h \ - hid.h hid_draw_helpers.h hid_nogui.h hid_actions.h hid_init.h \ - hid_attrib.h hid_helper.h plugins.h dolists.h + create.h polygon.h rtree.h math_helper.h compat_misc.h compat_nls.h \ + action_helper.h hid.h hid_draw_helpers.h hid_nogui.h hid_actions.h \ + hid_init.h hid_attrib.h hid_helper.h plugins.h dolists.h ../src_plugins/import_edif/edif.o: ../src_plugins/import_edif/edif.c \ - ../config.h board.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ - vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ + math_helper.h board.h ../config.h const.h macro.h global_typedefs.h \ + pcb_bool.h unit.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \ layer.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ @@ -1605,8 +1608,8 @@ list_conf.h error.h data.h global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ crosshair.h rubberband.h buffer.h ../src_plugins/io_kicad/read.h layer.h \ - const.h netlist.h route_style.h create.h polygon.h rtree.h misc.h \ - mymem.h misc_util.h conf_core.h move.h macro.h + const.h netlist.h route_style.h create.h polygon.h rtree.h math_helper.h \ + misc.h mymem.h misc_util.h conf_core.h move.h macro.h ../src_plugins/io_kicad/uniq_name.o: ../src_plugins/io_kicad/uniq_name.c \ ../src_3rd/liblihata/genht/hash.h ../src_plugins/io_kicad/uniq_name.h \ ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ @@ -1717,7 +1720,7 @@ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \ flag_str.h compat_misc.h macro.h error.h misc.h mymem.h misc_util.h \ layer.h create.h vtptr.h ../src_plugins/io_lihata/common.h polygon.h \ - rtree.h conf_core.h + rtree.h math_helper.h conf_core.h ../src_plugins/io_lihata/write.o: ../src_plugins/io_lihata/write.c \ ../src_3rd/liblihata/tree.h ../src_3rd/liblihata/dom.h \ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \ @@ -1781,8 +1784,8 @@ ../src_plugins/io_pcb/file.h board.h const.h macro.h vtroutestyle.h \ rats_patch.h board.h plug_io.h hid.h layer.h misc.h mymem.h move.h \ mymem.h ../src_plugins/io_pcb/parse_common.h pcb-printf.h polygon.h \ - rtree.h rats.h netlist.h route_style.h remove.h set.h flag_str.h \ - compat_fs.h paths.h rats_patch.h hid_actions.h hid_flags.h \ + rtree.h math_helper.h rats.h netlist.h route_style.h remove.h set.h \ + flag_str.h compat_fs.h paths.h rats_patch.h hid_actions.h hid_flags.h \ ../src_plugins/io_pcb/flags.h global_objs.h \ ../src_plugins/io_pcb/attribs.h route_style.h ../src_plugins/io_pcb/flags.o: ../src_plugins/io_pcb/flags.c flag_str.h \ @@ -1846,8 +1849,8 @@ list_element.h ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h buffer.h error.h \ ../src_plugins/io_pcb/file.h plug_io.h mymem.h misc.h mymem.h \ - ../src_plugins/io_pcb/parse_l.h polygon.h rtree.h remove.h rtree.h \ - flag_str.h thermal.h rats_patch.h ../src_plugins/io_pcb/flags.h \ + ../src_plugins/io_pcb/parse_l.h polygon.h rtree.h math_helper.h remove.h \ + rtree.h flag_str.h thermal.h rats_patch.h ../src_plugins/io_pcb/flags.h \ route_style.h compat_misc.h ../src_plugins/io_pcb/parse_y.h ../src_plugins/jostle/jostle.o: ../src_plugins/jostle/jostle.c \ ../config.h board.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ @@ -1862,12 +1865,13 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ hid.h misc.h ../src_3rd/genvector/gds_char.h mymem.h create.h rtree.h \ - undo.h rats.h netlist.h route_style.h polygon.h rtree.h remove.h error.h \ - set.h pcb-printf.h plugins.h hid_actions.h layer.h conf_core.h conf.h \ - pcb-printf.h ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \ - ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \ - ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ - ../src_3rd/genvector/vtp0.h list_conf.h misc_util.h dolists.h + undo.h rats.h netlist.h route_style.h polygon.h rtree.h math_helper.h \ + remove.h error.h set.h pcb-printf.h plugins.h hid_actions.h layer.h \ + conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ + ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ + misc_util.h dolists.h ../src_plugins/lib_gensexpr/lib_gensexpr.o: \ ../src_plugins/lib_gensexpr/lib_gensexpr.c plugins.h ../src_plugins/lib_legacy_func/lib_legacy_func.o: \ @@ -1928,9 +1932,9 @@ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ - find.h misc.h mymem.h mymem.h polygon.h rtree.h rats.h netlist.h \ - route_style.h vtroutestyle.h search.h misc_util.h set.h undo.h plugins.h \ - compat_misc.h ../src_plugins/mincut/pcb-mincut/graph.h \ + find.h misc.h mymem.h mymem.h polygon.h rtree.h math_helper.h rats.h \ + netlist.h route_style.h vtroutestyle.h search.h misc_util.h set.h undo.h \ + plugins.h compat_misc.h ../src_plugins/mincut/pcb-mincut/graph.h \ ../src_plugins/mincut/pcb-mincut/../../../config.h \ ../src_plugins/mincut/pcb-mincut/solve.h \ ../src_plugins/mincut/pcb-mincut/graph.h conf.h \ @@ -1968,8 +1972,9 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ macro.h create.h remove.h hid.h error.h rtree.h polygon.h rtree.h \ - polyarea.h flag_str.h find.h misc.h ../src_3rd/genvector/gds_char.h \ - mymem.h draw.h undo.h plugins.h hid_actions.h dolists.h + math_helper.h polyarea.h flag_str.h find.h misc.h \ + ../src_3rd/genvector/gds_char.h mymem.h draw.h undo.h plugins.h \ + hid_actions.h dolists.h ../src_plugins/polystitch/polystitch.o: \ ../src_plugins/polystitch/polystitch.c ../config.h board.h const.h \ macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \ @@ -1984,8 +1989,8 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ macro.h create.h remove.h hid.h error.h rtree.h draw.h set.h polygon.h \ - rtree.h misc.h ../src_3rd/genvector/gds_char.h mymem.h plugins.h \ - hid_actions.h dolists.h + rtree.h math_helper.h misc.h ../src_3rd/genvector/gds_char.h mymem.h \ + plugins.h hid_actions.h dolists.h ../src_plugins/propedit/propedit.o: ../src_plugins/propedit/propedit.c \ plugins.h ../src_plugins/propedit/props.h global_typedefs.h ../config.h \ pcb_bool.h unit.h ../src_3rd/liblihata/genht/htsp.h \ @@ -2081,8 +2086,8 @@ ../src_3rd/genregex/regex.h ../src_plugins/query/fields_sphash.h \ fptr_cast.h ../src_plugins/query/query_access.o: ../src_plugins/query/query_access.c \ - ../config.h board.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ - vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ + ../config.h math_helper.h board.h const.h macro.h global_typedefs.h \ + pcb_bool.h unit.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \ layer.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ @@ -2129,8 +2134,8 @@ ../src_plugins/query/fields_sphash.h ../src_plugins/query/query_exec.h \ ../src_plugins/query/query_access.h pcb-printf.h \ ../src_3rd/genvector/gds_char.h -../src_plugins/query/query_l.o: ../src_plugins/query/query_l.c \ - ../config.h unit.h ../src_plugins/query/query.h obj_any.h global_objs.h \ +../src_plugins/query/query_l.o: ../src_plugins/query/query_l.c unit.h \ + ../config.h ../src_plugins/query/query.h obj_any.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h \ global_typedefs.h pcb_bool.h unit.h polyarea.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ @@ -2141,7 +2146,7 @@ ../src_plugins/query/query_y.h compat_misc.h layer.h list_line.h \ list_arc.h list_text.h list_poly.h ../src_plugins/query/query_y.o: ../src_plugins/query/query_y.c const.h \ - ../config.h unit.h ../src_plugins/query/query.h obj_any.h global_objs.h \ + unit.h ../config.h ../src_plugins/query/query.h obj_any.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h \ global_typedefs.h pcb_bool.h unit.h polyarea.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ @@ -2199,12 +2204,12 @@ ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ ../src_3rd/genlist/gendlist.h globalconst.h \ - ../src_plugins/report/report.h crosshair.h rubberband.h global_objs.h \ - ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h vtonpoint.h \ - hid.h error.h drc.h board.h const.h macro.h vtroutestyle.h layer.h \ - list_line.h list_arc.h list_text.h list_poly.h library.h rats_patch.h \ - board.h list_common.h list_pad.h list_pin.h list_rat.h data.h \ - global_element.h list_element.h ht_element.h \ + ../src_plugins/report/report.h math_helper.h crosshair.h rubberband.h \ + global_objs.h ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h \ + vtonpoint.h hid.h error.h drc.h board.h const.h macro.h vtroutestyle.h \ + layer.h list_line.h list_arc.h list_text.h list_poly.h library.h \ + rats_patch.h board.h list_common.h list_pad.h list_pin.h list_rat.h \ + data.h global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ crosshair.h buffer.h drill.h error.h search.h misc_util.h misc.h mymem.h \ mymem.h rats.h netlist.h route_style.h rtree.h flag_str.h macro.h undo.h \ @@ -2252,8 +2257,8 @@ netlist.h route_style.h error.h move.h draw.h set.h plugins.h \ action_helper.h hid_actions.h compat_nls.h dolists.h ../src_plugins/stroke/stroke.o: ../src_plugins/stroke/stroke.c \ - ../config.h board.h const.h macro.h global_typedefs.h pcb_bool.h unit.h \ - vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ + ../config.h math_helper.h board.h const.h macro.h global_typedefs.h \ + pcb_bool.h unit.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \ layer.h list_line.h ../src_3rd/genlist/gentdlist_impl.h \ @@ -2271,8 +2276,8 @@ crosshair.h stub_stroke.h rotate.h undo.h set.h error.h misc.h mymem.h \ plugins.h compat_nls.h ../src_plugins/teardrops/teardrops.o: \ - ../src_plugins/teardrops/teardrops.c ../config.h board.h const.h macro.h \ - global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \ + ../src_plugins/teardrops/teardrops.c ../config.h math_helper.h board.h \ + const.h macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \ ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \ @@ -2300,10 +2305,10 @@ ../src_3rd/genvector/genvector_undef.h hid.h error.h drc.h buffer.h \ macro.h ../src_plugins/toporouter/../autoroute/autoroute.h board.h \ const.h macro.h vtroutestyle.h library.h rats_patch.h board.h box.h \ - misc_util.h create.h draw.h error.h find.h heap.h rtree.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h mymem.h polygon.h rtree.h rats.h \ - netlist.h route_style.h remove.h thermal.h undo.h ../src_3rd/gts/gts.h \ - pcb-printf.h compat_nls.h + math_helper.h misc_util.h create.h draw.h error.h find.h heap.h rtree.h \ + misc.h ../src_3rd/genvector/gds_char.h mymem.h mymem.h polygon.h rtree.h \ + rats.h netlist.h route_style.h remove.h thermal.h undo.h \ + ../src_3rd/gts/gts.h pcb-printf.h compat_nls.h ../src_plugins/vendordrill/vendor.o: ../src_plugins/vendordrill/vendor.c \ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \ pcb-printf.h ../src_3rd/genvector/gds_char.h \ @@ -2453,10 +2458,11 @@ drc.h buffer.h change.h copy.h create.h rubberband.h crosshair.h data.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h draw.h \ - find.h insert.h line.h misc.h mymem.h move.h polygon.h rtree.h rats.h \ - netlist.h route_style.h remove.h rotate.h search.h misc_util.h select.h \ - operation.h set.h undo.h stub_stroke.h funchash_core.h funchash.h \ - funchash_core_list.h hid_actions.h compat_misc.h compat_nls.h + find.h insert.h line.h misc.h mymem.h move.h polygon.h rtree.h \ + math_helper.h rats.h netlist.h route_style.h remove.h rotate.h search.h \ + misc_util.h select.h operation.h set.h undo.h stub_stroke.h \ + funchash_core.h funchash.h funchash_core_list.h hid_actions.h \ + compat_misc.h compat_nls.h attrib.o: attrib.c compat_misc.h ../config.h attrib.h board.o: board.c board.h ../config.h const.h macro.h global_typedefs.h \ pcb_bool.h unit.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ @@ -2469,8 +2475,8 @@ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h -box.o: box.c box.h global_typedefs.h ../config.h pcb_bool.h unit.h \ - global_objs.h ../src_3rd/genlist/gendlist.h attrib.h flag.h \ +box.o: box.c box.h math_helper.h global_typedefs.h ../config.h pcb_bool.h \ + unit.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h flag.h \ globalconst.h polyarea.h macro.h misc_util.h buffer.o: buffer.c ../config.h conf_core.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ @@ -2489,9 +2495,9 @@ rubberband.h crosshair.h data.h global_element.h list_element.h \ ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/hash.h plug_io.h mirror.h misc.h mymem.h \ - misc_util.h polygon.h rtree.h rotate.h remove.h select.h operation.h \ - set.h funchash_core.h funchash.h funchash_core_list.h compat_misc.h \ - compat_nls.h + misc_util.h polygon.h rtree.h math_helper.h rotate.h remove.h select.h \ + operation.h set.h funchash_core.h funchash.h funchash_core_list.h \ + compat_misc.h compat_nls.h buildin.o: buildin.c plugins.h buildin.h change.o: change.c ../config.h conf_core.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ @@ -2509,8 +2515,8 @@ vtonpoint.h hid.h error.h drc.h crosshair.h rubberband.h data.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ - buffer.h draw.h misc.h mymem.h mirror.h polygon.h rtree.h select.h \ - operation.h undo.h hid_actions.h compat_nls.h + buffer.h draw.h misc.h mymem.h mirror.h polygon.h rtree.h math_helper.h \ + select.h operation.h undo.h hid_actions.h compat_nls.h change_act.o: change_act.c ../config.h conf_core.h conf.h \ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ @@ -2613,7 +2619,7 @@ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ crosshair.h buffer.h draw.h misc.h mymem.h move.h polygon.h rtree.h \ - select.h operation.h undo.h compat_misc.h + math_helper.h select.h operation.h undo.h compat_misc.h create.o: create.c ../config.h conf_core.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -2627,8 +2633,8 @@ vtroutestyle.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ flag.h polyarea.h layer.h list_line.h list_arc.h list_text.h list_poly.h \ library.h rats_patch.h list_common.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h hid.h error.h drc.h create.h rubberband.h data.h \ - global_element.h list_element.h ht_element.h \ + vtonpoint.h hid.h error.h drc.h math_helper.h create.h rubberband.h \ + data.h global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ crosshair.h buffer.h misc.h mymem.h rtree.h search.h misc_util.h undo.h \ plug_io.h stub_vendor.h hid_actions.h paths.h compat_misc.h compat_nls.h @@ -2645,11 +2651,12 @@ vtroutestyle.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ flag.h polyarea.h layer.h list_line.h list_arc.h list_text.h list_poly.h \ library.h rats_patch.h list_common.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h hid.h error.h drc.h box.h misc_util.h crosshair.h \ - rubberband.h data.h global_element.h list_element.h ht_element.h \ - ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ - buffer.h draw.h line.h rtree.h search.h polygon.h misc.h mymem.h \ - hid_actions.h compat_misc.h compat_nls.h + vtonpoint.h hid.h error.h drc.h box.h math_helper.h misc_util.h \ + crosshair.h rubberband.h data.h global_element.h list_element.h \ + ht_element.h ../src_3rd/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/hash.h buffer.h draw.h line.h rtree.h \ + search.h polygon.h misc.h mymem.h hid_actions.h compat_misc.h \ + compat_nls.h data.o: data.c ../config.h board.h const.h macro.h global_typedefs.h \ pcb_bool.h unit.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h global_objs.h \ @@ -2671,14 +2678,15 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h globalconst.h board.h const.h macro.h \ - vtroutestyle.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ - flag.h polyarea.h layer.h list_line.h list_arc.h list_text.h list_poly.h \ - library.h rats_patch.h list_common.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h hid.h error.h drc.h data.h global_element.h list_element.h \ - ht_element.h ../src_3rd/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ - draw.h misc.h mymem.h rotate.h rtree.h draw_fab.h hid_helper.h + ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h board.h \ + const.h macro.h vtroutestyle.h global_objs.h \ + ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h layer.h \ + list_line.h list_arc.h list_text.h list_poly.h library.h rats_patch.h \ + list_common.h list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h \ + drc.h data.h global_element.h list_element.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ + crosshair.h rubberband.h buffer.h draw.h misc.h mymem.h rotate.h rtree.h \ + draw_fab.h hid_helper.h draw_fab.o: draw_fab.c ../config.h board.h const.h macro.h \ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -2692,7 +2700,7 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ draw.h drill.h misc.h ../src_3rd/genvector/gds_char.h mymem.h draw_fab.h \ - polygon.h rtree.h + polygon.h rtree.h math_helper.h drill.o: drill.c ../config.h const.h data.h globalconst.h \ global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h \ @@ -2741,9 +2749,9 @@ crosshair.h rubberband.h buffer.h action_helper.h set.h plug_io.h \ plug_import.h misc.h mymem.h remove.h create.h draw.h find.h search.h \ misc_util.h hid_actions.h hid_attrib.h compat_misc.h compat_nls.h -find.o: find.c ../config.h const.h conf_core.h conf.h global_typedefs.h \ - pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ - ../src_3rd/genvector/genvector_impl.h \ +find.o: find.c ../config.h const.h math_helper.h conf_core.h conf.h \ + global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ + ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ @@ -2855,10 +2863,10 @@ ../src_3rd/liblihata/genht/hash.h compat_misc.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/ht.c -hid_draw_helpers.o: hid_draw_helpers.c const.h global_objs.h \ - ../src_3rd/genlist/gendlist.h ../config.h attrib.h flag.h globalconst.h \ - global_typedefs.h pcb_bool.h unit.h polyarea.h hid.h error.h drc.h \ - polygon.h rtree.h macro.h +hid_draw_helpers.o: hid_draw_helpers.c const.h math_helper.h \ + global_objs.h ../src_3rd/genlist/gendlist.h ../config.h attrib.h flag.h \ + globalconst.h global_typedefs.h pcb_bool.h unit.h polyarea.h hid.h \ + error.h drc.h polygon.h rtree.h macro.h hid_extents.o: hid_extents.c ../config.h board.h const.h macro.h \ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -2937,22 +2945,23 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h globalconst.h create.h rubberband.h \ - global_objs.h ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h \ - library.h board.h const.h macro.h vtroutestyle.h layer.h list_line.h \ - list_arc.h list_text.h list_poly.h rats_patch.h list_common.h list_pad.h \ - list_pin.h list_rat.h vtonpoint.h hid.h error.h drc.h crosshair.h data.h \ - global_element.h list_element.h ht_element.h \ + ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h create.h \ + rubberband.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h flag.h \ + polyarea.h library.h board.h const.h macro.h vtroutestyle.h layer.h \ + list_line.h list_arc.h list_text.h list_poly.h rats_patch.h \ + list_common.h list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h \ + drc.h crosshair.h data.h global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ buffer.h draw.h line.h misc.h mymem.h polygon.h rtree.h search.h \ misc_util.h select.h operation.h set.h undo.h intersect.o: intersect.c ../config.h intersect.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h \ - global_typedefs.h pcb_bool.h unit.h polyarea.h box.h macro.h misc_util.h -layer.o: layer.c ../config.h global_objs.h ../src_3rd/genlist/gendlist.h \ - attrib.h flag.h globalconst.h global_typedefs.h pcb_bool.h unit.h \ - polyarea.h board.h const.h macro.h vtroutestyle.h \ - ../src_3rd/genvector/genvector_impl.h \ + global_typedefs.h pcb_bool.h unit.h polyarea.h box.h math_helper.h \ + macro.h misc_util.h +layer.o: layer.c ../config.h math_helper.h global_objs.h \ + ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h \ + global_typedefs.h pcb_bool.h unit.h polyarea.h board.h const.h macro.h \ + vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h layer.h list_line.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \ ../src_3rd/genlist/gentdlist_undef.h list_arc.h list_text.h list_poly.h \ @@ -2977,14 +2986,14 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/genvector/vtp0.h list_conf.h \ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h globalconst.h board.h const.h macro.h \ - vtroutestyle.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ - flag.h polyarea.h layer.h list_line.h list_arc.h list_text.h list_poly.h \ - library.h rats_patch.h list_common.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h hid.h error.h drc.h data.h global_element.h list_element.h \ - ht_element.h ../src_3rd/liblihata/genht/ht.h \ - ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ - find.h line.h misc.h mymem.h rtree.h + ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h board.h \ + const.h macro.h vtroutestyle.h global_objs.h \ + ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h layer.h \ + list_line.h list_arc.h list_text.h list_poly.h library.h rats_patch.h \ + list_common.h list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h \ + drc.h data.h global_element.h list_element.h ht_element.h \ + ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ + crosshair.h rubberband.h buffer.h find.h line.h misc.h mymem.h rtree.h list_arc.o: list_arc.c global_objs.h ../src_3rd/genlist/gendlist.h \ ../config.h attrib.h flag.h globalconst.h global_typedefs.h pcb_bool.h \ unit.h polyarea.h list_arc.h ../src_3rd/genlist/gentdlist_impl.h \ @@ -3055,7 +3064,7 @@ ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ create.h plug_io.h set.h misc.h mymem.h compat_lrealpath.h free_atexit.h \ - polygon.h rtree.h buildin.h paths.h flag_str.h plugins.h \ + polygon.h rtree.h math_helper.h buildin.h paths.h flag_str.h plugins.h \ plug_footprint.h vtlibrary.h event.h funchash.h hid_actions.h \ hid_attrib.h hid_init.h compat_misc.h compat_nls.h dolists.h \ generated_lists.h @@ -3088,7 +3097,7 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ mirror.h misc.h ../src_3rd/genvector/gds_char.h mymem.h polygon.h \ - rtree.h + rtree.h math_helper.h misc.o: misc.c ../config.h conf_core.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -3102,11 +3111,12 @@ vtroutestyle.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ flag.h polyarea.h layer.h list_line.h list_arc.h list_text.h list_poly.h \ library.h rats_patch.h list_common.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h hid.h error.h drc.h box.h misc_util.h crosshair.h \ - rubberband.h data.h global_element.h list_element.h ht_element.h \ - ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ - buffer.h plug_io.h misc.h mymem.h move.h polygon.h rtree.h rotate.h \ - set.h undo.h compat_misc.h hid_actions.h hid_init.h + vtonpoint.h hid.h error.h drc.h box.h math_helper.h misc_util.h \ + crosshair.h rubberband.h data.h global_element.h list_element.h \ + ht_element.h ../src_3rd/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/hash.h buffer.h plug_io.h misc.h mymem.h \ + move.h polygon.h rtree.h rotate.h set.h undo.h compat_misc.h \ + hid_actions.h hid_init.h misc_util.o: misc_util.c ../config.h misc_util.h pcb_bool.h unit.h move.o: move.c ../config.h conf_core.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ @@ -3125,8 +3135,8 @@ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ crosshair.h buffer.h draw.h misc.h mymem.h move.h polygon.h rtree.h \ - search.h misc_util.h select.h operation.h undo.h hid_actions.h \ - compat_misc.h compat_nls.h + math_helper.h search.h misc_util.h select.h operation.h undo.h \ + hid_actions.h compat_misc.h compat_nls.h mymem.o: mymem.c ../config.h data.h globalconst.h global_typedefs.h \ pcb_bool.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ flag.h polyarea.h global_element.h list_pin.h \ @@ -3198,11 +3208,11 @@ list_element.h ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/hash.h list_common.h list_text.h list_poly.h \ list_rat.h layer.h crosshair.h rubberband.h vtonpoint.h hid.h error.h \ - drc.h buffer.h board.h const.h macro.h vtroutestyle.h library.h \ - rats_patch.h action_helper.h change.h undo.h funchash_core.h funchash.h \ - funchash_core_list.h search.h misc_util.h move.h draw.h mirror.h \ - rotate.h set.h copy.h misc.h mymem.h remove.h create.h compat_misc.h \ - compat_nls.h + drc.h buffer.h math_helper.h board.h const.h macro.h vtroutestyle.h \ + library.h rats_patch.h action_helper.h change.h undo.h funchash_core.h \ + funchash.h funchash_core_list.h search.h misc_util.h move.h draw.h \ + mirror.h rotate.h set.h copy.h misc.h mymem.h remove.h create.h \ + compat_misc.h compat_nls.h paths.o: paths.c ../config.h paths.h error.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -3259,8 +3269,8 @@ vtroutestyle.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ flag.h polyarea.h layer.h list_line.h list_arc.h list_text.h list_poly.h \ library.h rats_patch.h list_common.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h hid.h error.h drc.h buffer.h change.h create.h rubberband.h \ - data.h global_element.h list_element.h ht_element.h \ + vtonpoint.h hid.h error.h drc.h math_helper.h buffer.h change.h create.h \ + rubberband.h data.h global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ crosshair.h plug_io.h misc.h mymem.h remove.h set.h paths.h \ hid_actions.h hid_flags.h plugins.h event.h compat_misc.h route_style.h \ @@ -3282,14 +3292,14 @@ vtroutestyle.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ flag.h polyarea.h layer.h list_line.h list_arc.h list_text.h list_poly.h \ library.h rats_patch.h list_common.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h hid.h error.h drc.h box.h misc_util.h create.h rubberband.h \ - crosshair.h data.h global_element.h list_element.h ht_element.h \ - ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ - buffer.h draw.h polygon.h rtree.h remove.h search.h set.h thermal.h \ - mymem.h undo.h misc.h compat_nls.h + vtonpoint.h hid.h error.h drc.h box.h math_helper.h misc_util.h create.h \ + rubberband.h crosshair.h data.h global_element.h list_element.h \ + ht_element.h ../src_3rd/liblihata/genht/ht.h \ + ../src_3rd/liblihata/genht/hash.h buffer.h draw.h polygon.h rtree.h \ + remove.h search.h set.h thermal.h mymem.h undo.h misc.h compat_nls.h polygon1.o: polygon1.c rtree.h global_typedefs.h ../config.h pcb_bool.h \ - unit.h heap.h compat_cc.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ - ../src_3rd/genvector/genvector_impl.h \ + unit.h math_helper.h heap.h compat_cc.h pcb-printf.h \ + ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h polyarea.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h macro.h polygon_act.o: polygon_act.c ../config.h conf_core.h conf.h \ @@ -3309,7 +3319,7 @@ ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ action_helper.h undo.h funchash_core.h funchash.h funchash_core_list.h \ - polygon.h rtree.h draw.h search.h misc_util.h compat_nls.h + polygon.h rtree.h math_helper.h draw.h search.h misc_util.h compat_nls.h ptrlist.o: ptrlist.c global_typedefs.h ../config.h pcb_bool.h unit.h \ ptrlist.h rats.o: rats.c ../config.h conf_core.h conf.h global_typedefs.h \ @@ -3329,8 +3339,8 @@ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ crosshair.h buffer.h draw.h find.h misc.h mymem.h polygon.h rtree.h \ - rats.h netlist.h route_style.h search.h misc_util.h undo.h stub_mincut.h \ - compat_misc.h compat_nls.h ptrlist.h + math_helper.h rats.h netlist.h route_style.h search.h misc_util.h undo.h \ + stub_mincut.h compat_misc.h compat_nls.h ptrlist.h rats_act.o: rats_act.c ../config.h conf_core.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -3381,8 +3391,8 @@ vtonpoint.h hid.h error.h drc.h data.h global_element.h list_element.h \ ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ - draw.h misc.h mymem.h move.h polygon.h rtree.h remove.h select.h \ - operation.h undo.h + draw.h misc.h mymem.h move.h polygon.h rtree.h math_helper.h remove.h \ + select.h operation.h undo.h remove_act.o: remove_act.c const.h ../config.h data.h globalconst.h \ global_typedefs.h pcb_bool.h unit.h global_objs.h \ ../src_3rd/genlist/gendlist.h attrib.h flag.h polyarea.h \ @@ -3408,8 +3418,8 @@ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ draw.h misc.h ../src_3rd/genvector/gds_char.h mymem.h polygon.h rtree.h \ - rotate.h search.h misc_util.h select.h operation.h set.h undo.h \ - conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \ + math_helper.h rotate.h search.h misc_util.h select.h operation.h set.h \ + undo.h conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ @@ -3426,9 +3436,10 @@ ../src_3rd/liblihata/genht/ht_inlines.h ../src_3rd/genvector/vtp0.h \ list_conf.h ../src_3rd/genlist/gentdlist_undef.h \ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h -rtree.o: rtree.c ../config.h compat_cc.h rtree.h global_typedefs.h \ - pcb_bool.h unit.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ - flag.h globalconst.h polyarea.h macro.h +rtree.o: rtree.c ../config.h math_helper.h compat_cc.h rtree.h \ + global_typedefs.h pcb_bool.h unit.h global_objs.h \ + ../src_3rd/genlist/gendlist.h attrib.h flag.h globalconst.h polyarea.h \ + macro.h rubberband.o: rubberband.c ../config.h board.h const.h macro.h \ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -3442,7 +3453,7 @@ ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h buffer.h misc.h \ - ../src_3rd/genvector/gds_char.h mymem.h polygon.h rtree.h + ../src_3rd/genvector/gds_char.h mymem.h polygon.h rtree.h math_helper.h search.o: search.c ../config.h conf_core.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -3456,7 +3467,7 @@ vtroutestyle.h global_objs.h ../src_3rd/genlist/gendlist.h attrib.h \ flag.h polyarea.h layer.h list_line.h list_arc.h list_text.h list_poly.h \ library.h rats_patch.h list_common.h list_pad.h list_pin.h list_rat.h \ - vtonpoint.h hid.h error.h drc.h box.h misc_util.h data.h \ + vtonpoint.h hid.h error.h drc.h box.h math_helper.h misc_util.h data.h \ global_element.h list_element.h ht_element.h \ ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/hash.h \ crosshair.h rubberband.h buffer.h find.h polygon.h rtree.h search.h \ @@ -3481,7 +3492,7 @@ route_style.h misc.h mymem.h find.h compat_misc.h compat_nls.h \ ../src_3rd/genregex/regex_sei.h ../src_3rd/genregex/regex_templ.h \ ../src_3rd/genregex/regex.h -select_act.o: select_act.c ../config.h conf_core.h conf.h \ +select_act.o: select_act.c ../config.h math_helper.h conf_core.h conf.h \ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \ @@ -3534,7 +3545,7 @@ list_arc.h list_text.h list_poly.h library.h rats_patch.h list_common.h \ list_pad.h list_pin.h list_rat.h vtonpoint.h hid.h error.h drc.h misc.h \ ../src_3rd/genvector/gds_char.h mymem.h rubberband.h polygon.h rtree.h \ - thermal.h + math_helper.h thermal.h undo.o: undo.c ../config.h board.h const.h macro.h global_typedefs.h \ pcb_bool.h unit.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \ ../src_3rd/genvector/genvector_undef.h global_objs.h \ @@ -3548,12 +3559,13 @@ ../src_3rd/liblihata/genht/ht_inlines.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h draw.h insert.h misc.h \ ../src_3rd/genvector/gds_char.h mymem.h mirror.h move.h polygon.h \ - rtree.h remove.h rotate.h search.h misc_util.h set.h undo.h flag_str.h \ - conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ - ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \ - compat_misc.h compat_nls.h netlist.h route_style.h + rtree.h math_helper.h remove.h rotate.h search.h misc_util.h set.h \ + undo.h flag_str.h conf_core.h conf.h pcb-printf.h \ + ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \ + ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \ + ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \ + ../src_3rd/genvector/vtp0.h list_conf.h compat_misc.h compat_nls.h \ + netlist.h route_style.h undo_act.o: undo_act.c ../config.h conf_core.h conf.h global_typedefs.h \ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ ../src_3rd/genvector/genvector_impl.h \ @@ -3571,7 +3583,8 @@ ht_element.h ../src_3rd/liblihata/genht/ht.h \ ../src_3rd/liblihata/genht/hash.h crosshair.h rubberband.h buffer.h \ action_helper.h funchash_core.h funchash.h funchash_core_list.h undo.h \ - polygon.h rtree.h set.h search.h misc_util.h draw.h misc.h mymem.h + polygon.h rtree.h math_helper.h set.h search.h misc_util.h draw.h misc.h \ + mymem.h unit.o: unit.c ../config.h const.h compat_misc.h compat_nls.h unit.h vtlibrary.o: vtlibrary.c vtlibrary.h global_objs.h \ ../src_3rd/genlist/gendlist.h ../config.h attrib.h flag.h globalconst.h \ Index: trunk/src/board.h =================================================================== --- trunk/src/board.h (revision 4523) +++ trunk/src/board.h (revision 4524) @@ -125,4 +125,7 @@ extern PCBTypePtr PCB; +#define SWAP_X(x) (SWAP_SIGN_X(x)) +#define SWAP_Y(y) (PCB->MaxHeight +SWAP_SIGN_Y(y)) + #endif Index: trunk/src/box.h =================================================================== --- trunk/src/box.h (revision 4523) +++ trunk/src/box.h (revision 4524) @@ -35,6 +35,7 @@ #define PCB_BOX_H #include +#include "math_helper.h" #include "global_typedefs.h" #include "global_objs.h" #include "config.h" Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 4523) +++ trunk/src/buffer.c (revision 4524) @@ -31,7 +31,6 @@ #include "conf_core.h" #include -#include #include "action_helper.h" #include "buffer.h" @@ -55,6 +54,7 @@ #include "compat_misc.h" #include "compat_nls.h" #include "layer.h" +#include "math_helper.h" /* --------------------------------------------------------------------------- * some local prototypes Index: trunk/src/const.h =================================================================== --- trunk/src/const.h (revision 4523) +++ trunk/src/const.h (revision 4524) @@ -39,33 +39,7 @@ #define SOLDER_LAYER 0 #define COMPONENT_LAYER 1 -/* --------------------------------------------------------------------------- - * some math constants - */ -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif -#ifndef M_SQRT1_2 -#define M_SQRT1_2 0.707106781 /* 1/sqrt(2) */ -#endif -#define PCB_M180 (M_PI/180.0) -#define PCB_RAD_TO_DEG (180.0/M_PI) -#define PCB_TAN_22_5_DEGREE_2 0.207106781 /* 0.5*tan(22.5) */ -#define PCB_COS_22_5_DEGREE 0.923879533 /* cos(22.5) */ -#define PCB_TAN_30_DEGREE 0.577350269 /* tan(30) */ -#define PCB_TAN_60_DEGREE 1.732050808 /* tan(60) */ -#define PCB_LN_2_OVER_2 0.346573590 -/* PCB/physical unit conversions */ -#define PCB_COORD_TO_MIL(n) ((n) / 25400.0) -#define PCB_MIL_TO_COORD(n) ((n) * 25400.0) -#define PCB_COORD_TO_MM(n) ((n) / 1000000.0) -#define PCB_MM_TO_COORD(n) ((n) * 1000000.0) -#define PCB_COORD_TO_INCH(n) (PCB_COORD_TO_MIL(n) / 1000.0) -#define PCB_INCH_TO_COORD(n) (PCB_MIL_TO_COORD(n) * 1000.0) -#define PCB_COORD_TO_DECIMIL(n) (PCB_COORD_TO_MIL(n) * 10.0) -#define PCB_DECIMIL_TO_COORD(n) (PCB_MIL_TO_COORD(n) / 10.0) - /* These need to be carefully written to avoid overflows, and return a Coord type. */ #define PCB_SCALE_TEXT(COORD,TEXTSCALE) ((Coord)((COORD) * ((double)(TEXTSCALE) / 100.0))) Index: trunk/src/create.c =================================================================== --- trunk/src/create.c (revision 4523) +++ trunk/src/create.c (revision 4524) @@ -36,6 +36,7 @@ #include "conf_core.h" #include "board.h" +#include "math_helper.h" #include "create.h" #include "data.h" #include "error.h" Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 4523) +++ trunk/src/draw.c (revision 4524) @@ -31,6 +31,7 @@ #include "config.h" #include "conf_core.h" +#include "math_helper.h" #include "board.h" #include "data.h" #include "draw.h" Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 4523) +++ trunk/src/find.c (revision 4524) @@ -55,11 +55,11 @@ #include #include -#include #include #include #include "const.h" +#include "math_helper.h" #include "conf_core.h" #include "data.h" #include "draw.h" Index: trunk/src/hid_draw_helpers.c =================================================================== --- trunk/src/hid_draw_helpers.c (revision 4523) +++ trunk/src/hid_draw_helpers.c (revision 4524) @@ -1,4 +1,5 @@ #include "const.h" +#include "math_helper.h" #include "global_objs.h" #include "hid.h" #include "polygon.h" Index: trunk/src/insert.c =================================================================== --- trunk/src/insert.c (revision 4523) +++ trunk/src/insert.c (revision 4524) @@ -30,6 +30,7 @@ #include "config.h" #include "conf_core.h" +#include "math_helper.h" #include "create.h" #include "board.h" Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 4523) +++ trunk/src/layer.c (revision 4524) @@ -26,6 +26,7 @@ */ #include "config.h" +#include "math_helper.h" #include "global_objs.h" #include "board.h" #include "data.h" Index: trunk/src/line.c =================================================================== --- trunk/src/line.c (revision 4523) +++ trunk/src/line.c (revision 4524) @@ -27,8 +27,8 @@ #include "config.h" #include "conf_core.h" +#include "math_helper.h" -#include #include #include Index: trunk/src/macro.h =================================================================== --- trunk/src/macro.h (revision 4523) +++ trunk/src/macro.h (revision 4524) @@ -39,27 +39,6 @@ #define SWAP_IDENT conf_core.editor.show_solder_side #endif -#define SWAP_SIGN_X(x) (x) -#define SWAP_SIGN_Y(y) (-(y)) -#define SWAP_ANGLE(a) (-(a)) -#define SWAP_DELTA(d) (-(d)) -#define SWAP_X(x) (SWAP_SIGN_X(x)) -#define SWAP_Y(y) (PCB->MaxHeight +SWAP_SIGN_Y(y)) - -/* --------------------------------------------------------------------------- - * misc macros, some might already be defined by - */ -#ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#define MAX(a,b) ((a) > (b) ? (a) : (b)) -#endif -#ifndef SGN -#define SGN(a) ((a) >0 ? 1 : ((a) == 0 ? 0 : -1)) -#endif -#define SGNZ(a) ((a) >=0 ? 1 : -1) -#define MAKEMIN(a,b) if ((b) < (a)) (a) = (b) -#define MAKEMAX(a,b) if ((b) > (a)) (a) = (b) - #define ENTRIES(x) (sizeof((x))/sizeof((x)[0])) #define UNKNOWN(a) ((a) && *(a) ? (a) : "(unknown)") #define NSTRCMP(a, b) ((a) ? ((b) ? strcmp((a),(b)) : 1) : -1) @@ -67,7 +46,6 @@ #define EMPTY_STRING_P(a) ((a) ? (a)[0]==0 : 1) #define XOR(a,b) (((a) && !(b)) || (!(a) && (b))) #define SQUARE(x) ((float) (x) * (float) (x)) -#define TO_RADIANS(degrees) (PCB_M180 * (degrees)) /* --------------------------------------------------------------------------- * returns the object ID @@ -347,7 +325,4 @@ POLYGON_LOOP(layer) -#define PCB_CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x))) -#define PCB_ABS(a) (((a) < 0) ? -(a) : (a)) - #endif Index: trunk/src/math_helper.h =================================================================== --- trunk/src/math_helper.h (nonexistent) +++ trunk/src/math_helper.h (revision 4524) @@ -0,0 +1,66 @@ +/* + * COPYRIGHT + * + * PCB, interactive printed circuit board design + * Copyright (C) 1994,1995,1996 Thomas Nau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Contact addresses for paper mail and Email: + * Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany + * Thomas.Nau@rz.uni-ulm.de + * + */ + +#include + +/* --------------------------------------------------------------------------- + * some math constants + */ +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif +#ifndef M_SQRT1_2 +#define M_SQRT1_2 0.707106781 /* 1/sqrt(2) */ +#endif +#define PCB_M180 (M_PI/180.0) +#define PCB_RAD_TO_DEG (180.0/M_PI) +#define PCB_TAN_22_5_DEGREE_2 0.207106781 /* 0.5*tan(22.5) */ +#define PCB_COS_22_5_DEGREE 0.923879533 /* cos(22.5) */ +#define PCB_TAN_30_DEGREE 0.577350269 /* tan(30) */ +#define PCB_TAN_60_DEGREE 1.732050808 /* tan(60) */ +#define PCB_LN_2_OVER_2 0.346573590 +#define TO_RADIANS(degrees) (PCB_M180 * (degrees)) + +#define PCB_CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x))) +#define PCB_ABS(a) (((a) < 0) ? -(a) : (a)) + +/* --------------------------------------------------------------------------- + * misc macros, some might already be defined by + */ +#ifndef MIN +#define MIN(a,b) ((a) < (b) ? (a) : (b)) +#define MAX(a,b) ((a) > (b) ? (a) : (b)) +#endif +#ifndef SGN +#define SGN(a) ((a) >0 ? 1 : ((a) == 0 ? 0 : -1)) +#endif +#define SGNZ(a) ((a) >=0 ? 1 : -1) +#define MAKEMIN(a,b) if ((b) < (a)) (a) = (b) +#define MAKEMAX(a,b) if ((b) > (a)) (a) = (b) + + +#define SWAP_SIGN_X(x) (x) +#define SWAP_SIGN_Y(y) (-(y)) Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 4523) +++ trunk/src/object_act.c (revision 4524) @@ -28,6 +28,7 @@ #include "conf_core.h" #include "data.h" +#include "math_helper.h" #include "board.h" #include "action_helper.h" #include "change.h" Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 4523) +++ trunk/src/plug_io.c (revision 4524) @@ -52,6 +52,7 @@ #include #include "board.h" +#include "math_helper.h" #include "buffer.h" #include "change.h" #include "create.h" Index: trunk/src/polygon.h =================================================================== --- trunk/src/polygon.h (revision 4523) +++ trunk/src/polygon.h (revision 4524) @@ -31,6 +31,7 @@ #include "config.h" #include "rtree.h" +#include "math_helper.h" /* Implementation constants */ Index: trunk/src/polygon1.c =================================================================== --- trunk/src/polygon1.c (revision 4523) +++ trunk/src/polygon1.c (revision 4524) @@ -43,10 +43,10 @@ #include #include #include -#include #include #include "rtree.h" +#include "math_helper.h" #include "heap.h" #include "compat_cc.h" #include "pcb-printf.h" Index: trunk/src/rtree.c =================================================================== --- trunk/src/rtree.c (revision 4523) +++ trunk/src/rtree.c (revision 4524) @@ -41,6 +41,7 @@ #include #include +#include "math_helper.h" #include "compat_cc.h" #include "rtree.h" #include "global_objs.h" Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 4523) +++ trunk/src/select_act.c (revision 4524) @@ -25,6 +25,7 @@ * */ #include "config.h" +#include "math_helper.h" #include "conf_core.h" #include "board.h" Index: trunk/src/unit.h =================================================================== --- trunk/src/unit.h (revision 4523) +++ trunk/src/unit.h (revision 4524) @@ -120,5 +120,17 @@ Coord unit_to_coord(const Unit *, double); Increments *get_increments_struct(const char *suffix); +/* PCB/physical unit conversions */ +#define PCB_COORD_TO_MIL(n) ((n) / 25400.0) +#define PCB_MIL_TO_COORD(n) ((n) * 25400.0) +#define PCB_COORD_TO_MM(n) ((n) / 1000000.0) +#define PCB_MM_TO_COORD(n) ((n) * 1000000.0) +#define PCB_COORD_TO_INCH(n) (PCB_COORD_TO_MIL(n) / 1000.0) +#define PCB_INCH_TO_COORD(n) (PCB_MIL_TO_COORD(n) * 1000.0) +#define PCB_COORD_TO_DECIMIL(n) (PCB_COORD_TO_MIL(n) * 10.0) +#define PCB_DECIMIL_TO_COORD(n) (PCB_MIL_TO_COORD(n) / 10.0) +#define SWAP_ANGLE(a) (-(a)) +#define SWAP_DELTA(d) (-(d)) + #endif Index: trunk/src_plugins/autoroute/vector.c =================================================================== --- trunk/src_plugins/autoroute/vector.c (revision 4523) +++ trunk/src_plugins/autoroute/vector.c (revision 4524) @@ -36,7 +36,7 @@ #include #include -#include "config.h" +#include "math_helper.h" #include "vector.h" #include "macro.h" Index: trunk/src_plugins/export_bboard/bboard.c =================================================================== --- trunk/src_plugins/export_bboard/bboard.c (revision 4523) +++ trunk/src_plugins/export_bboard/bboard.c (revision 4524) @@ -38,6 +38,7 @@ #include #include "config.h" +#include "math_helper.h" #include "board.h" #include "config.h" #include "data.h" Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 4523) +++ trunk/src_plugins/export_dxf/dxf.c (revision 4524) @@ -181,6 +181,7 @@ #include #include "config.h" +#include "math_helper.h" #include "macro.h" #include "board.h" #include "config.h" Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 4523) +++ trunk/src_plugins/export_gerber/gerber.c (revision 4524) @@ -11,6 +11,7 @@ #include #include "config.h" +#include "math_helper.h" #include "board.h" #include "config.h" #include "data.h" Index: trunk/src_plugins/export_openscad/scad.c =================================================================== --- trunk/src_plugins/export_openscad/scad.c (revision 4523) +++ trunk/src_plugins/export_openscad/scad.c (revision 4524) @@ -38,6 +38,7 @@ #include #include "board.h" +#include "math_helper.h" #include "config.h" #include "config.h" #include "data.h" Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 4523) +++ trunk/src_plugins/export_ps/eps.c (revision 4524) @@ -7,7 +7,7 @@ #include #include -#include "config.h" +#include "math_helper.h" #include "board.h" #include "data.h" #include "layer.h" Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 4523) +++ trunk/src_plugins/export_ps/ps.c (revision 4524) @@ -12,6 +12,7 @@ #include #include "config.h" +#include "math_helper.h" #include "board.h" #include "data.h" #include "misc.h" Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 4523) +++ trunk/src_plugins/export_svg/svg.c (revision 4524) @@ -37,6 +37,7 @@ #include #include "config.h" +#include "math_helper.h" #include "board.h" #include "data.h" #include "error.h" Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 4523) +++ trunk/src_plugins/export_xy/xy.c (revision 4524) @@ -8,6 +8,7 @@ #include #include "config.h" +#include "math_helper.h" #include "board.h" #include "data.h" #include "error.h" Index: trunk/src_plugins/hid_gtk/gui-misc.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-misc.c (revision 4523) +++ trunk/src_plugins/hid_gtk/gui-misc.c (revision 4524) @@ -26,6 +26,7 @@ #include "conf_core.h" #include "config.h" +#include "math_helper.h" #include "crosshair.h" #include "data.h" #include "misc.h" Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 4523) +++ trunk/src_plugins/hid_lesstif/main.c (revision 4524) @@ -3,6 +3,7 @@ #include "xincludes.h" #include "config.h" +#include "math_helper.h" #include "conf_core.h" #include Index: trunk/src_plugins/import_edif/edif.c =================================================================== --- trunk/src_plugins/import_edif/edif.c (revision 4523) +++ trunk/src_plugins/import_edif/edif.c (revision 4524) @@ -99,7 +99,7 @@ #include -#include "config.h" +#include "math_helper.h" #include "board.h" #include "data.h" #include "library.h" Index: trunk/src_plugins/import_edif/edif.y =================================================================== --- trunk/src_plugins/import_edif/edif.y (revision 4523) +++ trunk/src_plugins/import_edif/edif.y (revision 4524) @@ -26,7 +26,7 @@ #include -#include "global.h" +#include "math_helper.h" #include "board.h" #include "data.h" #include "library.h" Index: trunk/src_plugins/io_pcb/parse_l.c =================================================================== --- trunk/src_plugins/io_pcb/parse_l.c (revision 4523) +++ trunk/src_plugins/io_pcb/parse_l.c (revision 4524) @@ -680,17 +680,8 @@ #include #endif -#include "config.h" #include "flags.h" -#ifdef HAVE_LIBDMALLOC -# include /* see http://dmalloc.com */ -#endif - - - - -#include "config.h" #include "crosshair.h" #include "data.h" #include "error.h" @@ -736,7 +727,7 @@ */ static int Parse(FILE *Pipe, const char *Executable, const char *Path, const char *Filename, const char *Parse_parameter); -#line 740 "parse_l.c" +#line 731 "parse_l.c" #define INITIAL 0 @@ -954,10 +945,10 @@ } { -#line 117 "parse_l.l" +#line 108 "parse_l.l" -#line 961 "parse_l.c" +#line 952 "parse_l.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1026,227 +1017,227 @@ case 1: YY_RULE_SETUP -#line 119 "parse_l.l" +#line 110 "parse_l.l" { return(T_FILEVERSION); } YY_BREAK case 2: YY_RULE_SETUP -#line 120 "parse_l.l" +#line 111 "parse_l.l" { return(T_PCB); } YY_BREAK case 3: YY_RULE_SETUP -#line 121 "parse_l.l" +#line 112 "parse_l.l" { return(T_GRID); } YY_BREAK case 4: YY_RULE_SETUP -#line 122 "parse_l.l" +#line 113 "parse_l.l" { return(T_CURSOR); } YY_BREAK case 5: YY_RULE_SETUP -#line 123 "parse_l.l" +#line 114 "parse_l.l" { return(T_THERMAL); } YY_BREAK case 6: YY_RULE_SETUP -#line 124 "parse_l.l" +#line 115 "parse_l.l" { return(T_AREA); } YY_BREAK case 7: YY_RULE_SETUP -#line 125 "parse_l.l" +#line 116 "parse_l.l" { return(T_DRC); } YY_BREAK case 8: YY_RULE_SETUP -#line 126 "parse_l.l" +#line 117 "parse_l.l" { return(T_FLAGS); } YY_BREAK case 9: YY_RULE_SETUP -#line 127 "parse_l.l" +#line 118 "parse_l.l" { return(T_LAYER); } YY_BREAK case 10: YY_RULE_SETUP -#line 128 "parse_l.l" +#line 119 "parse_l.l" { return(T_PIN); } YY_BREAK case 11: YY_RULE_SETUP -#line 129 "parse_l.l" +#line 120 "parse_l.l" { return(T_PAD); } YY_BREAK case 12: YY_RULE_SETUP -#line 130 "parse_l.l" +#line 121 "parse_l.l" { return(T_VIA); } YY_BREAK case 13: YY_RULE_SETUP -#line 131 "parse_l.l" +#line 122 "parse_l.l" { return(T_LINE); } YY_BREAK case 14: YY_RULE_SETUP -#line 132 "parse_l.l" +#line 123 "parse_l.l" { return(T_RAT); } YY_BREAK case 15: YY_RULE_SETUP -#line 133 "parse_l.l" +#line 124 "parse_l.l" { return(T_RECTANGLE); } YY_BREAK case 16: YY_RULE_SETUP -#line 134 "parse_l.l" +#line 125 "parse_l.l" { return(T_TEXT); } YY_BREAK case 17: YY_RULE_SETUP -#line 135 "parse_l.l" +#line 126 "parse_l.l" { return(T_ELEMENTLINE); } YY_BREAK case 18: YY_RULE_SETUP -#line 136 "parse_l.l" +#line 127 "parse_l.l" { return(T_ELEMENTARC); } YY_BREAK case 19: YY_RULE_SETUP -#line 137 "parse_l.l" +#line 128 "parse_l.l" { return(T_ELEMENT); } YY_BREAK case 20: YY_RULE_SETUP -#line 138 "parse_l.l" +#line 129 "parse_l.l" { return(T_SYMBOLLINE); } YY_BREAK case 21: YY_RULE_SETUP -#line 139 "parse_l.l" +#line 130 "parse_l.l" { return(T_SYMBOL); } YY_BREAK case 22: YY_RULE_SETUP -#line 140 "parse_l.l" +#line 131 "parse_l.l" { return(T_MARK); } YY_BREAK case 23: YY_RULE_SETUP -#line 141 "parse_l.l" +#line 132 "parse_l.l" { return(T_GROUPS); } YY_BREAK case 24: YY_RULE_SETUP -#line 142 "parse_l.l" +#line 133 "parse_l.l" { return(T_STYLES); } YY_BREAK case 25: YY_RULE_SETUP -#line 143 "parse_l.l" +#line 134 "parse_l.l" { return(T_POLYGON); } YY_BREAK case 26: YY_RULE_SETUP -#line 144 "parse_l.l" +#line 135 "parse_l.l" { return(T_POLYGON_HOLE); } YY_BREAK case 27: YY_RULE_SETUP -#line 145 "parse_l.l" +#line 136 "parse_l.l" { return(T_ARC); } YY_BREAK case 28: YY_RULE_SETUP -#line 146 "parse_l.l" +#line 137 "parse_l.l" { return(T_NETLIST); } YY_BREAK case 29: YY_RULE_SETUP -#line 147 "parse_l.l" +#line 138 "parse_l.l" { return(T_NET); } YY_BREAK case 30: YY_RULE_SETUP -#line 148 "parse_l.l" +#line 139 "parse_l.l" { return(T_CONN); } YY_BREAK case 31: YY_RULE_SETUP -#line 149 "parse_l.l" +#line 140 "parse_l.l" { return(T_NETLISTPATCH); } YY_BREAK case 32: YY_RULE_SETUP -#line 150 "parse_l.l" +#line 141 "parse_l.l" { return(T_ADD_CONN); } YY_BREAK case 33: YY_RULE_SETUP -#line 151 "parse_l.l" +#line 142 "parse_l.l" { return(T_DEL_CONN); } YY_BREAK case 34: YY_RULE_SETUP -#line 152 "parse_l.l" +#line 143 "parse_l.l" { return(T_CHANGE_ATTRIB); } YY_BREAK case 35: YY_RULE_SETUP -#line 153 "parse_l.l" +#line 144 "parse_l.l" { return(T_ATTRIBUTE); } YY_BREAK case 36: YY_RULE_SETUP -#line 155 "parse_l.l" +#line 146 "parse_l.l" { return T_NM; } YY_BREAK case 37: YY_RULE_SETUP -#line 156 "parse_l.l" +#line 147 "parse_l.l" { return T_UM; } YY_BREAK case 38: YY_RULE_SETUP -#line 157 "parse_l.l" +#line 148 "parse_l.l" { return T_MM; } YY_BREAK case 39: YY_RULE_SETUP -#line 158 "parse_l.l" +#line 149 "parse_l.l" { return T_M; } YY_BREAK case 40: YY_RULE_SETUP -#line 159 "parse_l.l" +#line 150 "parse_l.l" { return T_KM; } YY_BREAK case 41: YY_RULE_SETUP -#line 160 "parse_l.l" +#line 151 "parse_l.l" { return T_UMIL; } YY_BREAK case 42: YY_RULE_SETUP -#line 161 "parse_l.l" +#line 152 "parse_l.l" { return T_CMIL; } YY_BREAK case 43: YY_RULE_SETUP -#line 162 "parse_l.l" +#line 153 "parse_l.l" { return T_MIL; } YY_BREAK case 44: YY_RULE_SETUP -#line 163 "parse_l.l" +#line 154 "parse_l.l" { return T_IN; } YY_BREAK case 45: YY_RULE_SETUP -#line 165 "parse_l.l" +#line 156 "parse_l.l" { pcb_lval.integer = (unsigned) *(pcb_text+1); return(CHAR_CONST); @@ -1254,17 +1245,17 @@ YY_BREAK case 46: YY_RULE_SETUP -#line 169 "parse_l.l" +#line 160 "parse_l.l" { return parse_number(); } YY_BREAK case 47: YY_RULE_SETUP -#line 170 "parse_l.l" +#line 161 "parse_l.l" { pcb_lval.integer = pcb_round (strtod (pcb_text, NULL)); return INTEGER; } YY_BREAK case 48: YY_RULE_SETUP -#line 172 "parse_l.l" +#line 163 "parse_l.l" { unsigned n; sscanf((char *) pcb_text, "%x", &n); pcb_lval.integer = n; @@ -1273,7 +1264,7 @@ YY_BREAK case 49: YY_RULE_SETUP -#line 177 "parse_l.l" +#line 168 "parse_l.l" { char *p1, *p2; @@ -1309,18 +1300,18 @@ YY_BREAK case 50: YY_RULE_SETUP -#line 209 "parse_l.l" +#line 200 "parse_l.l" {} YY_BREAK case 51: YY_RULE_SETUP -#line 210 "parse_l.l" +#line 201 "parse_l.l" {} YY_BREAK case 52: /* rule 52 can match eol */ YY_RULE_SETUP -#line 211 "parse_l.l" +#line 202 "parse_l.l" { #ifndef FLEX_SCANNER pcb_lineno++; @@ -1329,20 +1320,20 @@ YY_BREAK case 53: YY_RULE_SETUP -#line 216 "parse_l.l" +#line 207 "parse_l.l" {} YY_BREAK case 54: YY_RULE_SETUP -#line 217 "parse_l.l" +#line 208 "parse_l.l" { return(*pcb_text); } YY_BREAK case 55: YY_RULE_SETUP -#line 219 "parse_l.l" +#line 210 "parse_l.l" ECHO; YY_BREAK -#line 1346 "parse_l.c" +#line 1337 "parse_l.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2355,7 +2346,7 @@ #define YYTABLES_NAME "yytables" -#line 219 "parse_l.l" +#line 210 "parse_l.l" Index: trunk/src_plugins/io_pcb/parse_l.h =================================================================== --- trunk/src_plugins/io_pcb/parse_l.h (revision 4523) +++ trunk/src_plugins/io_pcb/parse_l.h (revision 4524) @@ -315,7 +315,7 @@ #undef YY_DECL #endif -#line 219 "parse_l.l" +#line 210 "parse_l.l" #line 322 "parse_l.h" Index: trunk/src_plugins/io_pcb/parse_l.l =================================================================== --- trunk/src_plugins/io_pcb/parse_l.l (revision 4523) +++ trunk/src_plugins/io_pcb/parse_l.l (revision 4524) @@ -46,17 +46,8 @@ #include #endif -#include "global.h" #include "flags.h" -#ifdef HAVE_LIBDMALLOC -# include /* see http://dmalloc.com */ -#endif - - - - -#include "global.h" #include "crosshair.h" #include "data.h" #include "error.h" Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 4523) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 4524) @@ -123,12 +123,6 @@ #include "route_style.h" #include "compat_misc.h" -#ifdef HAVE_LIBDMALLOC -# include /* see http://dmalloc.com */ -#endif - - - static LayerTypePtr Layer; static PolygonTypePtr Polygon; static SymbolTypePtr Symbol; @@ -173,7 +167,7 @@ #include "parse_y.h" -#line 177 "parse_y.c" /* yacc.c:339 */ +#line 171 "parse_y.c" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -264,7 +258,7 @@ union YYSTYPE { -#line 119 "parse_y.y" /* yacc.c:355 */ +#line 113 "parse_y.y" /* yacc.c:355 */ int integer; double number; @@ -272,7 +266,7 @@ FlagType flagtype; PLMeasure measure; -#line 276 "parse_y.c" /* yacc.c:355 */ +#line 270 "parse_y.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -289,7 +283,7 @@ /* Copy the second part of user declarations. */ -#line 293 "parse_y.c" /* yacc.c:358 */ +#line 287 "parse_y.c" /* yacc.c:358 */ #ifdef short # undef short @@ -591,28 +585,28 @@ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 146, 146, 147, 148, 149, 173, 173, 230, 230, - 241, 241, 260, 261, 266, 266, 306, 308, 338, 344, - 350, 379, 380, 381, 384, 392, 407, 441, 447, 453, - 469, 471, 496, 498, 529, 531, 532, 533, 537, 547, - 558, 585, 589, 594, 622, 626, 670, 679, 688, 692, - 693, 697, 698, 702, 703, 703, 704, 705, 707, 707, - 714, 718, 719, 720, 721, 722, 758, 768, 779, 789, - 799, 835, 840, 872, 871, 899, 900, 904, 905, 909, - 910, 911, 912, 913, 914, 916, 921, 922, 923, 924, - 924, 925, 955, 964, 973, 1021, 1030, 1039, 1076, 1086, - 1104, 1154, 1153, 1192, 1194, 1199, 1198, 1205, 1207, 1212, - 1216, 1276, 1277, 1278, 1279, 1280, 1288, 1287, 1306, 1305, - 1324, 1323, 1344, 1342, 1366, 1364, 1445, 1446, 1450, 1451, - 1452, 1453, 1454, 1456, 1461, 1466, 1471, 1476, 1481, 1486, - 1486, 1490, 1491, 1495, 1496, 1497, 1498, 1500, 1506, 1513, - 1518, 1523, 1523, 1564, 1576, 1588, 1599, 1615, 1669, 1683, - 1696, 1707, 1718, 1719, 1723, 1724, 1746, 1748, 1764, 1783, - 1784, 1787, 1789, 1790, 1811, 1818, 1834, 1835, 1839, 1844, - 1845, 1849, 1850, 1874, 1873, 1883, 1884, 1888, 1889, 1908, - 1925, 1926, 1930, 1935, 1936, 1940, 1941, 1956, 1957, 1958, - 1985, 1993, 1994, 1998, 1999, 2004, 2005, 2006, 2007, 2008, - 2009, 2010, 2011, 2012, 2013 + 0, 140, 140, 141, 142, 143, 167, 167, 224, 224, + 235, 235, 254, 255, 260, 260, 300, 302, 332, 338, + 344, 373, 374, 375, 378, 386, 401, 435, 441, 447, + 463, 465, 490, 492, 523, 525, 526, 527, 531, 541, + 552, 579, 583, 588, 616, 620, 664, 673, 682, 686, + 687, 691, 692, 696, 697, 697, 698, 699, 701, 701, + 708, 712, 713, 714, 715, 716, 752, 762, 773, 783, + 793, 829, 834, 866, 865, 893, 894, 898, 899, 903, + 904, 905, 906, 907, 908, 910, 915, 916, 917, 918, + 918, 919, 949, 958, 967, 1015, 1024, 1033, 1070, 1080, + 1098, 1148, 1147, 1186, 1188, 1193, 1192, 1199, 1201, 1206, + 1210, 1270, 1271, 1272, 1273, 1274, 1282, 1281, 1300, 1299, + 1318, 1317, 1338, 1336, 1360, 1358, 1439, 1440, 1444, 1445, + 1446, 1447, 1448, 1450, 1455, 1460, 1465, 1470, 1475, 1480, + 1480, 1484, 1485, 1489, 1490, 1491, 1492, 1494, 1500, 1507, + 1512, 1517, 1517, 1558, 1570, 1582, 1593, 1609, 1663, 1677, + 1690, 1701, 1712, 1713, 1717, 1718, 1740, 1742, 1758, 1777, + 1778, 1781, 1783, 1784, 1805, 1812, 1828, 1829, 1833, 1838, + 1839, 1843, 1844, 1868, 1867, 1877, 1878, 1882, 1883, 1902, + 1919, 1920, 1924, 1929, 1930, 1934, 1935, 1950, 1951, 1952, + 1979, 1987, 1988, 1992, 1993, 1998, 1999, 2000, 2001, 2002, + 2003, 2004, 2005, 2006, 2007 }; #endif @@ -1789,13 +1783,13 @@ switch (yyn) { case 5: -#line 149 "parse_y.y" /* yacc.c:1646 */ +#line 143 "parse_y.y" /* yacc.c:1646 */ { YYABORT; } -#line 1795 "parse_y.c" /* yacc.c:1646 */ +#line 1789 "parse_y.c" /* yacc.c:1646 */ break; case 6: -#line 173 "parse_y.y" /* yacc.c:1646 */ +#line 167 "parse_y.y" /* yacc.c:1646 */ { /* reset flags for 'used layers'; * init font and data pointers @@ -1816,11 +1810,11 @@ yyPCB->NetlistPatches = yyPCB->NetlistPatchLast = NULL; layer_group_string = NULL; } -#line 1820 "parse_y.c" /* yacc.c:1646 */ +#line 1814 "parse_y.c" /* yacc.c:1646 */ break; case 7: -#line 207 "parse_y.y" /* yacc.c:1646 */ +#line 201 "parse_y.y" /* yacc.c:1646 */ { PCBTypePtr pcb_save = PCB; if ((yy_settings_dest != CFR_invalid) && (layer_group_string != NULL)) @@ -1843,28 +1837,28 @@ ENDALL_LOOP; PCB = pcb_save; } -#line 1847 "parse_y.c" /* yacc.c:1646 */ +#line 1841 "parse_y.c" /* yacc.c:1646 */ break; case 8: -#line 230 "parse_y.y" /* yacc.c:1646 */ +#line 224 "parse_y.y" /* yacc.c:1646 */ { PreLoadElementPCB (); layer_group_string = NULL; } -#line 1854 "parse_y.c" /* yacc.c:1646 */ +#line 1848 "parse_y.c" /* yacc.c:1646 */ break; case 9: -#line 233 "parse_y.y" /* yacc.c:1646 */ +#line 227 "parse_y.y" /* yacc.c:1646 */ { LayerFlag[0] = pcb_true; LayerFlag[1] = pcb_true; yyData->LayerN = 2; PostLoadElementPCB (); } -#line 1864 "parse_y.c" /* yacc.c:1646 */ +#line 1858 "parse_y.c" /* yacc.c:1646 */ break; case 10: -#line 241 "parse_y.y" /* yacc.c:1646 */ +#line 235 "parse_y.y" /* yacc.c:1646 */ { /* reset flags for 'used layers'; * init font and data pointers @@ -1880,11 +1874,11 @@ LayerFlag[i] = pcb_false; yyData->LayerN = 0; } -#line 1884 "parse_y.c" /* yacc.c:1646 */ +#line 1878 "parse_y.c" /* yacc.c:1646 */ break; case 14: -#line 266 "parse_y.y" /* yacc.c:1646 */ +#line 260 "parse_y.y" /* yacc.c:1646 */ { /* mark all symbols invalid */ int i; @@ -1899,20 +1893,20 @@ free (yyFont->Symbol[i].Line); memset(yyFont->Symbol, 0, sizeof(yyFont->Symbol)); } -#line 1903 "parse_y.c" /* yacc.c:1646 */ +#line 1897 "parse_y.c" /* yacc.c:1646 */ break; case 15: -#line 281 "parse_y.y" /* yacc.c:1646 */ +#line 275 "parse_y.y" /* yacc.c:1646 */ { yyFont->Valid = pcb_true; SetFontInfo(yyFont); } -#line 1912 "parse_y.c" /* yacc.c:1646 */ +#line 1906 "parse_y.c" /* yacc.c:1646 */ break; case 17: -#line 309 "parse_y.y" /* yacc.c:1646 */ +#line 303 "parse_y.y" /* yacc.c:1646 */ { if (check_file_version ((yyvsp[-1].integer)) != 0) { @@ -1919,51 +1913,51 @@ YYABORT; } } -#line 1923 "parse_y.c" /* yacc.c:1646 */ +#line 1917 "parse_y.c" /* yacc.c:1646 */ break; case 18: -#line 339 "parse_y.y" /* yacc.c:1646 */ +#line 333 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Name = (yyvsp[-1].string); yyPCB->MaxWidth = MAX_COORD; yyPCB->MaxHeight = MAX_COORD; } -#line 1933 "parse_y.c" /* yacc.c:1646 */ +#line 1927 "parse_y.c" /* yacc.c:1646 */ break; case 19: -#line 345 "parse_y.y" /* yacc.c:1646 */ +#line 339 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Name = (yyvsp[-3].string); yyPCB->MaxWidth = OU ((yyvsp[-2].measure)); yyPCB->MaxHeight = OU ((yyvsp[-1].measure)); } -#line 1943 "parse_y.c" /* yacc.c:1646 */ +#line 1937 "parse_y.c" /* yacc.c:1646 */ break; case 20: -#line 351 "parse_y.y" /* yacc.c:1646 */ +#line 345 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Name = (yyvsp[-3].string); yyPCB->MaxWidth = NU ((yyvsp[-2].measure)); yyPCB->MaxHeight = NU ((yyvsp[-1].measure)); } -#line 1953 "parse_y.c" /* yacc.c:1646 */ +#line 1947 "parse_y.c" /* yacc.c:1646 */ break; case 24: -#line 385 "parse_y.y" /* yacc.c:1646 */ +#line 379 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Grid = OU ((yyvsp[-3].measure)); yyPCB->GridOffsetX = OU ((yyvsp[-2].measure)); yyPCB->GridOffsetY = OU ((yyvsp[-1].measure)); } -#line 1963 "parse_y.c" /* yacc.c:1646 */ +#line 1957 "parse_y.c" /* yacc.c:1646 */ break; case 25: -#line 393 "parse_y.y" /* yacc.c:1646 */ +#line 387 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Grid = OU ((yyvsp[-4].measure)); yyPCB->GridOffsetX = OU ((yyvsp[-3].measure)); @@ -1975,11 +1969,11 @@ conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE); } } -#line 1979 "parse_y.c" /* yacc.c:1646 */ +#line 1973 "parse_y.c" /* yacc.c:1646 */ break; case 26: -#line 408 "parse_y.y" /* yacc.c:1646 */ +#line 402 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Grid = NU ((yyvsp[-4].measure)); yyPCB->GridOffsetX = NU ((yyvsp[-3].measure)); @@ -1991,48 +1985,48 @@ conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE); } } -#line 1995 "parse_y.c" /* yacc.c:1646 */ +#line 1989 "parse_y.c" /* yacc.c:1646 */ break; case 27: -#line 442 "parse_y.y" /* yacc.c:1646 */ +#line 436 "parse_y.y" /* yacc.c:1646 */ { yyPCB->CursorX = OU ((yyvsp[-3].measure)); yyPCB->CursorY = OU ((yyvsp[-2].measure)); yyPCB->Zoom = (yyvsp[-1].number)*2; } -#line 2005 "parse_y.c" /* yacc.c:1646 */ +#line 1999 "parse_y.c" /* yacc.c:1646 */ break; case 28: -#line 448 "parse_y.y" /* yacc.c:1646 */ +#line 442 "parse_y.y" /* yacc.c:1646 */ { yyPCB->CursorX = NU ((yyvsp[-3].measure)); yyPCB->CursorY = NU ((yyvsp[-2].measure)); yyPCB->Zoom = (yyvsp[-1].number); } -#line 2015 "parse_y.c" /* yacc.c:1646 */ +#line 2009 "parse_y.c" /* yacc.c:1646 */ break; case 31: -#line 472 "parse_y.y" /* yacc.c:1646 */ +#line 466 "parse_y.y" /* yacc.c:1646 */ { /* Read in cmil^2 for now; in future this should be a noop. */ yyPCB->IsleArea = PCB_MIL_TO_COORD (PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0) / 100.0; } -#line 2024 "parse_y.c" /* yacc.c:1646 */ +#line 2018 "parse_y.c" /* yacc.c:1646 */ break; case 33: -#line 499 "parse_y.y" /* yacc.c:1646 */ +#line 493 "parse_y.y" /* yacc.c:1646 */ { yyPCB->ThermScale = (yyvsp[-1].number); } -#line 2032 "parse_y.c" /* yacc.c:1646 */ +#line 2026 "parse_y.c" /* yacc.c:1646 */ break; case 38: -#line 538 "parse_y.y" /* yacc.c:1646 */ +#line 532 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Bloat = NU ((yyvsp[-3].measure)); yyPCB->Shrink = NU ((yyvsp[-2].measure)); @@ -2039,11 +2033,11 @@ yyPCB->minWid = NU ((yyvsp[-1].measure)); yyPCB->minRing = NU ((yyvsp[-1].measure)); } -#line 2043 "parse_y.c" /* yacc.c:1646 */ +#line 2037 "parse_y.c" /* yacc.c:1646 */ break; case 39: -#line 548 "parse_y.y" /* yacc.c:1646 */ +#line 542 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Bloat = NU ((yyvsp[-4].measure)); yyPCB->Shrink = NU ((yyvsp[-3].measure)); @@ -2051,11 +2045,11 @@ yyPCB->minSlk = NU ((yyvsp[-1].measure)); yyPCB->minRing = NU ((yyvsp[-2].measure)); } -#line 2055 "parse_y.c" /* yacc.c:1646 */ +#line 2049 "parse_y.c" /* yacc.c:1646 */ break; case 40: -#line 559 "parse_y.y" /* yacc.c:1646 */ +#line 553 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Bloat = NU ((yyvsp[-6].measure)); yyPCB->Shrink = NU ((yyvsp[-5].measure)); @@ -2064,36 +2058,36 @@ yyPCB->minDrill = NU ((yyvsp[-2].measure)); yyPCB->minRing = NU ((yyvsp[-1].measure)); } -#line 2068 "parse_y.c" /* yacc.c:1646 */ +#line 2062 "parse_y.c" /* yacc.c:1646 */ break; case 41: -#line 586 "parse_y.y" /* yacc.c:1646 */ +#line 580 "parse_y.y" /* yacc.c:1646 */ { yy_pcb_flags = MakeFlags ((yyvsp[-1].integer) & PCB_FLAGS); } -#line 2076 "parse_y.c" /* yacc.c:1646 */ +#line 2070 "parse_y.c" /* yacc.c:1646 */ break; case 42: -#line 590 "parse_y.y" /* yacc.c:1646 */ +#line 584 "parse_y.y" /* yacc.c:1646 */ { yy_pcb_flags = string_to_pcbflags ((yyvsp[-1].string), yyerror); free((yyvsp[-1].string)); } -#line 2085 "parse_y.c" /* yacc.c:1646 */ +#line 2079 "parse_y.c" /* yacc.c:1646 */ break; case 44: -#line 623 "parse_y.y" /* yacc.c:1646 */ +#line 617 "parse_y.y" /* yacc.c:1646 */ { layer_group_string = (yyvsp[-1].string); } -#line 2093 "parse_y.c" /* yacc.c:1646 */ +#line 2087 "parse_y.c" /* yacc.c:1646 */ break; case 46: -#line 671 "parse_y.y" /* yacc.c:1646 */ +#line 665 "parse_y.y" /* yacc.c:1646 */ { if (ParseRouteString((yyvsp[-1].string), &yyPCB->RouteStyle, "mil")) { @@ -2102,11 +2096,11 @@ } free((yyvsp[-1].string)); } -#line 2106 "parse_y.c" /* yacc.c:1646 */ +#line 2100 "parse_y.c" /* yacc.c:1646 */ break; case 47: -#line 680 "parse_y.y" /* yacc.c:1646 */ +#line 674 "parse_y.y" /* yacc.c:1646 */ { if (ParseRouteString(((yyvsp[-1].string) == NULL ? "" : (yyvsp[-1].string)), &yyPCB->RouteStyle, "cmil")) { @@ -2115,17 +2109,17 @@ } free((yyvsp[-1].string)); } -#line 2119 "parse_y.c" /* yacc.c:1646 */ +#line 2113 "parse_y.c" /* yacc.c:1646 */ break; case 54: -#line 703 "parse_y.y" /* yacc.c:1646 */ +#line 697 "parse_y.y" /* yacc.c:1646 */ { attr_list = & yyPCB->Attributes; } -#line 2125 "parse_y.c" /* yacc.c:1646 */ +#line 2119 "parse_y.c" /* yacc.c:1646 */ break; case 58: -#line 707 "parse_y.y" /* yacc.c:1646 */ +#line 701 "parse_y.y" /* yacc.c:1646 */ { /* clear pointer to force memory allocation by * the appropriate subroutine @@ -2132,57 +2126,57 @@ */ yyElement = NULL; } -#line 2136 "parse_y.c" /* yacc.c:1646 */ +#line 2130 "parse_y.c" /* yacc.c:1646 */ break; case 60: -#line 714 "parse_y.y" /* yacc.c:1646 */ +#line 708 "parse_y.y" /* yacc.c:1646 */ { YYABORT; } -#line 2142 "parse_y.c" /* yacc.c:1646 */ +#line 2136 "parse_y.c" /* yacc.c:1646 */ break; case 66: -#line 759 "parse_y.y" /* yacc.c:1646 */ +#line 753 "parse_y.y" /* yacc.c:1646 */ { CreateNewVia(yyData, NU ((yyvsp[-8].measure)), NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), (yyvsp[-2].string), (yyvsp[-1].flagtype)); free ((yyvsp[-2].string)); } -#line 2152 "parse_y.c" /* yacc.c:1646 */ +#line 2146 "parse_y.c" /* yacc.c:1646 */ break; case 67: -#line 769 "parse_y.y" /* yacc.c:1646 */ +#line 763 "parse_y.y" /* yacc.c:1646 */ { CreateNewVia(yyData, OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2162 "parse_y.c" /* yacc.c:1646 */ +#line 2156 "parse_y.c" /* yacc.c:1646 */ break; case 68: -#line 780 "parse_y.y" /* yacc.c:1646 */ +#line 774 "parse_y.y" /* yacc.c:1646 */ { CreateNewVia(yyData, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-5].measure)) + OU((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2172 "parse_y.c" /* yacc.c:1646 */ +#line 2166 "parse_y.c" /* yacc.c:1646 */ break; case 69: -#line 790 "parse_y.y" /* yacc.c:1646 */ +#line 784 "parse_y.y" /* yacc.c:1646 */ { CreateNewVia(yyData, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), 2*GROUNDPLANEFRAME, OU((yyvsp[-4].measure)) + 2*MASKFRAME, OU ((yyvsp[-3].measure)), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2182 "parse_y.c" /* yacc.c:1646 */ +#line 2176 "parse_y.c" /* yacc.c:1646 */ break; case 70: -#line 800 "parse_y.y" /* yacc.c:1646 */ +#line 794 "parse_y.y" /* yacc.c:1646 */ { Coord hole = (OU((yyvsp[-3].measure)) * DEFAULT_DRILLINGHOLE); @@ -2195,29 +2189,29 @@ OU((yyvsp[-3].measure)) + 2*MASKFRAME, hole, (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2199 "parse_y.c" /* yacc.c:1646 */ +#line 2193 "parse_y.c" /* yacc.c:1646 */ break; case 71: -#line 836 "parse_y.y" /* yacc.c:1646 */ +#line 830 "parse_y.y" /* yacc.c:1646 */ { CreateNewRat(yyData, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), (yyvsp[-5].integer), (yyvsp[-2].integer), conf_core.appearance.rat_thickness, (yyvsp[-1].flagtype)); } -#line 2208 "parse_y.c" /* yacc.c:1646 */ +#line 2202 "parse_y.c" /* yacc.c:1646 */ break; case 72: -#line 841 "parse_y.y" /* yacc.c:1646 */ +#line 835 "parse_y.y" /* yacc.c:1646 */ { CreateNewRat(yyData, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-5].integer), (yyvsp[-2].integer), conf_core.appearance.rat_thickness, OldFlags((yyvsp[-1].integer))); } -#line 2217 "parse_y.c" /* yacc.c:1646 */ +#line 2211 "parse_y.c" /* yacc.c:1646 */ break; case 73: -#line 872 "parse_y.y" /* yacc.c:1646 */ +#line 866 "parse_y.y" /* yacc.c:1646 */ { if ((yyvsp[-4].integer) <= 0 || (yyvsp[-4].integer) > MAX_LAYER + 2) { @@ -2241,44 +2235,44 @@ if ((yyvsp[-2].string) != NULL) free((yyvsp[-2].string)); } -#line 2245 "parse_y.c" /* yacc.c:1646 */ +#line 2239 "parse_y.c" /* yacc.c:1646 */ break; case 85: -#line 917 "parse_y.y" /* yacc.c:1646 */ +#line 911 "parse_y.y" /* yacc.c:1646 */ { CreateNewPolygonFromRectangle(Layer, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-5].measure)) + OU ((yyvsp[-3].measure)), OU ((yyvsp[-4].measure)) + OU ((yyvsp[-2].measure)), OldFlags((yyvsp[-1].integer))); } -#line 2254 "parse_y.c" /* yacc.c:1646 */ +#line 2248 "parse_y.c" /* yacc.c:1646 */ break; case 89: -#line 924 "parse_y.y" /* yacc.c:1646 */ +#line 918 "parse_y.y" /* yacc.c:1646 */ { attr_list = & Layer->Attributes; } -#line 2260 "parse_y.c" /* yacc.c:1646 */ +#line 2254 "parse_y.c" /* yacc.c:1646 */ break; case 92: -#line 956 "parse_y.y" /* yacc.c:1646 */ +#line 950 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineOnLayer(Layer, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), (yyvsp[-1].flagtype)); } -#line 2269 "parse_y.c" /* yacc.c:1646 */ +#line 2263 "parse_y.c" /* yacc.c:1646 */ break; case 93: -#line 965 "parse_y.y" /* yacc.c:1646 */ +#line 959 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineOnLayer(Layer, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OldFlags((yyvsp[-1].integer))); } -#line 2278 "parse_y.c" /* yacc.c:1646 */ +#line 2272 "parse_y.c" /* yacc.c:1646 */ break; case 94: -#line 974 "parse_y.y" /* yacc.c:1646 */ +#line 968 "parse_y.y" /* yacc.c:1646 */ { /* eliminate old-style rat-lines */ if ((IV ((yyvsp[-1].measure)) & PCB_FLAG_RAT) == 0) @@ -2285,48 +2279,48 @@ CreateNewLineOnLayer(Layer, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), 200*GROUNDPLANEFRAME, OldFlags(IV ((yyvsp[-1].measure)))); } -#line 2289 "parse_y.c" /* yacc.c:1646 */ +#line 2283 "parse_y.c" /* yacc.c:1646 */ break; case 95: -#line 1022 "parse_y.y" /* yacc.c:1646 */ +#line 1016 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcOnLayer(Layer, NU ((yyvsp[-9].measure)), NU ((yyvsp[-8].measure)), NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), (yyvsp[-3].number), (yyvsp[-2].number), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-1].flagtype)); } -#line 2298 "parse_y.c" /* yacc.c:1646 */ +#line 2292 "parse_y.c" /* yacc.c:1646 */ break; case 96: -#line 1031 "parse_y.y" /* yacc.c:1646 */ +#line 1025 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcOnLayer(Layer, OU ((yyvsp[-9].measure)), OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), (yyvsp[-3].number), (yyvsp[-2].number), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OldFlags((yyvsp[-1].integer))); } -#line 2307 "parse_y.c" /* yacc.c:1646 */ +#line 2301 "parse_y.c" /* yacc.c:1646 */ break; case 97: -#line 1040 "parse_y.y" /* yacc.c:1646 */ +#line 1034 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcOnLayer(Layer, OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-6].measure)), IV ((yyvsp[-3].measure)), (yyvsp[-2].number), OU ((yyvsp[-4].measure)), 200*GROUNDPLANEFRAME, OldFlags((yyvsp[-1].integer))); } -#line 2316 "parse_y.c" /* yacc.c:1646 */ +#line 2310 "parse_y.c" /* yacc.c:1646 */ break; case 98: -#line 1077 "parse_y.y" /* yacc.c:1646 */ +#line 1071 "parse_y.y" /* yacc.c:1646 */ { /* use a default scale of 100% */ CreateNewText(Layer,yyFont,OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), 100, (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2326 "parse_y.c" /* yacc.c:1646 */ +#line 2320 "parse_y.c" /* yacc.c:1646 */ break; case 99: -#line 1087 "parse_y.y" /* yacc.c:1646 */ +#line 1081 "parse_y.y" /* yacc.c:1646 */ { if ((yyvsp[-1].integer) & PCB_FLAG_ONSILK) { @@ -2341,11 +2335,11 @@ OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2345 "parse_y.c" /* yacc.c:1646 */ +#line 2339 "parse_y.c" /* yacc.c:1646 */ break; case 100: -#line 1105 "parse_y.y" /* yacc.c:1646 */ +#line 1099 "parse_y.y" /* yacc.c:1646 */ { /* FIXME: shouldn't know about .f */ /* I don't think this matters because anything with hi_format @@ -2365,19 +2359,19 @@ CreateNewText(Layer, yyFont, NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string), (yyvsp[-1].flagtype)); free ((yyvsp[-2].string)); } -#line 2369 "parse_y.c" /* yacc.c:1646 */ +#line 2363 "parse_y.c" /* yacc.c:1646 */ break; case 101: -#line 1154 "parse_y.y" /* yacc.c:1646 */ +#line 1148 "parse_y.y" /* yacc.c:1646 */ { Polygon = CreateNewPolygon(Layer, (yyvsp[-2].flagtype)); } -#line 2377 "parse_y.c" /* yacc.c:1646 */ +#line 2371 "parse_y.c" /* yacc.c:1646 */ break; case 102: -#line 1159 "parse_y.y" /* yacc.c:1646 */ +#line 1153 "parse_y.y" /* yacc.c:1646 */ { pcb_cardinal_t contour, contour_start, contour_end; pcb_bool bad_contour_found = pcb_false; @@ -2409,35 +2403,35 @@ r_insert_entry (Layer->polygon_tree, (BoxType *) Polygon, 0); } } -#line 2413 "parse_y.c" /* yacc.c:1646 */ +#line 2407 "parse_y.c" /* yacc.c:1646 */ break; case 105: -#line 1199 "parse_y.y" /* yacc.c:1646 */ +#line 1193 "parse_y.y" /* yacc.c:1646 */ { CreateNewHoleInPolygon (Polygon); } -#line 2421 "parse_y.c" /* yacc.c:1646 */ +#line 2415 "parse_y.c" /* yacc.c:1646 */ break; case 109: -#line 1213 "parse_y.y" /* yacc.c:1646 */ +#line 1207 "parse_y.y" /* yacc.c:1646 */ { CreateNewPointInPolygon(Polygon, OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure))); } -#line 2429 "parse_y.c" /* yacc.c:1646 */ +#line 2423 "parse_y.c" /* yacc.c:1646 */ break; case 110: -#line 1217 "parse_y.y" /* yacc.c:1646 */ +#line 1211 "parse_y.y" /* yacc.c:1646 */ { CreateNewPointInPolygon(Polygon, NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure))); } -#line 2437 "parse_y.c" /* yacc.c:1646 */ +#line 2431 "parse_y.c" /* yacc.c:1646 */ break; case 116: -#line 1288 "parse_y.y" /* yacc.c:1646 */ +#line 1282 "parse_y.y" /* yacc.c:1646 */ { yyElement = CreateNewElement(yyData, yyElement, yyFont, NoFlags(), (yyvsp[-6].string), (yyvsp[-5].string), NULL, OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].integer), 100, NoFlags(), pcb_false); @@ -2445,19 +2439,19 @@ free ((yyvsp[-5].string)); pin_num = 1; } -#line 2449 "parse_y.c" /* yacc.c:1646 */ +#line 2443 "parse_y.c" /* yacc.c:1646 */ break; case 117: -#line 1296 "parse_y.y" /* yacc.c:1646 */ +#line 1290 "parse_y.y" /* yacc.c:1646 */ { SetElementBoundingBox(yyData, yyElement, yyFont); } -#line 2457 "parse_y.c" /* yacc.c:1646 */ +#line 2451 "parse_y.c" /* yacc.c:1646 */ break; case 118: -#line 1306 "parse_y.y" /* yacc.c:1646 */ +#line 1300 "parse_y.y" /* yacc.c:1646 */ { yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags((yyvsp[-9].integer)), (yyvsp[-8].string), (yyvsp[-7].string), NULL, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), OldFlags((yyvsp[-2].integer)), pcb_false); @@ -2465,19 +2459,19 @@ free ((yyvsp[-7].string)); pin_num = 1; } -#line 2469 "parse_y.c" /* yacc.c:1646 */ +#line 2463 "parse_y.c" /* yacc.c:1646 */ break; case 119: -#line 1314 "parse_y.y" /* yacc.c:1646 */ +#line 1308 "parse_y.y" /* yacc.c:1646 */ { SetElementBoundingBox(yyData, yyElement, yyFont); } -#line 2477 "parse_y.c" /* yacc.c:1646 */ +#line 2471 "parse_y.c" /* yacc.c:1646 */ break; case 120: -#line 1324 "parse_y.y" /* yacc.c:1646 */ +#line 1318 "parse_y.y" /* yacc.c:1646 */ { yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags((yyvsp[-10].integer)), (yyvsp[-9].string), (yyvsp[-8].string), (yyvsp[-7].string), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), OldFlags((yyvsp[-2].integer)), pcb_false); @@ -2486,19 +2480,19 @@ free ((yyvsp[-7].string)); pin_num = 1; } -#line 2490 "parse_y.c" /* yacc.c:1646 */ +#line 2484 "parse_y.c" /* yacc.c:1646 */ break; case 121: -#line 1333 "parse_y.y" /* yacc.c:1646 */ +#line 1327 "parse_y.y" /* yacc.c:1646 */ { SetElementBoundingBox(yyData, yyElement, yyFont); } -#line 2498 "parse_y.c" /* yacc.c:1646 */ +#line 2492 "parse_y.c" /* yacc.c:1646 */ break; case 122: -#line 1344 "parse_y.y" /* yacc.c:1646 */ +#line 1338 "parse_y.y" /* yacc.c:1646 */ { yyElement = CreateNewElement(yyData, yyElement, yyFont, OldFlags((yyvsp[-12].integer)), (yyvsp[-11].string), (yyvsp[-10].string), (yyvsp[-9].string), OU ((yyvsp[-8].measure)) + OU ((yyvsp[-6].measure)), OU ((yyvsp[-7].measure)) + OU ((yyvsp[-5].measure)), @@ -2509,19 +2503,19 @@ free ((yyvsp[-10].string)); free ((yyvsp[-9].string)); } -#line 2513 "parse_y.c" /* yacc.c:1646 */ +#line 2507 "parse_y.c" /* yacc.c:1646 */ break; case 123: -#line 1355 "parse_y.y" /* yacc.c:1646 */ +#line 1349 "parse_y.y" /* yacc.c:1646 */ { SetElementBoundingBox(yyData, yyElement, yyFont); } -#line 2521 "parse_y.c" /* yacc.c:1646 */ +#line 2515 "parse_y.c" /* yacc.c:1646 */ break; case 124: -#line 1366 "parse_y.y" /* yacc.c:1646 */ +#line 1360 "parse_y.y" /* yacc.c:1646 */ { yyElement = CreateNewElement(yyData, yyElement, yyFont, (yyvsp[-12].flagtype), (yyvsp[-11].string), (yyvsp[-10].string), (yyvsp[-9].string), NU ((yyvsp[-8].measure)) + NU ((yyvsp[-6].measure)), NU ((yyvsp[-7].measure)) + NU ((yyvsp[-5].measure)), @@ -2532,119 +2526,119 @@ free ((yyvsp[-10].string)); free ((yyvsp[-9].string)); } -#line 2536 "parse_y.c" /* yacc.c:1646 */ +#line 2530 "parse_y.c" /* yacc.c:1646 */ break; case 125: -#line 1377 "parse_y.y" /* yacc.c:1646 */ +#line 1371 "parse_y.y" /* yacc.c:1646 */ { SetElementBoundingBox(yyData, yyElement, yyFont); } -#line 2544 "parse_y.c" /* yacc.c:1646 */ +#line 2538 "parse_y.c" /* yacc.c:1646 */ break; case 133: -#line 1457 "parse_y.y" /* yacc.c:1646 */ +#line 1451 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineInElement(yyElement, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure))); } -#line 2552 "parse_y.c" /* yacc.c:1646 */ +#line 2546 "parse_y.c" /* yacc.c:1646 */ break; case 134: -#line 1462 "parse_y.y" /* yacc.c:1646 */ +#line 1456 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineInElement(yyElement, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure))); } -#line 2560 "parse_y.c" /* yacc.c:1646 */ +#line 2554 "parse_y.c" /* yacc.c:1646 */ break; case 135: -#line 1467 "parse_y.y" /* yacc.c:1646 */ +#line 1461 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcInElement(yyElement, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), NU ((yyvsp[-1].measure))); } -#line 2568 "parse_y.c" /* yacc.c:1646 */ +#line 2562 "parse_y.c" /* yacc.c:1646 */ break; case 136: -#line 1472 "parse_y.y" /* yacc.c:1646 */ +#line 1466 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcInElement(yyElement, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), OU ((yyvsp[-1].measure))); } -#line 2576 "parse_y.c" /* yacc.c:1646 */ +#line 2570 "parse_y.c" /* yacc.c:1646 */ break; case 137: -#line 1477 "parse_y.y" /* yacc.c:1646 */ +#line 1471 "parse_y.y" /* yacc.c:1646 */ { yyElement->MarkX = NU ((yyvsp[-2].measure)); yyElement->MarkY = NU ((yyvsp[-1].measure)); } -#line 2585 "parse_y.c" /* yacc.c:1646 */ +#line 2579 "parse_y.c" /* yacc.c:1646 */ break; case 138: -#line 1482 "parse_y.y" /* yacc.c:1646 */ +#line 1476 "parse_y.y" /* yacc.c:1646 */ { yyElement->MarkX = OU ((yyvsp[-2].measure)); yyElement->MarkY = OU ((yyvsp[-1].measure)); } -#line 2594 "parse_y.c" /* yacc.c:1646 */ +#line 2588 "parse_y.c" /* yacc.c:1646 */ break; case 139: -#line 1486 "parse_y.y" /* yacc.c:1646 */ +#line 1480 "parse_y.y" /* yacc.c:1646 */ { attr_list = & yyElement->Attributes; } -#line 2600 "parse_y.c" /* yacc.c:1646 */ +#line 2594 "parse_y.c" /* yacc.c:1646 */ break; case 147: -#line 1501 "parse_y.y" /* yacc.c:1646 */ +#line 1495 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineInElement(yyElement, NU ((yyvsp[-5].measure)) + yyElement->MarkX, NU ((yyvsp[-4].measure)) + yyElement->MarkY, NU ((yyvsp[-3].measure)) + yyElement->MarkX, NU ((yyvsp[-2].measure)) + yyElement->MarkY, NU ((yyvsp[-1].measure))); } -#line 2610 "parse_y.c" /* yacc.c:1646 */ +#line 2604 "parse_y.c" /* yacc.c:1646 */ break; case 148: -#line 1507 "parse_y.y" /* yacc.c:1646 */ +#line 1501 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineInElement(yyElement, OU ((yyvsp[-5].measure)) + yyElement->MarkX, OU ((yyvsp[-4].measure)) + yyElement->MarkY, OU ((yyvsp[-3].measure)) + yyElement->MarkX, OU ((yyvsp[-2].measure)) + yyElement->MarkY, OU ((yyvsp[-1].measure))); } -#line 2620 "parse_y.c" /* yacc.c:1646 */ +#line 2614 "parse_y.c" /* yacc.c:1646 */ break; case 149: -#line 1514 "parse_y.y" /* yacc.c:1646 */ +#line 1508 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcInElement(yyElement, NU ((yyvsp[-7].measure)) + yyElement->MarkX, NU ((yyvsp[-6].measure)) + yyElement->MarkY, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), NU ((yyvsp[-1].measure))); } -#line 2629 "parse_y.c" /* yacc.c:1646 */ +#line 2623 "parse_y.c" /* yacc.c:1646 */ break; case 150: -#line 1519 "parse_y.y" /* yacc.c:1646 */ +#line 1513 "parse_y.y" /* yacc.c:1646 */ { CreateNewArcInElement(yyElement, OU ((yyvsp[-7].measure)) + yyElement->MarkX, OU ((yyvsp[-6].measure)) + yyElement->MarkY, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), OU ((yyvsp[-1].measure))); } -#line 2638 "parse_y.c" /* yacc.c:1646 */ +#line 2632 "parse_y.c" /* yacc.c:1646 */ break; case 151: -#line 1523 "parse_y.y" /* yacc.c:1646 */ +#line 1517 "parse_y.y" /* yacc.c:1646 */ { attr_list = & yyElement->Attributes; } -#line 2644 "parse_y.c" /* yacc.c:1646 */ +#line 2638 "parse_y.c" /* yacc.c:1646 */ break; case 153: -#line 1565 "parse_y.y" /* yacc.c:1646 */ +#line 1559 "parse_y.y" /* yacc.c:1646 */ { CreateNewPin(yyElement, NU ((yyvsp[-9].measure)) + yyElement->MarkX, NU ((yyvsp[-8].measure)) + yyElement->MarkY, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].string), @@ -2652,11 +2646,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2656 "parse_y.c" /* yacc.c:1646 */ +#line 2650 "parse_y.c" /* yacc.c:1646 */ break; case 154: -#line 1577 "parse_y.y" /* yacc.c:1646 */ +#line 1571 "parse_y.y" /* yacc.c:1646 */ { CreateNewPin(yyElement, OU ((yyvsp[-9].measure)) + yyElement->MarkX, OU ((yyvsp[-8].measure)) + yyElement->MarkY, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].string), @@ -2664,11 +2658,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2668 "parse_y.c" /* yacc.c:1646 */ +#line 2662 "parse_y.c" /* yacc.c:1646 */ break; case 155: -#line 1589 "parse_y.y" /* yacc.c:1646 */ +#line 1583 "parse_y.y" /* yacc.c:1646 */ { CreateNewPin(yyElement, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), 2*GROUNDPLANEFRAME, OU ((yyvsp[-5].measure)) + 2*MASKFRAME, OU ((yyvsp[-4].measure)), (yyvsp[-3].string), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); @@ -2675,11 +2669,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2679 "parse_y.c" /* yacc.c:1646 */ +#line 2673 "parse_y.c" /* yacc.c:1646 */ break; case 156: -#line 1600 "parse_y.y" /* yacc.c:1646 */ +#line 1594 "parse_y.y" /* yacc.c:1646 */ { char p_number[8]; @@ -2689,11 +2683,11 @@ free ((yyvsp[-2].string)); } -#line 2693 "parse_y.c" /* yacc.c:1646 */ +#line 2687 "parse_y.c" /* yacc.c:1646 */ break; case 157: -#line 1616 "parse_y.y" /* yacc.c:1646 */ +#line 1610 "parse_y.y" /* yacc.c:1646 */ { Coord hole = OU ((yyvsp[-3].measure)) * DEFAULT_DRILLINGHOLE; char p_number[8]; @@ -2708,11 +2702,11 @@ OU ((yyvsp[-3].measure)) + 2*MASKFRAME, hole, (yyvsp[-2].string), p_number, OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2712 "parse_y.c" /* yacc.c:1646 */ +#line 2706 "parse_y.c" /* yacc.c:1646 */ break; case 158: -#line 1670 "parse_y.y" /* yacc.c:1646 */ +#line 1664 "parse_y.y" /* yacc.c:1646 */ { CreateNewPad(yyElement, NU ((yyvsp[-10].measure)) + yyElement->MarkX, NU ((yyvsp[-9].measure)) + yyElement->MarkY, @@ -2722,11 +2716,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2726 "parse_y.c" /* yacc.c:1646 */ +#line 2720 "parse_y.c" /* yacc.c:1646 */ break; case 159: -#line 1684 "parse_y.y" /* yacc.c:1646 */ +#line 1678 "parse_y.y" /* yacc.c:1646 */ { CreateNewPad(yyElement,OU ((yyvsp[-10].measure)) + yyElement->MarkX, OU ((yyvsp[-9].measure)) + yyElement->MarkY, OU ((yyvsp[-8].measure)) + yyElement->MarkX, @@ -2735,11 +2729,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2739 "parse_y.c" /* yacc.c:1646 */ +#line 2733 "parse_y.c" /* yacc.c:1646 */ break; case 160: -#line 1697 "parse_y.y" /* yacc.c:1646 */ +#line 1691 "parse_y.y" /* yacc.c:1646 */ { CreateNewPad(yyElement,OU ((yyvsp[-8].measure)),OU ((yyvsp[-7].measure)),OU ((yyvsp[-6].measure)),OU ((yyvsp[-5].measure)),OU ((yyvsp[-4].measure)), 2*GROUNDPLANEFRAME, OU ((yyvsp[-4].measure)) + 2*MASKFRAME, (yyvsp[-3].string), (yyvsp[-2].string), OldFlags((yyvsp[-1].integer))); @@ -2746,11 +2740,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2750 "parse_y.c" /* yacc.c:1646 */ +#line 2744 "parse_y.c" /* yacc.c:1646 */ break; case 161: -#line 1708 "parse_y.y" /* yacc.c:1646 */ +#line 1702 "parse_y.y" /* yacc.c:1646 */ { char p_number[8]; @@ -2759,23 +2753,23 @@ OU ((yyvsp[-3].measure)) + 2*MASKFRAME, (yyvsp[-2].string),p_number, OldFlags((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2763 "parse_y.c" /* yacc.c:1646 */ +#line 2757 "parse_y.c" /* yacc.c:1646 */ break; case 162: -#line 1718 "parse_y.y" /* yacc.c:1646 */ +#line 1712 "parse_y.y" /* yacc.c:1646 */ { (yyval.flagtype) = OldFlags((yyvsp[0].integer)); } -#line 2769 "parse_y.c" /* yacc.c:1646 */ +#line 2763 "parse_y.c" /* yacc.c:1646 */ break; case 163: -#line 1719 "parse_y.y" /* yacc.c:1646 */ +#line 1713 "parse_y.y" /* yacc.c:1646 */ { (yyval.flagtype) = string_to_flags ((yyvsp[0].string), yyerror); free((yyvsp[0].string)); } -#line 2775 "parse_y.c" /* yacc.c:1646 */ +#line 2769 "parse_y.c" /* yacc.c:1646 */ break; case 167: -#line 1749 "parse_y.y" /* yacc.c:1646 */ +#line 1743 "parse_y.y" /* yacc.c:1646 */ { if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > MAX_FONTPOSITION) { @@ -2791,11 +2785,11 @@ Symbol->Valid = pcb_true; Symbol->Delta = NU ((yyvsp[-2].measure)); } -#line 2795 "parse_y.c" /* yacc.c:1646 */ +#line 2789 "parse_y.c" /* yacc.c:1646 */ break; case 168: -#line 1765 "parse_y.y" /* yacc.c:1646 */ +#line 1759 "parse_y.y" /* yacc.c:1646 */ { if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > MAX_FONTPOSITION) { @@ -2811,158 +2805,158 @@ Symbol->Valid = pcb_true; Symbol->Delta = OU ((yyvsp[-2].measure)); } -#line 2815 "parse_y.c" /* yacc.c:1646 */ +#line 2809 "parse_y.c" /* yacc.c:1646 */ break; case 174: -#line 1812 "parse_y.y" /* yacc.c:1646 */ +#line 1806 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineInSymbol(Symbol, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure))); } -#line 2823 "parse_y.c" /* yacc.c:1646 */ +#line 2817 "parse_y.c" /* yacc.c:1646 */ break; case 175: -#line 1819 "parse_y.y" /* yacc.c:1646 */ +#line 1813 "parse_y.y" /* yacc.c:1646 */ { CreateNewLineInSymbol(Symbol, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure))); } -#line 2831 "parse_y.c" /* yacc.c:1646 */ +#line 2825 "parse_y.c" /* yacc.c:1646 */ break; case 183: -#line 1874 "parse_y.y" /* yacc.c:1646 */ +#line 1868 "parse_y.y" /* yacc.c:1646 */ { Menu = CreateNewNet((LibraryTypePtr)&yyPCB->NetlistLib, (yyvsp[-3].string), (yyvsp[-2].string)); free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2841 "parse_y.c" /* yacc.c:1646 */ +#line 2835 "parse_y.c" /* yacc.c:1646 */ break; case 189: -#line 1909 "parse_y.y" /* yacc.c:1646 */ +#line 1903 "parse_y.y" /* yacc.c:1646 */ { CreateNewConnection(Menu, (yyvsp[-1].string)); free ((yyvsp[-1].string)); } -#line 2850 "parse_y.c" /* yacc.c:1646 */ +#line 2844 "parse_y.c" /* yacc.c:1646 */ break; case 197: -#line 1956 "parse_y.y" /* yacc.c:1646 */ +#line 1950 "parse_y.y" /* yacc.c:1646 */ { rats_patch_append(yyPCB, RATP_ADD_CONN, (yyvsp[-2].string), (yyvsp[-1].string), NULL); free((yyvsp[-2].string)); free((yyvsp[-1].string)); } -#line 2856 "parse_y.c" /* yacc.c:1646 */ +#line 2850 "parse_y.c" /* yacc.c:1646 */ break; case 198: -#line 1957 "parse_y.y" /* yacc.c:1646 */ +#line 1951 "parse_y.y" /* yacc.c:1646 */ { rats_patch_append(yyPCB, RATP_DEL_CONN, (yyvsp[-2].string), (yyvsp[-1].string), NULL); free((yyvsp[-2].string)); free((yyvsp[-1].string)); } -#line 2862 "parse_y.c" /* yacc.c:1646 */ +#line 2856 "parse_y.c" /* yacc.c:1646 */ break; case 199: -#line 1958 "parse_y.y" /* yacc.c:1646 */ +#line 1952 "parse_y.y" /* yacc.c:1646 */ { rats_patch_append(yyPCB, RATP_CHANGE_ATTRIB, (yyvsp[-3].string), (yyvsp[-2].string), (yyvsp[-1].string)); free((yyvsp[-3].string)); free((yyvsp[-2].string)); free((yyvsp[-1].string)); } -#line 2868 "parse_y.c" /* yacc.c:1646 */ +#line 2862 "parse_y.c" /* yacc.c:1646 */ break; case 200: -#line 1986 "parse_y.y" /* yacc.c:1646 */ +#line 1980 "parse_y.y" /* yacc.c:1646 */ { CreateNewAttribute (attr_list, (yyvsp[-2].string), (yyvsp[-1].string) ? (yyvsp[-1].string) : (char *)""); free ((yyvsp[-2].string)); free ((yyvsp[-1].string)); } -#line 2878 "parse_y.c" /* yacc.c:1646 */ +#line 2872 "parse_y.c" /* yacc.c:1646 */ break; case 201: -#line 1993 "parse_y.y" /* yacc.c:1646 */ +#line 1987 "parse_y.y" /* yacc.c:1646 */ { (yyval.string) = (yyvsp[0].string); } -#line 2884 "parse_y.c" /* yacc.c:1646 */ +#line 2878 "parse_y.c" /* yacc.c:1646 */ break; case 202: -#line 1994 "parse_y.y" /* yacc.c:1646 */ +#line 1988 "parse_y.y" /* yacc.c:1646 */ { (yyval.string) = 0; } -#line 2890 "parse_y.c" /* yacc.c:1646 */ +#line 2884 "parse_y.c" /* yacc.c:1646 */ break; case 203: -#line 1998 "parse_y.y" /* yacc.c:1646 */ +#line 1992 "parse_y.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[0].number); } -#line 2896 "parse_y.c" /* yacc.c:1646 */ +#line 2890 "parse_y.c" /* yacc.c:1646 */ break; case 204: -#line 1999 "parse_y.y" /* yacc.c:1646 */ +#line 1993 "parse_y.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[0].integer); } -#line 2902 "parse_y.c" /* yacc.c:1646 */ +#line 2896 "parse_y.c" /* yacc.c:1646 */ break; case 205: -#line 2004 "parse_y.y" /* yacc.c:1646 */ +#line 1998 "parse_y.y" /* yacc.c:1646 */ { do_measure(&(yyval.measure), (yyvsp[0].number), PCB_MIL_TO_COORD ((yyvsp[0].number)) / 100.0, 0); } -#line 2908 "parse_y.c" /* yacc.c:1646 */ +#line 2902 "parse_y.c" /* yacc.c:1646 */ break; case 206: -#line 2005 "parse_y.y" /* yacc.c:1646 */ +#line 1999 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100000.0); } -#line 2914 "parse_y.c" /* yacc.c:1646 */ +#line 2908 "parse_y.c" /* yacc.c:1646 */ break; case 207: -#line 2006 "parse_y.y" /* yacc.c:1646 */ +#line 2000 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0); } -#line 2920 "parse_y.c" /* yacc.c:1646 */ +#line 2914 "parse_y.c" /* yacc.c:1646 */ break; case 208: -#line 2007 "parse_y.y" /* yacc.c:1646 */ +#line 2001 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number))); } -#line 2926 "parse_y.c" /* yacc.c:1646 */ +#line 2920 "parse_y.c" /* yacc.c:1646 */ break; case 209: -#line 2008 "parse_y.y" /* yacc.c:1646 */ +#line 2002 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_INCH_TO_COORD ((yyvsp[-1].number))); } -#line 2932 "parse_y.c" /* yacc.c:1646 */ +#line 2926 "parse_y.c" /* yacc.c:1646 */ break; case 210: -#line 2009 "parse_y.y" /* yacc.c:1646 */ +#line 2003 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000000.0); } -#line 2938 "parse_y.c" /* yacc.c:1646 */ +#line 2932 "parse_y.c" /* yacc.c:1646 */ break; case 211: -#line 2010 "parse_y.y" /* yacc.c:1646 */ +#line 2004 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000.0); } -#line 2944 "parse_y.c" /* yacc.c:1646 */ +#line 2938 "parse_y.c" /* yacc.c:1646 */ break; case 212: -#line 2011 "parse_y.y" /* yacc.c:1646 */ +#line 2005 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number))); } -#line 2950 "parse_y.c" /* yacc.c:1646 */ +#line 2944 "parse_y.c" /* yacc.c:1646 */ break; case 213: -#line 2012 "parse_y.y" /* yacc.c:1646 */ +#line 2006 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000.0); } -#line 2956 "parse_y.c" /* yacc.c:1646 */ +#line 2950 "parse_y.c" /* yacc.c:1646 */ break; case 214: -#line 2013 "parse_y.y" /* yacc.c:1646 */ +#line 2007 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000000.0); } -#line 2962 "parse_y.c" /* yacc.c:1646 */ +#line 2956 "parse_y.c" /* yacc.c:1646 */ break; -#line 2966 "parse_y.c" /* yacc.c:1646 */ +#line 2960 "parse_y.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3190,7 +3184,7 @@ #endif return yyresult; } -#line 2016 "parse_y.y" /* yacc.c:1906 */ +#line 2010 "parse_y.y" /* yacc.c:1906 */ /* --------------------------------------------------------------------------- Index: trunk/src_plugins/io_pcb/parse_y.h =================================================================== --- trunk/src_plugins/io_pcb/parse_y.h (revision 4523) +++ trunk/src_plugins/io_pcb/parse_y.h (revision 4524) @@ -101,7 +101,7 @@ union YYSTYPE { -#line 119 "parse_y.y" /* yacc.c:1909 */ +#line 113 "parse_y.y" /* yacc.c:1909 */ int integer; double number; Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 4523) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 4524) @@ -60,12 +60,6 @@ #include "route_style.h" #include "compat_misc.h" -#ifdef HAVE_LIBDMALLOC -# include /* see http://dmalloc.com */ -#endif - - - static LayerTypePtr Layer; static PolygonTypePtr Polygon; static SymbolTypePtr Symbol; Index: trunk/src_plugins/query/query_access.c =================================================================== --- trunk/src_plugins/query/query_access.c (revision 4523) +++ trunk/src_plugins/query/query_access.c (revision 4524) @@ -22,8 +22,8 @@ /* Query language - access to / extract core data */ -#include #include "config.h" +#include "math_helper.h" #include "board.h" #include "data.h" #include "query_access.h" Index: trunk/src_plugins/query/query_l.c =================================================================== --- trunk/src_plugins/query/query_l.c (revision 4523) +++ trunk/src_plugins/query/query_l.c (revision 4524) @@ -615,7 +615,6 @@ /* Query language - compiler: lexical analyzer */ -#include "config.h" #include "unit.h" #include "query.h" #include "query_y.h" @@ -626,7 +625,7 @@ static int qry_yy_input(char *buf, int buflen); static pcb_qry_node_t *make_constant(char *str, long val); #define YY_INPUT(buf, res, buflen) (res = qry_yy_input(buf, buflen)) -#line 630 "query_l.c" +#line 629 "query_l.c" #define INITIAL 0 @@ -844,9 +843,9 @@ } { -#line 41 "query_l.l" +#line 40 "query_l.l" -#line 850 "query_l.c" +#line 849 "query_l.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -906,317 +905,317 @@ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 42 "query_l.l" +#line 41 "query_l.l" { qry_lval.s = pcb_strdup(qry_text+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; /*"*/ } YY_BREAK case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 43 "query_l.l" +#line 42 "query_l.l" { qry_lval.s = pcb_strdup(qry_text+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; } YY_BREAK case 3: YY_RULE_SETUP -#line 45 "query_l.l" +#line 44 "query_l.l" { return T_LET; } YY_BREAK case 4: YY_RULE_SETUP -#line 46 "query_l.l" +#line 45 "query_l.l" { return T_ASSERT; } YY_BREAK case 5: YY_RULE_SETUP -#line 47 "query_l.l" +#line 46 "query_l.l" { return T_RULE; } YY_BREAK case 6: YY_RULE_SETUP -#line 48 "query_l.l" +#line 47 "query_l.l" { return T_LIST; } YY_BREAK case 7: YY_RULE_SETUP -#line 49 "query_l.l" +#line 48 "query_l.l" { return T_INVALID; } YY_BREAK case 8: YY_RULE_SETUP -#line 50 "query_l.l" +#line 49 "query_l.l" { return T_FLD_P; } YY_BREAK case 9: YY_RULE_SETUP -#line 51 "query_l.l" +#line 50 "query_l.l" { return T_FLD_A; } YY_BREAK case 10: YY_RULE_SETUP -#line 53 "query_l.l" +#line 52 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_POINT); return T_CONST; } YY_BREAK case 11: YY_RULE_SETUP -#line 54 "query_l.l" +#line 53 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_LINE); return T_CONST; } YY_BREAK case 12: YY_RULE_SETUP -#line 55 "query_l.l" +#line 54 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_TEXT); return T_CONST; } YY_BREAK case 13: YY_RULE_SETUP -#line 56 "query_l.l" +#line 55 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_POLYGON); return T_CONST; } YY_BREAK case 14: YY_RULE_SETUP -#line 57 "query_l.l" +#line 56 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_ARC); return T_CONST; } YY_BREAK case 15: YY_RULE_SETUP -#line 58 "query_l.l" +#line 57 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_RAT); return T_CONST; } YY_BREAK case 16: YY_RULE_SETUP -#line 59 "query_l.l" +#line 58 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_PAD); return T_CONST; } YY_BREAK case 17: YY_RULE_SETUP -#line 60 "query_l.l" +#line 59 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_PIN); return T_CONST; } YY_BREAK case 18: YY_RULE_SETUP -#line 61 "query_l.l" +#line 60 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_VIA); return T_CONST; } YY_BREAK case 19: YY_RULE_SETUP -#line 62 "query_l.l" +#line 61 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_ELEMENT); return T_CONST; } YY_BREAK case 20: YY_RULE_SETUP -#line 63 "query_l.l" +#line 62 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_NET); return T_CONST; } YY_BREAK case 21: YY_RULE_SETUP -#line 64 "query_l.l" +#line 63 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_LAYER); return T_CONST; } YY_BREAK case 22: YY_RULE_SETUP -#line 65 "query_l.l" +#line 64 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_ELINE); return T_CONST; } YY_BREAK case 23: YY_RULE_SETUP -#line 66 "query_l.l" +#line 65 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_EARC); return T_CONST; } YY_BREAK case 24: YY_RULE_SETUP -#line 67 "query_l.l" +#line 66 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_OBJ_ETEXT); return T_CONST; } YY_BREAK case 25: YY_RULE_SETUP -#line 69 "query_l.l" +#line 68 "query_l.l" { qry_lval.n = make_constant(qry_text, 1); return T_CONST; } YY_BREAK case 26: YY_RULE_SETUP -#line 70 "query_l.l" +#line 69 "query_l.l" { qry_lval.n = make_constant(qry_text, 1); return T_CONST; } YY_BREAK case 27: YY_RULE_SETUP -#line 71 "query_l.l" +#line 70 "query_l.l" { qry_lval.n = make_constant(qry_text, 1); return T_CONST; } YY_BREAK case 28: YY_RULE_SETUP -#line 72 "query_l.l" +#line 71 "query_l.l" { qry_lval.n = make_constant(qry_text, 1); return T_CONST; } YY_BREAK case 29: YY_RULE_SETUP -#line 74 "query_l.l" +#line 73 "query_l.l" { qry_lval.n = make_constant(qry_text, 0); return T_CONST; } YY_BREAK case 30: YY_RULE_SETUP -#line 75 "query_l.l" +#line 74 "query_l.l" { qry_lval.n = make_constant(qry_text, 0); return T_CONST; } YY_BREAK case 31: YY_RULE_SETUP -#line 76 "query_l.l" +#line 75 "query_l.l" { qry_lval.n = make_constant(qry_text, 0); return T_CONST; } YY_BREAK case 32: YY_RULE_SETUP -#line 77 "query_l.l" +#line 76 "query_l.l" { qry_lval.n = make_constant(qry_text, 0); return T_CONST; } YY_BREAK case 33: YY_RULE_SETUP -#line 79 "query_l.l" +#line 78 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_LYT_TOP); return T_CONST; } YY_BREAK case 34: YY_RULE_SETUP -#line 80 "query_l.l" +#line 79 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_LYT_BOTTOM); return T_CONST; } YY_BREAK case 35: YY_RULE_SETUP -#line 81 "query_l.l" +#line 80 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_LYT_INTERN); return T_CONST; } YY_BREAK case 36: YY_RULE_SETUP -#line 82 "query_l.l" +#line 81 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_LYT_INTERN); return T_CONST; } YY_BREAK case 37: YY_RULE_SETUP -#line 83 "query_l.l" +#line 82 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_LYT_COPPER); return T_CONST; } YY_BREAK case 38: YY_RULE_SETUP -#line 84 "query_l.l" +#line 83 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_LYT_SILK); return T_CONST; } YY_BREAK case 39: YY_RULE_SETUP -#line 85 "query_l.l" +#line 84 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_LYT_MASK); return T_CONST; } YY_BREAK case 40: YY_RULE_SETUP -#line 86 "query_l.l" +#line 85 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_LYT_PASTE); return T_CONST; } YY_BREAK case 41: YY_RULE_SETUP -#line 87 "query_l.l" +#line 86 "query_l.l" { qry_lval.n = make_constant(qry_text, PCB_LYT_OUTLINE); return T_CONST; } YY_BREAK case 42: YY_RULE_SETUP -#line 91 "query_l.l" +#line 90 "query_l.l" { qry_lval.u = get_unit_struct_by_allow(ALLOW_MM); return T_UNIT; } YY_BREAK case 43: YY_RULE_SETUP -#line 92 "query_l.l" +#line 91 "query_l.l" { qry_lval.u = get_unit_struct_by_allow(ALLOW_M); return T_UNIT; } YY_BREAK case 44: YY_RULE_SETUP -#line 93 "query_l.l" +#line 92 "query_l.l" { qry_lval.u = get_unit_struct_by_allow(ALLOW_UM); return T_UNIT; } YY_BREAK case 45: YY_RULE_SETUP -#line 94 "query_l.l" +#line 93 "query_l.l" { qry_lval.u = get_unit_struct_by_allow(ALLOW_CM); return T_UNIT; } YY_BREAK case 46: YY_RULE_SETUP -#line 95 "query_l.l" +#line 94 "query_l.l" { qry_lval.u = get_unit_struct_by_allow(ALLOW_NM); return T_UNIT; } YY_BREAK case 47: YY_RULE_SETUP -#line 96 "query_l.l" +#line 95 "query_l.l" { qry_lval.u = get_unit_struct_by_allow(ALLOW_MIL); return T_UNIT; } YY_BREAK case 48: YY_RULE_SETUP -#line 97 "query_l.l" +#line 96 "query_l.l" { qry_lval.u = get_unit_struct_by_allow(ALLOW_IN); return T_UNIT; } YY_BREAK case 49: YY_RULE_SETUP -#line 99 "query_l.l" +#line 98 "query_l.l" { return T_OR; } YY_BREAK case 50: YY_RULE_SETUP -#line 100 "query_l.l" +#line 99 "query_l.l" { return T_AND; } YY_BREAK case 51: YY_RULE_SETUP -#line 101 "query_l.l" +#line 100 "query_l.l" { return T_EQ; } YY_BREAK case 52: YY_RULE_SETUP -#line 102 "query_l.l" +#line 101 "query_l.l" { return T_NEQ; } YY_BREAK case 53: YY_RULE_SETUP -#line 103 "query_l.l" +#line 102 "query_l.l" { return T_GTEQ; } YY_BREAK case 54: YY_RULE_SETUP -#line 104 "query_l.l" +#line 103 "query_l.l" { return T_LTEQ; } YY_BREAK case 55: YY_RULE_SETUP -#line 106 "query_l.l" +#line 105 "query_l.l" { qry_lval.c = strtol(qry_text, NULL, 10); return T_INT; } YY_BREAK case 56: YY_RULE_SETUP -#line 107 "query_l.l" +#line 106 "query_l.l" { qry_lval.d = strtod(qry_text, NULL); return T_DBL; } YY_BREAK case 57: YY_RULE_SETUP -#line 108 "query_l.l" +#line 107 "query_l.l" { qry_lval.d = strtod(qry_text, NULL); return T_DBL; } YY_BREAK case 58: YY_RULE_SETUP -#line 109 "query_l.l" +#line 108 "query_l.l" { qry_lval.s = pcb_strdup(qry_text); return T_STR; } YY_BREAK case 59: YY_RULE_SETUP -#line 111 "query_l.l" +#line 110 "query_l.l" { return *qry_text; } YY_BREAK case 60: /* rule 60 can match eol */ YY_RULE_SETUP -#line 113 "query_l.l" +#line 112 "query_l.l" { return T_NL; } YY_BREAK case 61: YY_RULE_SETUP -#line 114 "query_l.l" +#line 113 "query_l.l" { continue; } YY_BREAK case 62: YY_RULE_SETUP -#line 116 "query_l.l" +#line 115 "query_l.l" ECHO; YY_BREAK -#line 1220 "query_l.c" +#line 1219 "query_l.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2217,7 +2216,7 @@ #define YYTABLES_NAME "yytables" -#line 116 "query_l.l" +#line 115 "query_l.l" Index: trunk/src_plugins/query/query_l.h =================================================================== --- trunk/src_plugins/query/query_l.h (revision 4523) +++ trunk/src_plugins/query/query_l.h (revision 4524) @@ -315,7 +315,7 @@ #undef YY_DECL #endif -#line 116 "query_l.l" +#line 115 "query_l.l" #line 322 "query_l.h" Index: trunk/src_plugins/query/query_l.l =================================================================== --- trunk/src_plugins/query/query_l.l (revision 4523) +++ trunk/src_plugins/query/query_l.l (revision 4524) @@ -23,7 +23,6 @@ /* Query language - compiler: lexical analyzer */ -#include "global.h" #include "unit.h" #include "query.h" #include "query_y.h" Index: trunk/src_plugins/query/query_y.c =================================================================== --- trunk/src_plugins/query/query_y.c (revision 4523) +++ trunk/src_plugins/query/query_y.c (revision 4524) @@ -98,7 +98,6 @@ #include #include "const.h" -#include "config.h" #include "unit.h" #include "query.h" #include "query_l.h" @@ -161,7 +160,7 @@ -#line 165 "query_y.c" /* yacc.c:339 */ +#line 164 "query_y.c" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -224,7 +223,7 @@ union YYSTYPE { -#line 96 "query_y.y" /* yacc.c:355 */ +#line 95 "query_y.y" /* yacc.c:355 */ char *s; Coord c; @@ -232,7 +231,7 @@ const Unit *u; pcb_qry_node_t *n; -#line 236 "query_y.c" /* yacc.c:355 */ +#line 235 "query_y.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -249,7 +248,7 @@ /* Copy the second part of user declarations. */ -#line 253 "query_y.c" /* yacc.c:358 */ +#line 252 "query_y.c" /* yacc.c:358 */ #ifdef short # undef short @@ -548,12 +547,12 @@ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 134, 134, 135, 140, 140, 153, 154, 158, 170, - 171, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, - 194, 195, 196, 197, 209, 210, 211, 212, 216, 220, - 221, 225, 226, 227, 228, 232, 233, 234, 238, 239, - 240, 244, 245, 249, 263, 264, 268, 269 + 0, 133, 133, 134, 139, 139, 152, 153, 157, 169, + 170, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 193, 194, 195, 196, 208, 209, 210, 211, 215, 219, + 220, 224, 225, 226, 227, 231, 232, 233, 237, 238, + 239, 243, 244, 248, 262, 263, 267, 268 }; #endif @@ -1415,25 +1414,25 @@ switch (yyn) { case 2: -#line 134 "query_y.y" /* yacc.c:1646 */ +#line 133 "query_y.y" /* yacc.c:1646 */ { *prg_out = (yyvsp[0].n); } -#line 1421 "query_y.c" /* yacc.c:1646 */ +#line 1420 "query_y.c" /* yacc.c:1646 */ break; case 3: -#line 135 "query_y.y" /* yacc.c:1646 */ +#line 134 "query_y.y" /* yacc.c:1646 */ { *prg_out = (yyvsp[0].n); } -#line 1427 "query_y.c" /* yacc.c:1646 */ +#line 1426 "query_y.c" /* yacc.c:1646 */ break; case 4: -#line 140 "query_y.y" /* yacc.c:1646 */ +#line 139 "query_y.y" /* yacc.c:1646 */ { iter_ctx = pcb_qry_iter_alloc(); } -#line 1433 "query_y.c" /* yacc.c:1646 */ +#line 1432 "query_y.c" /* yacc.c:1646 */ break; case 5: -#line 141 "query_y.y" /* yacc.c:1646 */ +#line 140 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_EXPR_PROG); (yyval.n)->data.children = pcb_qry_n_alloc(PCBQ_ITER_CTX); @@ -1442,23 +1441,23 @@ (yyval.n)->data.children->next = (yyvsp[0].n); (yyvsp[0].n)->parent = (yyval.n); } -#line 1446 "query_y.c" /* yacc.c:1646 */ +#line 1445 "query_y.c" /* yacc.c:1646 */ break; case 6: -#line 153 "query_y.y" /* yacc.c:1646 */ +#line 152 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = NULL; } -#line 1452 "query_y.c" /* yacc.c:1646 */ +#line 1451 "query_y.c" /* yacc.c:1646 */ break; case 7: -#line 154 "query_y.y" /* yacc.c:1646 */ +#line 153 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = (yyvsp[-1].n); (yyvsp[-1].n)->next = (yyvsp[0].n); } -#line 1458 "query_y.c" /* yacc.c:1646 */ +#line 1457 "query_y.c" /* yacc.c:1646 */ break; case 8: -#line 158 "query_y.y" /* yacc.c:1646 */ +#line 157 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_RULE); (yyval.n)->data.children = (yyvsp[-2].n); @@ -1468,155 +1467,155 @@ (yyval.n)->data.children->next->next = (yyvsp[0].n); (yyvsp[0].n)->parent = (yyval.n); } -#line 1472 "query_y.c" /* yacc.c:1646 */ +#line 1471 "query_y.c" /* yacc.c:1646 */ break; case 9: -#line 170 "query_y.y" /* yacc.c:1646 */ +#line 169 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = NULL; } -#line 1478 "query_y.c" /* yacc.c:1646 */ +#line 1477 "query_y.c" /* yacc.c:1646 */ break; case 10: -#line 171 "query_y.y" /* yacc.c:1646 */ +#line 170 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = (yyvsp[-2].n); (yyvsp[-2].n)->next = (yyvsp[-1].n); } -#line 1484 "query_y.c" /* yacc.c:1646 */ +#line 1483 "query_y.c" /* yacc.c:1646 */ break; case 11: -#line 175 "query_y.y" /* yacc.c:1646 */ +#line 174 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = (yyvsp[0].n); } -#line 1490 "query_y.c" /* yacc.c:1646 */ +#line 1489 "query_y.c" /* yacc.c:1646 */ break; case 12: -#line 176 "query_y.y" /* yacc.c:1646 */ +#line 175 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = (yyvsp[0].n); } -#line 1496 "query_y.c" /* yacc.c:1646 */ +#line 1495 "query_y.c" /* yacc.c:1646 */ break; case 13: -#line 177 "query_y.y" /* yacc.c:1646 */ +#line 176 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = (yyvsp[0].n); } -#line 1502 "query_y.c" /* yacc.c:1646 */ +#line 1501 "query_y.c" /* yacc.c:1646 */ break; case 14: -#line 178 "query_y.y" /* yacc.c:1646 */ +#line 177 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_DATA_INVALID); } -#line 1508 "query_y.c" /* yacc.c:1646 */ +#line 1507 "query_y.c" /* yacc.c:1646 */ break; case 15: -#line 179 "query_y.y" /* yacc.c:1646 */ +#line 178 "query_y.y" /* yacc.c:1646 */ { UNOP((yyval.n), PCBQ_OP_NOT, (yyvsp[0].n)); } -#line 1514 "query_y.c" /* yacc.c:1646 */ +#line 1513 "query_y.c" /* yacc.c:1646 */ break; case 16: -#line 180 "query_y.y" /* yacc.c:1646 */ +#line 179 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = (yyvsp[-1].n); } -#line 1520 "query_y.c" /* yacc.c:1646 */ +#line 1519 "query_y.c" /* yacc.c:1646 */ break; case 17: -#line 181 "query_y.y" /* yacc.c:1646 */ +#line 180 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_AND, (yyvsp[0].n)); } -#line 1526 "query_y.c" /* yacc.c:1646 */ +#line 1525 "query_y.c" /* yacc.c:1646 */ break; case 18: -#line 182 "query_y.y" /* yacc.c:1646 */ +#line 181 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_OR, (yyvsp[0].n)); } -#line 1532 "query_y.c" /* yacc.c:1646 */ +#line 1531 "query_y.c" /* yacc.c:1646 */ break; case 19: -#line 183 "query_y.y" /* yacc.c:1646 */ +#line 182 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_EQ, (yyvsp[0].n)); } -#line 1538 "query_y.c" /* yacc.c:1646 */ +#line 1537 "query_y.c" /* yacc.c:1646 */ break; case 20: -#line 184 "query_y.y" /* yacc.c:1646 */ +#line 183 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_NEQ, (yyvsp[0].n)); } -#line 1544 "query_y.c" /* yacc.c:1646 */ +#line 1543 "query_y.c" /* yacc.c:1646 */ break; case 21: -#line 185 "query_y.y" /* yacc.c:1646 */ +#line 184 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_GTEQ, (yyvsp[0].n)); } -#line 1550 "query_y.c" /* yacc.c:1646 */ +#line 1549 "query_y.c" /* yacc.c:1646 */ break; case 22: -#line 186 "query_y.y" /* yacc.c:1646 */ +#line 185 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_LTEQ, (yyvsp[0].n)); } -#line 1556 "query_y.c" /* yacc.c:1646 */ +#line 1555 "query_y.c" /* yacc.c:1646 */ break; case 23: -#line 187 "query_y.y" /* yacc.c:1646 */ +#line 186 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_GT, (yyvsp[0].n)); } -#line 1562 "query_y.c" /* yacc.c:1646 */ +#line 1561 "query_y.c" /* yacc.c:1646 */ break; case 24: -#line 188 "query_y.y" /* yacc.c:1646 */ +#line 187 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_LT, (yyvsp[0].n)); } -#line 1568 "query_y.c" /* yacc.c:1646 */ +#line 1567 "query_y.c" /* yacc.c:1646 */ break; case 25: -#line 189 "query_y.y" /* yacc.c:1646 */ +#line 188 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_ADD, (yyvsp[0].n)); } -#line 1574 "query_y.c" /* yacc.c:1646 */ +#line 1573 "query_y.c" /* yacc.c:1646 */ break; case 26: -#line 190 "query_y.y" /* yacc.c:1646 */ +#line 189 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_SUB, (yyvsp[0].n)); } -#line 1580 "query_y.c" /* yacc.c:1646 */ +#line 1579 "query_y.c" /* yacc.c:1646 */ break; case 27: -#line 191 "query_y.y" /* yacc.c:1646 */ +#line 190 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_MUL, (yyvsp[0].n)); } -#line 1586 "query_y.c" /* yacc.c:1646 */ +#line 1585 "query_y.c" /* yacc.c:1646 */ break; case 28: -#line 192 "query_y.y" /* yacc.c:1646 */ +#line 191 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_DIV, (yyvsp[0].n)); } -#line 1592 "query_y.c" /* yacc.c:1646 */ +#line 1591 "query_y.c" /* yacc.c:1646 */ break; case 29: -#line 193 "query_y.y" /* yacc.c:1646 */ +#line 192 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_MATCH, make_regex_free((yyvsp[0].s))); } -#line 1598 "query_y.c" /* yacc.c:1646 */ +#line 1597 "query_y.c" /* yacc.c:1646 */ break; case 30: -#line 194 "query_y.y" /* yacc.c:1646 */ +#line 193 "query_y.y" /* yacc.c:1646 */ { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_MATCH, make_regex_free((yyvsp[0].s))); } -#line 1604 "query_y.c" /* yacc.c:1646 */ +#line 1603 "query_y.c" /* yacc.c:1646 */ break; case 31: -#line 195 "query_y.y" /* yacc.c:1646 */ +#line 194 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = (yyvsp[0].n); } -#line 1610 "query_y.c" /* yacc.c:1646 */ +#line 1609 "query_y.c" /* yacc.c:1646 */ break; case 32: -#line 196 "query_y.y" /* yacc.c:1646 */ +#line 195 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = (yyvsp[0].n); } -#line 1616 "query_y.c" /* yacc.c:1646 */ +#line 1615 "query_y.c" /* yacc.c:1646 */ break; case 33: -#line 197 "query_y.y" /* yacc.c:1646 */ +#line 196 "query_y.y" /* yacc.c:1646 */ { pcb_qry_node_t *n; (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD_OF); @@ -1626,125 +1625,125 @@ for(n = (yyvsp[0].n); n != NULL; n = n->next) n->parent = (yyval.n); } -#line 1630 "query_y.c" /* yacc.c:1646 */ +#line 1629 "query_y.c" /* yacc.c:1646 */ break; case 34: -#line 209 "query_y.y" /* yacc.c:1646 */ +#line 208 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_DATA_COORD); UNIT_CONV((yyval.n)->data.crd, 0, (yyvsp[-1].c), (yyvsp[0].u)); } -#line 1636 "query_y.c" /* yacc.c:1646 */ +#line 1635 "query_y.c" /* yacc.c:1646 */ break; case 35: -#line 210 "query_y.y" /* yacc.c:1646 */ +#line 209 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_DATA_DOUBLE); UNIT_CONV((yyval.n)->data.dbl, 0, (yyvsp[-1].d), (yyvsp[0].u)); } -#line 1642 "query_y.c" /* yacc.c:1646 */ +#line 1641 "query_y.c" /* yacc.c:1646 */ break; case 36: -#line 211 "query_y.y" /* yacc.c:1646 */ +#line 210 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_DATA_COORD); UNIT_CONV((yyval.n)->data.crd, 1, (yyvsp[-1].c), (yyvsp[0].u)); } -#line 1648 "query_y.c" /* yacc.c:1646 */ +#line 1647 "query_y.c" /* yacc.c:1646 */ break; case 37: -#line 212 "query_y.y" /* yacc.c:1646 */ +#line 211 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_DATA_DOUBLE); UNIT_CONV((yyval.n)->data.dbl, 1, (yyvsp[-1].d), (yyvsp[0].u)); } -#line 1654 "query_y.c" /* yacc.c:1646 */ +#line 1653 "query_y.c" /* yacc.c:1646 */ break; case 38: -#line 216 "query_y.y" /* yacc.c:1646 */ +#line 215 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_DATA_STRING); (yyval.n)->data.str = (yyvsp[0].s); } -#line 1660 "query_y.c" /* yacc.c:1646 */ +#line 1659 "query_y.c" /* yacc.c:1646 */ break; case 39: -#line 220 "query_y.y" /* yacc.c:1646 */ +#line 219 "query_y.y" /* yacc.c:1646 */ { (yyval.u) = NULL; } -#line 1666 "query_y.c" /* yacc.c:1646 */ +#line 1665 "query_y.c" /* yacc.c:1646 */ break; case 40: -#line 221 "query_y.y" /* yacc.c:1646 */ +#line 220 "query_y.y" /* yacc.c:1646 */ { (yyval.u) = (yyvsp[0].u); } -#line 1672 "query_y.c" /* yacc.c:1646 */ +#line 1671 "query_y.c" /* yacc.c:1646 */ break; case 41: -#line 225 "query_y.y" /* yacc.c:1646 */ +#line 224 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = (yyvsp[0].s); (yyval.n)->precomp.fld = query_fields_sphash((yyvsp[0].s)); } -#line 1678 "query_y.c" /* yacc.c:1646 */ +#line 1677 "query_y.c" /* yacc.c:1646 */ break; case 42: -#line 226 "query_y.y" /* yacc.c:1646 */ +#line 225 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = (yyvsp[-2].s); (yyval.n)->precomp.fld = query_fields_sphash((yyvsp[-2].s)); (yyval.n)->next = (yyvsp[0].n); } -#line 1684 "query_y.c" /* yacc.c:1646 */ +#line 1683 "query_y.c" /* yacc.c:1646 */ break; case 43: -#line 227 "query_y.y" /* yacc.c:1646 */ +#line 226 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = (yyvsp[0].n); /* just ignore .p. */ } -#line 1690 "query_y.c" /* yacc.c:1646 */ +#line 1689 "query_y.c" /* yacc.c:1646 */ break; case 44: -#line 228 "query_y.y" /* yacc.c:1646 */ +#line 227 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = pcb_strdup("a"); (yyval.n)->precomp.fld = query_fields_sphash("a"); (yyval.n)->next = (yyvsp[0].n); } -#line 1696 "query_y.c" /* yacc.c:1646 */ +#line 1695 "query_y.c" /* yacc.c:1646 */ break; case 45: -#line 232 "query_y.y" /* yacc.c:1646 */ +#line 231 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = (yyvsp[0].s); } -#line 1702 "query_y.c" /* yacc.c:1646 */ +#line 1701 "query_y.c" /* yacc.c:1646 */ break; case 46: -#line 233 "query_y.y" /* yacc.c:1646 */ +#line 232 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = attrib_prepend_free((yyvsp[0].n)->data.str, (yyvsp[-2].s), '.'); } -#line 1708 "query_y.c" /* yacc.c:1646 */ +#line 1707 "query_y.c" /* yacc.c:1646 */ break; case 47: -#line 234 "query_y.y" /* yacc.c:1646 */ +#line 233 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = (yyvsp[0].s); } -#line 1714 "query_y.c" /* yacc.c:1646 */ +#line 1713 "query_y.c" /* yacc.c:1646 */ break; case 48: -#line 238 "query_y.y" /* yacc.c:1646 */ +#line 237 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_VAR); (yyval.n)->data.crd = pcb_qry_iter_var(iter_ctx, (yyvsp[0].s), 1); free((yyvsp[0].s)); } -#line 1720 "query_y.c" /* yacc.c:1646 */ +#line 1719 "query_y.c" /* yacc.c:1646 */ break; case 49: -#line 239 "query_y.y" /* yacc.c:1646 */ +#line 238 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_LISTVAR); (yyval.n)->data.str = pcb_strdup("@"); } -#line 1726 "query_y.c" /* yacc.c:1646 */ +#line 1725 "query_y.c" /* yacc.c:1646 */ break; case 50: -#line 240 "query_y.y" /* yacc.c:1646 */ +#line 239 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_VAR); (yyval.n)->data.crd = pcb_qry_iter_var(iter_ctx, "@", 1); } -#line 1732 "query_y.c" /* yacc.c:1646 */ +#line 1731 "query_y.c" /* yacc.c:1646 */ break; case 51: -#line 244 "query_y.y" /* yacc.c:1646 */ +#line 243 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_FCALL); (yyval.n)->data.children = (yyvsp[-3].n); (yyval.n)->data.children->next = (yyvsp[-1].n); (yyvsp[-3].n)->parent = (yyvsp[-1].n)->parent = (yyval.n); } -#line 1738 "query_y.c" /* yacc.c:1646 */ +#line 1737 "query_y.c" /* yacc.c:1646 */ break; case 52: -#line 245 "query_y.y" /* yacc.c:1646 */ +#line 244 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_FCALL); (yyval.n)->data.children = (yyvsp[-2].n); (yyvsp[-2].n)->parent = (yyval.n); } -#line 1744 "query_y.c" /* yacc.c:1646 */ +#line 1743 "query_y.c" /* yacc.c:1646 */ break; case 53: -#line 249 "query_y.y" /* yacc.c:1646 */ +#line 248 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_FNAME); (yyval.n)->data.fnc = pcb_qry_fnc_lookup((yyvsp[0].s)); @@ -1755,29 +1754,29 @@ } free((yyvsp[0].s)); } -#line 1759 "query_y.c" /* yacc.c:1646 */ +#line 1758 "query_y.c" /* yacc.c:1646 */ break; case 54: -#line 263 "query_y.y" /* yacc.c:1646 */ +#line 262 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = (yyvsp[0].n); } -#line 1765 "query_y.c" /* yacc.c:1646 */ +#line 1764 "query_y.c" /* yacc.c:1646 */ break; case 55: -#line 264 "query_y.y" /* yacc.c:1646 */ +#line 263 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = (yyvsp[-2].n); (yyval.n)->next = (yyvsp[0].n); } -#line 1771 "query_y.c" /* yacc.c:1646 */ +#line 1770 "query_y.c" /* yacc.c:1646 */ break; case 56: -#line 268 "query_y.y" /* yacc.c:1646 */ +#line 267 "query_y.y" /* yacc.c:1646 */ { (yyval.n) = pcb_qry_n_alloc(PCBQ_RNAME); (yyval.n)->data.str = (const char *)pcb_strdup(""); } -#line 1777 "query_y.c" /* yacc.c:1646 */ +#line 1776 "query_y.c" /* yacc.c:1646 */ break; case 57: -#line 269 "query_y.y" /* yacc.c:1646 */ +#line 268 "query_y.y" /* yacc.c:1646 */ { int l1 = strlen((yyvsp[0].n)->data.str), l2 = strlen((yyvsp[-1].s)); @@ -1785,11 +1784,11 @@ memcpy((char *)(yyvsp[0].n)->data.str+l1, (yyvsp[-1].s), l2+1); free((yyvsp[-1].s)); } -#line 1789 "query_y.c" /* yacc.c:1646 */ +#line 1788 "query_y.c" /* yacc.c:1646 */ break; -#line 1793 "query_y.c" /* yacc.c:1646 */ +#line 1792 "query_y.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires Index: trunk/src_plugins/query/query_y.h =================================================================== --- trunk/src_plugins/query/query_y.h (revision 4523) +++ trunk/src_plugins/query/query_y.h (revision 4524) @@ -73,7 +73,7 @@ union YYSTYPE { -#line 96 "query_y.y" /* yacc.c:1909 */ +#line 95 "query_y.y" /* yacc.c:1909 */ char *s; Coord c; Index: trunk/src_plugins/query/query_y.y =================================================================== --- trunk/src_plugins/query/query_y.y (revision 4523) +++ trunk/src_plugins/query/query_y.y (revision 4524) @@ -25,7 +25,6 @@ #include #include "const.h" -#include "global.h" #include "unit.h" #include "query.h" #include "query_l.h" Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4523) +++ trunk/src_plugins/report/report.c (revision 4524) @@ -33,6 +33,7 @@ #include #include "report.h" +#include "math_helper.h" #include "crosshair.h" #include "board.h" #include "data.h" Index: trunk/src_plugins/stroke/stroke.c =================================================================== --- trunk/src_plugins/stroke/stroke.c (revision 4523) +++ trunk/src_plugins/stroke/stroke.c (revision 4524) @@ -27,6 +27,7 @@ #include "config.h" #include +#include "math_helper.h" #include "board.h" #include "config.h" #include "conf.h" Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 4523) +++ trunk/src_plugins/teardrops/teardrops.c (revision 4524) @@ -17,6 +17,7 @@ #include #include "config.h" +#include "math_helper.h" #include "board.h" #include "config.h" #include "data.h"