Index: trunk/src/draw_composite.c =================================================================== --- trunk/src/draw_composite.c (revision 8972) +++ trunk/src/draw_composite.c (revision 8973) @@ -30,7 +30,7 @@ typedef struct comp_ctx_s { pcb_board_t *pcb; const pcb_box_t *screen; - pcb_layer_group_t *grp; + pcb_layergrp_t *grp; const char *color; unsigned thin:1; @@ -162,7 +162,7 @@ int pcb_draw_layer_is_comp(pcb_layer_id_t id) { - pcb_layer_group_t *g = pcb_get_layergrp(PCB, PCB->Data->Layer[id].grp); + pcb_layergrp_t *g = pcb_get_layergrp(PCB, PCB->Data->Layer[id].grp); if (g == NULL) return 0; /* silk has special rules because the original format/model had 1 (auto+) Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 8972) +++ trunk/src/gui_act.c (revision 8973) @@ -1493,7 +1493,7 @@ static int pcb_act_EditGroup(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { int ret = 0, n, interactive = 1, explicit = 0; - pcb_layer_group_t *g = NULL; + pcb_layergrp_t *g = NULL; if (CURRENT != NULL) g = pcb_get_layergrp(PCB, CURRENT->grp); Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 8972) +++ trunk/src/layer.c (revision 8973) @@ -441,7 +441,7 @@ pcb_undo_inc_serial(); if (old_index == -1) { /* append new layer at the end of the logical layer list, put it in the current group */ - pcb_layer_group_t *g; + pcb_layergrp_t *g; pcb_layer_t *lp; pcb_layer_id_t new_lid = PCB->Data->LayerN++; int grp_idx; @@ -476,7 +476,7 @@ } else if (new_index == -1) { /* Delete the layer at old_index */ pcb_layergrp_id_t gid; - pcb_layer_group_t *g; + pcb_layergrp_t *g; int grp_idx, remaining; #warning layer TODO remove objects, free fields layer_free(&PCB->Data->Layer[old_index]); @@ -561,7 +561,7 @@ PCB_ENDALL_LOOP; for(gid = 0; gid < pcb_max_group(PCB); gid++) { - pcb_layer_group_t *g = &PCB->LayerGroups.grp[gid]; + pcb_layergrp_t *g = &PCB->LayerGroups.grp[gid]; int n; for(n = 0; n < g->len; n++) { @@ -691,7 +691,7 @@ static pcb_layer_id_t pcb_layer_get_cached(pcb_layer_id_t *cache, unsigned int loc, unsigned int typ) { - pcb_layer_group_t *g; + pcb_layergrp_t *g; if (*cache < PCB->Data->LayerN) { /* check if the cache is still pointing to the right layer */ pcb_layergrp_id_t gid = PCB->Data->Layer[*cache].grp; Index: trunk/src/layer_grp.c =================================================================== --- trunk/src/layer_grp.c (revision 8972) +++ trunk/src/layer_grp.c (revision 8973) @@ -54,7 +54,7 @@ inhibit_notify--; } -pcb_layergrp_id_t pcb_layergrp_id(pcb_board_t *pcb, pcb_layer_group_t *grp) +pcb_layergrp_id_t pcb_layergrp_id(pcb_board_t *pcb, pcb_layergrp_t *grp) { if ((grp >= &pcb->LayerGroups.grp[0]) && (grp < &pcb->LayerGroups.grp[pcb->LayerGroups.len])) return grp - &pcb->LayerGroups.grp[0]; @@ -66,7 +66,7 @@ return Layer->grp; } -pcb_layer_group_t *pcb_get_layergrp(pcb_board_t *pcb, pcb_layergrp_id_t gid) +pcb_layergrp_t *pcb_get_layergrp(pcb_board_t *pcb, pcb_layergrp_id_t gid) { if ((gid < 0) || (gid >= pcb->LayerGroups.len)) return NULL; @@ -85,7 +85,7 @@ int pcb_layergrp_del_layer(pcb_board_t *pcb, pcb_layergrp_id_t gid, pcb_layer_id_t lid) { int n; - pcb_layer_group_t *grp; + pcb_layergrp_t *grp; pcb_layer_t *layer; if ((lid < 0) || (lid >= pcb->Data->LayerN)) @@ -149,7 +149,7 @@ pcb_bool pcb_layergrp_is_empty(pcb_board_t *pcb, pcb_layergrp_id_t num) { int i; - pcb_layer_group_t *g = &pcb->LayerGroups.grp[num]; + pcb_layergrp_t *g = &pcb->LayerGroups.grp[num]; /* some layers are never empty */ if (g->type & PCB_LYT_MASK) @@ -173,7 +173,7 @@ pcb_layer_stack_t *stack = &pcb->LayerGroups; if ((id >= 0) && (id < stack->len)) { int n; - pcb_layer_group_t *g = stack->grp + id; + pcb_layergrp_t *g = stack->grp + id; if (g->name != NULL) free(g->name); for(n = 0; n < g->len; n++) { @@ -180,7 +180,7 @@ pcb_layer_t *layer = pcb->Data->Layer + g->lid[n]; layer->grp = -1; } - memset(g, 0, sizeof(pcb_layer_group_t)); + memset(g, 0, sizeof(pcb_layergrp_t)); return 0; } return -1; @@ -189,7 +189,7 @@ int pcb_layergrp_move_onto(pcb_board_t *pcb, pcb_layergrp_id_t dst, pcb_layergrp_id_t src) { pcb_layer_stack_t *stack = &pcb->LayerGroups; - pcb_layer_group_t *d, *s; + pcb_layergrp_t *d, *s; int n; if ((src < 0) || (src >= stack->len)) @@ -198,7 +198,7 @@ return -1; d = stack->grp + dst; s = stack->grp + src; - memcpy(d, s, sizeof(pcb_layer_group_t)); + memcpy(d, s, sizeof(pcb_layergrp_t)); /* update layer's group refs to the new grp */ for(n = 0; n < d->len; n++) { @@ -206,7 +206,7 @@ layer->grp = dst; } - memset(s, 0, sizeof(pcb_layer_group_t)); + memset(s, 0, sizeof(pcb_layergrp_t)); NOTIFY(); return 0; } @@ -230,7 +230,7 @@ return 0; } -pcb_layer_group_t *pcb_get_grp(pcb_layer_stack_t *stack, pcb_layer_type_t loc, pcb_layer_type_t typ) +pcb_layergrp_t *pcb_get_grp(pcb_layer_stack_t *stack, pcb_layer_type_t loc, pcb_layer_type_t typ) { int n; for(n = 0; n < stack->len; n++) @@ -239,7 +239,7 @@ return NULL; } -pcb_layer_group_t *pcb_layergrp_insert_after(pcb_board_t *pcb, pcb_layergrp_id_t where) +pcb_layergrp_t *pcb_layergrp_insert_after(pcb_board_t *pcb, pcb_layergrp_id_t where) { pcb_layer_stack_t *stack = &pcb->LayerGroups; int n; @@ -254,7 +254,7 @@ return stack->grp+where+1; } -static pcb_layer_group_t *pcb_get_grp_new_intern_(pcb_board_t *pcb, int omit_substrate) +static pcb_layergrp_t *pcb_get_grp_new_intern_(pcb_board_t *pcb, int omit_substrate) { pcb_layer_stack_t *stack = &pcb->LayerGroups; int bl, n; @@ -286,10 +286,10 @@ return NULL; } -pcb_layer_group_t *pcb_get_grp_new_intern(pcb_board_t *pcb, int intern_id) +pcb_layergrp_t *pcb_get_grp_new_intern(pcb_board_t *pcb, int intern_id) { pcb_layer_stack_t *stack = &pcb->LayerGroups; - pcb_layer_group_t *g; + pcb_layergrp_t *g; if (intern_id > 0) { /* look for existing intern layer first */ int n; @@ -308,9 +308,9 @@ return g; } -pcb_layer_group_t *pcb_get_grp_new_misc(pcb_board_t *pcb) +pcb_layergrp_t *pcb_get_grp_new_misc(pcb_board_t *pcb) { - pcb_layer_group_t *g; + pcb_layergrp_t *g; inhibit_notify++; g = pcb_get_grp_new_intern_(pcb, 1); inhibit_notify--; @@ -337,10 +337,10 @@ remaining = to - from+1; if (remaining > 0) - memmove(&stk->grp[from + delta], &stk->grp[from], sizeof(pcb_layer_group_t) * remaining); + memmove(&stk->grp[from + delta], &stk->grp[from], sizeof(pcb_layergrp_t) * remaining); } -int pcb_layergrp_index_in_grp(pcb_layer_group_t *grp, pcb_layer_id_t lid) +int pcb_layergrp_index_in_grp(pcb_layergrp_t *grp, pcb_layer_id_t lid) { int idx; for(idx = 0; idx < grp->len; idx++) @@ -349,7 +349,7 @@ return -1; } -int pcb_layergrp_step_layer(pcb_layer_group_t *grp, pcb_layer_id_t lid, int delta) +int pcb_layergrp_step_layer(pcb_layergrp_t *grp, pcb_layer_id_t lid, int delta) { int idx, idx2; pcb_layer_id_t tmp; @@ -414,7 +414,7 @@ int pcb_layergrp_move(pcb_board_t *pcb, pcb_layergrp_id_t from, pcb_layergrp_id_t to_before) { pcb_layer_stack_t *stk = &pcb->LayerGroups; - pcb_layer_group_t tmp; + pcb_layergrp_t tmp; int n; if ((from < 0) || (from >= stk->len)) @@ -426,15 +426,15 @@ if ((to_before == from + 1) || (to_before == from)) return 0; - memcpy(&tmp, &stk->grp[from], sizeof(pcb_layer_group_t)); - memset(&stk->grp[from], 0, sizeof(pcb_layer_group_t)); + memcpy(&tmp, &stk->grp[from], sizeof(pcb_layergrp_t)); + memset(&stk->grp[from], 0, sizeof(pcb_layergrp_t)); if (to_before < from + 1) { move_grps(pcb, stk, to_before, from-1, +1); - memcpy(&stk->grp[to_before], &tmp, sizeof(pcb_layer_group_t)); + memcpy(&stk->grp[to_before], &tmp, sizeof(pcb_layergrp_t)); } else { move_grps(pcb, stk, from+1, to_before-1, -1); - memcpy(&stk->grp[to_before-1], &tmp, sizeof(pcb_layer_group_t)); + memcpy(&stk->grp[to_before-1], &tmp, sizeof(pcb_layergrp_t)); } /* fix up the group id for the layers of the group moved */ @@ -455,7 +455,7 @@ void pcb_layergrp_fix_old_outline(pcb_board_t *pcb) { pcb_layer_stack_t *LayerGroup = &pcb->LayerGroups; - pcb_layer_group_t *g = pcb_get_grp(LayerGroup, PCB_LYT_ANYWHERE, PCB_LYT_OUTLINE); + pcb_layergrp_t *g = pcb_get_grp(LayerGroup, PCB_LYT_ANYWHERE, PCB_LYT_OUTLINE); if ((g != NULL) && (g[1].type & PCB_LYT_SUBSTRATE)) { pcb_layergrp_id_t gid = g - LayerGroup->grp + 1; pcb_layergrp_del(pcb, gid, 0); @@ -462,7 +462,7 @@ } } -void pcb_layergrp_fix_turn_to_outline(pcb_layer_group_t *g) +void pcb_layergrp_fix_turn_to_outline(pcb_layergrp_t *g) { g->type |= PCB_LYT_OUTLINE; g->type &= ~PCB_LYT_COPPER; @@ -478,7 +478,7 @@ pcb_layer_id_t lids[PCB_MAX_LAYER]; int lids_len = 0; pcb_layer_type_t loc = PCB_LYT_INTERN; - pcb_layer_group_t *g; + pcb_layergrp_t *g; int n; pcb_layer_stack_t *LayerGroup = &pcb->LayerGroups; @@ -591,7 +591,7 @@ return used; } -int pcb_layer_add_in_group_(pcb_board_t *pcb, pcb_layer_group_t *grp, pcb_layergrp_id_t group_id, pcb_layer_id_t layer_id) +int pcb_layer_add_in_group_(pcb_board_t *pcb, pcb_layergrp_t *grp, pcb_layergrp_id_t group_id, pcb_layer_id_t layer_id) { if ((layer_id < 0) || (layer_id >= pcb->Data->LayerN)) return -1; @@ -625,7 +625,7 @@ void pcb_layer_group_setup_default(pcb_layer_stack_t *newg) { - pcb_layer_group_t *g; + pcb_layergrp_t *g; memset(newg, 0, sizeof(pcb_layer_stack_t)); @@ -654,7 +654,7 @@ -int pcb_layergrp_rename_(pcb_layer_group_t *grp, char *name) +int pcb_layergrp_rename_(pcb_layergrp_t *grp, char *name) { free(grp->name); grp->name = name; @@ -664,7 +664,7 @@ int pcb_layergrp_rename(pcb_board_t *pcb, pcb_layergrp_id_t gid, const char *name) { - pcb_layer_group_t *grp = pcb_get_layergrp(pcb, gid); + pcb_layergrp_t *grp = pcb_get_layergrp(pcb, gid); if (grp == NULL) return -1; return pcb_layergrp_rename_(grp, pcb_strdup(name)); } @@ -681,7 +681,7 @@ static pcb_layergrp_id_t pcb_layergrp_get_cached(pcb_board_t *pcb, pcb_layer_id_t *cache, unsigned int loc, unsigned int typ) { - pcb_layer_group_t *g; + pcb_layergrp_t *g; /* check if the last known value is still accurate */ if ((*cache >= 0) && (*cache < pcb->LayerGroups.len)) { Index: trunk/src/layer_grp.h =================================================================== --- trunk/src/layer_grp.h (revision 8972) +++ trunk/src/layer_grp.h (revision 8973) @@ -28,7 +28,7 @@ #ifndef PCB_LAYER_GRP_H #define PCB_LAYER_GRP_H -typedef struct pcb_layergrp_s pcb_layer_group_t; +typedef struct pcb_layergrp_s pcb_layergrp_t; #include "layer.h" @@ -55,14 +55,14 @@ /* layer stack: an ordered list of layer groups (physical layers). */ struct pcb_layer_stack_s { pcb_cardinal_t len; - pcb_layer_group_t grp[PCB_MAX_LAYERGRP]; + pcb_layergrp_t grp[PCB_MAX_LAYERGRP]; }; /* Return the layer group for an id, or NULL on error (range check) */ -pcb_layer_group_t *pcb_get_layergrp(pcb_board_t *pcb, pcb_layergrp_id_t gid); +pcb_layergrp_t *pcb_get_layergrp(pcb_board_t *pcb, pcb_layergrp_id_t gid); /* Return the gid if grp is in the stackup of pcb (else return -1) */ -pcb_layergrp_id_t pcb_layergrp_id(pcb_board_t *pcb, pcb_layer_group_t *grp); +pcb_layergrp_id_t pcb_layergrp_id(pcb_board_t *pcb, pcb_layergrp_t *grp); /* lookup the group to which a layer belongs to returns -1 if no group is found */ @@ -90,7 +90,7 @@ /* Put a layer in a group (the layer should not be in any other group); returns 0 on success */ int pcb_layer_add_in_group(pcb_board_t *pcb, pcb_layer_id_t layer_id, pcb_layergrp_id_t group_id); -int pcb_layer_add_in_group_(pcb_board_t *pcb, pcb_layer_group_t *grp, pcb_layergrp_id_t group_id, pcb_layer_id_t layer_id); +int pcb_layer_add_in_group_(pcb_board_t *pcb, pcb_layergrp_t *grp, pcb_layergrp_id_t group_id, pcb_layer_id_t layer_id); /* Remove a layer group; if del_layers is zero, layers are kept but detached (.grp = -1), else layers are deleted too */ @@ -105,15 +105,15 @@ /* Insert a new layer group in the layer stack after the specified group */ -pcb_layer_group_t *pcb_layergrp_insert_after(pcb_board_t *pcb, pcb_layergrp_id_t where); +pcb_layergrp_t *pcb_layergrp_insert_after(pcb_board_t *pcb, pcb_layergrp_id_t where); /* Move lid 1 step towards the front (delta=-1) or end (delta=+1) of the layer list of the group. Return 0 on success (even when already reached the end of the list) or -1 on error */ -int pcb_layergrp_step_layer(pcb_layer_group_t *grp, pcb_layer_id_t lid, int delta); +int pcb_layergrp_step_layer(pcb_layergrp_t *grp, pcb_layer_id_t lid, int delta); /* Return the array index of lid within the grp's lid list or -1 if not on the list */ -int pcb_layergrp_index_in_grp(pcb_layer_group_t *grp, pcb_layer_id_t lid); +int pcb_layergrp_index_in_grp(pcb_layergrp_t *grp, pcb_layer_id_t lid); /* Enable/disable inhibition of layer changed events during layer group updates */ @@ -124,7 +124,7 @@ int pcb_layergrp_rename(pcb_board_t *pcb, pcb_layergrp_id_t gid, const char *lname); /* changes the name of a layer; memory has to be already allocated */ -int pcb_layergrp_rename_(pcb_layer_group_t *grp, char *name); +int pcb_layergrp_rename_(pcb_layergrp_t *grp, char *name); /* Slow linear search for a layer group by name */ pcb_layergrp_id_t pcb_layergrp_by_name(pcb_board_t *pcb, const char *name); @@ -153,15 +153,15 @@ /* for parsing old files with old layer descriptions, with no layer groups */ void pcb_layer_group_setup_default(pcb_layer_stack_t *newg); /* default layer groups, no layers */ void pcb_layer_group_setup_silks(pcb_layer_stack_t *newg); /* make sure we have two silk layers, add them if needed */ -pcb_layer_group_t *pcb_get_grp(pcb_layer_stack_t *stack, pcb_layer_type_t loc, pcb_layer_type_t typ); -pcb_layer_group_t *pcb_get_grp_new_intern(pcb_board_t *pcb, int intern_id); -pcb_layer_group_t *pcb_get_grp_new_misc(pcb_board_t *pcb); +pcb_layergrp_t *pcb_get_grp(pcb_layer_stack_t *stack, pcb_layer_type_t loc, pcb_layer_type_t typ); +pcb_layergrp_t *pcb_get_grp_new_intern(pcb_board_t *pcb, int intern_id); +pcb_layergrp_t *pcb_get_grp_new_misc(pcb_board_t *pcb); /* ugly hack: remove the extra substrate we added after the outline layer */ void pcb_layergrp_fix_old_outline(pcb_board_t *pcb); /* ugly hack: turn an old intern layer group into an outline group after realizing it is really an outline (reading the old layers) */ -void pcb_layergrp_fix_turn_to_outline(pcb_layer_group_t *g); +void pcb_layergrp_fix_turn_to_outline(pcb_layergrp_t *g); Index: trunk/src/layer_it.h =================================================================== --- trunk/src/layer_it.h (revision 8972) +++ trunk/src/layer_it.h (revision 8973) @@ -60,7 +60,7 @@ return -1; } else for(;;) { - pcb_layer_group_t *g = &(it->stack->grp[it->gid]); + pcb_layergrp_t *g = &(it->stack->grp[it->gid]); pcb_layer_id_t lid; unsigned int hit; if (it->lidx >= g->len) { /* layer list over in this group */ Index: trunk/src/layer_vis.c =================================================================== --- trunk/src/layer_vis.c (revision 8972) +++ trunk/src/layer_vis.c (revision 8973) @@ -242,7 +242,7 @@ int n; for(gid = 0; gid < pcb_max_group(pcb); gid++) { - pcb_layer_group_t *g = &pcb->LayerGroups.grp[gid]; + pcb_layergrp_t *g = &pcb->LayerGroups.grp[gid]; pcb_bool_op(g->open, open); Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 8972) +++ trunk/src/object_act.c (revision 8973) @@ -1093,7 +1093,7 @@ } else if (strncmp(argv[1], "step", 4) == 0) { pcb_layer_t *l = CURRENT; - pcb_layer_group_t *g = pcb_get_layergrp(PCB, l->grp); + pcb_layergrp_t *g = pcb_get_layergrp(PCB, l->grp); if (g == NULL) { pcb_message(PCB_MSG_ERROR, "Invalid layer group\n"); return 1; @@ -1112,7 +1112,7 @@ if (new_index < 0) { if (pcb_layer_flags(PCB, old_index) & PCB_LYT_SILK) { pcb_layer_t *l = pcb_get_layer(old_index); - pcb_layer_group_t *g = pcb_get_layergrp(PCB, l->grp); + pcb_layergrp_t *g = pcb_get_layergrp(PCB, l->grp); if (g->len == 1) { pcb_message(PCB_MSG_ERROR, "Removing this layer would result in an empty top or bottom silk group, which is not possible at the moment.\n"); return 1; Index: trunk/src_plugins/draw_csect/draw_csect.c =================================================================== --- trunk/src_plugins/draw_csect/draw_csect.c (revision 8972) +++ trunk/src_plugins/draw_csect/draw_csect.c (revision 8973) @@ -351,7 +351,7 @@ static void mark_layer_order(pcb_coord_t x) { - pcb_layer_group_t *g; + pcb_layergrp_t *g; pcb_coord_t tx, ty1, ty2; lactive_idx = -1; @@ -398,7 +398,7 @@ y = ystart; for(gid = 0; gid < pcb_max_group(PCB); gid++) { int i, stepf = 0, stepb = 0, th; - pcb_layer_group_t *g = PCB->LayerGroups.grp + gid; + pcb_layergrp_t *g = PCB->LayerGroups.grp + gid; const char *color = "#ff0000"; if ((!g->valid) || (gid == drag_gid) || (gid == drag_gid_subst)) @@ -529,7 +529,7 @@ mark_layer_order(cx); } else if (drag_gid >= 0) { - pcb_layer_group_t *g = &PCB->LayerGroups.grp[drag_gid]; + pcb_layergrp_t *g = &PCB->LayerGroups.grp[drag_gid]; const char *name = g->name == NULL ? "" : g->name; draw_hover_label(name); mark_grp(cy, PCB_LYT_COPPER | PCB_LYT_INTERN, MARK_GRP_TOP); @@ -544,7 +544,7 @@ /* Returns 0 if gactive can be removed from its current group */ static int check_layer_del(pcb_layer_id_t lid) { - pcb_layer_group_t *grp; + pcb_layergrp_t *grp; unsigned int tflg; tflg = pcb_layer_flags(PCB, lid); @@ -654,7 +654,7 @@ case PCB_HID_MOUSE_RELEASE: if (drag_addgrp) { if (gactive >= 0) { - pcb_layer_group_t *g; + pcb_layergrp_t *g; g = pcb_layergrp_insert_after(PCB, gactive); g->name = NULL; g->type = PCB_LYT_INTERN | PCB_LYT_SUBSTRATE; @@ -702,7 +702,7 @@ else if (drag_lid >= 0) { if (gactive >= 0) { pcb_layer_t *l = &PCB->Data->Layer[drag_lid]; - pcb_layer_group_t *g; + pcb_layergrp_t *g; if (l->grp == gactive) { /* move within the group */ int d, s, at; g = &PCB->LayerGroups.grp[gactive]; @@ -781,7 +781,7 @@ for(gid = 0; gid < pcb_max_group(PCB); gid++) { int i; const char *type_gfx; - pcb_layer_group_t *g = PCB->LayerGroups.grp + gid; + pcb_layergrp_t *g = PCB->LayerGroups.grp + gid; if (!g->valid) { if (g->len <= 0) Index: trunk/src_plugins/io_eagle/read.c =================================================================== --- trunk/src_plugins/io_eagle/read.c (revision 8972) +++ trunk/src_plugins/io_eagle/read.c (revision 8973) @@ -264,7 +264,7 @@ int id, reuse = 0; unsigned long typ; pcb_layergrp_id_t gid; - pcb_layer_group_t *grp; + pcb_layergrp_t *grp; ly->name = eagle_get_attrs(n, "name", NULL); ly->color = eagle_get_attrl(n, "color", -1); Index: trunk/src_plugins/io_hyp/hyp_l.c =================================================================== --- trunk/src_plugins/io_hyp/hyp_l.c (revision 8972) +++ trunk/src_plugins/io_hyp/hyp_l.c (revision 8973) @@ -36,7 +36,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_SUBMINOR_VERSION 35 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -223,13 +223,8 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - /* %if-not-reentrant */ -extern yy_size_t hyyleng; +extern int hyyleng; /* %endif */ /* %if-c-only */ @@ -256,13 +251,6 @@ if ( hyytext[yyl] == '\n' )\ --hyylineno;\ }while(0) - #define YY_LINENO_REWIND_TO(dst) \ - do {\ - const char *p;\ - for ( p = yy_cp-1; p >= (dst); --p)\ - if ( *p == '\n' )\ - --hyylineno;\ - }while(0) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -280,6 +268,11 @@ #define unput(c) yyunput( c, (yytext_ptr) ) +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -302,7 +295,7 @@ /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -386,8 +379,8 @@ /* yy_hold_char holds the character lost when hyytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t hyyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int hyyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; @@ -418,7 +411,7 @@ YY_BUFFER_STATE hyy_scan_buffer (char *base,yy_size_t size ); YY_BUFFER_STATE hyy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE hyy_scan_bytes (yyconst char *bytes,yy_size_t len ); +YY_BUFFER_STATE hyy_scan_bytes (yyconst char *bytes,int len ); /* %endif */ @@ -453,7 +446,7 @@ /* %% [1.0] hyytext/hyyin/hyyout/yy_state_type/hyylineno etc. def's & init go here */ /* Begin user sect3 */ -#define hyywrap() 1 +#define hyywrap(n) 1 #define YY_SKIP_YYWRAP #define FLEX_DEBUG @@ -471,8 +464,6 @@ extern char *hyytext; #define yytext_ptr hyytext -/* %% [1.5] DFA */ - /* %if-c-only Standard (non-C++) definition */ static yy_state_type yy_get_previous_state (void ); @@ -2076,7 +2067,7 @@ /* all variables used in assignments */ /* an unquoted string with spaces is terminated by the next assignment or the end of line */ /* an empty string is terminated by the next assignment, a ')' or a '}' */ -#line 2080 "hyp_l.c" +#line 2071 "hyp_l.c" #define INITIAL 0 #define STATE_STRING 1 @@ -2133,7 +2124,7 @@ void hyyset_out (FILE * out_str ); -yy_size_t hyyget_leng (void ); +int hyyget_leng (void ); char *hyyget_text (void ); @@ -2221,7 +2212,7 @@ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - int n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( hyyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -2234,7 +2225,7 @@ else \ { \ errno=0; \ - while ( (result = fread(buf, 1, (yy_size_t) max_size, hyyin)) == 0 && ferror(hyyin)) \ + while ( (result = fread(buf, 1, max_size, hyyin))==0 && ferror(hyyin)) \ { \ if( errno != EINTR) \ { \ @@ -2330,6 +2321,13 @@ register char *yy_cp, *yy_bp; register int yy_act; +/* %% [7.0] user's declarations go here */ +#line 139 "hyp_l.l" + + + /* When in STATE_COMMENT skip all comment until next right brace */ +#line 2330 "hyp_l.c" + if ( !(yy_init) ) { (yy_init) = 1; @@ -2370,14 +2368,6 @@ hyy_load_buffer_state( ); } - { -/* %% [7.0] user's declarations go here */ -#line 139 "hyp_l.l" - - - /* When in STATE_COMMENT skip all comment until next right brace */ -#line 2380 "hyp_l.c" - while ( 1 ) /* loops until end-of-file is reached */ { /* %% [8.0] yymore()-related code goes here */ @@ -2401,7 +2391,7 @@ yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; @@ -2440,7 +2430,7 @@ if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) { - yy_size_t yyl; + int yyl; for ( yyl = 0; yyl < hyyleng; ++yyl ) if ( hyytext[yyl] == '\n' ) @@ -3406,7 +3396,7 @@ #line 392 "hyp_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 3410 "hyp_l.c" +#line 3400 "hyp_l.c" case YY_END_OF_BUFFER: { @@ -3536,7 +3526,6 @@ "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ - } /* end of user's declarations */ } /* end of hyylex */ /* %ok-for-header */ @@ -3620,7 +3609,7 @@ /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), num_to_read ); + (yy_n_chars), (size_t) num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -3724,7 +3713,7 @@ if ( ! yy_is_jam ) *(yy_state_ptr)++ = yy_current_state; - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } /* %if-c-only */ @@ -3744,7 +3733,7 @@ if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register yy_size_t number_to_move = (yy_n_chars) + 2; + register int number_to_move = (yy_n_chars) + 2; register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; register char *source = @@ -3806,7 +3795,7 @@ else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -3995,6 +3984,17 @@ hyyfree((void *) b ); } +/* %if-c-only */ + +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + +/* %endif */ + +/* %if-c++-only */ +/* %endif */ + /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a hyyrestart() or at EOF. @@ -4137,7 +4137,7 @@ /* %if-c++-only */ /* %endif */ { - yy_size_t num_to_alloc; + int num_to_alloc; if (!(yy_buffer_stack)) { @@ -4240,12 +4240,12 @@ * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE hyy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE hyy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -4336,7 +4336,7 @@ /** Get the length of the current token. * */ -yy_size_t hyyget_leng (void) +int hyyget_leng (void) { return hyyleng; } @@ -4516,7 +4516,7 @@ /* %ok-for-header */ -#line 391 "hyp_l.l" +#line 392 "hyp_l.l" Index: trunk/src_plugins/io_hyp/hyp_l.h =================================================================== --- trunk/src_plugins/io_hyp/hyp_l.h (revision 8972) +++ trunk/src_plugins/io_hyp/hyp_l.h (revision 8973) @@ -15,7 +15,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_SUBMINOR_VERSION 35 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -165,13 +165,8 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - /* %if-not-reentrant */ -extern yy_size_t hyyleng; +extern int hyyleng; /* %endif */ /* %if-c-only */ @@ -180,6 +175,11 @@ /* %endif */ /* %endif */ +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -202,7 +202,7 @@ /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -258,7 +258,7 @@ YY_BUFFER_STATE hyy_scan_buffer (char *base,yy_size_t size ); YY_BUFFER_STATE hyy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE hyy_scan_bytes (yyconst char *bytes,yy_size_t len ); +YY_BUFFER_STATE hyy_scan_bytes (yyconst char *bytes,int len ); /* %endif */ @@ -269,7 +269,7 @@ /* %% [1.0] hyytext/hyyin/hyyout/yy_state_type/hyylineno etc. def's & init go here */ /* Begin user sect3 */ -#define hyywrap() 1 +#define hyywrap(n) 1 #define YY_SKIP_YYWRAP #define FLEX_DEBUG @@ -339,7 +339,7 @@ void hyyset_out (FILE * out_str ); -yy_size_t hyyget_leng (void ); +int hyyget_leng (void ); char *hyyget_text (void ); @@ -444,7 +444,7 @@ #undef YY_DECL #endif -#line 391 "hyp_l.l" +#line 392 "hyp_l.l" #line 451 "hyp_l.h" Index: trunk/src_plugins/io_hyp/hyp_y.c =================================================================== --- trunk/src_plugins/io_hyp/hyp_y.c (revision 8972) +++ trunk/src_plugins/io_hyp/hyp_y.c (revision 8973) @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.0.4. */ +/* A Bison parser, made by GNU Bison 3.0.2. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. 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 @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.0.4" +#define YYBISON_VERSION "3.0.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -227,7 +227,7 @@ /* Value type. */ #if ! defined HYYSTYPE && ! defined HYYSTYPE_IS_DECLARED - +typedef union HYYSTYPE HYYSTYPE; union HYYSTYPE { #line 30 "hyp_y.y" /* yacc.c:355 */ @@ -239,8 +239,6 @@ #line 241 "hyp_y.c" /* yacc.c:355 */ }; - -typedef union HYYSTYPE HYYSTYPE; # define HYYSTYPE_IS_TRIVIAL 1 # define HYYSTYPE_IS_DECLARED 1 #endif @@ -273,7 +271,7 @@ static parse_param h; -#line 277 "hyp_y.c" /* yacc.c:358 */ +#line 275 "hyp_y.c" /* yacc.c:358 */ #ifdef short # undef short @@ -1868,947 +1866,947 @@ case 19: #line 150 "hyp_y.y" /* yacc.c:1646 */ { if (exec_board_file(&h)) YYERROR; } -#line 1872 "hyp_y.c" /* yacc.c:1646 */ +#line 1870 "hyp_y.c" /* yacc.c:1646 */ break; case 21: #line 155 "hyp_y.y" /* yacc.c:1646 */ { h.vers = yylval.floatval; } -#line 1878 "hyp_y.c" /* yacc.c:1646 */ +#line 1876 "hyp_y.c" /* yacc.c:1646 */ break; case 22: #line 155 "hyp_y.y" /* yacc.c:1646 */ { if (exec_version(&h)) YYERROR; } -#line 1884 "hyp_y.c" /* yacc.c:1646 */ +#line 1882 "hyp_y.c" /* yacc.c:1646 */ break; case 23: #line 160 "hyp_y.y" /* yacc.c:1646 */ { if (exec_data_mode(&h)) YYERROR; } -#line 1890 "hyp_y.c" /* yacc.c:1646 */ +#line 1888 "hyp_y.c" /* yacc.c:1646 */ break; case 24: #line 163 "hyp_y.y" /* yacc.c:1646 */ { h.detailed = pcb_false; } -#line 1896 "hyp_y.c" /* yacc.c:1646 */ +#line 1894 "hyp_y.c" /* yacc.c:1646 */ break; case 25: #line 164 "hyp_y.y" /* yacc.c:1646 */ { h.detailed = pcb_true; } -#line 1902 "hyp_y.c" /* yacc.c:1646 */ +#line 1900 "hyp_y.c" /* yacc.c:1646 */ break; case 26: #line 169 "hyp_y.y" /* yacc.c:1646 */ { if (exec_units(&h)) YYERROR; } -#line 1908 "hyp_y.c" /* yacc.c:1646 */ +#line 1906 "hyp_y.c" /* yacc.c:1646 */ break; case 27: #line 172 "hyp_y.y" /* yacc.c:1646 */ { h.unit_system_english = pcb_true; } -#line 1914 "hyp_y.c" /* yacc.c:1646 */ +#line 1912 "hyp_y.c" /* yacc.c:1646 */ break; case 28: #line 173 "hyp_y.y" /* yacc.c:1646 */ { h.unit_system_english = pcb_false; } -#line 1920 "hyp_y.c" /* yacc.c:1646 */ +#line 1918 "hyp_y.c" /* yacc.c:1646 */ break; case 29: #line 176 "hyp_y.y" /* yacc.c:1646 */ { h.metal_thickness_weight = pcb_true; } -#line 1926 "hyp_y.c" /* yacc.c:1646 */ +#line 1924 "hyp_y.c" /* yacc.c:1646 */ break; case 30: #line 177 "hyp_y.y" /* yacc.c:1646 */ { h.metal_thickness_weight = pcb_false; } -#line 1932 "hyp_y.c" /* yacc.c:1646 */ +#line 1930 "hyp_y.c" /* yacc.c:1646 */ break; case 31: #line 181 "hyp_y.y" /* yacc.c:1646 */ { h.default_plane_separation = yylval.floatval; } -#line 1938 "hyp_y.c" /* yacc.c:1646 */ +#line 1936 "hyp_y.c" /* yacc.c:1646 */ break; case 32: #line 181 "hyp_y.y" /* yacc.c:1646 */ { if (exec_plane_sep(&h)) YYERROR; } -#line 1944 "hyp_y.c" /* yacc.c:1646 */ +#line 1942 "hyp_y.c" /* yacc.c:1646 */ break; case 38: #line 195 "hyp_y.y" /* yacc.c:1646 */ { hyyerror("warning: missing ')'"); } -#line 1950 "hyp_y.c" /* yacc.c:1646 */ +#line 1948 "hyp_y.c" /* yacc.c:1646 */ break; case 43: #line 205 "hyp_y.y" /* yacc.c:1646 */ { if (exec_perimeter_segment(&h)) YYERROR; } -#line 1956 "hyp_y.c" /* yacc.c:1646 */ +#line 1954 "hyp_y.c" /* yacc.c:1646 */ break; case 44: #line 208 "hyp_y.y" /* yacc.c:1646 */ { if (exec_perimeter_arc(&h)) YYERROR; } -#line 1962 "hyp_y.c" /* yacc.c:1646 */ +#line 1960 "hyp_y.c" /* yacc.c:1646 */ break; case 45: #line 211 "hyp_y.y" /* yacc.c:1646 */ { h.name = yylval.strval; } -#line 1968 "hyp_y.c" /* yacc.c:1646 */ +#line 1966 "hyp_y.c" /* yacc.c:1646 */ break; case 46: #line 211 "hyp_y.y" /* yacc.c:1646 */ { h.value = yylval.strval; } -#line 1974 "hyp_y.c" /* yacc.c:1646 */ +#line 1972 "hyp_y.c" /* yacc.c:1646 */ break; case 47: #line 211 "hyp_y.y" /* yacc.c:1646 */ { if (exec_board_attribute(&h)) YYERROR; } -#line 1980 "hyp_y.c" /* yacc.c:1646 */ +#line 1978 "hyp_y.c" /* yacc.c:1646 */ break; case 56: #line 230 "hyp_y.y" /* yacc.c:1646 */ { if (exec_options(&h)) YYERROR; } -#line 1986 "hyp_y.c" /* yacc.c:1646 */ +#line 1984 "hyp_y.c" /* yacc.c:1646 */ break; case 57: #line 233 "hyp_y.y" /* yacc.c:1646 */ { h.use_die_for_metal = yylval.boolval; } -#line 1992 "hyp_y.c" /* yacc.c:1646 */ +#line 1990 "hyp_y.c" /* yacc.c:1646 */ break; case 60: #line 238 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 1998 "hyp_y.c" /* yacc.c:1646 */ +#line 1996 "hyp_y.c" /* yacc.c:1646 */ break; case 61: #line 238 "hyp_y.y" /* yacc.c:1646 */ { if (exec_signal(&h)) YYERROR; } -#line 2004 "hyp_y.c" /* yacc.c:1646 */ +#line 2002 "hyp_y.c" /* yacc.c:1646 */ break; case 66: #line 247 "hyp_y.y" /* yacc.c:1646 */ { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } -#line 2010 "hyp_y.c" /* yacc.c:1646 */ +#line 2008 "hyp_y.c" /* yacc.c:1646 */ break; case 74: #line 257 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2016 "hyp_y.c" /* yacc.c:1646 */ +#line 2014 "hyp_y.c" /* yacc.c:1646 */ break; case 75: #line 257 "hyp_y.y" /* yacc.c:1646 */ { if (exec_dielectric(&h)) YYERROR; } -#line 2022 "hyp_y.c" /* yacc.c:1646 */ +#line 2020 "hyp_y.c" /* yacc.c:1646 */ break; case 79: #line 265 "hyp_y.y" /* yacc.c:1646 */ { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; } -#line 2028 "hyp_y.c" /* yacc.c:1646 */ +#line 2026 "hyp_y.c" /* yacc.c:1646 */ break; case 86: #line 275 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2034 "hyp_y.c" /* yacc.c:1646 */ +#line 2032 "hyp_y.c" /* yacc.c:1646 */ break; case 87: #line 275 "hyp_y.y" /* yacc.c:1646 */ { if (exec_plane(&h)) YYERROR; } -#line 2040 "hyp_y.c" /* yacc.c:1646 */ +#line 2038 "hyp_y.c" /* yacc.c:1646 */ break; case 91: #line 283 "hyp_y.y" /* yacc.c:1646 */ { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } -#line 2046 "hyp_y.c" /* yacc.c:1646 */ +#line 2044 "hyp_y.c" /* yacc.c:1646 */ break; case 99: #line 293 "hyp_y.y" /* yacc.c:1646 */ { h.thickness = yylval.floatval; h.thickness_set = pcb_true; } -#line 2052 "hyp_y.c" /* yacc.c:1646 */ +#line 2050 "hyp_y.c" /* yacc.c:1646 */ break; case 100: #line 296 "hyp_y.y" /* yacc.c:1646 */ { h.plating_thickness = yylval.floatval; h.plating_thickness_set = pcb_true; } -#line 2058 "hyp_y.c" /* yacc.c:1646 */ +#line 2056 "hyp_y.c" /* yacc.c:1646 */ break; case 101: #line 299 "hyp_y.y" /* yacc.c:1646 */ { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } -#line 2064 "hyp_y.c" /* yacc.c:1646 */ +#line 2062 "hyp_y.c" /* yacc.c:1646 */ break; case 102: #line 302 "hyp_y.y" /* yacc.c:1646 */ { h.temperature_coefficient = yylval.floatval; h.temperature_coefficient_set = pcb_true; } -#line 2070 "hyp_y.c" /* yacc.c:1646 */ +#line 2068 "hyp_y.c" /* yacc.c:1646 */ break; case 103: #line 305 "hyp_y.y" /* yacc.c:1646 */ { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; } -#line 2076 "hyp_y.c" /* yacc.c:1646 */ +#line 2074 "hyp_y.c" /* yacc.c:1646 */ break; case 104: #line 308 "hyp_y.y" /* yacc.c:1646 */ { h.loss_tangent = yylval.floatval; h.loss_tangent_set = pcb_true; } -#line 2082 "hyp_y.c" /* yacc.c:1646 */ +#line 2080 "hyp_y.c" /* yacc.c:1646 */ break; case 105: #line 311 "hyp_y.y" /* yacc.c:1646 */ { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; } -#line 2088 "hyp_y.c" /* yacc.c:1646 */ +#line 2086 "hyp_y.c" /* yacc.c:1646 */ break; case 106: #line 314 "hyp_y.y" /* yacc.c:1646 */ { h.material_name = yylval.strval; h.material_name_set = pcb_true; } -#line 2094 "hyp_y.c" /* yacc.c:1646 */ +#line 2092 "hyp_y.c" /* yacc.c:1646 */ break; case 107: #line 317 "hyp_y.y" /* yacc.c:1646 */ { h.plane_separation = yylval.floatval; h.plane_separation_set = pcb_true; } -#line 2100 "hyp_y.c" /* yacc.c:1646 */ +#line 2098 "hyp_y.c" /* yacc.c:1646 */ break; case 108: #line 320 "hyp_y.y" /* yacc.c:1646 */ { h.conformal = yylval.boolval; h.conformal_set = pcb_true; } -#line 2106 "hyp_y.c" /* yacc.c:1646 */ +#line 2104 "hyp_y.c" /* yacc.c:1646 */ break; case 109: #line 323 "hyp_y.y" /* yacc.c:1646 */ { h.prepreg = yylval.boolval; h.prepreg_set = pcb_true; } -#line 2112 "hyp_y.c" /* yacc.c:1646 */ +#line 2110 "hyp_y.c" /* yacc.c:1646 */ break; case 114: #line 336 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2118 "hyp_y.c" /* yacc.c:1646 */ +#line 2116 "hyp_y.c" /* yacc.c:1646 */ break; case 115: #line 336 "hyp_y.y" /* yacc.c:1646 */ { h.device_type = yylval.strval; } -#line 2124 "hyp_y.c" /* yacc.c:1646 */ +#line 2122 "hyp_y.c" /* yacc.c:1646 */ break; case 116: #line 336 "hyp_y.y" /* yacc.c:1646 */ { h.ref = yylval.strval; } -#line 2130 "hyp_y.c" /* yacc.c:1646 */ +#line 2128 "hyp_y.c" /* yacc.c:1646 */ break; case 117: #line 336 "hyp_y.y" /* yacc.c:1646 */ { if (exec_devices(&h)) YYERROR; } -#line 2136 "hyp_y.c" /* yacc.c:1646 */ +#line 2134 "hyp_y.c" /* yacc.c:1646 */ break; case 125: #line 355 "hyp_y.y" /* yacc.c:1646 */ { h.name = yylval.strval; h.name_set = pcb_true; } -#line 2142 "hyp_y.c" /* yacc.c:1646 */ +#line 2140 "hyp_y.c" /* yacc.c:1646 */ break; case 128: #line 363 "hyp_y.y" /* yacc.c:1646 */ { h.value_float = yylval.floatval; h.value_float_set = pcb_true; } -#line 2148 "hyp_y.c" /* yacc.c:1646 */ +#line 2146 "hyp_y.c" /* yacc.c:1646 */ break; case 129: #line 366 "hyp_y.y" /* yacc.c:1646 */ { h.value_string = yylval.strval; h.value_string_set = pcb_true; } -#line 2154 "hyp_y.c" /* yacc.c:1646 */ +#line 2152 "hyp_y.c" /* yacc.c:1646 */ break; case 130: #line 369 "hyp_y.y" /* yacc.c:1646 */ { h.package = yylval.strval; h.package_set = pcb_true; } -#line 2160 "hyp_y.c" /* yacc.c:1646 */ +#line 2158 "hyp_y.c" /* yacc.c:1646 */ break; case 134: #line 381 "hyp_y.y" /* yacc.c:1646 */ { if (exec_supplies(&h)) YYERROR; } -#line 2166 "hyp_y.c" /* yacc.c:1646 */ +#line 2164 "hyp_y.c" /* yacc.c:1646 */ break; case 136: #line 385 "hyp_y.y" /* yacc.c:1646 */ { h.voltage_specified = yylval.boolval; } -#line 2172 "hyp_y.c" /* yacc.c:1646 */ +#line 2170 "hyp_y.c" /* yacc.c:1646 */ break; case 137: #line 388 "hyp_y.y" /* yacc.c:1646 */ { h.conversion = yylval.boolval; } -#line 2178 "hyp_y.c" /* yacc.c:1646 */ +#line 2176 "hyp_y.c" /* yacc.c:1646 */ break; case 138: #line 393 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2184 "hyp_y.c" /* yacc.c:1646 */ +#line 2182 "hyp_y.c" /* yacc.c:1646 */ break; case 139: #line 393 "hyp_y.y" /* yacc.c:1646 */ { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; } -#line 2190 "hyp_y.c" /* yacc.c:1646 */ +#line 2188 "hyp_y.c" /* yacc.c:1646 */ break; case 140: #line 393 "hyp_y.y" /* yacc.c:1646 */ { if (exec_padstack_end(&h)) YYERROR; } -#line 2196 "hyp_y.c" /* yacc.c:1646 */ +#line 2194 "hyp_y.c" /* yacc.c:1646 */ break; case 141: #line 396 "hyp_y.y" /* yacc.c:1646 */ { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; } -#line 2202 "hyp_y.c" /* yacc.c:1646 */ +#line 2200 "hyp_y.c" /* yacc.c:1646 */ break; case 147: #line 405 "hyp_y.y" /* yacc.c:1646 */ { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; } -#line 2208 "hyp_y.c" /* yacc.c:1646 */ +#line 2206 "hyp_y.c" /* yacc.c:1646 */ break; case 148: #line 405 "hyp_y.y" /* yacc.c:1646 */ { if (exec_padstack_element(&h)) YYERROR; new_record(); } -#line 2214 "hyp_y.c" /* yacc.c:1646 */ +#line 2212 "hyp_y.c" /* yacc.c:1646 */ break; case 150: #line 409 "hyp_y.y" /* yacc.c:1646 */ { h.pad_shape = yylval.floatval; } -#line 2220 "hyp_y.c" /* yacc.c:1646 */ +#line 2218 "hyp_y.c" /* yacc.c:1646 */ break; case 152: #line 410 "hyp_y.y" /* yacc.c:1646 */ { h.pad_shape = -1; } -#line 2226 "hyp_y.c" /* yacc.c:1646 */ +#line 2224 "hyp_y.c" /* yacc.c:1646 */ break; case 153: #line 414 "hyp_y.y" /* yacc.c:1646 */ { h.pad_sx = yylval.floatval; } -#line 2232 "hyp_y.c" /* yacc.c:1646 */ +#line 2230 "hyp_y.c" /* yacc.c:1646 */ break; case 154: #line 414 "hyp_y.y" /* yacc.c:1646 */ { h.pad_sy = yylval.floatval; } -#line 2238 "hyp_y.c" /* yacc.c:1646 */ +#line 2236 "hyp_y.c" /* yacc.c:1646 */ break; case 155: #line 414 "hyp_y.y" /* yacc.c:1646 */ { h.pad_angle = yylval.floatval; } -#line 2244 "hyp_y.c" /* yacc.c:1646 */ +#line 2242 "hyp_y.c" /* yacc.c:1646 */ break; case 157: #line 418 "hyp_y.y" /* yacc.c:1646 */ { h.pad_type = PAD_TYPE_METAL; h.pad_type_set = pcb_true; } -#line 2250 "hyp_y.c" /* yacc.c:1646 */ +#line 2248 "hyp_y.c" /* yacc.c:1646 */ break; case 158: #line 419 "hyp_y.y" /* yacc.c:1646 */ { h.pad_type = PAD_TYPE_ANTIPAD; h.pad_type_set = pcb_true; } -#line 2256 "hyp_y.c" /* yacc.c:1646 */ +#line 2254 "hyp_y.c" /* yacc.c:1646 */ break; case 159: #line 420 "hyp_y.y" /* yacc.c:1646 */ { h.thermal_clear_shape = yylval.floatval; } -#line 2262 "hyp_y.c" /* yacc.c:1646 */ +#line 2260 "hyp_y.c" /* yacc.c:1646 */ break; case 160: #line 421 "hyp_y.y" /* yacc.c:1646 */ { h.thermal_clear_sx = yylval.floatval; } -#line 2268 "hyp_y.c" /* yacc.c:1646 */ +#line 2266 "hyp_y.c" /* yacc.c:1646 */ break; case 161: #line 422 "hyp_y.y" /* yacc.c:1646 */ { h.thermal_clear_sy = yylval.floatval; } -#line 2274 "hyp_y.c" /* yacc.c:1646 */ +#line 2272 "hyp_y.c" /* yacc.c:1646 */ break; case 162: #line 423 "hyp_y.y" /* yacc.c:1646 */ { h.thermal_clear_angle = yylval.floatval; } -#line 2280 "hyp_y.c" /* yacc.c:1646 */ +#line 2278 "hyp_y.c" /* yacc.c:1646 */ break; case 163: #line 424 "hyp_y.y" /* yacc.c:1646 */ { h.pad_type = PAD_TYPE_THERMAL_RELIEF; h.pad_type_set = pcb_true; } -#line 2286 "hyp_y.c" /* yacc.c:1646 */ +#line 2284 "hyp_y.c" /* yacc.c:1646 */ break; case 164: #line 430 "hyp_y.y" /* yacc.c:1646 */ { h.net_name = yylval.strval; if (exec_net(&h)) YYERROR; } -#line 2292 "hyp_y.c" /* yacc.c:1646 */ +#line 2290 "hyp_y.c" /* yacc.c:1646 */ break; case 166: #line 433 "hyp_y.y" /* yacc.c:1646 */ { if (exec_net_plane_separation(&h)) YYERROR; } -#line 2298 "hyp_y.c" /* yacc.c:1646 */ +#line 2296 "hyp_y.c" /* yacc.c:1646 */ break; case 170: #line 438 "hyp_y.y" /* yacc.c:1646 */ { hyyerror("warning: empty net"); } -#line 2304 "hyp_y.c" /* yacc.c:1646 */ +#line 2302 "hyp_y.c" /* yacc.c:1646 */ break; case 186: #line 461 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2310 "hyp_y.c" /* yacc.c:1646 */ +#line 2308 "hyp_y.c" /* yacc.c:1646 */ break; case 187: #line 461 "hyp_y.y" /* yacc.c:1646 */ { if (exec_seg(&h)) YYERROR; } -#line 2316 "hyp_y.c" /* yacc.c:1646 */ +#line 2314 "hyp_y.c" /* yacc.c:1646 */ break; case 188: #line 464 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2322 "hyp_y.c" /* yacc.c:1646 */ +#line 2320 "hyp_y.c" /* yacc.c:1646 */ break; case 189: #line 464 "hyp_y.y" /* yacc.c:1646 */ { if (exec_arc(&h)) YYERROR; } -#line 2328 "hyp_y.c" /* yacc.c:1646 */ +#line 2326 "hyp_y.c" /* yacc.c:1646 */ break; case 194: #line 477 "hyp_y.y" /* yacc.c:1646 */ { h.width = yylval.floatval; h.width_set = pcb_true; } -#line 2334 "hyp_y.c" /* yacc.c:1646 */ +#line 2332 "hyp_y.c" /* yacc.c:1646 */ break; case 195: #line 480 "hyp_y.y" /* yacc.c:1646 */ { h.left_plane_separation = yylval.floatval; h.left_plane_separation_set = pcb_true; } -#line 2340 "hyp_y.c" /* yacc.c:1646 */ +#line 2338 "hyp_y.c" /* yacc.c:1646 */ break; case 196: #line 483 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2346 "hyp_y.c" /* yacc.c:1646 */ +#line 2344 "hyp_y.c" /* yacc.c:1646 */ break; case 197: #line 483 "hyp_y.y" /* yacc.c:1646 */ { if (exec_via(&h)) YYERROR; } -#line 2352 "hyp_y.c" /* yacc.c:1646 */ +#line 2350 "hyp_y.c" /* yacc.c:1646 */ break; case 201: #line 494 "hyp_y.y" /* yacc.c:1646 */ { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; } -#line 2358 "hyp_y.c" /* yacc.c:1646 */ +#line 2356 "hyp_y.c" /* yacc.c:1646 */ break; case 204: #line 497 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; } -#line 2364 "hyp_y.c" /* yacc.c:1646 */ +#line 2362 "hyp_y.c" /* yacc.c:1646 */ break; case 205: #line 498 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; } -#line 2370 "hyp_y.c" /* yacc.c:1646 */ +#line 2368 "hyp_y.c" /* yacc.c:1646 */ break; case 206: #line 499 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; } -#line 2376 "hyp_y.c" /* yacc.c:1646 */ +#line 2374 "hyp_y.c" /* yacc.c:1646 */ break; case 207: #line 500 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; } -#line 2382 "hyp_y.c" /* yacc.c:1646 */ +#line 2380 "hyp_y.c" /* yacc.c:1646 */ break; case 208: #line 501 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad1_shape = yylval.strval; h.via_pad1_shape_set = pcb_true; } -#line 2388 "hyp_y.c" /* yacc.c:1646 */ +#line 2386 "hyp_y.c" /* yacc.c:1646 */ break; case 209: #line 502 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad1_sx = yylval.floatval; h.via_pad1_sx_set = pcb_true; } -#line 2394 "hyp_y.c" /* yacc.c:1646 */ +#line 2392 "hyp_y.c" /* yacc.c:1646 */ break; case 210: #line 503 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad1_sy = yylval.floatval; h.via_pad1_sy_set = pcb_true; } -#line 2400 "hyp_y.c" /* yacc.c:1646 */ +#line 2398 "hyp_y.c" /* yacc.c:1646 */ break; case 211: #line 504 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad1_angle = yylval.floatval; h.via_pad1_angle_set = pcb_true; } -#line 2406 "hyp_y.c" /* yacc.c:1646 */ +#line 2404 "hyp_y.c" /* yacc.c:1646 */ break; case 212: #line 505 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad2_shape = yylval.strval; h.via_pad2_shape_set = pcb_true; } -#line 2412 "hyp_y.c" /* yacc.c:1646 */ +#line 2410 "hyp_y.c" /* yacc.c:1646 */ break; case 213: #line 506 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad2_sx = yylval.floatval; h.via_pad2_sx_set = pcb_true; } -#line 2418 "hyp_y.c" /* yacc.c:1646 */ +#line 2416 "hyp_y.c" /* yacc.c:1646 */ break; case 214: #line 507 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad2_sy = yylval.floatval; h.via_pad2_sy_set = pcb_true; } -#line 2424 "hyp_y.c" /* yacc.c:1646 */ +#line 2422 "hyp_y.c" /* yacc.c:1646 */ break; case 215: #line 508 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad2_angle = yylval.floatval; h.via_pad2_angle_set = pcb_true; } -#line 2430 "hyp_y.c" /* yacc.c:1646 */ +#line 2428 "hyp_y.c" /* yacc.c:1646 */ break; case 216: #line 512 "hyp_y.y" /* yacc.c:1646 */ { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; } -#line 2436 "hyp_y.c" /* yacc.c:1646 */ +#line 2434 "hyp_y.c" /* yacc.c:1646 */ break; case 217: #line 515 "hyp_y.y" /* yacc.c:1646 */ { h.layer1_name = yylval.strval; h.layer1_name_set = pcb_true; } -#line 2442 "hyp_y.c" /* yacc.c:1646 */ +#line 2440 "hyp_y.c" /* yacc.c:1646 */ break; case 218: #line 518 "hyp_y.y" /* yacc.c:1646 */ { h.layer2_name = yylval.strval; h.layer2_name_set = pcb_true; } -#line 2448 "hyp_y.c" /* yacc.c:1646 */ +#line 2446 "hyp_y.c" /* yacc.c:1646 */ break; case 219: #line 521 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2454 "hyp_y.c" /* yacc.c:1646 */ +#line 2452 "hyp_y.c" /* yacc.c:1646 */ break; case 220: #line 521 "hyp_y.y" /* yacc.c:1646 */ { if (exec_pin(&h)) YYERROR; } -#line 2460 "hyp_y.c" /* yacc.c:1646 */ +#line 2458 "hyp_y.c" /* yacc.c:1646 */ break; case 225: #line 534 "hyp_y.y" /* yacc.c:1646 */ { h.pin_reference = yylval.strval; h.pin_reference_set = pcb_true; } -#line 2466 "hyp_y.c" /* yacc.c:1646 */ +#line 2464 "hyp_y.c" /* yacc.c:1646 */ break; case 226: #line 537 "hyp_y.y" /* yacc.c:1646 */ { h.pin_function = PIN_SIM_OUT; h.pin_function_set = pcb_true; } -#line 2472 "hyp_y.c" /* yacc.c:1646 */ +#line 2470 "hyp_y.c" /* yacc.c:1646 */ break; case 227: #line 538 "hyp_y.y" /* yacc.c:1646 */ { h.pin_function = PIN_SIM_IN; h.pin_function_set = pcb_true; } -#line 2478 "hyp_y.c" /* yacc.c:1646 */ +#line 2476 "hyp_y.c" /* yacc.c:1646 */ break; case 228: #line 539 "hyp_y.y" /* yacc.c:1646 */ { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = pcb_true; } -#line 2484 "hyp_y.c" /* yacc.c:1646 */ +#line 2482 "hyp_y.c" /* yacc.c:1646 */ break; case 229: #line 540 "hyp_y.y" /* yacc.c:1646 */ { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = pcb_true; hyyerror("warning: SIM_BOTH assumed"); } -#line 2490 "hyp_y.c" /* yacc.c:1646 */ +#line 2488 "hyp_y.c" /* yacc.c:1646 */ break; case 230: #line 544 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2496 "hyp_y.c" /* yacc.c:1646 */ +#line 2494 "hyp_y.c" /* yacc.c:1646 */ break; case 231: #line 544 "hyp_y.y" /* yacc.c:1646 */ { if (exec_pad(&h)) YYERROR; } -#line 2502 "hyp_y.c" /* yacc.c:1646 */ +#line 2500 "hyp_y.c" /* yacc.c:1646 */ break; case 235: #line 553 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; } -#line 2508 "hyp_y.c" /* yacc.c:1646 */ +#line 2506 "hyp_y.c" /* yacc.c:1646 */ break; case 236: #line 554 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; } -#line 2514 "hyp_y.c" /* yacc.c:1646 */ +#line 2512 "hyp_y.c" /* yacc.c:1646 */ break; case 237: #line 555 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; } -#line 2520 "hyp_y.c" /* yacc.c:1646 */ +#line 2518 "hyp_y.c" /* yacc.c:1646 */ break; case 238: #line 556 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; } -#line 2526 "hyp_y.c" /* yacc.c:1646 */ +#line 2524 "hyp_y.c" /* yacc.c:1646 */ break; case 239: #line 560 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2532 "hyp_y.c" /* yacc.c:1646 */ +#line 2530 "hyp_y.c" /* yacc.c:1646 */ break; case 240: #line 560 "hyp_y.y" /* yacc.c:1646 */ { if (exec_useg(&h)) YYERROR; } -#line 2538 "hyp_y.c" /* yacc.c:1646 */ +#line 2536 "hyp_y.c" /* yacc.c:1646 */ break; case 243: #line 568 "hyp_y.y" /* yacc.c:1646 */ { h.zlayer_name = yylval.strval; h.zlayer_name_set = pcb_true; } -#line 2544 "hyp_y.c" /* yacc.c:1646 */ +#line 2542 "hyp_y.c" /* yacc.c:1646 */ break; case 244: #line 569 "hyp_y.y" /* yacc.c:1646 */ { h.width = yylval.floatval; } -#line 2550 "hyp_y.c" /* yacc.c:1646 */ +#line 2548 "hyp_y.c" /* yacc.c:1646 */ break; case 245: #line 570 "hyp_y.y" /* yacc.c:1646 */ { h.length = yylval.floatval; } -#line 2556 "hyp_y.c" /* yacc.c:1646 */ +#line 2554 "hyp_y.c" /* yacc.c:1646 */ break; case 247: #line 575 "hyp_y.y" /* yacc.c:1646 */ { h.impedance = yylval.floatval; h.impedance_set = pcb_true; } -#line 2562 "hyp_y.c" /* yacc.c:1646 */ +#line 2560 "hyp_y.c" /* yacc.c:1646 */ break; case 248: #line 576 "hyp_y.y" /* yacc.c:1646 */ { h.delay = yylval.floatval; } -#line 2568 "hyp_y.c" /* yacc.c:1646 */ +#line 2566 "hyp_y.c" /* yacc.c:1646 */ break; case 250: #line 580 "hyp_y.y" /* yacc.c:1646 */ { h.resistance = yylval.floatval; h.resistance_set = pcb_true;} -#line 2574 "hyp_y.c" /* yacc.c:1646 */ +#line 2572 "hyp_y.c" /* yacc.c:1646 */ break; case 253: #line 586 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2580 "hyp_y.c" /* yacc.c:1646 */ +#line 2578 "hyp_y.c" /* yacc.c:1646 */ break; case 254: #line 586 "hyp_y.y" /* yacc.c:1646 */ { if (exec_polygon_begin(&h)) YYERROR; } -#line 2586 "hyp_y.c" /* yacc.c:1646 */ +#line 2584 "hyp_y.c" /* yacc.c:1646 */ break; case 255: #line 587 "hyp_y.y" /* yacc.c:1646 */ { if (exec_polygon_end(&h)) YYERROR; } -#line 2592 "hyp_y.c" /* yacc.c:1646 */ +#line 2590 "hyp_y.c" /* yacc.c:1646 */ break; case 262: #line 602 "hyp_y.y" /* yacc.c:1646 */ { h.id = yylval.intval; h.id_set = pcb_true; } -#line 2598 "hyp_y.c" /* yacc.c:1646 */ +#line 2596 "hyp_y.c" /* yacc.c:1646 */ break; case 263: #line 606 "hyp_y.y" /* yacc.c:1646 */ { h.polygon_type = POLYGON_TYPE_POUR; h.polygon_type_set = pcb_true; } -#line 2604 "hyp_y.c" /* yacc.c:1646 */ +#line 2602 "hyp_y.c" /* yacc.c:1646 */ break; case 264: #line 607 "hyp_y.y" /* yacc.c:1646 */ { h.polygon_type = POLYGON_TYPE_PLANE; h.polygon_type_set = pcb_true; } -#line 2610 "hyp_y.c" /* yacc.c:1646 */ +#line 2608 "hyp_y.c" /* yacc.c:1646 */ break; case 265: #line 608 "hyp_y.y" /* yacc.c:1646 */ { h.polygon_type = POLYGON_TYPE_COPPER; h.polygon_type_set = pcb_true; } -#line 2616 "hyp_y.c" /* yacc.c:1646 */ +#line 2614 "hyp_y.c" /* yacc.c:1646 */ break; case 266: #line 612 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2622 "hyp_y.c" /* yacc.c:1646 */ +#line 2620 "hyp_y.c" /* yacc.c:1646 */ break; case 267: #line 612 "hyp_y.y" /* yacc.c:1646 */ { if (exec_polyvoid_begin(&h)) YYERROR; } -#line 2628 "hyp_y.c" /* yacc.c:1646 */ +#line 2626 "hyp_y.c" /* yacc.c:1646 */ break; case 268: #line 613 "hyp_y.y" /* yacc.c:1646 */ { if (exec_polyvoid_end(&h)) YYERROR; } -#line 2634 "hyp_y.c" /* yacc.c:1646 */ +#line 2632 "hyp_y.c" /* yacc.c:1646 */ break; case 269: #line 616 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2640 "hyp_y.c" /* yacc.c:1646 */ +#line 2638 "hyp_y.c" /* yacc.c:1646 */ break; case 270: #line 616 "hyp_y.y" /* yacc.c:1646 */ { if (exec_polyline_begin(&h)) YYERROR; } -#line 2646 "hyp_y.c" /* yacc.c:1646 */ +#line 2644 "hyp_y.c" /* yacc.c:1646 */ break; case 271: #line 617 "hyp_y.y" /* yacc.c:1646 */ { if (exec_polyline_end(&h)) YYERROR; } -#line 2652 "hyp_y.c" /* yacc.c:1646 */ +#line 2650 "hyp_y.c" /* yacc.c:1646 */ break; case 276: #line 627 "hyp_y.y" /* yacc.c:1646 */ { hyyerror("warning: unexpected ')'"); } -#line 2658 "hyp_y.c" /* yacc.c:1646 */ +#line 2656 "hyp_y.c" /* yacc.c:1646 */ break; case 278: #line 632 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2664 "hyp_y.c" /* yacc.c:1646 */ +#line 2662 "hyp_y.c" /* yacc.c:1646 */ break; case 279: #line 632 "hyp_y.y" /* yacc.c:1646 */ { if (exec_line(&h)) YYERROR; } -#line 2670 "hyp_y.c" /* yacc.c:1646 */ +#line 2668 "hyp_y.c" /* yacc.c:1646 */ break; case 280: #line 635 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2676 "hyp_y.c" /* yacc.c:1646 */ +#line 2674 "hyp_y.c" /* yacc.c:1646 */ break; case 281: #line 635 "hyp_y.y" /* yacc.c:1646 */ { if (exec_curve(&h)) YYERROR; } -#line 2682 "hyp_y.c" /* yacc.c:1646 */ +#line 2680 "hyp_y.c" /* yacc.c:1646 */ break; case 282: #line 638 "hyp_y.y" /* yacc.c:1646 */ { h.name = yylval.strval; } -#line 2688 "hyp_y.c" /* yacc.c:1646 */ +#line 2686 "hyp_y.c" /* yacc.c:1646 */ break; case 283: #line 638 "hyp_y.y" /* yacc.c:1646 */ { h.value = yylval.strval; } -#line 2694 "hyp_y.c" /* yacc.c:1646 */ +#line 2692 "hyp_y.c" /* yacc.c:1646 */ break; case 284: #line 638 "hyp_y.y" /* yacc.c:1646 */ { if (exec_net_attribute(&h)) YYERROR; } -#line 2700 "hyp_y.c" /* yacc.c:1646 */ +#line 2698 "hyp_y.c" /* yacc.c:1646 */ break; case 285: #line 643 "hyp_y.y" /* yacc.c:1646 */ { h.net_class_name = yylval.strval; if (exec_net_class(&h)) YYERROR; } -#line 2706 "hyp_y.c" /* yacc.c:1646 */ +#line 2704 "hyp_y.c" /* yacc.c:1646 */ break; case 294: #line 662 "hyp_y.y" /* yacc.c:1646 */ { h.net_name = yylval.strval; } -#line 2712 "hyp_y.c" /* yacc.c:1646 */ +#line 2710 "hyp_y.c" /* yacc.c:1646 */ break; case 295: #line 662 "hyp_y.y" /* yacc.c:1646 */ { if (exec_net_class_element(&h)) YYERROR; } -#line 2718 "hyp_y.c" /* yacc.c:1646 */ +#line 2716 "hyp_y.c" /* yacc.c:1646 */ break; case 296: #line 665 "hyp_y.y" /* yacc.c:1646 */ { h.name = yylval.strval; } -#line 2724 "hyp_y.c" /* yacc.c:1646 */ +#line 2722 "hyp_y.c" /* yacc.c:1646 */ break; case 297: #line 665 "hyp_y.y" /* yacc.c:1646 */ { h.value = yylval.strval; } -#line 2730 "hyp_y.c" /* yacc.c:1646 */ +#line 2728 "hyp_y.c" /* yacc.c:1646 */ break; case 298: #line 665 "hyp_y.y" /* yacc.c:1646 */ { if (exec_net_class_attribute(&h)) YYERROR; } -#line 2736 "hyp_y.c" /* yacc.c:1646 */ +#line 2734 "hyp_y.c" /* yacc.c:1646 */ break; case 299: #line 670 "hyp_y.y" /* yacc.c:1646 */ { if (exec_end(&h)) YYERROR; } -#line 2742 "hyp_y.c" /* yacc.c:1646 */ +#line 2740 "hyp_y.c" /* yacc.c:1646 */ break; case 300: #line 675 "hyp_y.y" /* yacc.c:1646 */ { h.key = yylval.strval; } -#line 2748 "hyp_y.c" /* yacc.c:1646 */ +#line 2746 "hyp_y.c" /* yacc.c:1646 */ break; case 301: #line 675 "hyp_y.y" /* yacc.c:1646 */ { if (exec_key(&h)) YYERROR; } -#line 2754 "hyp_y.c" /* yacc.c:1646 */ +#line 2752 "hyp_y.c" /* yacc.c:1646 */ break; case 302: #line 680 "hyp_y.y" /* yacc.c:1646 */ { h.x = yylval.floatval; } -#line 2760 "hyp_y.c" /* yacc.c:1646 */ +#line 2758 "hyp_y.c" /* yacc.c:1646 */ break; case 303: #line 680 "hyp_y.y" /* yacc.c:1646 */ { h.y = yylval.floatval; } -#line 2766 "hyp_y.c" /* yacc.c:1646 */ +#line 2764 "hyp_y.c" /* yacc.c:1646 */ break; case 304: #line 683 "hyp_y.y" /* yacc.c:1646 */ { h.x1 = yylval.floatval; } -#line 2772 "hyp_y.c" /* yacc.c:1646 */ +#line 2770 "hyp_y.c" /* yacc.c:1646 */ break; case 305: #line 683 "hyp_y.y" /* yacc.c:1646 */ { h.y1 = yylval.floatval; } -#line 2778 "hyp_y.c" /* yacc.c:1646 */ +#line 2776 "hyp_y.c" /* yacc.c:1646 */ break; case 306: #line 686 "hyp_y.y" /* yacc.c:1646 */ { h.x2 = yylval.floatval; } -#line 2784 "hyp_y.c" /* yacc.c:1646 */ +#line 2782 "hyp_y.c" /* yacc.c:1646 */ break; case 307: #line 686 "hyp_y.y" /* yacc.c:1646 */ { h.y2 = yylval.floatval; } -#line 2790 "hyp_y.c" /* yacc.c:1646 */ +#line 2788 "hyp_y.c" /* yacc.c:1646 */ break; case 309: #line 692 "hyp_y.y" /* yacc.c:1646 */ { h.xc = yylval.floatval; } -#line 2796 "hyp_y.c" /* yacc.c:1646 */ +#line 2794 "hyp_y.c" /* yacc.c:1646 */ break; case 310: #line 692 "hyp_y.y" /* yacc.c:1646 */ { h.yc = yylval.floatval; } -#line 2802 "hyp_y.c" /* yacc.c:1646 */ +#line 2800 "hyp_y.c" /* yacc.c:1646 */ break; case 311: #line 692 "hyp_y.y" /* yacc.c:1646 */ { h.r = yylval.floatval; } -#line 2808 "hyp_y.c" /* yacc.c:1646 */ +#line 2806 "hyp_y.c" /* yacc.c:1646 */ break; -#line 2812 "hyp_y.c" /* yacc.c:1646 */ +#line 2810 "hyp_y.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires Index: trunk/src_plugins/io_hyp/hyp_y.h =================================================================== --- trunk/src_plugins/io_hyp/hyp_y.h (revision 8972) +++ trunk/src_plugins/io_hyp/hyp_y.h (revision 8973) @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.0.4. */ +/* A Bison parser, made by GNU Bison 3.0.2. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. 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 @@ -165,7 +165,7 @@ /* Value type. */ #if ! defined HYYSTYPE && ! defined HYYSTYPE_IS_DECLARED - +typedef union HYYSTYPE HYYSTYPE; union HYYSTYPE { #line 30 "hyp_y.y" /* yacc.c:1909 */ @@ -177,8 +177,6 @@ #line 179 "hyp_y.h" /* yacc.c:1909 */ }; - -typedef union HYYSTYPE HYYSTYPE; # define HYYSTYPE_IS_TRIVIAL 1 # define HYYSTYPE_IS_DECLARED 1 #endif Index: trunk/src_plugins/io_hyp/parser.c =================================================================== --- trunk/src_plugins/io_hyp/parser.c (revision 8972) +++ trunk/src_plugins/io_hyp/parser.c (revision 8973) @@ -771,7 +771,7 @@ pcb_layer_id_t id = -1; pcb_layergrp_id_t gid = -1; - pcb_layer_group_t *grp = NULL; + pcb_layergrp_t *grp = NULL; pcb_layergrp_inhibit_inc(); @@ -831,7 +831,7 @@ { pcb_layer_id_t layer_id; pcb_layergrp_id_t gid; - pcb_layer_group_t *grp; + pcb_layergrp_t *grp; char new_layer_name[PCB_MAX_LAYER]; int n; Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 8972) +++ trunk/src_plugins/io_kicad/read.c (revision 8973) @@ -908,13 +908,13 @@ default: if (strcmp(lname, "Edge.Cuts") == 0) { /* Edge must be the outline */ - pcb_layer_group_t *g = pcb_get_grp_new_intern(PCB, -1); + pcb_layergrp_t *g = pcb_get_grp_new_intern(PCB, -1); pcb_layergrp_fix_turn_to_outline(g); id = pcb_layer_create(g - PCB->LayerGroups.grp, lname); } else if ((strcmp(ltype, "signal") == 0) || (strcmp(ltype, "power") == 0) || (strncmp(lname, "Dwgs.", 4) == 0) || (strncmp(lname, "Cmts.", 4) == 0) || (strncmp(lname, "Eco", 3) == 0)) { /* Create a new inner layer for signals and for emulating misc layers */ - pcb_layer_group_t *g = pcb_get_grp_new_intern(PCB, -1); + pcb_layergrp_t *g = pcb_get_grp_new_intern(PCB, -1); id = pcb_layer_create(g - PCB->LayerGroups.grp, lname); } else if ((lname[1] == '.') && ((lname[0] == 'F') || (lname[0] == 'B'))) { Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 8972) +++ trunk/src_plugins/io_lihata/read.c (revision 8973) @@ -753,7 +753,7 @@ { int n; pcb_layergrp_id_t top_silk, bottom_silk; - pcb_layer_group_t *g; + pcb_layergrp_t *g; pcb_layergrp_inhibit_inc(); @@ -816,7 +816,7 @@ grps = lht_dom_hash_get(nd, "groups"); for(grp = lht_dom_first(&it, grps); grp != NULL; grp = lht_dom_next(&it)) { pcb_layergrp_id_t gid; - pcb_layer_group_t *g; + pcb_layergrp_t *g; char *end; gid = strtol(grp->name, &end, 10); if ((*end != '\0') || (gid < 0)) { Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 8972) +++ trunk/src_plugins/io_lihata/write.c (revision 8973) @@ -472,7 +472,7 @@ lht_dom_hash_put(lstk, grps = lht_dom_node_alloc(LHT_LIST, "groups")); for(n = 0; n < pcb->LayerGroups.len; n++) { - pcb_layer_group_t *g = &pcb->LayerGroups.grp[n]; + pcb_layergrp_t *g = &pcb->LayerGroups.grp[n]; char tmp[32]; sprintf(tmp, "%d", n); lht_dom_list_append(grps, grp = lht_dom_node_alloc(LHT_HASH, tmp)); @@ -565,7 +565,7 @@ long int n; lht_node_t *layers; pcb_layergrp_id_t gm, grp[PCB_MAX_LAYERGRP], gtop = -1, gbottom = -1; - pcb_layer_group_t *g; + pcb_layergrp_t *g; layers = lht_dom_node_alloc(LHT_LIST, "layers"); Index: trunk/src_plugins/lib_gtk_common/wt_layersel.c =================================================================== --- trunk/src_plugins/lib_gtk_common/wt_layersel.c (revision 8972) +++ trunk/src_plugins/lib_gtk_common/wt_layersel.c (revision 8973) @@ -174,7 +174,7 @@ /* look for the next one to enable, group-vise */ for(gid = CURRENT->grp + 1; gid != CURRENT->grp; gid++) { - pcb_layer_group_t *g; + pcb_layergrp_t *g; if (gid >= pcb_max_group(PCB)) gid = 0; g = &PCB->LayerGroups.grp[gid]; @@ -264,7 +264,7 @@ return TRUE; } -static void layer_popup(pcb_gtk_layersel_t *ls, int button, pcb_layer_id_t lid, pcb_layer_group_t *g) +static void layer_popup(pcb_gtk_layersel_t *ls, int button, pcb_layer_id_t lid, pcb_layergrp_t *g) { if (button != 3) return; @@ -393,7 +393,7 @@ return conf_core.appearance.color.layer[lid] == NULL ? "#aaaa00" : conf_core.appearance.color.layer[lid]; } -static const char * const grp_color(pcb_layer_group_t *g) +static const char * const grp_color(pcb_layergrp_t *g) { hardwired_colors(g->type); /* normal mechanism: first layer's color or yellow */ @@ -450,7 +450,7 @@ } /* Creating a group enrty (both open and closed state); after layers are added, finish() needs to be called */ -static GtkWidget *build_group_start(pcb_gtk_layersel_t *ls, pcb_gtk_ls_grp_t *lsg, const char *gname, int has_group_vis, pcb_layer_group_t *grp) +static GtkWidget *build_group_start(pcb_gtk_layersel_t *ls, pcb_gtk_ls_grp_t *lsg, const char *gname, int has_group_vis, pcb_layergrp_t *grp) { GtkWidget *gn_vert, *vlabel, *opn, *cld; @@ -512,7 +512,7 @@ } /* Create a group that has a real layer group in core, add all layers */ -static GtkWidget *build_group_real(pcb_gtk_layersel_t *ls, pcb_gtk_ls_grp_t *lsg, pcb_layer_group_t *grp) +static GtkWidget *build_group_real(pcb_gtk_layersel_t *ls, pcb_gtk_ls_grp_t *lsg, pcb_layergrp_t *grp) { int n; GtkWidget *wg = build_group_start(ls, lsg, grp->name, 1, grp); @@ -570,7 +570,7 @@ int n; for(gid = 0; gid < pcb_max_group(PCB); gid++) { - pcb_layer_group_t *g = &PCB->LayerGroups.grp[gid]; + pcb_layergrp_t *g = &PCB->LayerGroups.grp[gid]; if (g->type & PCB_LYT_SUBSTRATE) continue; gtk_box_pack_start(GTK_BOX(ls->grp_box), build_group_real(ls, &ls->grp[gid], g), FALSE, FALSE, 0); Index: trunk/src_plugins/lib_gtk_common/wt_layersel.h =================================================================== --- trunk/src_plugins/lib_gtk_common/wt_layersel.h (revision 8972) +++ trunk/src_plugins/lib_gtk_common/wt_layersel.h (revision 8973) @@ -27,7 +27,7 @@ struct pcb_gtk_ls_grp_s { GtkWidget *grp_row, *grp_closed, *grp_open, *layers, *vis_on, *vis_off; - pcb_layer_group_t *grp; + pcb_layergrp_t *grp; pcb_gtk_ls_lyr_t *layer; /* for callbacks */ @@ -40,7 +40,7 @@ GtkWidget *grp_box, *grp_box_outer; pcb_gtk_ls_grp_t grp[PCB_MAX_LAYERGRP]; pcb_gtk_ls_grp_t lsg_virt, lsg_ui; - pcb_layer_group_t grp_virt, grp_ui; + pcb_layergrp_t grp_virt, grp_ui; unsigned running:1; unsigned no_copper_sel:1; }; Index: trunk/src_plugins/lib_hid_common/layer_menu.c =================================================================== --- trunk/src_plugins/lib_hid_common/layer_menu.c (revision 8972) +++ trunk/src_plugins/lib_hid_common/layer_menu.c (revision 8973) @@ -45,7 +45,7 @@ } for(gid = 0; gid < pcb_max_group(PCB); gid++) { - pcb_layer_group_t *g = &PCB->LayerGroups.grp[gid]; + pcb_layergrp_t *g = &PCB->LayerGroups.grp[gid]; int n; if (g->type & PCB_LYT_SUBSTRATE)