Index: file.c =================================================================== --- file.c (revision 31010) +++ file.c (revision 31011) @@ -782,7 +782,7 @@ pcb_layer_group_setup_default(yyPCB); PCB = yyPCB; pcb_layer_group_setup_silks(yyPCB); - pcb_data_bbox(&dbb, yyPCB->Data, pcb_false); + pcb_data_bbox(&dbb, yyPCB->Data, rnd_false); pcb_data_normalize_(yyPCB->Data, &dbb); PCB = pcb_save; yyPCB->hidlib.size_x = dbb.X2*2; @@ -1080,7 +1080,7 @@ { pcb_layer_type_t side = yysubc_bottom ? PCB_LYT_BOTTOM : PCB_LYT_TOP; const char *name = yysubc_bottom ? "bottom-silk" : "top-silk"; - return pcb_subc_get_layer(subc, PCB_LYT_SILK | side, /*PCB_LYC_AUTO*/0, pcb_true, name, pcb_false); + return pcb_subc_get_layer(subc, PCB_LYT_SILK | side, /*PCB_LYC_AUTO*/0, rnd_true, name, rnd_false); } pcb_line_t *io_pcb_element_line_new(pcb_subc_t *subc, rnd_coord_t X1, rnd_coord_t Y1, rnd_coord_t X2, rnd_coord_t Y2, rnd_coord_t Thickness) @@ -1093,7 +1093,7 @@ rnd_coord_t Width, rnd_coord_t Height, rnd_angle_t angle, rnd_angle_t delta, rnd_coord_t Thickness) { pcb_layer_t *ly = subc_silk_layer(subc); - return pcb_arc_new(ly, X, Y, Width, Height, angle, delta, Thickness, 0, pcb_no_flags(), pcb_true); + return pcb_arc_new(ly, X, Y, Width, Height, angle, delta, Thickness, 0, pcb_no_flags(), rnd_true); } pcb_pstk_t *io_pcb_element_pin_new(pcb_subc_t *subc, rnd_coord_t X, rnd_coord_t Y, rnd_coord_t Thickness, rnd_coord_t Clearance, rnd_coord_t Mask, rnd_coord_t DrillingHole, const char *Name, const char *Number, pcb_flag_t Flags) @@ -1193,7 +1193,7 @@ void pcb_tmp_data_save(void) { char *fn = rnd_build_fn(&PCB->hidlib, conf_core.rc.emergency_name); - pcb_write_pcb_file(fn, pcb_true, NULL, pcb_true, pcb_false, -1, 0); + pcb_write_pcb_file(fn, rnd_true, NULL, rnd_true, rnd_false, -1, 0); if (TMPFilename != NULL) free(TMPFilename); TMPFilename = fn; Index: parse_l.c =================================================================== --- parse_l.c (revision 31010) +++ parse_l.c (revision 31011) @@ -2600,7 +2600,7 @@ char *tmps; size_t l; #ifdef FLEX_SCANNER - static rnd_bool firsttime = pcb_true; + static rnd_bool firsttime = rnd_true; #endif pcb_io_pcb_usty_seen = 0; if (Pipe == NULL) { @@ -2653,7 +2653,7 @@ /* reset parser if not called the first time */ if (!firsttime) yyrestart(yyin); - firsttime = pcb_false; + firsttime = rnd_false; #endif /* init linenumber and filename for yyerror() */ @@ -2666,7 +2666,7 @@ * on termination. */ - pcb_create_be_lenient(pcb_true); + pcb_create_be_lenient(rnd_true); #if !defined(RND_HAS_ATEXIT) if (PCB && PCB->Data) @@ -2679,7 +2679,7 @@ /* clean up parse buffer */ yy_delete_buffer(YY_CURRENT_BUFFER); - pcb_create_be_lenient(pcb_false); + pcb_create_be_lenient(rnd_false); if (Pipe != NULL) return returncode; @@ -2708,7 +2708,7 @@ yyData = Ptr; pcb_data_set_layer_parents(Ptr); yyFont = pcb_font(PCB, 0, 1); - yyFontReset = pcb_false; + yyFontReset = rnd_false; yyFontkitValid = NULL; yysubc = NULL; yyElemFixLayers = 1; @@ -2758,7 +2758,7 @@ yyPCB = Ptr; yyData = NULL; yyFont = NULL; - yyFontReset = pcb_true; + yyFontReset = rnd_true; yyFontkitValid = NULL; yysubc = NULL; yy_settings_dest = settings_dest; @@ -2867,7 +2867,7 @@ yyFont = Ptr; yyFontkitValid = &valid; yysubc = NULL; - yyFontReset = pcb_false; + yyFontReset = rnd_false; yy_settings_dest = RND_CFR_invalid; fcmd = conf_core.rc.font_command; Index: parse_l.l =================================================================== --- parse_l.l (revision 31010) +++ parse_l.l (revision 31011) @@ -217,7 +217,7 @@ char *tmps; size_t l; #ifdef FLEX_SCANNER - static rnd_bool firsttime = pcb_true; + static rnd_bool firsttime = rnd_true; #endif pcb_io_pcb_usty_seen = 0; if (Pipe == NULL) { @@ -270,7 +270,7 @@ /* reset parser if not called the first time */ if (!firsttime) yyrestart(yyin); - firsttime = pcb_false; + firsttime = rnd_false; #endif /* init linenumber and filename for yyerror() */ @@ -283,7 +283,7 @@ * on termination. */ - pcb_create_be_lenient(pcb_true); + pcb_create_be_lenient(rnd_true); #if !defined(RND_HAS_ATEXIT) if (PCB && PCB->Data) @@ -296,7 +296,7 @@ /* clean up parse buffer */ yy_delete_buffer(YY_CURRENT_BUFFER); - pcb_create_be_lenient(pcb_false); + pcb_create_be_lenient(rnd_false); if (Pipe != NULL) return returncode; @@ -325,7 +325,7 @@ yyData = Ptr; pcb_data_set_layer_parents(Ptr); yyFont = pcb_font(PCB, 0, 1); - yyFontReset = pcb_false; + yyFontReset = rnd_false; yyFontkitValid = NULL; yysubc = NULL; yyElemFixLayers = 1; @@ -375,7 +375,7 @@ yyPCB = Ptr; yyData = NULL; yyFont = NULL; - yyFontReset = pcb_true; + yyFontReset = rnd_true; yyFontkitValid = NULL; yysubc = NULL; yy_settings_dest = settings_dest; @@ -484,7 +484,7 @@ yyFont = Ptr; yyFontkitValid = &valid; yysubc = NULL; - yyFontReset = pcb_false; + yyFontReset = rnd_false; yy_settings_dest = RND_CFR_invalid; fcmd = conf_core.rc.font_command; Index: parse_y.c =================================================================== --- parse_y.c (revision 31010) +++ parse_y.c (revision 31011) @@ -1825,7 +1825,7 @@ YYABORT; } for (i = 0; i < PCB_MAX_LAYER + 2; i++) - LayerFlag[i] = pcb_false; + LayerFlag[i] = rnd_false; yyFont = &yyPCB->fontkit.dflt; yyFontkitValid = &yyPCB->fontkit.valid; yyData = yyPCB->Data; @@ -1846,7 +1846,7 @@ rnd_conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, RND_POL_OVERWRITE); pcb_board_new_postproc(yyPCB, 0); if (layer_group_string == NULL) { - if (pcb_layer_improvise(yyPCB, pcb_true) != 0) { + if (pcb_layer_improvise(yyPCB, rnd_true) != 0) { rnd_message(RND_MSG_ERROR, "missing layer-group string, failed to improvise the groups\n"); YYABORT; } @@ -1859,7 +1859,7 @@ YYABORT; } else { - if (pcb_layer_improvise(yyPCB, pcb_false) != 0) { + if (pcb_layer_improvise(yyPCB, rnd_false) != 0) { rnd_message(RND_MSG_ERROR, "failed to extend-improvise the groups\n"); YYABORT; } @@ -1889,8 +1889,8 @@ case 9: #line 232 "parse_y.y" /* yacc.c:1652 */ - { LayerFlag[0] = pcb_true; - LayerFlag[1] = pcb_true; + { LayerFlag[0] = rnd_true; + LayerFlag[1] = rnd_true; if (yyElemFixLayers) { yyData->LayerN = 2; free((char *)yyData->Layer[0].name); @@ -1925,7 +1925,7 @@ YYABORT; } for (i = 0; i < PCB_MAX_LAYER + 2; i++) - LayerFlag[i] = pcb_false; + LayerFlag[i] = rnd_false; yyData->LayerN = 0; } #line 1932 "parse_y.c" /* yacc.c:1652 */ @@ -1944,7 +1944,7 @@ pcb_font_free (yyFont); yyFont->id = 0; } - *yyFontkitValid = pcb_false; + *yyFontkitValid = rnd_false; } #line 1950 "parse_y.c" /* yacc.c:1652 */ break; @@ -1952,7 +1952,7 @@ case 15: #line 293 "parse_y.y" /* yacc.c:1652 */ { - *yyFontkitValid = pcb_true; + *yyFontkitValid = rnd_true; pcb_font_set_info(yyFont); } #line 1959 "parse_y.c" /* yacc.c:1652 */ @@ -2284,7 +2284,7 @@ if (Layer->name != NULL) free((char*)Layer->name); Layer->name = (yyvsp[-3].string); /* shouldn't this be strdup()'ed ? */ - LayerFlag[(yyvsp[-4].integer)-1] = pcb_true; + LayerFlag[(yyvsp[-4].integer)-1] = rnd_true; if (yyData->LayerN < (yyvsp[-4].integer)) yyData->LayerN = (yyvsp[-4].integer); if ((yyvsp[-2].string) != NULL) @@ -2341,7 +2341,7 @@ #line 687 "parse_y.y" /* yacc.c:1652 */ { pcb_arc_new(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), pcb_true); + NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-1].flagtype), rnd_true); } #line 2347 "parse_y.c" /* yacc.c:1652 */ break; @@ -2350,7 +2350,7 @@ #line 696 "parse_y.y" /* yacc.c:1652 */ { pcb_arc_new(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)), pcb_flag_old((yyvsp[-1].integer)), pcb_true); + OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), pcb_flag_old((yyvsp[-1].integer)), rnd_true); } #line 2356 "parse_y.c" /* yacc.c:1652 */ break; @@ -2359,7 +2359,7 @@ #line 705 "parse_y.y" /* yacc.c:1652 */ { pcb_arc_new(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*PCB_GROUNDPLANEFRAME, pcb_flag_old((yyvsp[-1].integer)), pcb_true); + OU ((yyvsp[-4].measure)), 200*PCB_GROUNDPLANEFRAME, pcb_flag_old((yyvsp[-1].integer)), rnd_true); } #line 2365 "parse_y.c" /* yacc.c:1652 */ break; @@ -2429,7 +2429,7 @@ #line 771 "parse_y.y" /* yacc.c:1652 */ { rnd_cardinal_t contour, contour_start, contour_end; - rnd_bool bad_contour_found = pcb_false; + rnd_bool bad_contour_found = rnd_false; /* ignore junk */ for (contour = 0; contour <= Polygon->HoleIndexN; contour++) { @@ -2439,7 +2439,7 @@ Polygon->PointN : Polygon->HoleIndex[contour]; if (contour_end - contour_start < 3) - bad_contour_found = pcb_true; + bad_contour_found = rnd_true; } if (bad_contour_found) @@ -2489,7 +2489,7 @@ #line 847 "parse_y.y" /* yacc.c:1652 */ { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_no_flags(), - (yyvsp[-6].string), (yyvsp[-5].string), NULL, OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].integer), 100, pcb_no_flags(), pcb_false); + (yyvsp[-6].string), (yyvsp[-5].string), NULL, OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].integer), 100, pcb_no_flags(), rnd_false); free ((yyvsp[-6].string)); free ((yyvsp[-5].string)); pin_num = 1; @@ -2509,7 +2509,7 @@ #line 865 "parse_y.y" /* yacc.c:1652 */ { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old((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)), pcb_flag_old((yyvsp[-2].integer)), pcb_false); + (yyvsp[-8].string), (yyvsp[-7].string), NULL, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), pcb_flag_old((yyvsp[-2].integer)), rnd_false); free ((yyvsp[-8].string)); free ((yyvsp[-7].string)); pin_num = 1; @@ -2529,7 +2529,7 @@ #line 883 "parse_y.y" /* yacc.c:1652 */ { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old((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)), pcb_flag_old((yyvsp[-2].integer)), pcb_false); + (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)), pcb_flag_old((yyvsp[-2].integer)), rnd_false); free ((yyvsp[-9].string)); free ((yyvsp[-8].string)); free ((yyvsp[-7].string)); @@ -2551,7 +2551,7 @@ { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old((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)), - (yyvsp[-4].number), (yyvsp[-3].number), pcb_flag_old((yyvsp[-2].integer)), pcb_false); + (yyvsp[-4].number), (yyvsp[-3].number), pcb_flag_old((yyvsp[-2].integer)), rnd_false); yysubc_ox = OU ((yyvsp[-8].measure)); yysubc_oy = OU ((yyvsp[-7].measure)); free ((yyvsp[-11].string)); @@ -2574,7 +2574,7 @@ { yysubc = io_pcb_element_new(yyData, yysubc, 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)), - (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].flagtype), pcb_false); + (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].flagtype), rnd_false); yysubc_ox = NU ((yyvsp[-8].measure)); yysubc_oy = NU ((yyvsp[-7].measure)); free ((yyvsp[-11].string)); @@ -2845,7 +2845,7 @@ yyerror("symbol ID used twice"); YYABORT; } - Symbol->Valid = pcb_true; + Symbol->Valid = rnd_true; Symbol->Delta = NU ((yyvsp[-2].measure)); } #line 2852 "parse_y.c" /* yacc.c:1652 */ @@ -2865,7 +2865,7 @@ yyerror("symbol ID used twice"); YYABORT; } - Symbol->Valid = pcb_true; + Symbol->Valid = rnd_true; Symbol->Delta = OU ((yyvsp[-2].measure)); } #line 2872 "parse_y.c" /* yacc.c:1652 */ Index: parse_y.y =================================================================== --- parse_y.y (revision 31010) +++ parse_y.y (revision 31011) @@ -164,7 +164,7 @@ YYABORT; } for (i = 0; i < PCB_MAX_LAYER + 2; i++) - LayerFlag[i] = pcb_false; + LayerFlag[i] = rnd_false; yyFont = &yyPCB->fontkit.dflt; yyFontkitValid = &yyPCB->fontkit.valid; yyData = yyPCB->Data; @@ -194,7 +194,7 @@ rnd_conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, RND_POL_OVERWRITE); pcb_board_new_postproc(yyPCB, 0); if (layer_group_string == NULL) { - if (pcb_layer_improvise(yyPCB, pcb_true) != 0) { + if (pcb_layer_improvise(yyPCB, rnd_true) != 0) { rnd_message(RND_MSG_ERROR, "missing layer-group string, failed to improvise the groups\n"); YYABORT; } @@ -207,7 +207,7 @@ YYABORT; } else { - if (pcb_layer_improvise(yyPCB, pcb_false) != 0) { + if (pcb_layer_improvise(yyPCB, rnd_false) != 0) { rnd_message(RND_MSG_ERROR, "failed to extend-improvise the groups\n"); YYABORT; } @@ -229,8 +229,8 @@ | { PreLoadElementPCB (); layer_group_string = NULL; } element - { LayerFlag[0] = pcb_true; - LayerFlag[1] = pcb_true; + { LayerFlag[0] = rnd_true; + LayerFlag[1] = rnd_true; if (yyElemFixLayers) { yyData->LayerN = 2; free((char *)yyData->Layer[0].name); @@ -263,7 +263,7 @@ YYABORT; } for (i = 0; i < PCB_MAX_LAYER + 2; i++) - LayerFlag[i] = pcb_false; + LayerFlag[i] = rnd_false; yyData->LayerN = 0; } pcbdata @@ -287,11 +287,11 @@ pcb_font_free (yyFont); yyFont->id = 0; } - *yyFontkitValid = pcb_false; + *yyFontkitValid = rnd_false; } symbols { - *yyFontkitValid = pcb_true; + *yyFontkitValid = rnd_true; pcb_font_set_info(yyFont); } ; @@ -614,7 +614,7 @@ if (Layer->name != NULL) free((char*)Layer->name); Layer->name = $4; /* shouldn't this be strdup()'ed ? */ - LayerFlag[$3-1] = pcb_true; + LayerFlag[$3-1] = rnd_true; if (yyData->LayerN < $3) yyData->LayerN = $3; if ($5 != NULL) @@ -686,7 +686,7 @@ : T_ARC '[' measure measure measure measure measure measure number number flags ']' { pcb_arc_new(Layer, NU ($3), NU ($4), NU ($5), NU ($6), $9, $10, - NU ($7), NU ($8), $11, pcb_true); + NU ($7), NU ($8), $11, rnd_true); } ; @@ -695,7 +695,7 @@ : T_ARC '(' measure measure measure measure measure measure number number INTEGER ')' { pcb_arc_new(Layer, OU ($3), OU ($4), OU ($5), OU ($6), $9, $10, - OU ($7), OU ($8), pcb_flag_old($11), pcb_true); + OU ($7), OU ($8), pcb_flag_old($11), rnd_true); } ; @@ -704,7 +704,7 @@ : T_ARC '(' measure measure measure measure measure measure number INTEGER ')' { pcb_arc_new(Layer, OU ($3), OU ($4), OU ($5), OU ($5), IV ($8), $9, - OU ($7), 200*PCB_GROUNDPLANEFRAME, pcb_flag_old($10), pcb_true); + OU ($7), 200*PCB_GROUNDPLANEFRAME, pcb_flag_old($10), rnd_true); } ; @@ -770,7 +770,7 @@ polygonholes ')' { rnd_cardinal_t contour, contour_start, contour_end; - rnd_bool bad_contour_found = pcb_false; + rnd_bool bad_contour_found = rnd_false; /* ignore junk */ for (contour = 0; contour <= Polygon->HoleIndexN; contour++) { @@ -780,7 +780,7 @@ Polygon->PointN : Polygon->HoleIndex[contour]; if (contour_end - contour_start < 3) - bad_contour_found = pcb_true; + bad_contour_found = rnd_true; } if (bad_contour_found) @@ -846,7 +846,7 @@ : T_ELEMENT '(' STRING STRING measure measure INTEGER ')' '(' { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_no_flags(), - $3, $4, NULL, OU ($5), OU ($6), $7, 100, pcb_no_flags(), pcb_false); + $3, $4, NULL, OU ($5), OU ($6), $7, 100, pcb_no_flags(), rnd_false); free ($3); free ($4); pin_num = 1; @@ -864,7 +864,7 @@ : T_ELEMENT '(' INTEGER STRING STRING measure measure measure measure INTEGER ')' '(' { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old($3), - $4, $5, NULL, OU ($6), OU ($7), IV ($8), IV ($9), pcb_flag_old($10), pcb_false); + $4, $5, NULL, OU ($6), OU ($7), IV ($8), IV ($9), pcb_flag_old($10), rnd_false); free ($4); free ($5); pin_num = 1; @@ -882,7 +882,7 @@ : T_ELEMENT '(' INTEGER STRING STRING STRING measure measure measure measure INTEGER ')' '(' { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old($3), - $4, $5, $6, OU ($7), OU ($8), IV ($9), IV ($10), pcb_flag_old($11), pcb_false); + $4, $5, $6, OU ($7), OU ($8), IV ($9), IV ($10), pcb_flag_old($11), rnd_false); free ($4); free ($5); free ($6); @@ -903,7 +903,7 @@ { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old($3), $4, $5, $6, OU ($7) + OU ($9), OU ($8) + OU ($10), - $11, $12, pcb_flag_old($13), pcb_false); + $11, $12, pcb_flag_old($13), rnd_false); yysubc_ox = OU ($7); yysubc_oy = OU ($8); free ($4); @@ -925,7 +925,7 @@ { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, $3, $4, $5, $6, NU ($7) + NU ($9), NU ($8) + NU ($10), - $11, $12, $13, pcb_false); + $11, $12, $13, rnd_false); yysubc_ox = NU ($7); yysubc_oy = NU ($8); free ($4); @@ -1174,7 +1174,7 @@ yyerror("symbol ID used twice"); YYABORT; } - Symbol->Valid = pcb_true; + Symbol->Valid = rnd_true; Symbol->Delta = NU ($4); } | T_SYMBOL '(' symbolid measure ')' '(' @@ -1190,7 +1190,7 @@ yyerror("symbol ID used twice"); YYABORT; } - Symbol->Valid = pcb_true; + Symbol->Valid = rnd_true; Symbol->Delta = OU ($4); } ;