Index: work/alien_formats/eagle/eagle_bin/test_parser/eagle_bin.c =================================================================== --- work/alien_formats/eagle/eagle_bin/test_parser/eagle_bin.c (revision 9541) +++ work/alien_formats/eagle/eagle_bin/test_parser/eagle_bin.c (revision 9542) @@ -102,7 +102,7 @@ }, }, { PCB_EGKW_SECT_UKNOWN11 }, - { PCB_EGKW_SECT_GRID, "grid", + { GRID, "grid", { /* field match */ TERM }, @@ -120,7 +120,7 @@ TERM }, }, - { PCB_EGKW_SECT_LAYER, "layer", + { LAYERS, "layers", { /* field match */ TERM }, @@ -139,7 +139,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_LAYER, "alt_layer", + { ALT_LAYERS, "alt_layers", { /* field match */ TERM }, @@ -173,7 +173,7 @@ TERM }, }, - { PCB_EGKW_SECT_LIBRARY, "library", + { LIBRARY, "library", { /* field match */ TERM }, @@ -217,7 +217,7 @@ TERM }, }, - { PCB_EGKW_SECT_PACKAGES, "packages", + { PACKAGES, "packages", { /* field match */ TERM }, @@ -233,7 +233,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_PACKAGES, "alt_packages", + { ALT_PACKAGES, "alt_packages", { /* field match */ TERM }, @@ -249,7 +249,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ALT_PACKAGES, "alt_alt_packages", + { ALT_ALT_PACKAGES, "alt_alt_packages", { /* field match */ TERM }, @@ -284,7 +284,7 @@ TERM }, }, - { PCB_EGKW_SECT_BOARD, "board", + { BOARD, "board", { /* field match */ TERM }, @@ -306,7 +306,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_BOARD, "alt_board", + { ALT_BOARD, "alt_board", { /* field match */ TERM }, @@ -328,7 +328,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ALT_BOARD, "alt_alt_board", + { ALT_ALT_BOARD, "alt_alt_board", { /* field match */ TERM }, @@ -350,7 +350,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ALT_ALT_BOARD, "alt_alt_alt_board", + { ALT_ALT_ALT_BOARD, "alt_alt_alt_board", { /* field match */ TERM }, @@ -484,7 +484,7 @@ TERM }, }, - { PCB_EGKW_SECT_PACKAGE, "package", + { PACKAGE, "package", { /* field match */ TERM }, @@ -502,7 +502,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_PACKAGE, "alt_package", + { ALT_PACKAGE, "alt_package", { /* field match */ TERM }, @@ -554,7 +554,7 @@ TERM }, }, - { PCB_EGKW_SECT_POLYGON, "polygon", + { POLYGON, "polygon", { /* field match */ TERM }, @@ -578,7 +578,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_POLYGON, "alt_polygon", + { ALT_POLYGON, "alt_polygon", { /* field match */ TERM }, @@ -845,7 +845,7 @@ TERM }, }, - { PCB_EGKW_SECT_CIRCLE, "circle", + { CIRCLE, "circle", { /* field match */ TERM }, @@ -861,7 +861,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_CIRCLE, "alt_circle", + { ALT_CIRCLE, "alt_circle", { /* field match */ TERM }, @@ -877,7 +877,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ALT_CIRCLE, "alt_alt_circle", + { ALT_ALT_CIRCLE, "alt_alt_circle", { /* field match */ TERM }, @@ -893,7 +893,7 @@ TERM }, }, - { PCB_EGKW_SECT_RECTANGLE, "rectangle", + { RECTANGLE, "rectangle", { /* field match */ TERM }, @@ -910,7 +910,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_RECTANGLE, "alt_rectangle", + { ALT_RECTANGLE, "alt_rectangle", { /* field match */ TERM }, @@ -927,7 +927,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ALT_RECTANGLE, "alt_alt_rectangle", + { ALT_ALT_RECTANGLE, "alt_alt_rectangle", { /* field match */ TERM }, @@ -959,7 +959,7 @@ TERM }, }, - { PCB_EGKW_SECT_HOLE, "hole", + { HOLE, "hole", { /* field match */ TERM }, @@ -973,7 +973,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_HOLE, "alt_hole", + { ALT_HOLE, "alt_hole", { /* field match */ TERM }, @@ -987,7 +987,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ALT_HOLE, "alt_alt_hole", + { ALT_ALT_HOLE, "alt_alt_hole", { /* field match */ TERM }, @@ -1001,7 +1001,7 @@ TERM }, }, - { PCB_EGKW_SECT_VIA, "via", + { VIA, "via", { /* field match */ TERM }, @@ -1019,7 +1019,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_VIA, "alt_via", + { ALT_VIA, "alt_via", { /* field match */ TERM }, @@ -1037,7 +1037,7 @@ TERM }, }, - { PCB_EGKW_SECT_PAD, "pad", + { PAD, "pad", { /* field match */ TERM }, @@ -1058,7 +1058,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_PAD, "alt_pad", + { ALT_PAD, "alt_pad", { /* field match */ TERM }, @@ -1079,7 +1079,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ALT_PAD, "alt_alt_pad", + { ALT_ALT_PAD, "alt_alt_pad", { /* field match */ TERM }, @@ -1100,7 +1100,7 @@ TERM }, }, - { PCB_EGKW_SECT_SMD, "smd", + { SMD, "smd", { /* field match */ TERM }, @@ -1123,7 +1123,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_SMD, "alt_smd", + { ALT_SMD, "alt_smd", { /* field match */ TERM }, @@ -1184,7 +1184,7 @@ TERM }, }, - { PCB_EGKW_SECT_BOARDPACKAGE, "boardpackage", + { PACKAGE, "package", { /* field match */ TERM }, @@ -1203,7 +1203,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_BOARDPACKAGE, "alt_boardpackage", + { ALT_PACKAGE, "alt_package", { /* field match */ TERM }, @@ -1222,7 +1222,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ALT_BOARDPACKAGE, "alt_alt_boardpackage", + { ALT_ALT_PACKAGE, "alt_alt_package", { /* field match */ TERM }, @@ -1241,7 +1241,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ALT_ALT_BOARDPACKAGE, "alt_alt_alt_boardpackage", + { ALT_ALT_ALT_PACKAGE, "alt_alt_alt_package", { /* field match */ TERM }, @@ -1260,7 +1260,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ALT_ALT_ALT_BOARDPACKAGE, "alt_alt_alt_alt_boardpackage", + { ALT_ALT_ALT_ALT_PACKAGE, "alt_alt_alt_alt_package", { /* field match */ TERM }, @@ -1279,7 +1279,7 @@ TERM }, }, - { PCB_EGKW_SECT_BOARDPACKAGE2, "boardpackage2", + { PACKAGE2, "package2", { /* field match */ TERM }, @@ -1292,7 +1292,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_BOARDPACKAGE2, "alt_boardpackage2", + { ALT_PACKAGE2, "alt_package2", { /* field match */ TERM }, @@ -1305,7 +1305,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ALT_BOARDPACKAGE2, "alt_alt_boardpackage2", + { ALT_ALT_PACKAGE2, "alt_alt_package2", { /* field match */ TERM }, @@ -1339,7 +1339,7 @@ TERM }, }, - { PCB_EGKW_SECT_TEXT, "textbasesection", /* basic text block */ + { TEXT, "text", /* basic text block */ { /* field match */ TERM }, @@ -1363,7 +1363,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_TEXT, "alt_textbasesection", /* basic text block */ + { ALT_TEXT, "alt_text", /* basic text block */ { /* field match */ TERM }, @@ -1387,7 +1387,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ALT_TEXT, "alt_alt_textbasesection", /* basic text block */ + { ALT_ALT_TEXT, "alt_alt_text", /* basic text block */ { /* field match */ TERM }, @@ -1411,7 +1411,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ALT_ALT_TEXT, "alt_alt_alt_textbasesection", /* basic text block */ + { ALT_ALT_ALT_TEXT, "alt_alt_alt_text", /* basic text block */ { /* field match */ TERM }, @@ -1770,7 +1770,7 @@ TERM }, }, - { PCB_EGKW_SECT_ATTRIBUTE, "attribute", /* same as text basesection */ + { ATTRIBUTE, "attribute", /* same as text basesection */ { /* field match */ TERM }, @@ -1794,7 +1794,7 @@ TERM }, }, - { PCB_EGKW_SECT_ALT_ATTRIBUTE, "alt_attribute", /* same as text basesection */ + { ALT_ATTRIBUTE, "alt_attribute", /* same as text basesection */ { /* field match */ TERM }, Index: work/alien_formats/eagle/eagle_bin/test_parser/eagle_bin.h =================================================================== --- work/alien_formats/eagle/eagle_bin/test_parser/eagle_bin.h (revision 9541) +++ work/alien_formats/eagle/eagle_bin/test_parser/eagle_bin.h (revision 9542) @@ -4,21 +4,21 @@ PCB_EGKW_SECT_START = 0x1000, PCB_EGKW_SECT_ALT_START = 0x1080, PCB_EGKW_SECT_UKNOWN11 = 0x1100, - PCB_EGKW_SECT_GRID = 0x1200, - PCB_EGKW_SECT_LAYER = 0x1300, - PCB_EGKW_SECT_ALT_LAYER = 0x1380, + GRID = 0x1200, + LAYERS = 0x1300, + ALT_LAYERS = 0x1380, PCB_EGKW_SECT_SCHEMA = 0x1400, - PCB_EGKW_SECT_LIBRARY = 0x1500, + LIBRARY = 0x1500, PCB_EGKW_SECT_DEVICES = 0x1700, PCB_EGKW_SECT_SYMBOLS = 0x1800, - PCB_EGKW_SECT_PACKAGES = 0x1900, - PCB_EGKW_SECT_ALT_PACKAGES = 0x1980, - PCB_EGKW_SECT_ALT_ALT_PACKAGES = 0x19a0, + PACKAGES = 0x1900, + ALT_PACKAGES = 0x1980, + ALT_ALT_PACKAGES = 0x19a0, PCB_EGKW_SECT_SCHEMASHEET = 0x1a00, - PCB_EGKW_SECT_BOARD = 0x1b00, - PCB_EGKW_SECT_ALT_BOARD = 0x1b40, - PCB_EGKW_SECT_ALT_ALT_BOARD = 0x1b80, - PCB_EGKW_SECT_ALT_ALT_ALT_BOARD = 0x1b08, + BOARD = 0x1b00, + ALT_BOARD = 0x1b40, + ALT_ALT_BOARD = 0x1b80, + ALT_ALT_ALT_BOARD = 0x1b08, PCB_EGKW_SECT_BOARDNET = 0x1c00, PCB_EGKW_SECT_ALT_BOARDNET = 0x1c04, PCB_EGKW_SECT_ALT_ALT_BOARDNET = 0x1c40, @@ -40,38 +40,38 @@ PCB_EGKW_SECT_ALT_ALT_ALT_ALT_ALT_ALT_LINE = 0x228c, PCB_EGKW_SECT_ALT_ALT_ALT_ALT_ALT_ALT_ALT_LINE = 0x2288, PCB_EGKW_SECT_ARC = 0x2400, - PCB_EGKW_SECT_CIRCLE = 0x2500, - PCB_EGKW_SECT_ALT_CIRCLE = 0x2580, - PCB_EGKW_SECT_ALT_ALT_CIRCLE = 0x25a0, - PCB_EGKW_SECT_RECTANGLE = 0x2600, - PCB_EGKW_SECT_ALT_RECTANGLE = 0x2680, - PCB_EGKW_SECT_ALT_ALT_RECTANGLE = 0x26a0, + CIRCLE = 0x2500, + ALT_CIRCLE = 0x2580, + ALT_ALT_CIRCLE = 0x25a0, + RECTANGLE = 0x2600, + ALT_RECTANGLE = 0x2680, + ALT_ALT_RECTANGLE = 0x26a0, PCB_EGKW_SECT_JUNCTION = 0x2700, - PCB_EGKW_SECT_HOLE = 0x2800, + HOLE = 0x2800, PCB_EGKW_SECT_ALT_HOLE = 0x2880, PCB_EGKW_SECT_ALT_ALT_HOLE = 0x28a0, - PCB_EGKW_SECT_VIA = 0x2900, - PCB_EGKW_SECT_ALT_VIA = 0x2980, - PCB_EGKW_SECT_PAD = 0x2a00, - PCB_EGKW_SECT_ALT_PAD = 0x2a80, - PCB_EGKW_SECT_ALT_ALT_PAD = 0x2aa0, - PCB_EGKW_SECT_SMD = 0x2b00, - PCB_EGKW_SECT_ALT_SMD = 0x2b80, + VIA = 0x2900, + ALT_VIA = 0x2980, + PAD = 0x2a00, + ALT_PAD = 0x2a80, + ALT_ALT_PAD = 0x2aa0, + SMD = 0x2b00, + ALT_SMD = 0x2b80, PCB_EGKW_SECT_PIN = 0x2c00, PCB_EGKW_SECT_GATE = 0x2d00, - PCB_EGKW_SECT_BOARDPACKAGE = 0x2e00, - PCB_EGKW_SECT_ALT_BOARDPACKAGE = 0x2e20, - PCB_EGKW_SECT_ALT_ALT_BOARDPACKAGE = 0x2e80, - PCB_EGKW_SECT_ALT_ALT_ALT_BOARDPACKAGE = 0x2e0c, - PCB_EGKW_SECT_ALT_ALT_ALT_ALT_BOARDPACKAGE = 0x2e28, - PCB_EGKW_SECT_BOARDPACKAGE2 = 0x2f00, - PCB_EGKW_SECT_ALT_BOARDPACKAGE2 = 0x2f80, - PCB_EGKW_SECT_ALT_ALT_BOARDPACKAGE2 = 0x2fa0, + PACKAGE = 0x2e00, + ALT_PACKAGE = 0x2e20, + ALT_ALT_PACKAGE = 0x2e80, + ALT_ALT_ALT_PACKAGE = 0x2e0c, + ALT_ALT_ALT_ALT_PACKAGE = 0x2e28, + PACKAGE2 = 0x2f00, + ALT_PACKAGE2 = 0x2f80, + ALT_ALT_PACKAGE2 = 0x2fa0, PCB_EGKW_SECT_INSTANCE = 0x3000, - PCB_EGKW_SECT_TEXT = 0x3100, - PCB_EGKW_SECT_ALT_TEXT = 0x3180, - PCB_EGKW_SECT_ALT_ALT_TEXT = 0x31a0, - PCB_EGKW_SECT_ALT_ALT_ALT_TEXT = 0x318c, + TEXT = 0x3100, + ALT_TEXT = 0x3180, + ALT_ALT_TEXT = 0x31a0, + ALT_ALT_ALT_TEXT = 0x318c, PCB_EGKW_SECT_NETBUSLABEL = 0x3300, PCB_EGKW_SECT_SMASHEDNAME = 0x3400, PCB_EGKW_SECT_ALT_SMASHEDNAME = 0x3480, @@ -94,8 +94,8 @@ PCB_EGKW_SECT_ALT_ALT_ALT_ALT_BOARDCONNECTION = 0x3e20, PCB_EGKW_SECT_SMASHEDPART = 0x3f00, PCB_EGKW_SECT_SMASHEDGATE = 0x4000, - PCB_EGKW_SECT_ATTRIBUTE = 0x4100, - PCB_EGKW_SECT_ALT_ATTRIBUTE = 0x4180, + ATTRIBUTE = 0x4100, + ALT_ATTRIBUTE = 0x4180, PCB_EGKW_SECT_ATTRIBUTEVALUE = 0x4200, PCB_EGKW_SECT_FRAME = 0x4300, PCB_EGKW_SECT_SMASHEDXREF = 0x4400,