From fd461e7bf58dcdc5adcad923cb4f2496aa9c222e Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 18 Feb 2006 15:02:18 +0000
Subject: [PATCH] (empfile, SYMTAB): Reorder so that symbol tables are
 together.  Sort them alphabetically.  Factor out commonalities into new
 SYMTAB().  No functional changes.

---
 include/file.h        | 29 +++++++++++----------
 src/lib/global/file.c | 60 +++++++++++++++++--------------------------
 2 files changed, 39 insertions(+), 50 deletions(-)

diff --git a/include/file.h b/include/file.h
index 631ea6db..98494cb0 100644
--- a/include/file.h
+++ b/include/file.h
@@ -122,31 +122,32 @@ enum {
     EF_LAND_CHR,
     EF_NUKE_CHR,
     EF_NEWS_CHR,
-    EF_TREATY_FLAGS,
     EF_ITEM,
     EF_INFRASTRUCTURE,
     EF_PRODUCT,
     EF_TABLE,
-    EF_SHIP_CHR_FLAGS,
-    EF_PLANE_CHR_FLAGS,
-    EF_LAND_CHR_FLAGS,
-    EF_NUKE_CHR_FLAGS,
     EF_META,
-    EF_META_TYPE,
+    /* Symbol tables */
+    EF_AGREEMENT_STATUS,
+    EF_LAND_CHR_FLAGS,
+    EF_LEVEL,
     EF_META_FLAGS,
+    EF_META_TYPE,
     EF_MISSIONS,
-    EF_PLANE_FLAGS,
-    EF_RETREAT_FLAGS,
     EF_NATION_FLAGS,
     EF_NATION_RELATIONS,
-    EF_LEVEL,
-    EF_AGREEMENT_STATUS,
-    EF_PLAGUE_STAGES,
-    EF_PACKING,
-    EF_RESOURCES,
     EF_NATION_STATUS,
-    EF_SECTOR_NAVIGATION,
+    EF_NUKE_CHR_FLAGS,
+    EF_PACKING,
     EF_PAGE_HEADINGS,
+    EF_PLAGUE_STAGES,
+    EF_PLANE_CHR_FLAGS,
+    EF_PLANE_FLAGS,
+    EF_RESOURCES,
+    EF_RETREAT_FLAGS,
+    EF_SECTOR_NAVIGATION,
+    EF_SHIP_CHR_FLAGS,
+    EF_TREATY_FLAGS,
     /* Views */
     EF_COUNTRY,
     /* Number of types: */
diff --git a/src/lib/global/file.c b/src/lib/global/file.c
index b9177b3c..a5e07739 100644
--- a/src/lib/global/file.c
+++ b/src/lib/global/file.c
@@ -151,48 +151,36 @@ struct empfile empfile[] = {
     {EF_LAND_CHR, "land-chr", NULL, lchr_ca, ARRAY_CACHE(lchr, EFF_CFG)},
     {EF_NUKE_CHR, "nuke-chr", NULL, nchr_ca, ARRAY_CACHE(nchr, EFF_CFG)},
     {EF_NEWS_CHR, "news-chr", NULL, rpt_ca, ARRAY_TABLE(rpt, EFF_CFG)},
-    {EF_TREATY_FLAGS, "treaty-flags", NULL, symbol_ca,
-     PTR_CACHE(treaty_flags, EFF_CFG)},
     {EF_ITEM, "item", NULL, ichr_ca, ARRAY_TABLE(ichr, EFF_CFG)},
     {EF_INFRASTRUCTURE, "infrastructure", NULL, intrchr_ca,
      ARRAY_TABLE(intrchr, EFF_CFG)},
     {EF_PRODUCT, "product", NULL, pchr_ca, ARRAY_TABLE(pchr, EFF_CFG)},
     {EF_TABLE, "table", NULL, empfile_ca, ARRAY_TABLE(empfile, EFF_CFG)},
-    {EF_SHIP_CHR_FLAGS, "ship-chr-flags", NULL, symbol_ca,
-     PTR_CACHE(ship_chr_flags, EFF_CFG)},
-    {EF_PLANE_CHR_FLAGS, "plane-chr-flags", NULL, symbol_ca,
-     PTR_CACHE(plane_chr_flags, EFF_CFG)},
-    {EF_LAND_CHR_FLAGS, "land-chr-flags", NULL, symbol_ca,
-     PTR_CACHE(land_chr_flags, EFF_CFG)},
-    {EF_NUKE_CHR_FLAGS, "nuke-chr-flags", NULL, symbol_ca,
-     PTR_CACHE(nuke_chr_flags, EFF_CFG)},
     {EF_META, "meta", NULL, mdchr_ca, PTR_CACHE(mdchr_ca, EFF_CFG)},
-    {EF_META_TYPE, "meta-type", NULL, symbol_ca,
-     PTR_CACHE(meta_type, EFF_CFG)},
-    {EF_META_FLAGS, "meta-flags", NULL, symbol_ca,
-     PTR_CACHE(meta_flags, EFF_CFG)},
-    {EF_MISSIONS, "missions", NULL, symbol_ca, PTR_CACHE(missions, EFF_CFG)},
-    {EF_PLANE_FLAGS, "plane-flags", NULL, symbol_ca,
-     PTR_CACHE(plane_flags, EFF_CFG)},
-    {EF_RETREAT_FLAGS, "retreat-flags", NULL, symbol_ca,
-     PTR_CACHE(retreat_flags, EFF_CFG)},
-    {EF_NATION_FLAGS, "nation-flags", NULL, symbol_ca,
-     PTR_CACHE(nation_flags, EFF_CFG)},
-    {EF_NATION_RELATIONS, "nation-relationships", NULL, symbol_ca,
-     PTR_CACHE(nation_relations, EFF_CFG)},
-    {EF_LEVEL, "level", NULL, symbol_ca, PTR_CACHE(level, EFF_CFG)},
-    {EF_AGREEMENT_STATUS, "agreement-status", NULL, symbol_ca,
-     PTR_CACHE(agreement_statuses, EFF_CFG)},
-    {EF_PLAGUE_STAGES, "plague-stages", NULL, symbol_ca,
-     PTR_CACHE(plague_stages, EFF_CFG)},
-    {EF_PACKING, "packing", NULL, symbol_ca, PTR_CACHE(packing, EFF_CFG)},
-    {EF_RESOURCES, "resources", NULL, symbol_ca, PTR_CACHE(resources, EFF_CFG)},
-    {EF_NATION_STATUS, "nation-status", NULL, symbol_ca,
-     PTR_CACHE(nation_status, EFF_CFG)},
-    {EF_SECTOR_NAVIGATION, "sector-navigation", NULL, symbol_ca,
-     PTR_CACHE(sector_navigation, EFF_CFG)},
-    {EF_PAGE_HEADINGS, "page-headings", NULL, symbol_ca,
-     PTR_CACHE(page_headings, EFF_CFG)},
+
+    /* Symbol tables */
+#define SYMTAB(type, name, tab) \
+	{(type), (name), NULL, symbol_ca, PTR_CACHE((tab), EFF_CFG)}
+    SYMTAB(EF_AGREEMENT_STATUS, "agreement-status", agreement_statuses),
+    SYMTAB(EF_LAND_CHR_FLAGS, "land-chr-flags", land_chr_flags),
+    SYMTAB(EF_LEVEL, "level", level),
+    SYMTAB(EF_META_FLAGS, "meta-flags", meta_flags),
+    SYMTAB(EF_META_TYPE, "meta-type", meta_type),
+    SYMTAB(EF_MISSIONS, "missions", missions),
+    SYMTAB(EF_NATION_FLAGS, "nation-flags", nation_flags),
+    SYMTAB(EF_NATION_RELATIONS, "nation-relationships", nation_relations),
+    SYMTAB(EF_NATION_STATUS, "nation-status", nation_status),
+    SYMTAB(EF_NUKE_CHR_FLAGS, "nuke-chr-flags", nuke_chr_flags),
+    SYMTAB(EF_PACKING, "packing", packing),
+    SYMTAB(EF_PAGE_HEADINGS, "page-headings", page_headings),
+    SYMTAB(EF_PLAGUE_STAGES, "plague-stages", plague_stages),
+    SYMTAB(EF_PLANE_CHR_FLAGS, "plane-chr-flags", plane_chr_flags),
+    SYMTAB(EF_PLANE_FLAGS, "plane-flags", plane_flags),
+    SYMTAB(EF_RESOURCES, "resources", resources),
+    SYMTAB(EF_RETREAT_FLAGS, "retreat-flags", retreat_flags),
+    SYMTAB(EF_SECTOR_NAVIGATION, "sector-navigation", sector_navigation),
+    SYMTAB(EF_SHIP_CHR_FLAGS, "ship-chr-flags", ship_chr_flags),
+    SYMTAB(EF_TREATY_FLAGS, "treaty-flags", treaty_flags),
 
     /* Views */
     {EF_COUNTRY, "country", NULL, cou_ca, UNMAPPED_CACHE(struct natstr, 0)},