diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2eac9c954..3d2bf8bdd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: run: | sudo apt update sudo ACCEPT_EULA=Y apt -y --fix-missing --allow-downgrades upgrade - sudo apt -y --allow-downgrades install g++-10-multilib linux-libc-dev binutils-arm-none-eabi p7zip-full pkg-config ppa-purge + sudo apt -y --allow-downgrades install g++-10-multilib linux-libc-dev binutils-arm-none-eabi p7zip-full pkg-config ppa-purge libpugixml-dev sudo ppa-purge -y ppa:ubuntu-toolchain-r/test sudo dpkg --add-architecture i386 sudo mkdir -pm755 /etc/apt/keyrings diff --git a/INSTALL.md b/INSTALL.md index fe2e1e795..21b6bb220 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -22,6 +22,7 @@ Building the ROM requires the following packages: * python3 (for asm preprocessor) * libpng-devel (libpng-dev on Ubuntu) * pkg-config +* pugixml (libpugixml-dev on Ubuntu) NOTE: If you are using Arch/Manjaro or Void you will only need base-devel instead of build-essentials or make or git. You will still need wine. @@ -50,6 +51,7 @@ You will still require the following packages: * build-essentials * libpng-devel * pkg-config +* pugixml Install them using either the Cygwin package manager or using pacman on Msys2. @@ -68,13 +70,14 @@ macOS 10.15 Catalina and later is supported on Intel and ARM64 hardware configur * libpng * pkg-config * wine-crossover (includes wine32on64, required on Catalina and later to run 32-bit x86 EXEs) +* pugixml They can be installed with the following commands: ```console $ brew tap osx-cross/homebrew-arm $ brew tap gcenx/wine -$ brew install coreutils make gnu-sed llvm arm-gcc-bin libpng git pkg-config +$ brew install coreutils make gnu-sed llvm arm-gcc-bin libpng git pkg-config pugixml $ brew install wine-crossover ``` diff --git a/Makefile b/Makefile index 1ea32d50c..ff4e191e5 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,7 @@ clean: mostlyclean clean-fs clean-tools clean-fs: $(RM) $(filter %.narc %.arc,$(HOSTFS_FILES)) $(RM) $(patsubst %.narc,%.naix,$(patsubst %.arc,%.naix,$(filter %.narc %.arc,$(HOSTFS_FILES)))) - $(RM) $(NCGR_CLEAN_LIST) $(NCLR_CLEAN_LIST) $(NCER_CLEAN_LIST) + $(RM) $(NCGR_CLEAN_LIST) $(NCLR_CLEAN_LIST) $(NCER_CLEAN_LIST) $(FS_CLEAN_LIST) find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' \) -exec $(RM) {} + $(RM) files/msgdata/msg/narc_*.bin diff --git a/files/msgdata/msg.mk b/files/msgdata/msg.mk index 4aa7800d7..8472b9f94 100644 --- a/files/msgdata/msg.mk +++ b/files/msgdata/msg.mk @@ -1,8 +1,22 @@ CHARMAP = charmap.txt +MSGDATA_DIR := files/msgdata +MSGDATA_MSG_DIR := $(MSGDATA_DIR)/msg + +TRNAME_GMM := $(MSGDATA_MSG_DIR)/narc_0559.gmm +MSGFILE_GMM := $(sort $(wildcard $(MSGDATA_MSG_DIR)/*.gmm) $(TRNAME_GMM)) +MSGFILE_BIN := $(patsubst %.gmm,%.bin,$(MSGFILE_GMM)) +MSGFILE_H := $(patsubst %.gmm,%.h,$(MSGFILE_GMM)) + +$(MSGFILE_H): %.h: %.bin + ## Trainer names -files/msgdata/msg/narc_0559.txt: files/poketool/trainer/trdata.json - (echo " -"; $(GREP) -w '"name":' $< | cut -d'"' -f4) | $(SED) 's/^(.+)$$/{TRNAME}\1\r/g' > $@ +$(TRNAME_GMM): files/poketool/trainer/trdata.json files/poketool/trainer/trname.json.txt + $(JSONPROC) $^ $@ + $(SED) -i 's/&/&/g' $@ + +$(MSGFILE_BIN): %.bin: %.gmm $(CHARMAP) + $(MSGENC) $(MSGENCFLAGS) -e -c $(CHARMAP) --gmm -H $*.h $< $@ files/msgdata/msg/%.bin: files/msgdata/msg/%.txt $(CHARMAP) $(MSGENC) $(MSGENCFLAGS) -e -c $(CHARMAP) $< $@ @@ -631,3 +645,5 @@ files/msgdata/msg/narc_0620.bin: MSGENCFLAGS = -k 0x1395 files/msgdata/msg/narc_0621.bin: MSGENCFLAGS = -k 0xbea9 files/msgdata/msg/narc_0622.bin: MSGENCFLAGS = -k 0x7df9 files/msgdata/msg/narc_0623.bin: MSGENCFLAGS = -k 0x5938 + +FS_CLEAN_LIST += $(TRNAME_GMM) $(MSGFILE_H) diff --git a/files/msgdata/msg/.gitignore b/files/msgdata/msg/.gitignore index 74ed169b8..6915c8c14 100644 --- a/files/msgdata/msg/.gitignore +++ b/files/msgdata/msg/.gitignore @@ -1,2 +1,3 @@ *.bin -narc_0559.txt +narc_0559.gmm +*.h diff --git a/files/msgdata/msg/.knarcignore b/files/msgdata/msg/.knarcignore index da3e0808d..044abd05f 100644 --- a/files/msgdata/msg/.knarcignore +++ b/files/msgdata/msg/.knarcignore @@ -2,3 +2,5 @@ *.pal *.txt *.key +*.h +*.gmm diff --git a/files/poketool/trainer/trdata.json b/files/poketool/trainer/trdata.json index 24fa3a6d6..5e7e3478c 100644 --- a/files/poketool/trainer/trdata.json +++ b/files/poketool/trainer/trdata.json @@ -1,10 +1,21 @@ { "trdata": [ + { + "index": 0, + "type": "TRTYPE_MON", + "class": "TRAINER_CLASS_PKMN_TRAINER_M", + "name": "{TRNAME} -", + "unk2": 0, + "items": [], + "unkC": 0, + "doubleBattle": 0, + "party": [] + }, { "index": 1, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Tristan", + "name": "{TRNAME}Tristan", "unk2": 0, "items": [], "unkC": 1, @@ -21,7 +32,7 @@ "index": 2, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Logan", + "name": "{TRNAME}Logan", "unk2": 0, "items": [], "unkC": 1, @@ -38,7 +49,7 @@ "index": 3, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Natalie", + "name": "{TRNAME}Natalie", "unk2": 0, "items": [], "unkC": 1, @@ -60,7 +71,7 @@ "index": 4, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Michael", + "name": "{TRNAME}Michael", "unk2": 0, "items": [], "unkC": 1, @@ -82,7 +93,7 @@ "index": 5, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMPER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -99,7 +110,7 @@ "index": 6, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMPER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -116,7 +127,7 @@ "index": 7, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PICNICKER", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -133,7 +144,7 @@ "index": 8, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PICNICKER", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -150,7 +161,7 @@ "index": 9, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -167,7 +178,7 @@ "index": 10, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Tyler", + "name": "{TRNAME}Tyler", "unk2": 0, "items": [], "unkC": 1, @@ -189,7 +200,7 @@ "index": 11, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Samantha", + "name": "{TRNAME}Samantha", "unk2": 0, "items": [], "unkC": 1, @@ -206,7 +217,7 @@ "index": 12, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Sarah", + "name": "{TRNAME}Sarah", "unk2": 0, "items": [], "unkC": 1, @@ -223,7 +234,7 @@ "index": 13, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BUG_CATCHER", - "name": "Brandon", + "name": "{TRNAME}Brandon", "unk2": 0, "items": [], "unkC": 1, @@ -245,7 +256,7 @@ "index": 14, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_AROMA_LADY", - "name": "Taylor", + "name": "{TRNAME}Taylor", "unk2": 0, "items": [], "unkC": 1, @@ -267,7 +278,7 @@ "index": 15, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_TWINS", - "name": "Liv & Liz", + "name": "{TRNAME}Liv & Liz", "unk2": 0, "items": [], "unkC": 1, @@ -289,7 +300,7 @@ "index": 16, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_CAMPER", - "name": "Jacob", + "name": "{TRNAME}Jacob", "unk2": 0, "items": [], "unkC": 1, @@ -310,7 +321,7 @@ "index": 17, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PICNICKER", - "name": "Siena", + "name": "{TRNAME}Siena", "unk2": 0, "items": [], "unkC": 1, @@ -341,7 +352,7 @@ "index": 18, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Daniel", + "name": "{TRNAME}Daniel", "unk2": 0, "items": [], "unkC": 1, @@ -373,7 +384,7 @@ "index": 19, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Nicholas", + "name": "{TRNAME}Nicholas", "unk2": 0, "items": [], "unkC": 1, @@ -390,7 +401,7 @@ "index": 20, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BATTLE_GIRL", - "name": "Kelsey", + "name": "{TRNAME}Kelsey", "unk2": 0, "items": [], "unkC": 1, @@ -407,7 +418,7 @@ "index": 21, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_AROMA_LADY", - "name": "Elizabeth", + "name": "{TRNAME}Elizabeth", "unk2": 0, "items": [], "unkC": 1, @@ -424,7 +435,7 @@ "index": 22, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Andrew", + "name": "{TRNAME}Andrew", "unk2": 0, "items": [], "unkC": 1, @@ -466,7 +477,7 @@ "index": 23, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Joseph", + "name": "{TRNAME}Joseph", "unk2": 0, "items": [], "unkC": 1, @@ -483,7 +494,7 @@ "index": 24, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Zachary", + "name": "{TRNAME}Zachary", "unk2": 0, "items": [], "unkC": 1, @@ -510,7 +521,7 @@ "index": 25, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_M", - "name": "Axel", + "name": "{TRNAME}Axel", "unk2": 0, "items": [], "unkC": 1, @@ -527,7 +538,7 @@ "index": 26, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_M", - "name": "James", + "name": "{TRNAME}James", "unk2": 0, "items": [], "unkC": 1, @@ -544,7 +555,7 @@ "index": 27, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_M", - "name": "John", + "name": "{TRNAME}John", "unk2": 0, "items": [], "unkC": 1, @@ -566,7 +577,7 @@ "index": 28, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_M", - "name": "Ryan", + "name": "{TRNAME}Ryan", "unk2": 0, "items": [], "unkC": 1, @@ -583,7 +594,7 @@ "index": 29, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_F", - "name": "Megan", + "name": "{TRNAME}Megan", "unk2": 0, "items": [], "unkC": 1, @@ -600,7 +611,7 @@ "index": 30, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_F", - "name": "Nicole", + "name": "{TRNAME}Nicole", "unk2": 0, "items": [], "unkC": 1, @@ -622,7 +633,7 @@ "index": 31, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_F", - "name": "Kayla", + "name": "{TRNAME}Kayla", "unk2": 0, "items": [], "unkC": 1, @@ -639,7 +650,7 @@ "index": 32, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_F", - "name": "Rachel", + "name": "{TRNAME}Rachel", "unk2": 0, "items": [], "unkC": 1, @@ -661,7 +672,7 @@ "index": 33, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Austin", + "name": "{TRNAME}Austin", "unk2": 0, "items": [], "unkC": 1, @@ -688,7 +699,7 @@ "index": 34, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_CAMPER", - "name": "Anthony", + "name": "{TRNAME}Anthony", "unk2": 0, "items": [], "unkC": 1, @@ -710,7 +721,7 @@ "index": 35, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PICNICKER", - "name": "Lauren", + "name": "{TRNAME}Lauren", "unk2": 0, "items": [], "unkC": 1, @@ -732,7 +743,7 @@ "index": 36, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Kevin", + "name": "{TRNAME}Kevin", "unk2": 0, "items": [], "unkC": 1, @@ -764,7 +775,7 @@ "index": 37, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Justin", + "name": "{TRNAME}Justin", "unk2": 0, "items": [], "unkC": 1, @@ -786,7 +797,7 @@ "index": 38, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BATTLE_GIRL", - "name": "Helen", + "name": "{TRNAME}Helen", "unk2": 0, "items": [], "unkC": 1, @@ -808,7 +819,7 @@ "index": 39, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Robert", + "name": "{TRNAME}Robert", "unk2": 0, "items": [], "unkC": 1, @@ -830,7 +841,7 @@ "index": 40, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Alexander", + "name": "{TRNAME}Alexander", "unk2": 0, "items": [], "unkC": 1, @@ -857,7 +868,7 @@ "index": 41, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Jonathan", + "name": "{TRNAME}Jonathan", "unk2": 0, "items": [], "unkC": 1, @@ -874,7 +885,7 @@ "index": 42, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Kyle", + "name": "{TRNAME}Kyle", "unk2": 0, "items": [], "unkC": 1, @@ -891,7 +902,7 @@ "index": 43, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Cody", + "name": "{TRNAME}Cody", "unk2": 0, "items": [], "unkC": 1, @@ -913,7 +924,7 @@ "index": 44, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_AROMA_LADY", - "name": "Hannah", + "name": "{TRNAME}Hannah", "unk2": 0, "items": [], "unkC": 1, @@ -935,7 +946,7 @@ "index": 45, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ARTIST", - "name": "William", + "name": "{TRNAME}William", "unk2": 0, "items": [], "unkC": 1, @@ -957,7 +968,7 @@ "index": 46, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_BREEDER_M", - "name": "Albert", + "name": "{TRNAME}Albert", "unk2": 0, "items": [], "unkC": 1, @@ -984,7 +995,7 @@ "index": 47, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_BREEDER_F", - "name": "Jennifer", + "name": "{TRNAME}Jennifer", "unk2": 0, "items": [], "unkC": 1, @@ -1011,7 +1022,7 @@ "index": 48, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COWGIRL", - "name": "Shelley", + "name": "{TRNAME}Shelley", "unk2": 0, "items": [], "unkC": 1, @@ -1048,7 +1059,7 @@ "index": 49, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_JOGGER", - "name": "Richard", + "name": "{TRNAME}Richard", "unk2": 0, "items": [], "unkC": 1, @@ -1065,7 +1076,7 @@ "index": 50, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKEFAN_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -1082,7 +1093,7 @@ "index": 51, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKEFAN_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -1099,7 +1110,7 @@ "index": 52, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -1116,7 +1127,7 @@ "index": 53, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKE_KID", - "name": "Danielle", + "name": "{TRNAME}Danielle", "unk2": 0, "items": [], "unkC": 1, @@ -1133,7 +1144,7 @@ "index": 54, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -1150,7 +1161,7 @@ "index": 55, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNG_COUPLE", - "name": "Ty & Sue", + "name": "{TRNAME}Ty & Sue", "unk2": 0, "items": [], "unkC": 1, @@ -1172,7 +1183,7 @@ "index": 56, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_BREEDER_M", - "name": "Kahlil", + "name": "{TRNAME}Kahlil", "unk2": 0, "items": [], "unkC": 1, @@ -1199,7 +1210,7 @@ "index": 57, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_BREEDER_F", - "name": "Amber", + "name": "{TRNAME}Amber", "unk2": 0, "items": [], "unkC": 1, @@ -1226,7 +1237,7 @@ "index": 58, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COWGIRL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -1243,7 +1254,7 @@ "index": 59, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_JOGGER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -1260,7 +1271,7 @@ "index": 60, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKEFAN_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -1277,7 +1288,7 @@ "index": 61, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKEFAN_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -1294,7 +1305,7 @@ "index": 62, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -1311,7 +1322,7 @@ "index": 63, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -1328,7 +1339,7 @@ "index": 64, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WAITRESS", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -1345,7 +1356,7 @@ "index": 65, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_TWINS", - "name": "Teri & Tia", + "name": "{TRNAME}Teri & Tia", "unk2": 0, "items": [], "unkC": 1, @@ -1367,7 +1378,7 @@ "index": 66, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Ernest", + "name": "{TRNAME}Ernest", "unk2": 0, "items": [], "unkC": 1, @@ -1410,7 +1421,7 @@ "index": 67, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Alyssa", + "name": "{TRNAME}Alyssa", "unk2": 0, "items": [], "unkC": 1, @@ -1442,7 +1453,7 @@ "index": 68, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_VETERAN", - "name": "Brian", + "name": "{TRNAME}Brian", "unk2": 0, "items": [], "unkC": 1, @@ -1486,7 +1497,7 @@ "index": 69, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Adam", + "name": "{TRNAME}Adam", "unk2": 0, "items": [], "unkC": 1, @@ -1503,7 +1514,7 @@ "index": 70, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_NINJA_BOY", - "name": "Joel", + "name": "{TRNAME}Joel", "unk2": 0, "items": [], "unkC": 1, @@ -1535,7 +1546,7 @@ "index": 71, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_NINJA_BOY", - "name": "Nathan", + "name": "{TRNAME}Nathan", "unk2": 0, "items": [], "unkC": 1, @@ -1557,7 +1568,7 @@ "index": 72, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_NINJA_BOY", - "name": "Davido", + "name": "{TRNAME}Davido", "unk2": 0, "items": [], "unkC": 1, @@ -1574,7 +1585,7 @@ "index": 73, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Patrick", + "name": "{TRNAME}Patrick", "unk2": 0, "items": [], "unkC": 1, @@ -1591,7 +1602,7 @@ "index": 74, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BIRD_KEEPER", - "name": "Brianna", + "name": "{TRNAME}Brianna", "unk2": 0, "items": [], "unkC": 1, @@ -1613,7 +1624,7 @@ "index": 75, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DOUBLE_TEAM", - "name": "Zac & Jen", + "name": "{TRNAME}Zac & Jen", "unk2": 0, "items": [], "unkC": 1, @@ -1635,7 +1646,7 @@ "index": 76, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BIRD_KEEPER", - "name": "Alexandra", + "name": "{TRNAME}Alexandra", "unk2": 0, "items": [], "unkC": 1, @@ -1652,7 +1663,7 @@ "index": 77, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BATTLE_GIRL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -1669,7 +1680,7 @@ "index": 78, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_NINJA_BOY", - "name": "Zach", + "name": "{TRNAME}Zach", "unk2": 0, "items": [], "unkC": 1, @@ -1696,7 +1707,7 @@ "index": 79, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Sean", + "name": "{TRNAME}Sean", "unk2": 0, "items": [], "unkC": 1, @@ -1723,7 +1734,7 @@ "index": 80, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_NINJA_BOY", - "name": "Nick", + "name": "{TRNAME}Nick", "unk2": 0, "items": [], "unkC": 1, @@ -1745,7 +1756,7 @@ "index": 81, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BIRD_KEEPER", - "name": "Katherine", + "name": "{TRNAME}Katherine", "unk2": 0, "items": [], "unkC": 1, @@ -1762,7 +1773,7 @@ "index": 82, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RICH_BOY", - "name": "Jason", + "name": "{TRNAME}Jason", "unk2": 0, "items": [ "ITEM_FULL_RESTORE" @@ -1781,7 +1792,7 @@ "index": 83, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LADY", - "name": "Melissa", + "name": "{TRNAME}Melissa", "unk2": 0, "items": [ "ITEM_FULL_RESTORE" @@ -1800,7 +1811,7 @@ "index": 84, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GENTLEMAN", - "name": "Jeremy", + "name": "{TRNAME}Jeremy", "unk2": 0, "items": [ "ITEM_FULL_RESTORE" @@ -1819,7 +1830,7 @@ "index": 85, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SOCIALITE", - "name": "Reina", + "name": "{TRNAME}Reina", "unk2": 0, "items": [ "ITEM_FULL_RESTORE" @@ -1838,7 +1849,7 @@ "index": 86, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BEAUTY", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -1855,7 +1866,7 @@ "index": 87, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COLLECTOR", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -1872,7 +1883,7 @@ "index": 88, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POLICEMAN", - "name": "Bobby", + "name": "{TRNAME}Bobby", "unk2": 0, "items": [], "unkC": 1, @@ -1894,7 +1905,7 @@ "index": 89, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POLICEMAN", - "name": "Alex", + "name": "{TRNAME}Alex", "unk2": 0, "items": [], "unkC": 1, @@ -1916,7 +1927,7 @@ "index": 90, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POLICEMAN", - "name": "Dylan", + "name": "{TRNAME}Dylan", "unk2": 0, "items": [], "unkC": 1, @@ -1938,7 +1949,7 @@ "index": 91, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Juan", + "name": "{TRNAME}Juan", "unk2": 0, "items": [], "unkC": 1, @@ -1955,7 +1966,7 @@ "index": 92, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Cameron", + "name": "{TRNAME}Cameron", "unk2": 0, "items": [], "unkC": 1, @@ -1977,7 +1988,7 @@ "index": 93, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Travis", + "name": "{TRNAME}Travis", "unk2": 0, "items": [], "unkC": 1, @@ -2009,7 +2020,7 @@ "index": 94, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_M", - "name": "Taylor", + "name": "{TRNAME}Taylor", "unk2": 0, "items": [], "unkC": 1, @@ -2031,7 +2042,7 @@ "index": 95, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_M", - "name": "Jeffrey", + "name": "{TRNAME}Jeffrey", "unk2": 0, "items": [], "unkC": 1, @@ -2053,7 +2064,7 @@ "index": 96, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_F", - "name": "Allison", + "name": "{TRNAME}Allison", "unk2": 0, "items": [], "unkC": 0, @@ -2075,7 +2086,7 @@ "index": 97, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -2092,7 +2103,7 @@ "index": 98, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -2109,7 +2120,7 @@ "index": 99, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Stefano", + "name": "{TRNAME}Stefano", "unk2": 0, "items": [], "unkC": 1, @@ -2132,7 +2143,7 @@ "index": 100, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -2149,7 +2160,7 @@ "index": 101, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -2166,7 +2177,7 @@ "index": 102, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POLICEMAN", - "name": "Caleb", + "name": "{TRNAME}Caleb", "unk2": 0, "items": [], "unkC": 1, @@ -2188,7 +2199,7 @@ "index": 103, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Sheltin", + "name": "{TRNAME}Sheltin", "unk2": 0, "items": [], "unkC": 1, @@ -2215,7 +2226,7 @@ "index": 104, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Evan", + "name": "{TRNAME}Evan", "unk2": 0, "items": [], "unkC": 1, @@ -2237,7 +2248,7 @@ "index": 105, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Haley", + "name": "{TRNAME}Haley", "unk2": 0, "items": [], "unkC": 1, @@ -2259,7 +2270,7 @@ "index": 106, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Mary", + "name": "{TRNAME}Mary", "unk2": 0, "items": [], "unkC": 1, @@ -2281,7 +2292,7 @@ "index": 107, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_TUBER_M", - "name": "Jared", + "name": "{TRNAME}Jared", "unk2": 0, "items": [], "unkC": 1, @@ -2308,7 +2319,7 @@ "index": 108, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_TUBER_F", - "name": "Chelsea", + "name": "{TRNAME}Chelsea", "unk2": 0, "items": [], "unkC": 1, @@ -2331,7 +2342,7 @@ "index": 109, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BATTLE_GIRL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -2348,7 +2359,7 @@ "index": 110, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SAILOR", - "name": "Paul", + "name": "{TRNAME}Paul", "unk2": 0, "items": [], "unkC": 1, @@ -2370,7 +2381,7 @@ "index": 111, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Kenneth", + "name": "{TRNAME}Kenneth", "unk2": 0, "items": [], "unkC": 1, @@ -2397,7 +2408,7 @@ "index": 112, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SIS_AND_BRO", - "name": "Tara & Tim", + "name": "{TRNAME}Tara & Tim", "unk2": 0, "items": [], "unkC": 1, @@ -2419,7 +2430,7 @@ "index": 113, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RUIN_MANIAC", - "name": "Bryan", + "name": "{TRNAME}Bryan", "unk2": 0, "items": [], "unkC": 1, @@ -2446,7 +2457,7 @@ "index": 114, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RUIN_MANIAC", - "name": "Hunter", + "name": "{TRNAME}Hunter", "unk2": 0, "items": [], "unkC": 1, @@ -2463,7 +2474,7 @@ "index": 115, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -2480,7 +2491,7 @@ "index": 116, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_VETERAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -2497,7 +2508,7 @@ "index": 117, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMPER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -2514,7 +2525,7 @@ "index": 118, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PICNICKER", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -2531,7 +2542,7 @@ "index": 119, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Mitchell", + "name": "{TRNAME}Mitchell", "unk2": 0, "items": [], "unkC": 1, @@ -2553,7 +2564,7 @@ "index": 120, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Abigail", + "name": "{TRNAME}Abigail", "unk2": 0, "items": [], "unkC": 1, @@ -2580,7 +2591,7 @@ "index": 121, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PI", - "name": "Carlos", + "name": "{TRNAME}Carlos", "unk2": 0, "items": [], "unkC": 1, @@ -2619,7 +2630,7 @@ "index": 122, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -2636,7 +2647,7 @@ "index": 123, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PI", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -2653,7 +2664,7 @@ "index": 124, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BEAUTY", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -2670,7 +2681,7 @@ "index": 125, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BEAUTY", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -2687,7 +2698,7 @@ "index": 126, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -2704,7 +2715,7 @@ "index": 127, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Gregory", + "name": "{TRNAME}Gregory", "unk2": 0, "items": [], "unkC": 1, @@ -2731,7 +2742,7 @@ "index": 128, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Derek", + "name": "{TRNAME}Derek", "unk2": 0, "items": [], "unkC": 1, @@ -2748,7 +2759,7 @@ "index": 129, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Nathaniel", + "name": "{TRNAME}Nathaniel", "unk2": 0, "items": [], "unkC": 1, @@ -2775,7 +2786,7 @@ "index": 130, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_JOGGER", - "name": "Scott", + "name": "{TRNAME}Scott", "unk2": 0, "items": [], "unkC": 1, @@ -2792,7 +2803,7 @@ "index": 131, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BIRD_KEEPER", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -2809,7 +2820,7 @@ "index": 132, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M", - "name": "Blake", + "name": "{TRNAME}Blake", "unk2": 0, "items": [], "unkC": 1, @@ -2843,7 +2854,7 @@ "index": 133, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M", - "name": "Garrett", + "name": "{TRNAME}Garrett", "unk2": 0, "items": [], "unkC": 1, @@ -2888,7 +2899,7 @@ "index": 134, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F", - "name": "Laura", + "name": "{TRNAME}Laura", "unk2": 0, "items": [], "unkC": 1, @@ -2911,7 +2922,7 @@ "index": 135, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F", - "name": "Maria", + "name": "{TRNAME}Maria", "unk2": 0, "items": [], "unkC": 1, @@ -2956,7 +2967,7 @@ "index": 136, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_M", - "name": "Bradley", + "name": "{TRNAME}Bradley", "unk2": 0, "items": [], "unkC": 1, @@ -2983,7 +2994,7 @@ "index": 137, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_M", - "name": "Edward", + "name": "{TRNAME}Edward", "unk2": 0, "items": [], "unkC": 1, @@ -3000,7 +3011,7 @@ "index": 138, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_F", - "name": "Kaitlyn", + "name": "{TRNAME}Kaitlyn", "unk2": 0, "items": [], "unkC": 1, @@ -3022,7 +3033,7 @@ "index": 139, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_F", - "name": "Andrea", + "name": "{TRNAME}Andrea", "unk2": 0, "items": [], "unkC": 1, @@ -3039,7 +3050,7 @@ "index": 140, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M", - "name": "Dalton", + "name": "{TRNAME}Dalton", "unk2": 0, "items": [], "unkC": 1, @@ -3084,7 +3095,7 @@ "index": 141, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F", - "name": "Olivia", + "name": "{TRNAME}Olivia", "unk2": 0, "items": [], "unkC": 1, @@ -3118,7 +3129,7 @@ "index": 142, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_M", - "name": "Shawn", + "name": "{TRNAME}Shawn", "unk2": 0, "items": [], "unkC": 1, @@ -3150,7 +3161,7 @@ "index": 143, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_M", - "name": "Bjorn", + "name": "{TRNAME}Bjorn", "unk2": 0, "items": [], "unkC": 1, @@ -3172,7 +3183,7 @@ "index": 144, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_F", - "name": "Lexie", + "name": "{TRNAME}Lexie", "unk2": 0, "items": [], "unkC": 1, @@ -3194,7 +3205,7 @@ "index": 145, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_F", - "name": "Madison", + "name": "{TRNAME}Madison", "unk2": 0, "items": [], "unkC": 1, @@ -3211,7 +3222,7 @@ "index": 146, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_NINJA_BOY", - "name": "Antonio", + "name": "{TRNAME}Antonio", "unk2": 0, "items": [], "unkC": 1, @@ -3243,7 +3254,7 @@ "index": 147, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_NINJA_BOY", - "name": "Ethan", + "name": "{TRNAME}Ethan", "unk2": 0, "items": [], "unkC": 1, @@ -3265,7 +3276,7 @@ "index": 148, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Luke", + "name": "{TRNAME}Luke", "unk2": 0, "items": [], "unkC": 1, @@ -3292,7 +3303,7 @@ "index": 149, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -3309,7 +3320,7 @@ "index": 150, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -3326,7 +3337,7 @@ "index": 151, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -3343,7 +3354,7 @@ "index": 152, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -3360,7 +3371,7 @@ "index": 153, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Miguel", + "name": "{TRNAME}Miguel", "unk2": 0, "items": [], "unkC": 1, @@ -3382,7 +3393,7 @@ "index": 154, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Luc", + "name": "{TRNAME}Luc", "unk2": 0, "items": [], "unkC": 1, @@ -3419,7 +3430,7 @@ "index": 155, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SIS_AND_BRO", - "name": "Tara & Tim", + "name": "{TRNAME}Tara & Tim", "unk2": 0, "items": [], "unkC": 1, @@ -3441,7 +3452,7 @@ "index": 156, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -3458,7 +3469,7 @@ "index": 157, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -3475,7 +3486,7 @@ "index": 158, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -3492,7 +3503,7 @@ "index": 159, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Adrian", + "name": "{TRNAME}Adrian", "unk2": 0, "items": [], "unkC": 1, @@ -3519,7 +3530,7 @@ "index": 160, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Erik", + "name": "{TRNAME}Erik", "unk2": 0, "items": [], "unkC": 1, @@ -3536,7 +3547,7 @@ "index": 161, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Vincent", + "name": "{TRNAME}Vincent", "unk2": 0, "items": [], "unkC": 1, @@ -3558,7 +3569,7 @@ "index": 162, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Jessica", + "name": "{TRNAME}Jessica", "unk2": 0, "items": [], "unkC": 1, @@ -3590,7 +3601,7 @@ "index": 163, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Erica", + "name": "{TRNAME}Erica", "unk2": 0, "items": [], "unkC": 1, @@ -3612,7 +3623,7 @@ "index": 164, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Katelyn", + "name": "{TRNAME}Katelyn", "unk2": 0, "items": [], "unkC": 1, @@ -3657,7 +3668,7 @@ "index": 165, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SIS_AND_BRO", - "name": "Tara & Tim", + "name": "{TRNAME}Tara & Tim", "unk2": 0, "items": [], "unkC": 1, @@ -3679,7 +3690,7 @@ "index": 166, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Dillon", + "name": "{TRNAME}Dillon", "unk2": 0, "items": [], "unkC": 1, @@ -3701,7 +3712,7 @@ "index": 167, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Vanessa", + "name": "{TRNAME}Vanessa", "unk2": 0, "items": [], "unkC": 1, @@ -3718,7 +3729,7 @@ "index": 168, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Cory", + "name": "{TRNAME}Cory", "unk2": 0, "items": [], "unkC": 1, @@ -3745,7 +3756,7 @@ "index": 169, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RUIN_MANIAC", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -3762,7 +3773,7 @@ "index": 170, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Jake", + "name": "{TRNAME}Jake", "unk2": 0, "items": [], "unkC": 1, @@ -3795,7 +3806,7 @@ "index": 171, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Shannon", + "name": "{TRNAME}Shannon", "unk2": 0, "items": [], "unkC": 1, @@ -3837,7 +3848,7 @@ "index": 172, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Brett", + "name": "{TRNAME}Brett", "unk2": 0, "items": [], "unkC": 1, @@ -3864,7 +3875,7 @@ "index": 173, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Alec", + "name": "{TRNAME}Alec", "unk2": 0, "items": [], "unkC": 1, @@ -3886,7 +3897,7 @@ "index": 174, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "George", + "name": "{TRNAME}George", "unk2": 0, "items": [], "unkC": 1, @@ -3918,7 +3929,7 @@ "index": 175, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Cole", + "name": "{TRNAME}Cole", "unk2": 0, "items": [], "unkC": 1, @@ -3945,7 +3956,7 @@ "index": 176, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ROUGHNECK", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -3962,7 +3973,7 @@ "index": 177, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ROUGHNECK", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -3979,7 +3990,7 @@ "index": 178, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -3996,7 +4007,7 @@ "index": 179, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CLOWN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4013,7 +4024,7 @@ "index": 180, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SAILOR", - "name": "Luther", + "name": "{TRNAME}Luther", "unk2": 0, "items": [], "unkC": 1, @@ -4040,7 +4051,7 @@ "index": 181, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ARTIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4057,7 +4068,7 @@ "index": 182, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNG_COUPLE", - "name": "Tara & Tim", + "name": "{TRNAME}Tara & Tim", "unk2": 0, "items": [], "unkC": 1, @@ -4079,7 +4090,7 @@ "index": 183, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Wesley", + "name": "{TRNAME}Wesley", "unk2": 0, "items": [], "unkC": 1, @@ -4101,7 +4112,7 @@ "index": 184, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Ricardo", + "name": "{TRNAME}Ricardo", "unk2": 0, "items": [], "unkC": 1, @@ -4118,7 +4129,7 @@ "index": 185, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Francisco", + "name": "{TRNAME}Francisco", "unk2": 0, "items": [], "unkC": 1, @@ -4140,7 +4151,7 @@ "index": 186, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Colton", + "name": "{TRNAME}Colton", "unk2": 0, "items": [], "unkC": 1, @@ -4167,7 +4178,7 @@ "index": 187, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Troy", + "name": "{TRNAME}Troy", "unk2": 0, "items": [], "unkC": 1, @@ -4184,7 +4195,7 @@ "index": 188, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Oscar", + "name": "{TRNAME}Oscar", "unk2": 0, "items": [], "unkC": 1, @@ -4211,7 +4222,7 @@ "index": 189, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Miranda", + "name": "{TRNAME}Miranda", "unk2": 0, "items": [], "unkC": 1, @@ -4228,7 +4239,7 @@ "index": 190, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Aubree", + "name": "{TRNAME}Aubree", "unk2": 0, "items": [], "unkC": 1, @@ -4250,7 +4261,7 @@ "index": 191, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Paige", + "name": "{TRNAME}Paige", "unk2": 0, "items": [], "unkC": 1, @@ -4277,7 +4288,7 @@ "index": 192, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Crystal", + "name": "{TRNAME}Crystal", "unk2": 0, "items": [], "unkC": 1, @@ -4299,7 +4310,7 @@ "index": 193, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Cassandra", + "name": "{TRNAME}Cassandra", "unk2": 0, "items": [], "unkC": 1, @@ -4321,7 +4332,7 @@ "index": 194, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Gabrielle", + "name": "{TRNAME}Gabrielle", "unk2": 0, "items": [], "unkC": 1, @@ -4338,7 +4349,7 @@ "index": 195, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_WORKER", - "name": "Colin", + "name": "{TRNAME}Colin", "unk2": 0, "items": [], "unkC": 1, @@ -4370,7 +4381,7 @@ "index": 196, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_WORKER", - "name": "Mason", + "name": "{TRNAME}Mason", "unk2": 0, "items": [], "unkC": 1, @@ -4391,7 +4402,7 @@ "index": 197, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WORKER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4408,7 +4419,7 @@ "index": 198, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4425,7 +4436,7 @@ "index": 199, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4442,7 +4453,7 @@ "index": 200, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4459,7 +4470,7 @@ "index": 201, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BUG_CATCHER", - "name": "Jack", + "name": "{TRNAME}Jack", "unk2": 0, "items": [], "unkC": 1, @@ -4486,7 +4497,7 @@ "index": 202, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BUG_CATCHER", - "name": "Phillip", + "name": "{TRNAME}Phillip", "unk2": 0, "items": [], "unkC": 1, @@ -4513,7 +4524,7 @@ "index": 203, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BUG_CATCHER", - "name": "Donald", + "name": "{TRNAME}Donald", "unk2": 0, "items": [], "unkC": 1, @@ -4535,7 +4546,7 @@ "index": 204, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Briana", + "name": "{TRNAME}Briana", "unk2": 0, "items": [], "unkC": 1, @@ -4552,7 +4563,7 @@ "index": 205, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Elijah", + "name": "{TRNAME}Elijah", "unk2": 0, "items": [], "unkC": 1, @@ -4572,7 +4583,7 @@ "index": 206, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Lindsey", + "name": "{TRNAME}Lindsey", "unk2": 0, "items": [], "unkC": 1, @@ -4592,7 +4603,7 @@ "index": 207, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNG_COUPLE", - "name": "Tara & Tim", + "name": "{TRNAME}Tara & Tim", "unk2": 0, "items": [], "unkC": 1, @@ -4614,7 +4625,7 @@ "index": 208, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WORKER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4631,7 +4642,7 @@ "index": 209, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WORKER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4648,7 +4659,7 @@ "index": 210, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WORKER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4665,7 +4676,7 @@ "index": 211, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4682,7 +4693,7 @@ "index": 212, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4699,7 +4710,7 @@ "index": 213, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -4716,7 +4727,7 @@ "index": 214, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -4733,7 +4744,7 @@ "index": 215, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_VETERAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4750,7 +4761,7 @@ "index": 216, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_VETERAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4767,7 +4778,7 @@ "index": 217, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4784,7 +4795,7 @@ "index": 218, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -4801,7 +4812,7 @@ "index": 219, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4818,7 +4829,7 @@ "index": 220, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SAILOR", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4835,7 +4846,7 @@ "index": 221, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCHOOL_KID_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -4852,7 +4863,7 @@ "index": 222, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCHOOL_KID_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -4869,7 +4880,7 @@ "index": 223, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNG_COUPLE", - "name": "Tara & Tim", + "name": "{TRNAME}Tara & Tim", "unk2": 0, "items": [], "unkC": 1, @@ -4891,7 +4902,7 @@ "index": 224, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Omar", + "name": "{TRNAME}Omar", "unk2": 0, "items": [], "unkC": 1, @@ -4936,7 +4947,7 @@ "index": 225, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Henry", + "name": "{TRNAME}Henry", "unk2": 0, "items": [], "unkC": 1, @@ -4959,7 +4970,7 @@ "index": 226, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Mariah", + "name": "{TRNAME}Mariah", "unk2": 0, "items": [], "unkC": 1, @@ -4993,7 +5004,7 @@ "index": 227, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Sydney", + "name": "{TRNAME}Sydney", "unk2": 0, "items": [], "unkC": 1, @@ -5027,7 +5038,7 @@ "index": 228, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_VETERAN", - "name": "Edgar", + "name": "{TRNAME}Edgar", "unk2": 0, "items": [], "unkC": 1, @@ -5072,7 +5083,7 @@ "index": 229, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_VETERAN", - "name": "Clayton", + "name": "{TRNAME}Clayton", "unk2": 0, "items": [], "unkC": 1, @@ -5106,7 +5117,7 @@ "index": 230, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Ondrej", + "name": "{TRNAME}Ondrej", "unk2": 0, "items": [], "unkC": 1, @@ -5123,7 +5134,7 @@ "index": 231, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Clinton", + "name": "{TRNAME}Clinton", "unk2": 0, "items": [], "unkC": 1, @@ -5150,7 +5161,7 @@ "index": 232, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "David", + "name": "{TRNAME}David", "unk2": 0, "items": [], "unkC": 1, @@ -5184,7 +5195,7 @@ "index": 233, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BIRD_KEEPER", - "name": "Hana", + "name": "{TRNAME}Hana", "unk2": 0, "items": [], "unkC": 1, @@ -5206,7 +5217,7 @@ "index": 234, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Bryce", + "name": "{TRNAME}Bryce", "unk2": 0, "items": [], "unkC": 1, @@ -5233,7 +5244,7 @@ "index": 235, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Valencia", + "name": "{TRNAME}Valencia", "unk2": 0, "items": [], "unkC": 1, @@ -5255,7 +5266,7 @@ "index": 236, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DOUBLE_TEAM", - "name": "Jo & Pat", + "name": "{TRNAME}Jo & Pat", "unk2": 0, "items": [], "unkC": 1, @@ -5277,7 +5288,7 @@ "index": 237, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DOUBLE_TEAM", - "name": "Al & Kay", + "name": "{TRNAME}Al & Kay", "unk2": 0, "items": [], "unkC": 1, @@ -5299,7 +5310,7 @@ "index": 238, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -5316,7 +5327,7 @@ "index": 239, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -5333,7 +5344,7 @@ "index": 240, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_VETERAN", - "name": "Grant", + "name": "{TRNAME}Grant", "unk2": 0, "items": [], "unkC": 1, @@ -5378,7 +5389,7 @@ "index": 241, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -5395,7 +5406,7 @@ "index": 242, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SAILOR", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -5412,7 +5423,7 @@ "index": 243, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BEAUTY", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -5429,7 +5440,7 @@ "index": 244, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Jonathon", + "name": "{TRNAME}Jonathon", "unk2": 0, "items": [], "unkC": 1, @@ -5450,7 +5461,7 @@ "index": 245, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Darius", + "name": "{TRNAME}Darius", "unk2": 0, "items": [], "unkC": 1, @@ -5481,7 +5492,7 @@ "index": 246, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_LEADER_ROARK", - "name": "Roark", + "name": "{TRNAME}Roark", "unk2": 0, "items": [ "ITEM_POTION", @@ -5525,7 +5536,7 @@ "index": 247, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -5555,7 +5566,7 @@ "index": 248, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -5585,7 +5596,7 @@ "index": 249, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -5615,7 +5626,7 @@ "index": 250, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_LEADER_BYRON", - "name": "Byron", + "name": "{TRNAME}Byron", "unk2": 0, "items": [ "ITEM_HYPER_POTION", @@ -5666,7 +5677,7 @@ "index": 251, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -5683,7 +5694,7 @@ "index": 252, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMPER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -5700,7 +5711,7 @@ "index": 253, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMPER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -5717,7 +5728,7 @@ "index": 254, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMPER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -5734,7 +5745,7 @@ "index": 255, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMPER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -5751,7 +5762,7 @@ "index": 256, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_WORKER", - "name": "Jackson", + "name": "{TRNAME}Jackson", "unk2": 0, "items": [], "unkC": 1, @@ -5793,7 +5804,7 @@ "index": 257, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_WORKER", - "name": "Gary", + "name": "{TRNAME}Gary", "unk2": 0, "items": [], "unkC": 1, @@ -5815,7 +5826,7 @@ "index": 258, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Philip", + "name": "{TRNAME}Philip", "unk2": 0, "items": [], "unkC": 1, @@ -5832,7 +5843,7 @@ "index": 259, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_AROMA_LADY", - "name": "Jenna", + "name": "{TRNAME}Jenna", "unk2": 0, "items": [], "unkC": 1, @@ -5874,7 +5885,7 @@ "index": 260, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_AROMA_LADY", - "name": "Angela", + "name": "{TRNAME}Angela", "unk2": 0, "items": [], "unkC": 1, @@ -5895,7 +5906,7 @@ "index": 261, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_ELITE_FOUR_AARON", - "name": "Aaron", + "name": "{TRNAME}Aaron", "unk2": 0, "items": [ "ITEM_FULL_RESTORE", @@ -5970,7 +5981,7 @@ "index": 262, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_ELITE_FOUR_BERTHA", - "name": "Bertha", + "name": "{TRNAME}Bertha", "unk2": 0, "items": [ "ITEM_FULL_RESTORE", @@ -6045,7 +6056,7 @@ "index": 263, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_ELITE_FOUR_FLINT", - "name": "Flint", + "name": "{TRNAME}Flint", "unk2": 0, "items": [ "ITEM_FULL_RESTORE", @@ -6120,7 +6131,7 @@ "index": 264, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_ELITE_FOUR_LUCIEN", - "name": "Lucian", + "name": "{TRNAME}Lucian", "unk2": 0, "items": [ "ITEM_FULL_RESTORE", @@ -6195,7 +6206,7 @@ "index": 265, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMPER", - "name": "Curtis", + "name": "{TRNAME}Curtis", "unk2": 0, "items": [], "unkC": 1, @@ -6212,7 +6223,7 @@ "index": 266, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_CAMPER", - "name": "Drew", + "name": "{TRNAME}Drew", "unk2": 0, "items": [], "unkC": 1, @@ -6254,7 +6265,7 @@ "index": 267, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_CHAMPION", - "name": "Cynthia", + "name": "{TRNAME}Cynthia", "unk2": 0, "items": [ "ITEM_FULL_RESTORE", @@ -6343,7 +6354,7 @@ "index": 268, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M", - "name": "Sergio", + "name": "{TRNAME}Sergio", "unk2": 0, "items": [], "unkC": 1, @@ -6377,7 +6388,7 @@ "index": 269, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M", - "name": "Isaiah", + "name": "{TRNAME}Isaiah", "unk2": 0, "items": [], "unkC": 1, @@ -6400,7 +6411,7 @@ "index": 270, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F", - "name": "Savannah", + "name": "{TRNAME}Savannah", "unk2": 0, "items": [], "unkC": 1, @@ -6445,7 +6456,7 @@ "index": 271, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F", - "name": "Alicia", + "name": "{TRNAME}Alicia", "unk2": 0, "items": [], "unkC": 1, @@ -6478,7 +6489,7 @@ "index": 272, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COLLECTOR", - "name": "Douglas", + "name": "{TRNAME}Douglas", "unk2": 0, "items": [], "unkC": 1, @@ -6505,7 +6516,7 @@ "index": 273, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COLLECTOR", - "name": "Brady", + "name": "{TRNAME}Brady", "unk2": 0, "items": [], "unkC": 1, @@ -6532,7 +6543,7 @@ "index": 274, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COLLECTOR", - "name": "Ivan", + "name": "{TRNAME}Ivan", "unk2": 0, "items": [], "unkC": 1, @@ -6559,7 +6570,7 @@ "index": 275, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COLLECTOR", - "name": "Fernando", + "name": "{TRNAME}Fernando", "unk2": 0, "items": [], "unkC": 1, @@ -6586,7 +6597,7 @@ "index": 276, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COLLECTOR", - "name": "Edwin", + "name": "{TRNAME}Edwin", "unk2": 0, "items": [], "unkC": 1, @@ -6613,7 +6624,7 @@ "index": 277, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Hayden", + "name": "{TRNAME}Hayden", "unk2": 0, "items": [], "unkC": 1, @@ -6635,7 +6646,7 @@ "index": 278, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Dennis", + "name": "{TRNAME}Dennis", "unk2": 0, "items": [], "unkC": 1, @@ -6667,7 +6678,7 @@ "index": 279, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Cesar", + "name": "{TRNAME}Cesar", "unk2": 0, "items": [], "unkC": 1, @@ -6701,7 +6712,7 @@ "index": 280, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Allen", + "name": "{TRNAME}Allen", "unk2": 0, "items": [], "unkC": 1, @@ -6746,7 +6757,7 @@ "index": 281, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Zachery", + "name": "{TRNAME}Zachery", "unk2": 0, "items": [], "unkC": 1, @@ -6779,7 +6790,7 @@ "index": 282, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Ruben", + "name": "{TRNAME}Ruben", "unk2": 0, "items": [], "unkC": 1, @@ -6812,7 +6823,7 @@ "index": 283, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Breanna", + "name": "{TRNAME}Breanna", "unk2": 0, "items": [], "unkC": 1, @@ -6835,7 +6846,7 @@ "index": 284, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Catherine", + "name": "{TRNAME}Catherine", "unk2": 0, "items": [], "unkC": 1, @@ -6869,7 +6880,7 @@ "index": 285, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Destiny", + "name": "{TRNAME}Destiny", "unk2": 0, "items": [], "unkC": 1, @@ -6903,7 +6914,7 @@ "index": 286, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Jamie", + "name": "{TRNAME}Jamie", "unk2": 0, "items": [], "unkC": 1, @@ -6926,7 +6937,7 @@ "index": 287, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Maya", + "name": "{TRNAME}Maya", "unk2": 0, "items": [], "unkC": 1, @@ -6959,7 +6970,7 @@ "index": 288, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Maxwell", + "name": "{TRNAME}Maxwell", "unk2": 0, "items": [], "unkC": 1, @@ -6981,7 +6992,7 @@ "index": 289, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Brittney", + "name": "{TRNAME}Brittney", "unk2": 0, "items": [], "unkC": 1, @@ -7003,7 +7014,7 @@ "index": 290, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BELLE__PA", - "name": "Ava & Matt", + "name": "{TRNAME}Ava & Matt", "unk2": 0, "items": [], "unkC": 1, @@ -7025,7 +7036,7 @@ "index": 291, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RANCHER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -7042,7 +7053,7 @@ "index": 292, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RANCHER", - "name": "Marco", + "name": "{TRNAME}Marco", "unk2": 0, "items": [], "unkC": 1, @@ -7069,7 +7080,7 @@ "index": 293, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Erick", + "name": "{TRNAME}Erick", "unk2": 0, "items": [], "unkC": 1, @@ -7111,7 +7122,7 @@ "index": 294, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_TWINS", - "name": "Emma & Lil", + "name": "{TRNAME}Emma & Lil", "unk2": 0, "items": [], "unkC": 1, @@ -7133,7 +7144,7 @@ "index": 295, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_COMMANDER_MARS", - "name": "Mars", + "name": "{TRNAME}Mars", "unk2": 0, "items": [], "unkC": 1, @@ -7167,7 +7178,7 @@ "index": 296, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -7197,7 +7208,7 @@ "index": 297, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -7218,7 +7229,7 @@ "index": 298, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -7240,7 +7251,7 @@ "index": 299, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -7262,7 +7273,7 @@ "index": 300, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Tony", + "name": "{TRNAME}Tony", "unk2": 0, "items": [], "unkC": 1, @@ -7279,7 +7290,7 @@ "index": 301, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_GUITARIST", - "name": "Jerry", + "name": "{TRNAME}Jerry", "unk2": 0, "items": [], "unkC": 1, @@ -7301,7 +7312,7 @@ "index": 302, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_GUITARIST", - "name": "Preston", + "name": "{TRNAME}Preston", "unk2": 0, "items": [], "unkC": 1, @@ -7334,7 +7345,7 @@ "index": 303, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_GUITARIST", - "name": "Lonnie", + "name": "{TRNAME}Lonnie", "unk2": 0, "items": [], "unkC": 1, @@ -7357,7 +7368,7 @@ "index": 304, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RUIN_MANIAC", - "name": "Calvin", + "name": "{TRNAME}Calvin", "unk2": 0, "items": [], "unkC": 1, @@ -7379,7 +7390,7 @@ "index": 305, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RUIN_MANIAC", - "name": "Larry", + "name": "{TRNAME}Larry", "unk2": 0, "items": [], "unkC": 1, @@ -7396,7 +7407,7 @@ "index": 306, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_JOGGER", - "name": "Wyatt", + "name": "{TRNAME}Wyatt", "unk2": 0, "items": [], "unkC": 1, @@ -7413,7 +7424,7 @@ "index": 307, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_JOGGER", - "name": "Craig", + "name": "{TRNAME}Craig", "unk2": 0, "items": [], "unkC": 1, @@ -7440,7 +7451,7 @@ "index": 308, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_JOGGER", - "name": "Raul", + "name": "{TRNAME}Raul", "unk2": 0, "items": [], "unkC": 1, @@ -7457,7 +7468,7 @@ "index": 309, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Colby", + "name": "{TRNAME}Colby", "unk2": 0, "items": [], "unkC": 1, @@ -7496,7 +7507,7 @@ "index": 310, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Darren", + "name": "{TRNAME}Darren", "unk2": 0, "items": [], "unkC": 1, @@ -7535,7 +7546,7 @@ "index": 311, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Rafael", + "name": "{TRNAME}Rafael", "unk2": 0, "items": [], "unkC": 1, @@ -7558,7 +7569,7 @@ "index": 312, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Jeffery", + "name": "{TRNAME}Jeffery", "unk2": 0, "items": [], "unkC": 1, @@ -7590,7 +7601,7 @@ "index": 313, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Carl", + "name": "{TRNAME}Carl", "unk2": 0, "items": [], "unkC": 1, @@ -7612,7 +7623,7 @@ "index": 314, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Ricky", + "name": "{TRNAME}Ricky", "unk2": 0, "items": [], "unkC": 1, @@ -7635,7 +7646,7 @@ "index": 315, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_LEADER_GARDENIA", - "name": "Gardenia", + "name": "{TRNAME}Gardenia", "unk2": 0, "items": [ "ITEM_SUPER_POTION", @@ -7686,7 +7697,7 @@ "index": 316, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_LEADER_WAKE", - "name": "Wake", + "name": "{TRNAME}Wake", "unk2": 0, "items": [ "ITEM_SUPER_POTION", @@ -7737,7 +7748,7 @@ "index": 317, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_LEADER_MAYLENE", - "name": "Maylene", + "name": "{TRNAME}Maylene", "unk2": 0, "items": [ "ITEM_HYPER_POTION", @@ -7788,7 +7799,7 @@ "index": 318, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_LEADER_FANTINA", - "name": "Fantina", + "name": "{TRNAME}Fantina", "unk2": 0, "items": [ "ITEM_HYPER_POTION", @@ -7839,7 +7850,7 @@ "index": 319, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_LEADER_CANDICE", - "name": "Candice", + "name": "{TRNAME}Candice", "unk2": 0, "items": [ "ITEM_HYPER_POTION", @@ -7902,7 +7913,7 @@ "index": 320, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_LEADER_VOLKNER", - "name": "Volkner", + "name": "{TRNAME}Volkner", "unk2": 0, "items": [ "ITEM_HYPER_POTION", @@ -7965,7 +7976,7 @@ "index": 321, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -7982,7 +7993,7 @@ "index": 322, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Madeline", + "name": "{TRNAME}Madeline", "unk2": 0, "items": [], "unkC": 1, @@ -8004,7 +8015,7 @@ "index": 323, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Kaitlin", + "name": "{TRNAME}Kaitlin", "unk2": 0, "items": [], "unkC": 1, @@ -8031,7 +8042,7 @@ "index": 324, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_LASS", - "name": "Caroline", + "name": "{TRNAME}Caroline", "unk2": 0, "items": [], "unkC": 1, @@ -8062,7 +8073,7 @@ "index": 325, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_LASS", - "name": "Molly", + "name": "{TRNAME}Molly", "unk2": 0, "items": [], "unkC": 1, @@ -8084,7 +8095,7 @@ "index": 326, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Louis", + "name": "{TRNAME}Louis", "unk2": 0, "items": [], "unkC": 1, @@ -8106,7 +8117,7 @@ "index": 327, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PARASOL_LADY", - "name": "Alexa", + "name": "{TRNAME}Alexa", "unk2": 0, "items": [], "unkC": 1, @@ -8128,7 +8139,7 @@ "index": 328, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PARASOL_LADY", - "name": "Sabrina", + "name": "{TRNAME}Sabrina", "unk2": 0, "items": [], "unkC": 1, @@ -8145,7 +8156,7 @@ "index": 329, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PICNICKER", - "name": "Diana", + "name": "{TRNAME}Diana", "unk2": 0, "items": [], "unkC": 1, @@ -8176,7 +8187,7 @@ "index": 330, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PICNICKER", - "name": "Cheyenne", + "name": "{TRNAME}Cheyenne", "unk2": 0, "items": [], "unkC": 1, @@ -8208,7 +8219,7 @@ "index": 331, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKE_KID", - "name": "Meghan", + "name": "{TRNAME}Meghan", "unk2": 0, "items": [], "unkC": 1, @@ -8240,7 +8251,7 @@ "index": 332, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POLICEMAN", - "name": "Danny", + "name": "{TRNAME}Danny", "unk2": 0, "items": [], "unkC": 1, @@ -8262,7 +8273,7 @@ "index": 333, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POLICEMAN", - "name": "Thomas", + "name": "{TRNAME}Thomas", "unk2": 0, "items": [], "unkC": 1, @@ -8284,7 +8295,7 @@ "index": 334, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RICH_BOY", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -8301,7 +8312,7 @@ "index": 335, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RICH_BOY", - "name": "Trey", + "name": "{TRNAME}Trey", "unk2": 0, "items": [], "unkC": 1, @@ -8318,7 +8329,7 @@ "index": 336, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LADY", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -8335,7 +8346,7 @@ "index": 337, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SAILOR", - "name": "Marc", + "name": "{TRNAME}Marc", "unk2": 0, "items": [], "unkC": 1, @@ -8352,7 +8363,7 @@ "index": 338, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SAILOR", - "name": "Skyler", + "name": "{TRNAME}Skyler", "unk2": 0, "items": [], "unkC": 1, @@ -8374,7 +8385,7 @@ "index": 339, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SAILOR", - "name": "Damian", + "name": "{TRNAME}Damian", "unk2": 0, "items": [], "unkC": 1, @@ -8406,7 +8417,7 @@ "index": 340, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SCHOOL_KID_M", - "name": "Chance", + "name": "{TRNAME}Chance", "unk2": 0, "items": [], "unkC": 1, @@ -8429,7 +8440,7 @@ "index": 341, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SCHOOL_KID_M", - "name": "Forrest", + "name": "{TRNAME}Forrest", "unk2": 0, "items": [], "unkC": 1, @@ -8452,7 +8463,7 @@ "index": 342, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SCHOOL_KID_M", - "name": "Harrison", + "name": "{TRNAME}Harrison", "unk2": 0, "items": [], "unkC": 1, @@ -8472,7 +8483,7 @@ "index": 343, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SCHOOL_KID_F", - "name": "Mackenzie", + "name": "{TRNAME}Mackenzie", "unk2": 0, "items": [], "unkC": 1, @@ -8505,7 +8516,7 @@ "index": 344, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SCHOOL_KID_F", - "name": "Tiera", + "name": "{TRNAME}Tiera", "unk2": 0, "items": [], "unkC": 1, @@ -8528,7 +8539,7 @@ "index": 345, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SCHOOL_KID_F", - "name": "Christine", + "name": "{TRNAME}Christine", "unk2": 0, "items": [], "unkC": 1, @@ -8548,7 +8559,7 @@ "index": 346, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BEAUTY", - "name": "Cyndy", + "name": "{TRNAME}Cyndy", "unk2": 0, "items": [], "unkC": 1, @@ -8565,7 +8576,7 @@ "index": 347, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BEAUTY", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -8582,7 +8593,7 @@ "index": 348, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_BEAUTY", - "name": "Lindsay", + "name": "{TRNAME}Lindsay", "unk2": 0, "items": [], "unkC": 1, @@ -8604,7 +8615,7 @@ "index": 349, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -8621,7 +8632,7 @@ "index": 350, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -8638,7 +8649,7 @@ "index": 351, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -8655,7 +8666,7 @@ "index": 352, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -8672,7 +8683,7 @@ "index": 353, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -8689,7 +8700,7 @@ "index": 354, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -8706,7 +8717,7 @@ "index": 355, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Dallas", + "name": "{TRNAME}Dallas", "unk2": 0, "items": [], "unkC": 1, @@ -8723,7 +8734,7 @@ "index": 356, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Sebastian", + "name": "{TRNAME}Sebastian", "unk2": 0, "items": [], "unkC": 1, @@ -8744,7 +8755,7 @@ "index": 357, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Donny", + "name": "{TRNAME}Donny", "unk2": 0, "items": [], "unkC": 1, @@ -8778,7 +8789,7 @@ "index": 358, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_TUBER_M", - "name": "Trenton", + "name": "{TRNAME}Trenton", "unk2": 0, "items": [], "unkC": 1, @@ -8800,7 +8811,7 @@ "index": 359, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_TUBER_M", - "name": "Conner", + "name": "{TRNAME}Conner", "unk2": 0, "items": [], "unkC": 1, @@ -8817,7 +8828,7 @@ "index": 360, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_TUBER_F", - "name": "Mariel", + "name": "{TRNAME}Mariel", "unk2": 0, "items": [], "unkC": 1, @@ -8839,7 +8850,7 @@ "index": 361, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_TUBER_F", - "name": "Holly", + "name": "{TRNAME}Holly", "unk2": 0, "items": [], "unkC": 1, @@ -8856,7 +8867,7 @@ "index": 362, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_VETERAN", - "name": "Armando", + "name": "{TRNAME}Armando", "unk2": 0, "items": [], "unkC": 1, @@ -8901,7 +8912,7 @@ "index": 363, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WAITER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -8918,7 +8929,7 @@ "index": 364, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WAITER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -8935,7 +8946,7 @@ "index": 365, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WAITER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -8952,7 +8963,7 @@ "index": 366, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WAITRESS", - "name": "Kati", + "name": "{TRNAME}Kati", "unk2": 0, "items": [], "unkC": 1, @@ -8969,7 +8980,7 @@ "index": 367, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_WORKER", - "name": "Gerardo", + "name": "{TRNAME}Gerardo", "unk2": 0, "items": [], "unkC": 1, @@ -9001,7 +9012,7 @@ "index": 368, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_INTERVIEWERS", - "name": "Roxy & Oli", + "name": "{TRNAME}Roxy & Oli", "unk2": 0, "items": [], "unkC": 1, @@ -9023,7 +9034,7 @@ "index": 369, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMERAMAN", - "name": "Tevin", + "name": "{TRNAME}Tevin", "unk2": 0, "items": [], "unkC": 1, @@ -9040,7 +9051,7 @@ "index": 370, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_REPORTER", - "name": "Kinsey", + "name": "{TRNAME}Kinsey", "unk2": 0, "items": [], "unkC": 1, @@ -9057,7 +9068,7 @@ "index": 371, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_IDOL", - "name": "Grace", + "name": "{TRNAME}Grace", "unk2": 0, "items": [], "unkC": 1, @@ -9079,7 +9090,7 @@ "index": 372, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BATTLE_GIRL", - "name": "Tyler", + "name": "{TRNAME}Tyler", "unk2": 0, "items": [], "unkC": 1, @@ -9096,7 +9107,7 @@ "index": 373, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BIRD_KEEPER", - "name": "Autumn", + "name": "{TRNAME}Autumn", "unk2": 0, "items": [], "unkC": 1, @@ -9118,7 +9129,7 @@ "index": 374, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_BREEDER_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -9135,7 +9146,7 @@ "index": 375, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_BREEDER_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -9152,7 +9163,7 @@ "index": 376, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMERAMAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -9169,7 +9180,7 @@ "index": 377, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_CAMPER", - "name": "Zackary", + "name": "{TRNAME}Zackary", "unk2": 0, "items": [], "unkC": 1, @@ -9190,7 +9201,7 @@ "index": 378, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_CAMPER", - "name": "Lawrence", + "name": "{TRNAME}Lawrence", "unk2": 0, "items": [], "unkC": 1, @@ -9223,7 +9234,7 @@ "index": 379, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_CAMPER", - "name": "Diego", + "name": "{TRNAME}Diego", "unk2": 0, "items": [], "unkC": 1, @@ -9254,7 +9265,7 @@ "index": 380, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_CAMPER", - "name": "Parker", + "name": "{TRNAME}Parker", "unk2": 0, "items": [], "unkC": 1, @@ -9285,7 +9296,7 @@ "index": 381, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COLLECTOR", - "name": "Dominique", + "name": "{TRNAME}Dominique", "unk2": 0, "items": [], "unkC": 1, @@ -9312,7 +9323,7 @@ "index": 382, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COLLECTOR", - "name": "Jamal", + "name": "{TRNAME}Jamal", "unk2": 0, "items": [], "unkC": 1, @@ -9339,7 +9350,7 @@ "index": 383, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COLLECTOR", - "name": "Terry", + "name": "{TRNAME}Terry", "unk2": 0, "items": [], "unkC": 1, @@ -9366,7 +9377,7 @@ "index": 384, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKEFAN_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -9383,7 +9394,7 @@ "index": 385, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKEFAN_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -9400,7 +9411,7 @@ "index": 386, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Joe", + "name": "{TRNAME}Joe", "unk2": 0, "items": [], "unkC": 1, @@ -9422,7 +9433,7 @@ "index": 387, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -9439,7 +9450,7 @@ "index": 388, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Jonah", + "name": "{TRNAME}Jonah", "unk2": 0, "items": [], "unkC": 1, @@ -9484,7 +9495,7 @@ "index": 389, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Micah", + "name": "{TRNAME}Micah", "unk2": 0, "items": [], "unkC": 1, @@ -9529,7 +9540,7 @@ "index": 390, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Arthur", + "name": "{TRNAME}Arthur", "unk2": 0, "items": [], "unkC": 1, @@ -9563,7 +9574,7 @@ "index": 391, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -9580,7 +9591,7 @@ "index": 392, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Brenda", + "name": "{TRNAME}Brenda", "unk2": 0, "items": [], "unkC": 1, @@ -9614,7 +9625,7 @@ "index": 393, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Brandi", + "name": "{TRNAME}Brandi", "unk2": 0, "items": [], "unkC": 1, @@ -9659,7 +9670,7 @@ "index": 394, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Clarice", + "name": "{TRNAME}Clarice", "unk2": 0, "items": [], "unkC": 1, @@ -9704,7 +9715,7 @@ "index": 395, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Kody", + "name": "{TRNAME}Kody", "unk2": 0, "items": [], "unkC": 1, @@ -9721,7 +9732,7 @@ "index": 396, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Landon", + "name": "{TRNAME}Landon", "unk2": 0, "items": [], "unkC": 1, @@ -9738,7 +9749,7 @@ "index": 397, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Deandre", + "name": "{TRNAME}Deandre", "unk2": 0, "items": [], "unkC": 1, @@ -9755,7 +9766,7 @@ "index": 398, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Rachael", + "name": "{TRNAME}Rachael", "unk2": 0, "items": [], "unkC": 1, @@ -9777,7 +9788,7 @@ "index": 399, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Desiree", + "name": "{TRNAME}Desiree", "unk2": 0, "items": [], "unkC": 1, @@ -9799,7 +9810,7 @@ "index": 400, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Kendra", + "name": "{TRNAME}Kendra", "unk2": 0, "items": [], "unkC": 1, @@ -9821,7 +9832,7 @@ "index": 401, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Walter", + "name": "{TRNAME}Walter", "unk2": 0, "items": [], "unkC": 1, @@ -9843,7 +9854,7 @@ "index": 402, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GENTLEMAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -9860,7 +9871,7 @@ "index": 403, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_GALACTIC_BOSS", - "name": "Cyrus", + "name": "{TRNAME}Cyrus", "unk2": 0, "items": [ "ITEM_SUPER_POTION", @@ -9911,7 +9922,7 @@ "index": 404, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_GALACTIC_BOSS", - "name": "Cyrus", + "name": "{TRNAME}Cyrus", "unk2": 0, "items": [ "ITEM_SUPER_POTION", @@ -9974,7 +9985,7 @@ "index": 405, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_COMMANDER_MARS", - "name": "Mars", + "name": "{TRNAME}Mars", "unk2": 0, "items": [], "unkC": 1, @@ -10022,7 +10033,7 @@ "index": 406, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_COMMANDER_JUPITER", - "name": "Jupiter", + "name": "{TRNAME}Jupiter", "unk2": 0, "items": [], "unkC": 1, @@ -10057,7 +10068,7 @@ "index": 407, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_COMMANDER_JUPITER", - "name": "Jupiter", + "name": "{TRNAME}Jupiter", "unk2": 0, "items": [], "unkC": 1, @@ -10105,7 +10116,7 @@ "index": 408, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_COMMANDER_SATURN", - "name": "Saturn", + "name": "{TRNAME}Saturn", "unk2": 0, "items": [], "unkC": 1, @@ -10153,7 +10164,7 @@ "index": 409, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_COMMANDER_SATURN", - "name": "Saturn", + "name": "{TRNAME}Saturn", "unk2": 0, "items": [], "unkC": 1, @@ -10201,7 +10212,7 @@ "index": 410, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10233,7 +10244,7 @@ "index": 411, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10250,7 +10261,7 @@ "index": 412, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10281,7 +10292,7 @@ "index": 413, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10298,7 +10309,7 @@ "index": 414, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10319,7 +10330,7 @@ "index": 415, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10336,7 +10347,7 @@ "index": 416, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10358,7 +10369,7 @@ "index": 417, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10380,7 +10391,7 @@ "index": 418, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10407,7 +10418,7 @@ "index": 419, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10424,7 +10435,7 @@ "index": 420, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10446,7 +10457,7 @@ "index": 421, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10468,7 +10479,7 @@ "index": 422, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10490,7 +10501,7 @@ "index": 423, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10531,7 +10542,7 @@ "index": 424, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10548,7 +10559,7 @@ "index": 425, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10570,7 +10581,7 @@ "index": 426, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10614,7 +10625,7 @@ "index": 427, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10636,7 +10647,7 @@ "index": 428, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10653,7 +10664,7 @@ "index": 429, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10670,7 +10681,7 @@ "index": 430, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -10692,7 +10703,7 @@ "index": 431, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Arturo", + "name": "{TRNAME}Arturo", "unk2": 0, "items": [], "unkC": 1, @@ -10714,7 +10725,7 @@ "index": 432, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -10731,7 +10742,7 @@ "index": 433, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -10748,7 +10759,7 @@ "index": 434, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -10765,7 +10776,7 @@ "index": 435, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -10782,7 +10793,7 @@ "index": 436, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -10799,7 +10810,7 @@ "index": 437, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_IDOL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -10816,7 +10827,7 @@ "index": 438, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_IDOL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -10833,7 +10844,7 @@ "index": 439, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_IDOL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -10850,7 +10861,7 @@ "index": 440, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_IDOL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -10867,7 +10878,7 @@ "index": 441, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RUIN_MANIAC", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -10884,7 +10895,7 @@ "index": 442, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RUIN_MANIAC", - "name": "Harry", + "name": "{TRNAME}Harry", "unk2": 0, "items": [], "unkC": 1, @@ -10901,7 +10912,7 @@ "index": 443, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RUIN_MANIAC", - "name": "Gerald", + "name": "{TRNAME}Gerald", "unk2": 0, "items": [], "unkC": 1, @@ -10923,7 +10934,7 @@ "index": 444, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Miles", + "name": "{TRNAME}Miles", "unk2": 0, "items": [], "unkC": 1, @@ -10940,7 +10951,7 @@ "index": 445, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Kendal", + "name": "{TRNAME}Kendal", "unk2": 0, "items": [], "unkC": 1, @@ -10957,7 +10968,7 @@ "index": 446, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Eddie", + "name": "{TRNAME}Eddie", "unk2": 0, "items": [], "unkC": 1, @@ -10979,7 +10990,7 @@ "index": 447, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Willie", + "name": "{TRNAME}Willie", "unk2": 0, "items": [], "unkC": 1, @@ -11001,7 +11012,7 @@ "index": 448, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SOCIALITE", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -11018,7 +11029,7 @@ "index": 449, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -11035,7 +11046,7 @@ "index": 450, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Cassidy", + "name": "{TRNAME}Cassidy", "unk2": 0, "items": [], "unkC": 1, @@ -11052,7 +11063,7 @@ "index": 451, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Theodore", + "name": "{TRNAME}Theodore", "unk2": 0, "items": [], "unkC": 1, @@ -11074,7 +11085,7 @@ "index": 452, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Damon", + "name": "{TRNAME}Damon", "unk2": 0, "items": [], "unkC": 1, @@ -11101,7 +11112,7 @@ "index": 453, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Maurice", + "name": "{TRNAME}Maurice", "unk2": 0, "items": [], "unkC": 1, @@ -11123,7 +11134,7 @@ "index": 454, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Reginald", + "name": "{TRNAME}Reginald", "unk2": 0, "items": [], "unkC": 1, @@ -11145,7 +11156,7 @@ "index": 455, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Lorenzo", + "name": "{TRNAME}Lorenzo", "unk2": 0, "items": [], "unkC": 1, @@ -11162,7 +11173,7 @@ "index": 456, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PICNICKER", - "name": "Karina", + "name": "{TRNAME}Karina", "unk2": 0, "items": [], "unkC": 1, @@ -11183,7 +11194,7 @@ "index": 457, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PICNICKER", - "name": "Summer", + "name": "{TRNAME}Summer", "unk2": 0, "items": [], "unkC": 1, @@ -11216,7 +11227,7 @@ "index": 458, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PICNICKER", - "name": "Tori", + "name": "{TRNAME}Tori", "unk2": 0, "items": [], "unkC": 1, @@ -11247,7 +11258,7 @@ "index": 459, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PICNICKER", - "name": "Ana", + "name": "{TRNAME}Ana", "unk2": 0, "items": [], "unkC": 1, @@ -11268,7 +11279,7 @@ "index": 460, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CLOWN", - "name": "Lee", + "name": "{TRNAME}Lee", "unk2": 0, "items": [], "unkC": 1, @@ -11285,7 +11296,7 @@ "index": 461, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CLOWN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -11302,7 +11313,7 @@ "index": 462, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CLOWN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -11319,7 +11330,7 @@ "index": 463, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CLOWN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -11336,7 +11347,7 @@ "index": 464, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CLOWN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -11353,7 +11364,7 @@ "index": 465, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKE_KID", - "name": "Ariel", + "name": "{TRNAME}Ariel", "unk2": 0, "items": [], "unkC": 1, @@ -11375,7 +11386,7 @@ "index": 466, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POLICEMAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -11392,7 +11403,7 @@ "index": 467, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RICH_BOY", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -11409,7 +11420,7 @@ "index": 468, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RICH_BOY", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -11426,7 +11437,7 @@ "index": 469, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LADY", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -11443,7 +11454,7 @@ "index": 470, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -11499,7 +11510,7 @@ "index": 471, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -11555,7 +11566,7 @@ "index": 472, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -11611,7 +11622,7 @@ "index": 473, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -11667,7 +11678,7 @@ "index": 474, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -11723,7 +11734,7 @@ "index": 475, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -11779,7 +11790,7 @@ "index": 476, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -11846,7 +11857,7 @@ "index": 477, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -11913,7 +11924,7 @@ "index": 478, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -11980,7 +11991,7 @@ "index": 479, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -12058,7 +12069,7 @@ "index": 480, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -12136,7 +12147,7 @@ "index": 481, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -12214,7 +12225,7 @@ "index": 482, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SAILOR", - "name": "Zachariah", + "name": "{TRNAME}Zachariah", "unk2": 0, "items": [], "unkC": 1, @@ -12241,7 +12252,7 @@ "index": 483, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SAILOR", - "name": "Samson", + "name": "{TRNAME}Samson", "unk2": 0, "items": [], "unkC": 1, @@ -12283,7 +12294,7 @@ "index": 484, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCHOOL_KID_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -12300,7 +12311,7 @@ "index": 485, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCHOOL_KID_F", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -12317,7 +12328,7 @@ "index": 486, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Shaun", + "name": "{TRNAME}Shaun", "unk2": 0, "items": [], "unkC": 1, @@ -12348,7 +12359,7 @@ "index": 487, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -12365,7 +12376,7 @@ "index": 488, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_NINJA_BOY", - "name": "Fabian", + "name": "{TRNAME}Fabian", "unk2": 0, "items": [], "unkC": 1, @@ -12392,7 +12403,7 @@ "index": 489, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_NINJA_BOY", - "name": "Brennan", + "name": "{TRNAME}Brennan", "unk2": 0, "items": [], "unkC": 1, @@ -12414,7 +12425,7 @@ "index": 490, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_NINJA_BOY", - "name": "Bruce", + "name": "{TRNAME}Bruce", "unk2": 0, "items": [], "unkC": 1, @@ -12431,7 +12442,7 @@ "index": 491, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BEAUTY", - "name": "Devon", + "name": "{TRNAME}Devon", "unk2": 0, "items": [], "unkC": 1, @@ -12448,7 +12459,7 @@ "index": 492, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BEAUTY", - "name": "Nicola", + "name": "{TRNAME}Nicola", "unk2": 0, "items": [], "unkC": 1, @@ -12465,7 +12476,7 @@ "index": 493, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -12482,7 +12493,7 @@ "index": 494, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Claire", + "name": "{TRNAME}Claire", "unk2": 0, "items": [], "unkC": 1, @@ -12499,7 +12510,7 @@ "index": 495, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -12516,7 +12527,7 @@ "index": 496, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Wayne", + "name": "{TRNAME}Wayne", "unk2": 0, "items": [], "unkC": 1, @@ -12543,7 +12554,7 @@ "index": 497, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_TUBER_M", - "name": "Jacky", + "name": "{TRNAME}Jacky", "unk2": 0, "items": [], "unkC": 1, @@ -12566,7 +12577,7 @@ "index": 498, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_TUBER_F", - "name": "Caitlyn", + "name": "{TRNAME}Caitlyn", "unk2": 0, "items": [], "unkC": 1, @@ -12599,7 +12610,7 @@ "index": 499, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_VETERAN", - "name": "Terrell", + "name": "{TRNAME}Terrell", "unk2": 0, "items": [], "unkC": 1, @@ -12644,7 +12655,7 @@ "index": 500, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_VETERAN", - "name": "Brenden", + "name": "{TRNAME}Brenden", "unk2": 0, "items": [], "unkC": 1, @@ -12689,7 +12700,7 @@ "index": 501, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WAITER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -12706,7 +12717,7 @@ "index": 502, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WORKER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -12723,7 +12734,7 @@ "index": 503, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WORKER", - "name": "Willy", + "name": "{TRNAME}Willy", "unk2": 0, "items": [], "unkC": 1, @@ -12745,7 +12756,7 @@ "index": 504, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WORKER", - "name": "Braden", + "name": "{TRNAME}Braden", "unk2": 0, "items": [], "unkC": 1, @@ -12762,7 +12773,7 @@ "index": 505, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WORKER", - "name": "Brendon", + "name": "{TRNAME}Brendon", "unk2": 0, "items": [], "unkC": 1, @@ -12784,7 +12795,7 @@ "index": 506, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WORKER", - "name": "Quentin", + "name": "{TRNAME}Quentin", "unk2": 0, "items": [], "unkC": 1, @@ -12811,7 +12822,7 @@ "index": 507, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -12828,7 +12839,7 @@ "index": 508, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -12850,7 +12861,7 @@ "index": 509, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -12867,7 +12878,7 @@ "index": 510, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -12894,7 +12905,7 @@ "index": 511, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -12911,7 +12922,7 @@ "index": 512, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -12933,7 +12944,7 @@ "index": 513, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -12955,7 +12966,7 @@ "index": 514, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -12977,7 +12988,7 @@ "index": 515, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -12994,7 +13005,7 @@ "index": 516, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -13021,7 +13032,7 @@ "index": 517, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -13043,7 +13054,7 @@ "index": 518, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -13070,7 +13081,7 @@ "index": 519, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -13087,7 +13098,7 @@ "index": 520, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -13109,7 +13120,7 @@ "index": 521, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -13131,7 +13142,7 @@ "index": 522, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -13158,7 +13169,7 @@ "index": 523, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -13175,7 +13186,7 @@ "index": 524, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -13202,7 +13213,7 @@ "index": 525, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -13224,7 +13235,7 @@ "index": 526, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -13251,7 +13262,7 @@ "index": 527, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC_F", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -13273,7 +13284,7 @@ "index": 528, "type": "TRTYPE_MON_ITEM_MOVES", "class": "TRAINER_CLASS_COMMANDER_MARS", - "name": "Mars", + "name": "{TRNAME}Mars", "unk2": 0, "items": [], "unkC": 1, @@ -13321,7 +13332,7 @@ "index": 529, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ROUGHNECK", - "name": "Kirby", + "name": "{TRNAME}Kirby", "unk2": 0, "items": [], "unkC": 1, @@ -13338,7 +13349,7 @@ "index": 530, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKEFAN_M", - "name": "Leonard", + "name": "{TRNAME}Leonard", "unk2": 0, "items": [], "unkC": 1, @@ -13365,7 +13376,7 @@ "index": 531, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKEFAN_F", - "name": "Rebekah", + "name": "{TRNAME}Rebekah", "unk2": 0, "items": [], "unkC": 1, @@ -13382,7 +13393,7 @@ "index": 532, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Oliver", + "name": "{TRNAME}Oliver", "unk2": 0, "items": [], "unkC": 1, @@ -13409,7 +13420,7 @@ "index": 533, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BELLE__PA", - "name": "Beth & Bob", + "name": "{TRNAME}Beth & Bob", "unk2": 0, "items": [], "unkC": 1, @@ -13431,7 +13442,7 @@ "index": 534, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNG_COUPLE", - "name": "Mike & Nat", + "name": "{TRNAME}Mike & Nat", "unk2": 0, "items": [], "unkC": 1, @@ -13453,7 +13464,7 @@ "index": 535, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_AROMA_LADY", - "name": "Alison", + "name": "{TRNAME}Alison", "unk2": 0, "items": [], "unkC": 1, @@ -13470,7 +13481,7 @@ "index": 536, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ARTIST", - "name": "Ismael", + "name": "{TRNAME}Ismael", "unk2": 0, "items": [], "unkC": 1, @@ -13487,7 +13498,7 @@ "index": 537, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_BREEDER_F", - "name": "Kaylee", + "name": "{TRNAME}Kaylee", "unk2": 0, "items": [], "unkC": 1, @@ -13509,7 +13520,7 @@ "index": 538, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMERAMAN", - "name": "Darryl", + "name": "{TRNAME}Darryl", "unk2": 0, "items": [], "unkC": 1, @@ -13531,7 +13542,7 @@ "index": 539, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COLLECTOR", - "name": "Eugene", + "name": "{TRNAME}Eugene", "unk2": 0, "items": [], "unkC": 1, @@ -13558,7 +13569,7 @@ "index": 540, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKEFAN_F", - "name": "Meredith", + "name": "{TRNAME}Meredith", "unk2": 0, "items": [], "unkC": 1, @@ -13580,7 +13591,7 @@ "index": 541, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PI", - "name": "Kendrick", + "name": "{TRNAME}Kendrick", "unk2": 0, "items": [], "unkC": 1, @@ -13610,7 +13621,7 @@ "index": 542, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GENTLEMAN", - "name": "Leonardo", + "name": "{TRNAME}Leonardo", "unk2": 0, "items": [], "unkC": 1, @@ -13632,7 +13643,7 @@ "index": 543, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SOCIALITE", - "name": "Rebecca", + "name": "{TRNAME}Rebecca", "unk2": 0, "items": [ "ITEM_FULL_RESTORE" @@ -13656,7 +13667,7 @@ "index": 544, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Blythe", + "name": "{TRNAME}Blythe", "unk2": 0, "items": [], "unkC": 1, @@ -13678,7 +13689,7 @@ "index": 545, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RICH_BOY", - "name": "Roman", + "name": "{TRNAME}Roman", "unk2": 0, "items": [], "unkC": 1, @@ -13695,7 +13706,7 @@ "index": 546, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LADY", - "name": "Kylie", + "name": "{TRNAME}Kylie", "unk2": 0, "items": [], "unkC": 1, @@ -13717,7 +13728,7 @@ "index": 547, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_REPORTER", - "name": "Valerie", + "name": "{TRNAME}Valerie", "unk2": 0, "items": [], "unkC": 1, @@ -13734,7 +13745,7 @@ "index": 548, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SCHOOL_KID_M", - "name": "Esteban", + "name": "{TRNAME}Esteban", "unk2": 0, "items": [], "unkC": 1, @@ -13757,7 +13768,7 @@ "index": 549, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Emilio", + "name": "{TRNAME}Emilio", "unk2": 0, "items": [], "unkC": 1, @@ -13774,7 +13785,7 @@ "index": 550, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BEAUTY", - "name": "Gabriella", + "name": "{TRNAME}Gabriella", "unk2": 0, "items": [], "unkC": 1, @@ -13791,7 +13802,7 @@ "index": 551, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BEAUTY", - "name": "Harley", + "name": "{TRNAME}Harley", "unk2": 0, "items": [], "unkC": 1, @@ -13808,7 +13819,7 @@ "index": 552, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_VETERAN", - "name": "Emanuel", + "name": "{TRNAME}Emanuel", "unk2": 0, "items": [], "unkC": 1, @@ -13840,7 +13851,7 @@ "index": 553, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RUIN_MANIAC", - "name": "Karl", + "name": "{TRNAME}Karl", "unk2": 0, "items": [], "unkC": 1, @@ -13867,7 +13878,7 @@ "index": 554, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BIRD_KEEPER", - "name": "Audrey", + "name": "{TRNAME}Audrey", "unk2": 0, "items": [], "unkC": 1, @@ -13889,7 +13900,7 @@ "index": 555, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BIRD_KEEPER", - "name": "Geneva", + "name": "{TRNAME}Geneva", "unk2": 0, "items": [], "unkC": 1, @@ -13911,7 +13922,7 @@ "index": 556, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BIRD_KEEPER", - "name": "Krystal", + "name": "{TRNAME}Krystal", "unk2": 0, "items": [], "unkC": 1, @@ -13938,7 +13949,7 @@ "index": 557, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Geoffrey", + "name": "{TRNAME}Geoffrey", "unk2": 0, "items": [], "unkC": 1, @@ -13960,7 +13971,7 @@ "index": 558, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Darien", + "name": "{TRNAME}Darien", "unk2": 0, "items": [], "unkC": 1, @@ -13977,7 +13988,7 @@ "index": 559, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Keegan", + "name": "{TRNAME}Keegan", "unk2": 0, "items": [], "unkC": 1, @@ -13994,7 +14005,7 @@ "index": 560, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Stanley", + "name": "{TRNAME}Stanley", "unk2": 0, "items": [], "unkC": 1, @@ -14016,7 +14027,7 @@ "index": 561, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Drake", + "name": "{TRNAME}Drake", "unk2": 0, "items": [], "unkC": 1, @@ -14043,7 +14054,7 @@ "index": 562, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Kenny", + "name": "{TRNAME}Kenny", "unk2": 0, "items": [], "unkC": 1, @@ -14065,7 +14076,7 @@ "index": 563, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Rodolfo", + "name": "{TRNAME}Rodolfo", "unk2": 0, "items": [], "unkC": 1, @@ -14099,7 +14110,7 @@ "index": 564, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Saul", + "name": "{TRNAME}Saul", "unk2": 0, "items": [], "unkC": 1, @@ -14122,7 +14133,7 @@ "index": 565, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Jose", + "name": "{TRNAME}Jose", "unk2": 0, "items": [], "unkC": 1, @@ -14156,7 +14167,7 @@ "index": 566, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Felix", + "name": "{TRNAME}Felix", "unk2": 0, "items": [], "unkC": 1, @@ -14190,7 +14201,7 @@ "index": 567, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Quinn", + "name": "{TRNAME}Quinn", "unk2": 0, "items": [], "unkC": 1, @@ -14224,7 +14235,7 @@ "index": 568, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Graham", + "name": "{TRNAME}Graham", "unk2": 0, "items": [], "unkC": 1, @@ -14247,7 +14258,7 @@ "index": 569, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Keenan", + "name": "{TRNAME}Keenan", "unk2": 0, "items": [], "unkC": 1, @@ -14281,7 +14292,7 @@ "index": 570, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Stefan", + "name": "{TRNAME}Stefan", "unk2": 0, "items": [], "unkC": 1, @@ -14315,7 +14326,7 @@ "index": 571, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Skylar", + "name": "{TRNAME}Skylar", "unk2": 0, "items": [], "unkC": 1, @@ -14349,7 +14360,7 @@ "index": 572, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Abel", + "name": "{TRNAME}Abel", "unk2": 0, "items": [], "unkC": 1, @@ -14372,7 +14383,7 @@ "index": 573, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Deanna", + "name": "{TRNAME}Deanna", "unk2": 0, "items": [], "unkC": 1, @@ -14406,7 +14417,7 @@ "index": 574, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Ariana", + "name": "{TRNAME}Ariana", "unk2": 0, "items": [], "unkC": 1, @@ -14451,7 +14462,7 @@ "index": 575, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Dana", + "name": "{TRNAME}Dana", "unk2": 0, "items": [], "unkC": 1, @@ -14485,7 +14496,7 @@ "index": 576, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Mikayla", + "name": "{TRNAME}Mikayla", "unk2": 0, "items": [], "unkC": 1, @@ -14530,7 +14541,7 @@ "index": 577, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Meagan", + "name": "{TRNAME}Meagan", "unk2": 0, "items": [], "unkC": 1, @@ -14564,7 +14575,7 @@ "index": 578, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Sandra", + "name": "{TRNAME}Sandra", "unk2": 0, "items": [], "unkC": 1, @@ -14587,7 +14598,7 @@ "index": 579, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Kassandra", + "name": "{TRNAME}Kassandra", "unk2": 0, "items": [], "unkC": 1, @@ -14621,7 +14632,7 @@ "index": 580, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Jasmin", + "name": "{TRNAME}Jasmin", "unk2": 0, "items": [], "unkC": 1, @@ -14644,7 +14655,7 @@ "index": 581, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Natasha", + "name": "{TRNAME}Natasha", "unk2": 0, "items": [], "unkC": 1, @@ -14689,7 +14700,7 @@ "index": 582, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Monique", + "name": "{TRNAME}Monique", "unk2": 0, "items": [], "unkC": 1, @@ -14723,7 +14734,7 @@ "index": 583, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Corbin", + "name": "{TRNAME}Corbin", "unk2": 0, "items": [], "unkC": 1, @@ -14745,7 +14756,7 @@ "index": 584, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Sterling", + "name": "{TRNAME}Sterling", "unk2": 0, "items": [], "unkC": 1, @@ -14767,7 +14778,7 @@ "index": 585, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Daisy", + "name": "{TRNAME}Daisy", "unk2": 0, "items": [], "unkC": 1, @@ -14789,7 +14800,7 @@ "index": 586, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Chelsey", + "name": "{TRNAME}Chelsey", "unk2": 0, "items": [], "unkC": 1, @@ -14811,7 +14822,7 @@ "index": 587, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Davon", + "name": "{TRNAME}Davon", "unk2": 0, "items": [], "unkC": 1, @@ -14838,7 +14849,7 @@ "index": 588, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Griffin", + "name": "{TRNAME}Griffin", "unk2": 0, "items": [], "unkC": 1, @@ -14860,7 +14871,7 @@ "index": 589, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Ray", + "name": "{TRNAME}Ray", "unk2": 0, "items": [], "unkC": 1, @@ -14887,7 +14898,7 @@ "index": 590, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Jarrett", + "name": "{TRNAME}Jarrett", "unk2": 0, "items": [], "unkC": 1, @@ -14904,7 +14915,7 @@ "index": 591, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_M", - "name": "Kyler", + "name": "{TRNAME}Kyler", "unk2": 0, "items": [], "unkC": 1, @@ -14926,7 +14937,7 @@ "index": 592, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_M", - "name": "Deshawn", + "name": "{TRNAME}Deshawn", "unk2": 0, "items": [], "unkC": 1, @@ -14948,7 +14959,7 @@ "index": 593, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_M", - "name": "Dwayne", + "name": "{TRNAME}Dwayne", "unk2": 0, "items": [], "unkC": 1, @@ -14965,7 +14976,7 @@ "index": 594, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_F", - "name": "Ashlee", + "name": "{TRNAME}Ashlee", "unk2": 0, "items": [], "unkC": 1, @@ -14987,7 +14998,7 @@ "index": 595, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_F", - "name": "Felicia", + "name": "{TRNAME}Felicia", "unk2": 0, "items": [], "unkC": 1, @@ -15009,7 +15020,7 @@ "index": 596, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_F", - "name": "Krista", + "name": "{TRNAME}Krista", "unk2": 0, "items": [], "unkC": 1, @@ -15031,7 +15042,7 @@ "index": 597, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Glenn", + "name": "{TRNAME}Glenn", "unk2": 0, "items": [], "unkC": 1, @@ -15053,7 +15064,7 @@ "index": 598, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Kurt", + "name": "{TRNAME}Kurt", "unk2": 0, "items": [], "unkC": 1, @@ -15070,7 +15081,7 @@ "index": 599, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Sam", + "name": "{TRNAME}Sam", "unk2": 0, "items": [], "unkC": 1, @@ -15092,7 +15103,7 @@ "index": 600, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Wade", + "name": "{TRNAME}Wade", "unk2": 0, "items": [], "unkC": 1, @@ -15119,7 +15130,7 @@ "index": 601, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Joanna", + "name": "{TRNAME}Joanna", "unk2": 0, "items": [], "unkC": 1, @@ -15141,7 +15152,7 @@ "index": 602, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Sophia", + "name": "{TRNAME}Sophia", "unk2": 0, "items": [], "unkC": 1, @@ -15163,7 +15174,7 @@ "index": 603, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Mallory", + "name": "{TRNAME}Mallory", "unk2": 0, "items": [], "unkC": 1, @@ -15185,7 +15196,7 @@ "index": 604, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Lydia", + "name": "{TRNAME}Lydia", "unk2": 0, "items": [], "unkC": 1, @@ -15212,7 +15223,7 @@ "index": 605, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_VETERAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -15229,7 +15240,7 @@ "index": 606, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_VETERAN", - "name": "Harlan", + "name": "{TRNAME}Harlan", "unk2": 0, "items": [], "unkC": 1, @@ -15274,7 +15285,7 @@ "index": 607, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -15352,7 +15363,7 @@ "index": 608, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_CHERYL", - "name": "Cheryl", + "name": "{TRNAME}Cheryl", "unk2": 0, "items": [], "unkC": 1, @@ -15374,7 +15385,7 @@ "index": 609, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_RILEY", - "name": "Riley", + "name": "{TRNAME}Riley", "unk2": 0, "items": [], "unkC": 1, @@ -15397,7 +15408,7 @@ "index": 610, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_MARLEY", - "name": "Marley", + "name": "{TRNAME}Marley", "unk2": 0, "items": [], "unkC": 1, @@ -15420,7 +15431,7 @@ "index": 611, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BUCK", - "name": "Buck", + "name": "{TRNAME}Buck", "unk2": 0, "items": [], "unkC": 1, @@ -15443,7 +15454,7 @@ "index": 612, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_MIRA", - "name": "Mira", + "name": "{TRNAME}Mira", "unk2": 0, "items": [], "unkC": 1, @@ -15466,7 +15477,7 @@ "index": 613, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_LUCAS", - "name": "Lucas", + "name": "{TRNAME}Lucas", "unk2": 0, "items": [], "unkC": 1, @@ -15487,7 +15498,7 @@ "index": 614, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_LUCAS", - "name": "Lucas", + "name": "{TRNAME}Lucas", "unk2": 0, "items": [], "unkC": 1, @@ -15508,7 +15519,7 @@ "index": 615, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_LUCAS", - "name": "Lucas", + "name": "{TRNAME}Lucas", "unk2": 0, "items": [], "unkC": 1, @@ -15529,7 +15540,7 @@ "index": 616, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_DAWN", - "name": "Dawn", + "name": "{TRNAME}Dawn", "unk2": 0, "items": [], "unkC": 1, @@ -15550,7 +15561,7 @@ "index": 617, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_DAWN", - "name": "Dawn", + "name": "{TRNAME}Dawn", "unk2": 0, "items": [], "unkC": 1, @@ -15571,7 +15582,7 @@ "index": 618, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_DAWN", - "name": "Dawn", + "name": "{TRNAME}Dawn", "unk2": 0, "items": [], "unkC": 1, @@ -15592,7 +15603,7 @@ "index": 619, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -15670,7 +15681,7 @@ "index": 620, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -15748,7 +15759,7 @@ "index": 621, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_LUCAS", - "name": "Lucas", + "name": "{TRNAME}Lucas", "unk2": 0, "items": [], "unkC": 1, @@ -15793,7 +15804,7 @@ "index": 622, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_LUCAS", - "name": "Lucas", + "name": "{TRNAME}Lucas", "unk2": 0, "items": [], "unkC": 1, @@ -15838,7 +15849,7 @@ "index": 623, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_LUCAS", - "name": "Lucas", + "name": "{TRNAME}Lucas", "unk2": 0, "items": [], "unkC": 1, @@ -15883,7 +15894,7 @@ "index": 624, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_DAWN", - "name": "Dawn", + "name": "{TRNAME}Dawn", "unk2": 0, "items": [], "unkC": 1, @@ -15928,7 +15939,7 @@ "index": 625, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_DAWN", - "name": "Dawn", + "name": "{TRNAME}Dawn", "unk2": 0, "items": [], "unkC": 1, @@ -15973,7 +15984,7 @@ "index": 626, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_DAWN", - "name": "Dawn", + "name": "{TRNAME}Dawn", "unk2": 0, "items": [], "unkC": 1, @@ -16018,7 +16029,7 @@ "index": 627, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_AROMA_LADY", - "name": "Elizabeth", + "name": "{TRNAME}Elizabeth", "unk2": 0, "items": [], "unkC": 1, @@ -16035,7 +16046,7 @@ "index": 628, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_AROMA_LADY", - "name": "Elizabeth", + "name": "{TRNAME}Elizabeth", "unk2": 0, "items": [], "unkC": 1, @@ -16052,7 +16063,7 @@ "index": 629, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_AROMA_LADY", - "name": "Elizabeth", + "name": "{TRNAME}Elizabeth", "unk2": 0, "items": [], "unkC": 1, @@ -16069,7 +16080,7 @@ "index": 630, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ARTIST", - "name": "Kevin", + "name": "{TRNAME}Kevin", "unk2": 0, "items": [], "unkC": 1, @@ -16091,7 +16102,7 @@ "index": 631, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ARTIST", - "name": "Kevin", + "name": "{TRNAME}Kevin", "unk2": 0, "items": [], "unkC": 1, @@ -16113,7 +16124,7 @@ "index": 632, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_ARTIST", - "name": "Kevin", + "name": "{TRNAME}Kevin", "unk2": 0, "items": [], "unkC": 1, @@ -16135,7 +16146,7 @@ "index": 633, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BATTLE_GIRL", - "name": "Helen", + "name": "{TRNAME}Helen", "unk2": 0, "items": [], "unkC": 1, @@ -16157,7 +16168,7 @@ "index": 634, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BATTLE_GIRL", - "name": "Helen", + "name": "{TRNAME}Helen", "unk2": 0, "items": [], "unkC": 1, @@ -16179,7 +16190,7 @@ "index": 635, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BATTLE_GIRL", - "name": "Helen", + "name": "{TRNAME}Helen", "unk2": 0, "items": [], "unkC": 1, @@ -16201,7 +16212,7 @@ "index": 636, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BIRD_KEEPER", - "name": "Brianna", + "name": "{TRNAME}Brianna", "unk2": 0, "items": [], "unkC": 1, @@ -16223,7 +16234,7 @@ "index": 637, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BIRD_KEEPER", - "name": "Brianna", + "name": "{TRNAME}Brianna", "unk2": 0, "items": [], "unkC": 1, @@ -16245,7 +16256,7 @@ "index": 638, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BIRD_KEEPER", - "name": "Audrey", + "name": "{TRNAME}Audrey", "unk2": 0, "items": [], "unkC": 1, @@ -16267,7 +16278,7 @@ "index": 639, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_BREEDER_M", - "name": "Albert", + "name": "{TRNAME}Albert", "unk2": 0, "items": [], "unkC": 1, @@ -16294,7 +16305,7 @@ "index": 640, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_BREEDER_M", - "name": "Albert", + "name": "{TRNAME}Albert", "unk2": 0, "items": [], "unkC": 1, @@ -16321,7 +16332,7 @@ "index": 641, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_BREEDER_M", - "name": "Albert", + "name": "{TRNAME}Albert", "unk2": 0, "items": [], "unkC": 1, @@ -16348,7 +16359,7 @@ "index": 642, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_BREEDER_F", - "name": "Jennifer", + "name": "{TRNAME}Jennifer", "unk2": 0, "items": [], "unkC": 1, @@ -16375,7 +16386,7 @@ "index": 643, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_BREEDER_F", - "name": "Jennifer", + "name": "{TRNAME}Jennifer", "unk2": 0, "items": [], "unkC": 1, @@ -16402,7 +16413,7 @@ "index": 644, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_BREEDER_F", - "name": "Jennifer", + "name": "{TRNAME}Jennifer", "unk2": 0, "items": [], "unkC": 1, @@ -16429,7 +16440,7 @@ "index": 645, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_CAMPER", - "name": "Zackary", + "name": "{TRNAME}Zackary", "unk2": 0, "items": [], "unkC": 1, @@ -16452,7 +16463,7 @@ "index": 646, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_CAMPER", - "name": "Zackary", + "name": "{TRNAME}Zackary", "unk2": 0, "items": [], "unkC": 1, @@ -16475,7 +16486,7 @@ "index": 647, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_CAMPER", - "name": "Zackary", + "name": "{TRNAME}Zackary", "unk2": 0, "items": [], "unkC": 1, @@ -16498,7 +16509,7 @@ "index": 648, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M", - "name": "Dalton", + "name": "{TRNAME}Dalton", "unk2": 0, "items": [], "unkC": 1, @@ -16543,7 +16554,7 @@ "index": 649, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F", - "name": "Olivia", + "name": "{TRNAME}Olivia", "unk2": 0, "items": [], "unkC": 1, @@ -16577,7 +16588,7 @@ "index": 650, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COLLECTOR", - "name": "Ivan", + "name": "{TRNAME}Ivan", "unk2": 0, "items": [], "unkC": 1, @@ -16604,7 +16615,7 @@ "index": 651, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COWGIRL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -16621,7 +16632,7 @@ "index": 652, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_COWGIRL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -16638,7 +16649,7 @@ "index": 653, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_M", - "name": "John", + "name": "{TRNAME}John", "unk2": 0, "items": [], "unkC": 1, @@ -16660,7 +16671,7 @@ "index": 654, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_M", - "name": "John", + "name": "{TRNAME}John", "unk2": 0, "items": [], "unkC": 1, @@ -16682,7 +16693,7 @@ "index": 655, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_M", - "name": "John", + "name": "{TRNAME}John", "unk2": 0, "items": [], "unkC": 1, @@ -16704,7 +16715,7 @@ "index": 656, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_F", - "name": "Kayla", + "name": "{TRNAME}Kayla", "unk2": 0, "items": [], "unkC": 1, @@ -16721,7 +16732,7 @@ "index": 657, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_F", - "name": "Kayla", + "name": "{TRNAME}Kayla", "unk2": 0, "items": [], "unkC": 1, @@ -16738,7 +16749,7 @@ "index": 658, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CYCLIST_F", - "name": "Kayla", + "name": "{TRNAME}Kayla", "unk2": 0, "items": [], "unkC": 1, @@ -16755,7 +16766,7 @@ "index": 659, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Patrick", + "name": "{TRNAME}Patrick", "unk2": 0, "items": [], "unkC": 1, @@ -16772,7 +16783,7 @@ "index": 660, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Patrick", + "name": "{TRNAME}Patrick", "unk2": 0, "items": [], "unkC": 1, @@ -16789,7 +16800,7 @@ "index": 661, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Hayden", + "name": "{TRNAME}Hayden", "unk2": 0, "items": [], "unkC": 1, @@ -16811,7 +16822,7 @@ "index": 662, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_DRAGON_TAMER", - "name": "Geoffrey", + "name": "{TRNAME}Geoffrey", "unk2": 0, "items": [], "unkC": 1, @@ -16833,7 +16844,7 @@ "index": 663, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Jake", + "name": "{TRNAME}Jake", "unk2": 0, "items": [], "unkC": 0, @@ -16867,7 +16878,7 @@ "index": 664, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Dennis", + "name": "{TRNAME}Dennis", "unk2": 0, "items": [], "unkC": 1, @@ -16912,7 +16923,7 @@ "index": 665, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Dennis", + "name": "{TRNAME}Dennis", "unk2": 0, "items": [], "unkC": 1, @@ -16957,7 +16968,7 @@ "index": 666, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Rodolfo", + "name": "{TRNAME}Rodolfo", "unk2": 0, "items": [], "unkC": 1, @@ -16991,7 +17002,7 @@ "index": 667, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_M", - "name": "Saul", + "name": "{TRNAME}Saul", "unk2": 0, "items": [], "unkC": 1, @@ -17014,7 +17025,7 @@ "index": 668, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Shannon", + "name": "{TRNAME}Shannon", "unk2": 0, "items": [], "unkC": 1, @@ -17059,7 +17070,7 @@ "index": 669, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Maya", + "name": "{TRNAME}Maya", "unk2": 0, "items": [], "unkC": 1, @@ -17093,7 +17104,7 @@ "index": 670, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Maya", + "name": "{TRNAME}Maya", "unk2": 0, "items": [], "unkC": 1, @@ -17127,7 +17138,7 @@ "index": 671, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Deanna", + "name": "{TRNAME}Deanna", "unk2": 0, "items": [], "unkC": 1, @@ -17161,7 +17172,7 @@ "index": 672, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_F", - "name": "Ariana", + "name": "{TRNAME}Ariana", "unk2": 0, "items": [], "unkC": 1, @@ -17206,7 +17217,7 @@ "index": 673, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Mitchell", + "name": "{TRNAME}Mitchell", "unk2": 0, "items": [], "unkC": 1, @@ -17228,7 +17239,7 @@ "index": 674, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Mitchell", + "name": "{TRNAME}Mitchell", "unk2": 0, "items": [], "unkC": 1, @@ -17250,7 +17261,7 @@ "index": 675, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Maxwell", + "name": "{TRNAME}Maxwell", "unk2": 0, "items": [], "unkC": 1, @@ -17272,7 +17283,7 @@ "index": 676, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_M", - "name": "Corbin", + "name": "{TRNAME}Corbin", "unk2": 0, "items": [], "unkC": 1, @@ -17294,7 +17305,7 @@ "index": 677, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Abigail", + "name": "{TRNAME}Abigail", "unk2": 0, "items": [], "unkC": 1, @@ -17321,7 +17332,7 @@ "index": 678, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Abigail", + "name": "{TRNAME}Abigail", "unk2": 0, "items": [], "unkC": 1, @@ -17348,7 +17359,7 @@ "index": 679, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Brittney", + "name": "{TRNAME}Brittney", "unk2": 0, "items": [], "unkC": 1, @@ -17370,7 +17381,7 @@ "index": 680, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PSYCHIC_F", - "name": "Daisy", + "name": "{TRNAME}Daisy", "unk2": 0, "items": [], "unkC": 1, @@ -17392,7 +17403,7 @@ "index": 681, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RANCHER", - "name": "Marco", + "name": "{TRNAME}Marco", "unk2": 0, "items": [], "unkC": 1, @@ -17419,7 +17430,7 @@ "index": 682, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RANCHER", - "name": "Marco", + "name": "{TRNAME}Marco", "unk2": 0, "items": [], "unkC": 1, @@ -17446,7 +17457,7 @@ "index": 683, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Joseph", + "name": "{TRNAME}Joseph", "unk2": 0, "items": [], "unkC": 1, @@ -17463,7 +17474,7 @@ "index": 684, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Joseph", + "name": "{TRNAME}Joseph", "unk2": 0, "items": [], "unkC": 1, @@ -17480,7 +17491,7 @@ "index": 685, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Miguel", + "name": "{TRNAME}Miguel", "unk2": 0, "items": [], "unkC": 1, @@ -17502,7 +17513,7 @@ "index": 686, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_FISHERMAN", - "name": "Alec", + "name": "{TRNAME}Alec", "unk2": 0, "items": [], "unkC": 1, @@ -17524,7 +17535,7 @@ "index": 687, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_TWINS", - "name": "Teri & Tia", + "name": "{TRNAME}Teri & Tia", "unk2": 0, "items": [], "unkC": 1, @@ -17546,7 +17557,7 @@ "index": 688, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_TWINS", - "name": "Teri & Tia", + "name": "{TRNAME}Teri & Tia", "unk2": 0, "items": [], "unkC": 1, @@ -17568,7 +17579,7 @@ "index": 689, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PI", - "name": "Carlos", + "name": "{TRNAME}Carlos", "unk2": 0, "items": [], "unkC": 1, @@ -17607,7 +17618,7 @@ "index": 690, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PI", - "name": "Carlos", + "name": "{TRNAME}Carlos", "unk2": 0, "items": [], "unkC": 1, @@ -17646,7 +17657,7 @@ "index": 691, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GENTLEMAN", - "name": "Jeremy", + "name": "{TRNAME}Jeremy", "unk2": 0, "items": [ "ITEM_FULL_RESTORE" @@ -17665,7 +17676,7 @@ "index": 692, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GENTLEMAN", - "name": "Jeremy", + "name": "{TRNAME}Jeremy", "unk2": 0, "items": [ "ITEM_FULL_RESTORE" @@ -17684,7 +17695,7 @@ "index": 693, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GENTLEMAN", - "name": "Jeremy", + "name": "{TRNAME}Jeremy", "unk2": 0, "items": [ "ITEM_FULL_RESTORE" @@ -17703,7 +17714,7 @@ "index": 694, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Tony", + "name": "{TRNAME}Tony", "unk2": 0, "items": [], "unkC": 1, @@ -17720,7 +17731,7 @@ "index": 695, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RUIN_MANIAC", - "name": "Harry", + "name": "{TRNAME}Harry", "unk2": 0, "items": [], "unkC": 1, @@ -17737,7 +17748,7 @@ "index": 696, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RUIN_MANIAC", - "name": "Harry", + "name": "{TRNAME}Harry", "unk2": 0, "items": [], "unkC": 1, @@ -17754,7 +17765,7 @@ "index": 697, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_JOGGER", - "name": "Craig", + "name": "{TRNAME}Craig", "unk2": 0, "items": [], "unkC": 1, @@ -17781,7 +17792,7 @@ "index": 698, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_JOGGER", - "name": "Craig", + "name": "{TRNAME}Craig", "unk2": 0, "items": [], "unkC": 1, @@ -17808,7 +17819,7 @@ "index": 699, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Philip", + "name": "{TRNAME}Philip", "unk2": 0, "items": [], "unkC": 1, @@ -17825,7 +17836,7 @@ "index": 700, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BLACK_BELT", - "name": "Davon", + "name": "{TRNAME}Davon", "unk2": 0, "items": [], "unkC": 1, @@ -17852,7 +17863,7 @@ "index": 701, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SOCIALITE", - "name": "Reina", + "name": "{TRNAME}Reina", "unk2": 0, "items": [ "ITEM_FULL_RESTORE" @@ -17871,7 +17882,7 @@ "index": 702, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SOCIALITE", - "name": "Reina", + "name": "{TRNAME}Reina", "unk2": 0, "items": [ "ITEM_FULL_RESTORE" @@ -17890,7 +17901,7 @@ "index": 703, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Samantha", + "name": "{TRNAME}Samantha", "unk2": 0, "items": [], "unkC": 1, @@ -17907,7 +17918,7 @@ "index": 704, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Samantha", + "name": "{TRNAME}Samantha", "unk2": 0, "items": [], "unkC": 1, @@ -17924,7 +17935,7 @@ "index": 705, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Samantha", + "name": "{TRNAME}Samantha", "unk2": 0, "items": [], "unkC": 1, @@ -17941,7 +17952,7 @@ "index": 706, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Madeline", + "name": "{TRNAME}Madeline", "unk2": 0, "items": [], "unkC": 1, @@ -17963,7 +17974,7 @@ "index": 707, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Madeline", + "name": "{TRNAME}Madeline", "unk2": 0, "items": [], "unkC": 1, @@ -17985,7 +17996,7 @@ "index": 708, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Madeline", + "name": "{TRNAME}Madeline", "unk2": 0, "items": [], "unkC": 1, @@ -18007,7 +18018,7 @@ "index": 709, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Theodore", + "name": "{TRNAME}Theodore", "unk2": 0, "items": [], "unkC": 1, @@ -18029,7 +18040,7 @@ "index": 710, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Theodore", + "name": "{TRNAME}Theodore", "unk2": 0, "items": [], "unkC": 1, @@ -18051,7 +18062,7 @@ "index": 711, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_HIKER", - "name": "Theodore", + "name": "{TRNAME}Theodore", "unk2": 0, "items": [], "unkC": 1, @@ -18073,7 +18084,7 @@ "index": 712, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BUG_CATCHER", - "name": "Brandon", + "name": "{TRNAME}Brandon", "unk2": 0, "items": [], "unkC": 1, @@ -18095,7 +18106,7 @@ "index": 713, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BUG_CATCHER", - "name": "Brandon", + "name": "{TRNAME}Brandon", "unk2": 0, "items": [], "unkC": 1, @@ -18117,7 +18128,7 @@ "index": 714, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BUG_CATCHER", - "name": "Brandon", + "name": "{TRNAME}Brandon", "unk2": 0, "items": [], "unkC": 1, @@ -18139,7 +18150,7 @@ "index": 715, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PARASOL_LADY", - "name": "Alexa", + "name": "{TRNAME}Alexa", "unk2": 0, "items": [], "unkC": 1, @@ -18161,7 +18172,7 @@ "index": 716, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PARASOL_LADY", - "name": "Alexa", + "name": "{TRNAME}Alexa", "unk2": 0, "items": [], "unkC": 1, @@ -18183,7 +18194,7 @@ "index": 717, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PARASOL_LADY", - "name": "Alexa", + "name": "{TRNAME}Alexa", "unk2": 0, "items": [], "unkC": 1, @@ -18205,7 +18216,7 @@ "index": 718, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PICNICKER", - "name": "Karina", + "name": "{TRNAME}Karina", "unk2": 0, "items": [], "unkC": 1, @@ -18228,7 +18239,7 @@ "index": 719, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PICNICKER", - "name": "Karina", + "name": "{TRNAME}Karina", "unk2": 0, "items": [], "unkC": 1, @@ -18251,7 +18262,7 @@ "index": 720, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PICNICKER", - "name": "Karina", + "name": "{TRNAME}Karina", "unk2": 0, "items": [], "unkC": 0, @@ -18274,7 +18285,7 @@ "index": 721, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKE_KID", - "name": "Danielle", + "name": "{TRNAME}Danielle", "unk2": 0, "items": [], "unkC": 1, @@ -18291,7 +18302,7 @@ "index": 722, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKE_KID", - "name": "Danielle", + "name": "{TRNAME}Danielle", "unk2": 0, "items": [], "unkC": 1, @@ -18308,7 +18319,7 @@ "index": 723, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKE_KID", - "name": "Danielle", + "name": "{TRNAME}Danielle", "unk2": 0, "items": [], "unkC": 1, @@ -18325,7 +18336,7 @@ "index": 724, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POLICEMAN", - "name": "Danny", + "name": "{TRNAME}Danny", "unk2": 0, "items": [], "unkC": 1, @@ -18347,7 +18358,7 @@ "index": 725, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POLICEMAN", - "name": "Danny", + "name": "{TRNAME}Danny", "unk2": 0, "items": [], "unkC": 1, @@ -18369,7 +18380,7 @@ "index": 726, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POLICEMAN", - "name": "Danny", + "name": "{TRNAME}Danny", "unk2": 0, "items": [], "unkC": 1, @@ -18391,7 +18402,7 @@ "index": 727, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RICH_BOY", - "name": "Trey", + "name": "{TRNAME}Trey", "unk2": 0, "items": [], "unkC": 1, @@ -18408,7 +18419,7 @@ "index": 728, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_RICH_BOY", - "name": "Trey", + "name": "{TRNAME}Trey", "unk2": 0, "items": [], "unkC": 1, @@ -18425,7 +18436,7 @@ "index": 729, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LADY", - "name": "Melissa", + "name": "{TRNAME}Melissa", "unk2": 0, "items": [ "ITEM_FULL_RESTORE" @@ -18444,7 +18455,7 @@ "index": 730, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LADY", - "name": "Melissa", + "name": "{TRNAME}Melissa", "unk2": 0, "items": [ "ITEM_FULL_RESTORE" @@ -18463,7 +18474,7 @@ "index": 731, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LADY", - "name": "Melissa", + "name": "{TRNAME}Melissa", "unk2": 0, "items": [ "ITEM_FULL_RESTORE" @@ -18482,7 +18493,7 @@ "index": 732, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_M", - "name": "Taylor", + "name": "{TRNAME}Taylor", "unk2": 0, "items": [], "unkC": 1, @@ -18504,7 +18515,7 @@ "index": 733, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_M", - "name": "Taylor", + "name": "{TRNAME}Taylor", "unk2": 0, "items": [], "unkC": 1, @@ -18526,7 +18537,7 @@ "index": 734, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_M", - "name": "Taylor", + "name": "{TRNAME}Taylor", "unk2": 0, "items": [], "unkC": 1, @@ -18548,7 +18559,7 @@ "index": 735, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_M", - "name": "Kyler", + "name": "{TRNAME}Kyler", "unk2": 0, "items": [], "unkC": 1, @@ -18570,7 +18581,7 @@ "index": 736, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_F", - "name": "Allison", + "name": "{TRNAME}Allison", "unk2": 0, "items": [], "unkC": 1, @@ -18592,7 +18603,7 @@ "index": 737, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_F", - "name": "Allison", + "name": "{TRNAME}Allison", "unk2": 0, "items": [], "unkC": 1, @@ -18614,7 +18625,7 @@ "index": 738, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_F", - "name": "Allison", + "name": "{TRNAME}Allison", "unk2": 0, "items": [], "unkC": 1, @@ -18636,7 +18647,7 @@ "index": 739, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_PKMN_RANGER_F", - "name": "Ashlee", + "name": "{TRNAME}Ashlee", "unk2": 0, "items": [], "unkC": 1, @@ -18658,7 +18669,7 @@ "index": 740, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SAILOR", - "name": "Marc", + "name": "{TRNAME}Marc", "unk2": 0, "items": [], "unkC": 1, @@ -18680,7 +18691,7 @@ "index": 741, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SAILOR", - "name": "Marc", + "name": "{TRNAME}Marc", "unk2": 0, "items": [], "unkC": 1, @@ -18702,7 +18713,7 @@ "index": 742, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SAILOR", - "name": "Zachariah", + "name": "{TRNAME}Zachariah", "unk2": 0, "items": [], "unkC": 1, @@ -18729,7 +18740,7 @@ "index": 743, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Shaun", + "name": "{TRNAME}Shaun", "unk2": 0, "items": [], "unkC": 1, @@ -18751,7 +18762,7 @@ "index": 744, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Shaun", + "name": "{TRNAME}Shaun", "unk2": 0, "items": [], "unkC": 1, @@ -18773,7 +18784,7 @@ "index": 745, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Shaun", + "name": "{TRNAME}Shaun", "unk2": 0, "items": [], "unkC": 1, @@ -18795,7 +18806,7 @@ "index": 746, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_NINJA_BOY", - "name": "Zach", + "name": "{TRNAME}Zach", "unk2": 0, "items": [], "unkC": 1, @@ -18822,7 +18833,7 @@ "index": 747, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_NINJA_BOY", - "name": "Zach", + "name": "{TRNAME}Zach", "unk2": 0, "items": [], "unkC": 1, @@ -18849,7 +18860,7 @@ "index": 748, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_NINJA_BOY", - "name": "Zach", + "name": "{TRNAME}Zach", "unk2": 0, "items": [], "unkC": 1, @@ -18876,7 +18887,7 @@ "index": 749, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BEAUTY", - "name": "Cyndy", + "name": "{TRNAME}Cyndy", "unk2": 0, "items": [], "unkC": 1, @@ -18893,7 +18904,7 @@ "index": 750, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_BEAUTY", - "name": "Cyndy", + "name": "{TRNAME}Cyndy", "unk2": 0, "items": [], "unkC": 1, @@ -18910,7 +18921,7 @@ "index": 751, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_M", - "name": "Edward", + "name": "{TRNAME}Edward", "unk2": 0, "items": [], "unkC": 1, @@ -18927,7 +18938,7 @@ "index": 752, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_M", - "name": "Edward", + "name": "{TRNAME}Edward", "unk2": 0, "items": [], "unkC": 1, @@ -18944,7 +18955,7 @@ "index": 753, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_M", - "name": "Bjorn", + "name": "{TRNAME}Bjorn", "unk2": 0, "items": [], "unkC": 1, @@ -18966,7 +18977,7 @@ "index": 754, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_M", - "name": "Bjorn", + "name": "{TRNAME}Bjorn", "unk2": 0, "items": [], "unkC": 1, @@ -18988,7 +18999,7 @@ "index": 755, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_F", - "name": "Andrea", + "name": "{TRNAME}Andrea", "unk2": 0, "items": [], "unkC": 1, @@ -19005,7 +19016,7 @@ "index": 756, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_F", - "name": "Andrea", + "name": "{TRNAME}Andrea", "unk2": 0, "items": [], "unkC": 1, @@ -19022,7 +19033,7 @@ "index": 757, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_F", - "name": "Madison", + "name": "{TRNAME}Madison", "unk2": 0, "items": [], "unkC": 1, @@ -19039,7 +19050,7 @@ "index": 758, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SKIER_F", - "name": "Madison", + "name": "{TRNAME}Madison", "unk2": 0, "items": [], "unkC": 1, @@ -19056,7 +19067,7 @@ "index": 759, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Wesley", + "name": "{TRNAME}Wesley", "unk2": 0, "items": [], "unkC": 1, @@ -19078,7 +19089,7 @@ "index": 760, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Francisco", + "name": "{TRNAME}Francisco", "unk2": 0, "items": [], "unkC": 1, @@ -19100,7 +19111,7 @@ "index": 761, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Glenn", + "name": "{TRNAME}Glenn", "unk2": 0, "items": [], "unkC": 1, @@ -19122,7 +19133,7 @@ "index": 762, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Miranda", + "name": "{TRNAME}Miranda", "unk2": 0, "items": [], "unkC": 1, @@ -19139,7 +19150,7 @@ "index": 763, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Crystal", + "name": "{TRNAME}Crystal", "unk2": 0, "items": [], "unkC": 1, @@ -19161,7 +19172,7 @@ "index": 764, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_F", - "name": "Joanna", + "name": "{TRNAME}Joanna", "unk2": 0, "items": [], "unkC": 1, @@ -19183,7 +19194,7 @@ "index": 765, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Tristan", + "name": "{TRNAME}Tristan", "unk2": 0, "items": [], "unkC": 1, @@ -19200,7 +19211,7 @@ "index": 766, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Tristan", + "name": "{TRNAME}Tristan", "unk2": 0, "items": [], "unkC": 1, @@ -19217,7 +19228,7 @@ "index": 767, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Tristan", + "name": "{TRNAME}Tristan", "unk2": 0, "items": [], "unkC": 1, @@ -19234,7 +19245,7 @@ "index": 768, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Dallas", + "name": "{TRNAME}Dallas", "unk2": 0, "items": [], "unkC": 1, @@ -19251,7 +19262,7 @@ "index": 769, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Dallas", + "name": "{TRNAME}Dallas", "unk2": 0, "items": [], "unkC": 1, @@ -19268,7 +19279,7 @@ "index": 770, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Dallas", + "name": "{TRNAME}Dallas", "unk2": 0, "items": [], "unkC": 1, @@ -19285,7 +19296,7 @@ "index": 771, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_TUBER_M", - "name": "Jared", + "name": "{TRNAME}Jared", "unk2": 0, "items": [], "unkC": 1, @@ -19312,7 +19323,7 @@ "index": 772, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_TUBER_M", - "name": "Jared", + "name": "{TRNAME}Jared", "unk2": 0, "items": [], "unkC": 1, @@ -19339,7 +19350,7 @@ "index": 773, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_TUBER_F", - "name": "Chelsea", + "name": "{TRNAME}Chelsea", "unk2": 0, "items": [], "unkC": 1, @@ -19362,7 +19373,7 @@ "index": 774, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_VETERAN", - "name": "Brian", + "name": "{TRNAME}Brian", "unk2": 0, "items": [], "unkC": 1, @@ -19407,7 +19418,7 @@ "index": 775, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_TUBER_F", - "name": "Chelsea", + "name": "{TRNAME}Chelsea", "unk2": 0, "items": [], "unkC": 1, @@ -19430,7 +19441,7 @@ "index": 776, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_VETERAN", - "name": "Brian", + "name": "{TRNAME}Brian", "unk2": 0, "items": [], "unkC": 1, @@ -19475,7 +19486,7 @@ "index": 777, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_VETERAN", - "name": "Armando", + "name": "{TRNAME}Armando", "unk2": 0, "items": [], "unkC": 1, @@ -19520,7 +19531,7 @@ "index": 778, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_VETERAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19537,7 +19548,7 @@ "index": 779, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMERAMAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19554,7 +19565,7 @@ "index": 780, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMERAMAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19571,7 +19582,7 @@ "index": 781, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMERAMAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19588,7 +19599,7 @@ "index": 782, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMERAMAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19605,7 +19616,7 @@ "index": 783, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CAMERAMAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19622,7 +19633,7 @@ "index": 784, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19639,7 +19650,7 @@ "index": 785, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Arturo", + "name": "{TRNAME}Arturo", "unk2": 0, "items": [], "unkC": 1, @@ -19656,7 +19667,7 @@ "index": 786, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Arturo", + "name": "{TRNAME}Arturo", "unk2": 0, "items": [], "unkC": 1, @@ -19673,7 +19684,7 @@ "index": 787, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19690,7 +19701,7 @@ "index": 788, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19707,7 +19718,7 @@ "index": 789, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GUITARIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19724,7 +19735,7 @@ "index": 790, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_IDOL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -19741,7 +19752,7 @@ "index": 791, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_IDOL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -19758,7 +19769,7 @@ "index": 792, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_IDOL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -19775,7 +19786,7 @@ "index": 793, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_IDOL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -19792,7 +19803,7 @@ "index": 794, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_IDOL", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -19809,7 +19820,7 @@ "index": 795, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_INTERVIEWERS", - "name": "Tara & Tim", + "name": "{TRNAME}Tara & Tim", "unk2": 0, "items": [], "unkC": 1, @@ -19831,7 +19842,7 @@ "index": 796, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_INTERVIEWERS", - "name": "Tara & Tim", + "name": "{TRNAME}Tara & Tim", "unk2": 0, "items": [], "unkC": 1, @@ -19853,7 +19864,7 @@ "index": 797, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_INTERVIEWERS", - "name": "Tara & Tim", + "name": "{TRNAME}Tara & Tim", "unk2": 0, "items": [], "unkC": 1, @@ -19875,7 +19886,7 @@ "index": 798, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_INTERVIEWERS", - "name": "Tara & Tim", + "name": "{TRNAME}Tara & Tim", "unk2": 0, "items": [], "unkC": 1, @@ -19897,7 +19908,7 @@ "index": 799, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CLOWN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19914,7 +19925,7 @@ "index": 800, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CLOWN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19931,7 +19942,7 @@ "index": 801, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CLOWN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19948,7 +19959,7 @@ "index": 802, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CLOWN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19965,7 +19976,7 @@ "index": 803, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_CLOWN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -19982,7 +19993,7 @@ "index": 804, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKE_KID", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -19999,7 +20010,7 @@ "index": 805, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKE_KID", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -20016,7 +20027,7 @@ "index": 806, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKE_KID", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -20033,7 +20044,7 @@ "index": 807, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKE_KID", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -20050,7 +20061,7 @@ "index": 808, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POLICEMAN", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -20067,7 +20078,7 @@ "index": 809, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_REPORTER", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -20084,7 +20095,7 @@ "index": 810, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_REPORTER", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -20101,7 +20112,7 @@ "index": 811, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_REPORTER", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -20118,7 +20129,7 @@ "index": 812, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_REPORTER", - "name": "Angelica", + "name": "{TRNAME}Angelica", "unk2": 0, "items": [], "unkC": 1, @@ -20135,7 +20146,7 @@ "index": 813, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -20152,7 +20163,7 @@ "index": 814, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_SWIMMER_M", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -20169,7 +20180,7 @@ "index": 815, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WAITER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -20186,7 +20197,7 @@ "index": 816, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WORKER", - "name": "Mickey", + "name": "{TRNAME}Mickey", "unk2": 0, "items": [], "unkC": 1, @@ -20203,7 +20214,7 @@ "index": 817, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Roland", + "name": "{TRNAME}Roland", "unk2": 0, "items": [], "unkC": 1, @@ -20225,7 +20236,7 @@ "index": 818, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_LASS", - "name": "Carrie", + "name": "{TRNAME}Carrie", "unk2": 0, "items": [], "unkC": 1, @@ -20256,7 +20267,7 @@ "index": 819, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Norman", + "name": "{TRNAME}Norman", "unk2": 0, "items": [], "unkC": 1, @@ -20278,7 +20289,7 @@ "index": 820, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Roland", + "name": "{TRNAME}Roland", "unk2": 0, "items": [], "unkC": 1, @@ -20300,7 +20311,7 @@ "index": 821, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_LASS", - "name": "Carrie", + "name": "{TRNAME}Carrie", "unk2": 0, "items": [], "unkC": 1, @@ -20334,7 +20345,7 @@ "index": 822, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Norman", + "name": "{TRNAME}Norman", "unk2": 0, "items": [], "unkC": 1, @@ -20356,7 +20367,7 @@ "index": 823, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Roland", + "name": "{TRNAME}Roland", "unk2": 0, "items": [], "unkC": 1, @@ -20378,7 +20389,7 @@ "index": 824, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_LASS", - "name": "Carrie", + "name": "{TRNAME}Carrie", "unk2": 0, "items": [], "unkC": 1, @@ -20400,7 +20411,7 @@ "index": 825, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_YOUNGSTER", - "name": "Norman", + "name": "{TRNAME}Norman", "unk2": 0, "items": [], "unkC": 1, @@ -20434,7 +20445,7 @@ "index": 826, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_TOWER_TYCOON", - "name": "Palmer", + "name": "{TRNAME}Palmer", "unk2": 0, "items": [], "unkC": 1, @@ -20451,7 +20462,7 @@ "index": 827, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M", - "name": "Anton", + "name": "{TRNAME}Anton", "unk2": 0, "items": [], "unkC": 1, @@ -20473,7 +20484,7 @@ "index": 828, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F", - "name": "Brenna", + "name": "{TRNAME}Brenna", "unk2": 0, "items": [], "unkC": 1, @@ -20495,7 +20506,7 @@ "index": 829, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Darrius", + "name": "{TRNAME}Darrius", "unk2": 0, "items": [], "unkC": 1, @@ -20517,7 +20528,7 @@ "index": 830, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Fredrick", + "name": "{TRNAME}Fredrick", "unk2": 0, "items": [], "unkC": 1, @@ -20551,7 +20562,7 @@ "index": 831, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_SCIENTIST", - "name": "Travon", + "name": "{TRNAME}Travon", "unk2": 0, "items": [], "unkC": 1, @@ -20572,7 +20583,7 @@ "index": 832, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_POKE_KID", - "name": "Janet", + "name": "{TRNAME}Janet", "unk2": 0, "items": [], "unkC": 1, @@ -20594,7 +20605,7 @@ "index": 833, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -20638,7 +20649,7 @@ "index": 834, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -20665,7 +20676,7 @@ "index": 835, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -20692,7 +20703,7 @@ "index": 836, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -20719,7 +20730,7 @@ "index": 837, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -20797,7 +20808,7 @@ "index": 838, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -20875,7 +20886,7 @@ "index": 839, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -20953,7 +20964,7 @@ "index": 840, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -21031,7 +21042,7 @@ "index": 841, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -21109,7 +21120,7 @@ "index": 842, "type": "TRTYPE_MON_MOVES", "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY", - "name": "Cedric", + "name": "{TRNAME}Cedric", "unk2": 0, "items": [], "unkC": 1, @@ -21187,7 +21198,7 @@ "index": 843, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -21204,7 +21215,7 @@ "index": 844, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WORKER", - "name": "Dillan", + "name": "{TRNAME}Dillan", "unk2": 0, "items": [], "unkC": 1, @@ -21226,7 +21237,7 @@ "index": 845, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WORKER", - "name": "Holden", + "name": "{TRNAME}Holden", "unk2": 0, "items": [], "unkC": 1, @@ -21243,7 +21254,7 @@ "index": 846, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_WORKER", - "name": "Conrad", + "name": "{TRNAME}Conrad", "unk2": 0, "items": [], "unkC": 1, @@ -21260,7 +21271,7 @@ "index": 847, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -21277,7 +21288,7 @@ "index": 848, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, @@ -21299,7 +21310,7 @@ "index": 849, "type": "TRTYPE_MON", "class": "TRAINER_CLASS_GALACTIC", - "name": "Grunt", + "name": "{TRNAME}Grunt", "unk2": 0, "items": [], "unkC": 1, diff --git a/files/poketool/trainer/trdata.json.txt b/files/poketool/trainer/trdata.json.txt index 1c1c0bf8f..957774e9a 100644 --- a/files/poketool/trainer/trdata.json.txt +++ b/files/poketool/trainer/trdata.json.txt @@ -8,7 +8,6 @@ u32 __size = sizeof(struct TrainerData); const struct TrainerData __data[] = { - {}, ## for trainer in trdata { // Trainer #{{trainer.index}}, {{ trainer.class }} {{ trainer.name }} diff --git a/files/poketool/trainer/trname.json.txt b/files/poketool/trainer/trname.json.txt new file mode 100644 index 000000000..573a220d2 --- /dev/null +++ b/files/poketool/trainer/trname.json.txt @@ -0,0 +1,9 @@ + +{% set i=0 %} +## for trainer in trdata + + used + {{ trainer.name }} + {% set i=i+1 %} +## endfor + diff --git a/files/poketool/trainer/trpoke.json.txt b/files/poketool/trainer/trpoke.json.txt index b4e5c1cf8..9c3623f39 100644 --- a/files/poketool/trainer/trpoke.json.txt +++ b/files/poketool/trainer/trpoke.json.txt @@ -8,13 +8,13 @@ #define max(a, b) ((a) >= (b) ? (a) : (b)) -u32 __size[] = { 8, +u32 __size[] = { ## for trainer in trdata (max({{ length(trainer.party) }} * {% if trainer.type == "TRTYPE_MON" %}6{% else if trainer.type == "TRTYPE_MON_MOVES" %}14{% else if trainer.type == "TRTYPE_MONE_ITEM" %}8{% else %}16{% endif %}, 8) + 3) & ~3, ## endfor }; -const u16 __data[] = { 0, 0, 0, 0, +const u16 __data[] = { ## for trainer in trdata // Trainer #{{ trainer.index }}, {{ trainer.class }} {{ trainer.name }} ## if trainer.type == "TRTYPE_MON" @@ -45,8 +45,12 @@ const u16 __data[] = { 0, 0, 0, 0, ## endfor ## endif ## endfor -## if total_length < 4 or total_length % 2 != 0 +## if total_length < 4 +## for i in range(4 - total_length) 0, // Padding +## endfor +## else if total_length % 2 != 0 + 0, //Padding ## endif ## endfor }; diff --git a/filesystem.mk b/filesystem.mk index c96b116b6..d2320effe 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -319,7 +319,7 @@ $(O2NARC_TARGETS): %.narc: %.json %.json.txt $$(dep) $(JSONPROC) $*.json $*.json.txt $*.c $(CC) $(MWCFLAGS) -c -o $*.o $*.c $(O2NARC) $(O2NARCFLAGS) $*.o $@ - @$(RM) $*.o $*.c + @$(RM) $*.o $*.c $*/*.c $*/*.o files/application/wifi_earth/wifi_earth.narc: \ files/application/wifi_earth/wifi_earth/narc_0005.NCGR \ @@ -2707,7 +2707,7 @@ files/poketool/icongra/poke_icon.narc: \ files/poketool/icongra/poke_icon/narc_0402.NCGR files/msgdata/msg.narc: \ - files/msgdata/msg/narc_0000.bin \ + files/msgdata/msg/narc_0000.bin \ files/msgdata/msg/narc_0001.bin \ files/msgdata/msg/narc_0002.bin \ files/msgdata/msg/narc_0003.bin \ diff --git a/tools/jsonproc/Makefile b/tools/jsonproc/Makefile index 622f00abf..74797f54b 100644 --- a/tools/jsonproc/Makefile +++ b/tools/jsonproc/Makefile @@ -4,7 +4,22 @@ INCLUDES := -I . SRCS := jsonproc.cpp -HEADERS := jsonproc.h inja.hpp nlohmann/json.hpp +HEADERS := jsonproc.h \ + inja.hpp \ + config.hpp \ + environment.hpp \ + exceptions.hpp \ + function_storage.hpp \ + lexer.hpp \ + node.hpp \ + parser.hpp \ + renderer.hpp \ + statistics.hpp \ + string_view.hpp \ + template.hpp \ + token.hpp \ + utils.hpp \ + nlohmann/json.hpp .PHONY: all clean diff --git a/tools/jsonproc/config.hpp b/tools/jsonproc/config.hpp new file mode 100644 index 000000000..42b55c8a6 --- /dev/null +++ b/tools/jsonproc/config.hpp @@ -0,0 +1,79 @@ +#ifndef INCLUDE_INJA_CONFIG_HPP_ +#define INCLUDE_INJA_CONFIG_HPP_ + +#include +#include + +#include "string_view.hpp" + +namespace inja { + +/*! + * \brief Class for lexer configuration. + */ +struct LexerConfig { + std::string statement_open {"{%"}; + std::string statement_open_no_lstrip {"{%+"}; + std::string statement_open_force_lstrip {"{%-"}; + std::string statement_close {"%}"}; + std::string statement_close_force_rstrip {"-%}"}; + std::string line_statement {"##"}; + std::string expression_open {"{{"}; + std::string expression_open_force_lstrip {"{{-"}; + std::string expression_close {"}}"}; + std::string expression_close_force_rstrip {"-}}"}; + std::string comment_open {"{#"}; + std::string comment_open_force_lstrip {"{#-"}; + std::string comment_close {"#}"}; + std::string comment_close_force_rstrip {"-#}"}; + std::string open_chars {"#{"}; + + bool trim_blocks {false}; + bool lstrip_blocks {false}; + + void update_open_chars() { + open_chars = ""; + if (open_chars.find(line_statement[0]) == std::string::npos) { + open_chars += line_statement[0]; + } + if (open_chars.find(statement_open[0]) == std::string::npos) { + open_chars += statement_open[0]; + } + if (open_chars.find(statement_open_no_lstrip[0]) == std::string::npos) { + open_chars += statement_open_no_lstrip[0]; + } + if (open_chars.find(statement_open_force_lstrip[0]) == std::string::npos) { + open_chars += statement_open_force_lstrip[0]; + } + if (open_chars.find(expression_open[0]) == std::string::npos) { + open_chars += expression_open[0]; + } + if (open_chars.find(expression_open_force_lstrip[0]) == std::string::npos) { + open_chars += expression_open_force_lstrip[0]; + } + if (open_chars.find(comment_open[0]) == std::string::npos) { + open_chars += comment_open[0]; + } + if (open_chars.find(comment_open_force_lstrip[0]) == std::string::npos) { + open_chars += comment_open_force_lstrip[0]; + } + } +}; + +/*! + * \brief Class for parser configuration. + */ +struct ParserConfig { + bool search_included_templates_in_files {true}; +}; + +/*! + * \brief Class for render configuration. + */ +struct RenderConfig { + bool throw_at_missing_includes {true}; +}; + +} // namespace inja + +#endif // INCLUDE_INJA_CONFIG_HPP_ diff --git a/tools/jsonproc/environment.hpp b/tools/jsonproc/environment.hpp new file mode 100644 index 000000000..c4bd7deb6 --- /dev/null +++ b/tools/jsonproc/environment.hpp @@ -0,0 +1,228 @@ +#ifndef INCLUDE_INJA_ENVIRONMENT_HPP_ +#define INCLUDE_INJA_ENVIRONMENT_HPP_ + +#include +#include +#include +#include +#include + +#include + +#include "config.hpp" +#include "function_storage.hpp" +#include "parser.hpp" +#include "renderer.hpp" +#include "string_view.hpp" +#include "template.hpp" +#include "utils.hpp" + +namespace inja { + +using json = nlohmann::json; + +/*! + * \brief Class for changing the configuration. + */ +class Environment { + std::string input_path; + std::string output_path; + + LexerConfig lexer_config; + ParserConfig parser_config; + RenderConfig render_config; + + FunctionStorage function_storage; + TemplateStorage template_storage; + +public: + Environment() : Environment("") {} + + explicit Environment(const std::string &global_path) : input_path(global_path), output_path(global_path) {} + + Environment(const std::string &input_path, const std::string &output_path) + : input_path(input_path), output_path(output_path) {} + + /// Sets the opener and closer for template statements + void set_statement(const std::string &open, const std::string &close) { + lexer_config.statement_open = open; + lexer_config.statement_open_no_lstrip = open + "+"; + lexer_config.statement_open_force_lstrip = open + "-"; + lexer_config.statement_close = close; + lexer_config.statement_close_force_rstrip = "-" + close; + lexer_config.update_open_chars(); + } + + /// Sets the opener for template line statements + void set_line_statement(const std::string &open) { + lexer_config.line_statement = open; + lexer_config.update_open_chars(); + } + + /// Sets the opener and closer for template expressions + void set_expression(const std::string &open, const std::string &close) { + lexer_config.expression_open = open; + lexer_config.expression_open_force_lstrip = open + "-"; + lexer_config.expression_close = close; + lexer_config.expression_close_force_rstrip = "-" + close; + lexer_config.update_open_chars(); + } + + /// Sets the opener and closer for template comments + void set_comment(const std::string &open, const std::string &close) { + lexer_config.comment_open = open; + lexer_config.comment_open_force_lstrip = open + "-"; + lexer_config.comment_close = close; + lexer_config.comment_close_force_rstrip = "-" + close; + lexer_config.update_open_chars(); + } + + /// Sets whether to remove the first newline after a block + void set_trim_blocks(bool trim_blocks) { + lexer_config.trim_blocks = trim_blocks; + } + + /// Sets whether to strip the spaces and tabs from the start of a line to a block + void set_lstrip_blocks(bool lstrip_blocks) { + lexer_config.lstrip_blocks = lstrip_blocks; + } + + /// Sets the element notation syntax + void set_search_included_templates_in_files(bool search_in_files) { + parser_config.search_included_templates_in_files = search_in_files; + } + + /// Sets whether a missing include will throw an error + void set_throw_at_missing_includes(bool will_throw) { + render_config.throw_at_missing_includes = will_throw; + } + + Template parse(nonstd::string_view input) { + Parser parser(parser_config, lexer_config, template_storage, function_storage); + return parser.parse(input); + } + + Template parse_template(const std::string &filename) { + Parser parser(parser_config, lexer_config, template_storage, function_storage); + auto result = Template(parser.load_file(input_path + static_cast(filename))); + parser.parse_into_template(result, input_path + static_cast(filename)); + return result; + } + + Template parse_file(const std::string &filename) { + return parse_template(filename); + } + + std::string render(nonstd::string_view input, const json &data) { return render(parse(input), data); } + + std::string render(const Template &tmpl, const json &data) { + std::stringstream os; + render_to(os, tmpl, data); + return os.str(); + } + + std::string render_file(const std::string &filename, const json &data) { + return render(parse_template(filename), data); + } + + std::string render_file_with_json_file(const std::string &filename, const std::string &filename_data) { + const json data = load_json(filename_data); + return render_file(filename, data); + } + + void write(const std::string &filename, const json &data, const std::string &filename_out) { + std::ofstream file(output_path + filename_out); + file << render_file(filename, data); + file.close(); + } + + void write(const Template &temp, const json &data, const std::string &filename_out) { + std::ofstream file(output_path + filename_out); + file << render(temp, data); + file.close(); + } + + void write_with_json_file(const std::string &filename, const std::string &filename_data, + const std::string &filename_out) { + const json data = load_json(filename_data); + write(filename, data, filename_out); + } + + void write_with_json_file(const Template &temp, const std::string &filename_data, const std::string &filename_out) { + const json data = load_json(filename_data); + write(temp, data, filename_out); + } + + std::ostream &render_to(std::ostream &os, const Template &tmpl, const json &data) { + Renderer(render_config, template_storage, function_storage).render_to(os, tmpl, data); + return os; + } + + std::string load_file(const std::string &filename) { + Parser parser(parser_config, lexer_config, template_storage, function_storage); + return parser.load_file(input_path + filename); + } + + json load_json(const std::string &filename) { + std::ifstream file; + open_file_or_throw(input_path + filename, file); + json j; + file >> j; + return j; + } + + /*! + @brief Adds a variadic callback + */ + void add_callback(const std::string &name, const CallbackFunction &callback) { + add_callback(name, -1, callback); + } + + /*! + @brief Adds a variadic void callback + */ + void add_void_callback(const std::string &name, const VoidCallbackFunction &callback) { + add_void_callback(name, -1, callback); + } + + /*! + @brief Adds a callback with given number or arguments + */ + void add_callback(const std::string &name, int num_args, const CallbackFunction &callback) { + function_storage.add_callback(name, num_args, callback); + } + + /*! + @brief Adds a void callback with given number or arguments + */ + void add_void_callback(const std::string &name, int num_args, const VoidCallbackFunction &callback) { + function_storage.add_callback(name, num_args, [callback](Arguments& args) { callback(args); return json(); }); + } + + /** Includes a template with a given name into the environment. + * Then, a template can be rendered in another template using the + * include "" syntax. + */ + void include_template(const std::string &name, const Template &tmpl) { + template_storage[name] = tmpl; + } +}; + +/*! +@brief render with default settings to a string +*/ +inline std::string render(nonstd::string_view input, const json &data) { + return Environment().render(input, data); +} + +/*! +@brief render with default settings to the given output stream +*/ +inline void render_to(std::ostream &os, nonstd::string_view input, const json &data) { + Environment env; + env.render_to(os, env.parse(input), data); +} + +} // namespace inja + +#endif // INCLUDE_INJA_ENVIRONMENT_HPP_ diff --git a/tools/jsonproc/exceptions.hpp b/tools/jsonproc/exceptions.hpp new file mode 100644 index 000000000..9991f0d2d --- /dev/null +++ b/tools/jsonproc/exceptions.hpp @@ -0,0 +1,48 @@ +#ifndef INCLUDE_INJA_EXCEPTIONS_HPP_ +#define INCLUDE_INJA_EXCEPTIONS_HPP_ + +#include +#include + +namespace inja { + +struct SourceLocation { + size_t line; + size_t column; +}; + +struct InjaError : public std::runtime_error { + const std::string type; + const std::string message; + + const SourceLocation location; + + explicit InjaError(const std::string &type, const std::string &message) + : std::runtime_error("[inja.exception." + type + "] " + message), type(type), message(message), location({0, 0}) {} + + explicit InjaError(const std::string &type, const std::string &message, SourceLocation location) + : std::runtime_error("[inja.exception." + type + "] (at " + std::to_string(location.line) + ":" + + std::to_string(location.column) + ") " + message), + type(type), message(message), location(location) {} +}; + +struct ParserError : public InjaError { + explicit ParserError(const std::string &message, SourceLocation location) : InjaError("parser_error", message, location) {} +}; + +struct RenderError : public InjaError { + explicit RenderError(const std::string &message, SourceLocation location) : InjaError("render_error", message, location) {} +}; + +struct FileError : public InjaError { + explicit FileError(const std::string &message) : InjaError("file_error", message) {} + explicit FileError(const std::string &message, SourceLocation location) : InjaError("file_error", message, location) {} +}; + +struct JsonError : public InjaError { + explicit JsonError(const std::string &message, SourceLocation location) : InjaError("json_error", message, location) {} +}; + +} // namespace inja + +#endif // INCLUDE_INJA_EXCEPTIONS_HPP_ diff --git a/tools/jsonproc/function_storage.hpp b/tools/jsonproc/function_storage.hpp new file mode 100644 index 000000000..3e8e51320 --- /dev/null +++ b/tools/jsonproc/function_storage.hpp @@ -0,0 +1,142 @@ +#ifndef INCLUDE_INJA_FUNCTION_STORAGE_HPP_ +#define INCLUDE_INJA_FUNCTION_STORAGE_HPP_ + +#include + +#include "string_view.hpp" + +namespace inja { + +using json = nlohmann::json; + +using Arguments = std::vector; +using CallbackFunction = std::function; +using VoidCallbackFunction = std::function; + +/*! + * \brief Class for builtin functions and user-defined callbacks. + */ +class FunctionStorage { +public: + enum class Operation { + Not, + And, + Or, + In, + Equal, + NotEqual, + Greater, + GreaterEqual, + Less, + LessEqual, + Add, + Subtract, + Multiplication, + Division, + Power, + Modulo, + AtId, + At, + Default, + DivisibleBy, + Even, + Exists, + ExistsInObject, + First, + Float, + Int, + IsArray, + IsBoolean, + IsFloat, + IsInteger, + IsNumber, + IsObject, + IsString, + Last, + Length, + Lower, + Max, + Min, + Odd, + Range, + Round, + Sort, + Upper, + Super, + Join, + Callback, + ParenLeft, + ParenRight, + None, + }; + + struct FunctionData { + explicit FunctionData(const Operation &op, const CallbackFunction &cb = CallbackFunction{}) : operation(op), callback(cb) {} + const Operation operation; + const CallbackFunction callback; + }; + +private: + const int VARIADIC {-1}; + + std::map, FunctionData> function_storage = { + {std::make_pair("at", 2), FunctionData { Operation::At }}, + {std::make_pair("default", 2), FunctionData { Operation::Default }}, + {std::make_pair("divisibleBy", 2), FunctionData { Operation::DivisibleBy }}, + {std::make_pair("even", 1), FunctionData { Operation::Even }}, + {std::make_pair("exists", 1), FunctionData { Operation::Exists }}, + {std::make_pair("existsIn", 2), FunctionData { Operation::ExistsInObject }}, + {std::make_pair("first", 1), FunctionData { Operation::First }}, + {std::make_pair("float", 1), FunctionData { Operation::Float }}, + {std::make_pair("int", 1), FunctionData { Operation::Int }}, + {std::make_pair("isArray", 1), FunctionData { Operation::IsArray }}, + {std::make_pair("isBoolean", 1), FunctionData { Operation::IsBoolean }}, + {std::make_pair("isFloat", 1), FunctionData { Operation::IsFloat }}, + {std::make_pair("isInteger", 1), FunctionData { Operation::IsInteger }}, + {std::make_pair("isNumber", 1), FunctionData { Operation::IsNumber }}, + {std::make_pair("isObject", 1), FunctionData { Operation::IsObject }}, + {std::make_pair("isString", 1), FunctionData { Operation::IsString }}, + {std::make_pair("last", 1), FunctionData { Operation::Last }}, + {std::make_pair("length", 1), FunctionData { Operation::Length }}, + {std::make_pair("lower", 1), FunctionData { Operation::Lower }}, + {std::make_pair("max", 1), FunctionData { Operation::Max }}, + {std::make_pair("min", 1), FunctionData { Operation::Min }}, + {std::make_pair("odd", 1), FunctionData { Operation::Odd }}, + {std::make_pair("range", 1), FunctionData { Operation::Range }}, + {std::make_pair("round", 2), FunctionData { Operation::Round }}, + {std::make_pair("sort", 1), FunctionData { Operation::Sort }}, + {std::make_pair("upper", 1), FunctionData { Operation::Upper }}, + {std::make_pair("super", 0), FunctionData { Operation::Super }}, + {std::make_pair("super", 1), FunctionData { Operation::Super }}, + {std::make_pair("join", 2), FunctionData { Operation::Join }}, + }; + +public: + void add_builtin(nonstd::string_view name, int num_args, Operation op) { + function_storage.emplace(std::make_pair(static_cast(name), num_args), FunctionData { op }); + } + + void add_callback(nonstd::string_view name, int num_args, const CallbackFunction &callback) { + function_storage.emplace(std::make_pair(static_cast(name), num_args), FunctionData { Operation::Callback, callback }); + } + + FunctionData find_function(nonstd::string_view name, int num_args) const { + auto it = function_storage.find(std::make_pair(static_cast(name), num_args)); + if (it != function_storage.end()) { + return it->second; + + // Find variadic function + } else if (num_args > 0) { + it = function_storage.find(std::make_pair(static_cast(name), VARIADIC)); + if (it != function_storage.end()) { + return it->second; + } + } + + return FunctionData { Operation::None }; + } +}; + +} // namespace inja + +#endif // INCLUDE_INJA_FUNCTION_STORAGE_HPP_ diff --git a/tools/jsonproc/inja.hpp b/tools/jsonproc/inja.hpp index 26a637375..d4e2ab174 100644 --- a/tools/jsonproc/inja.hpp +++ b/tools/jsonproc/inja.hpp @@ -1,4151 +1,51 @@ -// Copyright (c) 2020 Pantor. All rights reserved. +/* + ___ _ Version 3.3 + |_ _|_ __ (_) __ _ https://github.com/pantor/inja + | || '_ \ | |/ _` | Licensed under the MIT License . + | || | | || | (_| | + |___|_| |_|/ |\__,_| Copyright (c) 2018-2021 Lars Berscheid + |__/ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ #ifndef INCLUDE_INJA_INJA_HPP_ #define INCLUDE_INJA_INJA_HPP_ #include -// #include "environment.hpp" -// Copyright (c) 2019 Pantor. All rights reserved. - -#ifndef INCLUDE_INJA_ENVIRONMENT_HPP_ -#define INCLUDE_INJA_ENVIRONMENT_HPP_ - -#include -#include -#include -#include -#include - -#include - -// #include "config.hpp" -// Copyright (c) 2019 Pantor. All rights reserved. - -#ifndef INCLUDE_INJA_CONFIG_HPP_ -#define INCLUDE_INJA_CONFIG_HPP_ - -#include -#include - -// #include "string_view.hpp" -// Copyright 2017-2019 by Martin Moene -// -// string-view lite, a C++17-like string_view for C++98 and later. -// For more information see https://github.com/martinmoene/string-view-lite -// -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - - - -#ifndef NONSTD_SV_LITE_H_INCLUDED -#define NONSTD_SV_LITE_H_INCLUDED - -#define string_view_lite_MAJOR 1 -#define string_view_lite_MINOR 4 -#define string_view_lite_PATCH 0 - -#define string_view_lite_VERSION \ - nssv_STRINGIFY(string_view_lite_MAJOR) "." nssv_STRINGIFY(string_view_lite_MINOR) "." nssv_STRINGIFY( \ - string_view_lite_PATCH) - -#define nssv_STRINGIFY(x) nssv_STRINGIFY_(x) -#define nssv_STRINGIFY_(x) #x - -// string-view lite configuration: - -#define nssv_STRING_VIEW_DEFAULT 0 -#define nssv_STRING_VIEW_NONSTD 1 -#define nssv_STRING_VIEW_STD 2 - -#if !defined(nssv_CONFIG_SELECT_STRING_VIEW) -#define nssv_CONFIG_SELECT_STRING_VIEW (nssv_HAVE_STD_STRING_VIEW ? nssv_STRING_VIEW_STD : nssv_STRING_VIEW_NONSTD) -#endif - -#if defined(nssv_CONFIG_SELECT_STD_STRING_VIEW) || defined(nssv_CONFIG_SELECT_NONSTD_STRING_VIEW) -#error nssv_CONFIG_SELECT_STD_STRING_VIEW and nssv_CONFIG_SELECT_NONSTD_STRING_VIEW are deprecated and removed, please use nssv_CONFIG_SELECT_STRING_VIEW=nssv_STRING_VIEW_... -#endif - -#ifndef nssv_CONFIG_STD_SV_OPERATOR -#define nssv_CONFIG_STD_SV_OPERATOR 0 -#endif - -#ifndef nssv_CONFIG_USR_SV_OPERATOR -#define nssv_CONFIG_USR_SV_OPERATOR 1 -#endif - -#ifdef nssv_CONFIG_CONVERSION_STD_STRING -#define nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS nssv_CONFIG_CONVERSION_STD_STRING -#define nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS nssv_CONFIG_CONVERSION_STD_STRING -#endif - -#ifndef nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS -#define nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS 1 -#endif - -#ifndef nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS -#define nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS 1 -#endif - -// Control presence of exception handling (try and auto discover): - -#ifndef nssv_CONFIG_NO_EXCEPTIONS -#if defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND) -#define nssv_CONFIG_NO_EXCEPTIONS 0 +#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(INJA_NOEXCEPTION) + #ifndef INJA_THROW + #define INJA_THROW(exception) throw exception + #endif #else -#define nssv_CONFIG_NO_EXCEPTIONS 1 -#endif + #include + #ifndef INJA_THROW + #define INJA_THROW(exception) std::abort(); std::ignore = exception + #endif + #ifndef INJA_NOEXCEPTION + #define INJA_NOEXCEPTION + #endif #endif -// C++ language version detection (C++20 is speculative): -// Note: VC14.0/1900 (VS2015) lacks too much from C++14. - -#ifndef nssv_CPLUSPLUS -#if defined(_MSVC_LANG) && !defined(__clang__) -#define nssv_CPLUSPLUS (_MSC_VER == 1900 ? 201103L : _MSVC_LANG) -#else -#define nssv_CPLUSPLUS __cplusplus -#endif -#endif - -#define nssv_CPP98_OR_GREATER (nssv_CPLUSPLUS >= 199711L) -#define nssv_CPP11_OR_GREATER (nssv_CPLUSPLUS >= 201103L) -#define nssv_CPP11_OR_GREATER_ (nssv_CPLUSPLUS >= 201103L) -#define nssv_CPP14_OR_GREATER (nssv_CPLUSPLUS >= 201402L) -#define nssv_CPP17_OR_GREATER (nssv_CPLUSPLUS >= 201703L) -#define nssv_CPP20_OR_GREATER (nssv_CPLUSPLUS >= 202000L) - -// use C++17 std::string_view if available and requested: - -#if nssv_CPP17_OR_GREATER && defined(__has_include) -#if __has_include( ) -#define nssv_HAVE_STD_STRING_VIEW 1 -#else -#define nssv_HAVE_STD_STRING_VIEW 0 -#endif -#else -#define nssv_HAVE_STD_STRING_VIEW 0 -#endif - -#define nssv_USES_STD_STRING_VIEW \ - ((nssv_CONFIG_SELECT_STRING_VIEW == nssv_STRING_VIEW_STD) || \ - ((nssv_CONFIG_SELECT_STRING_VIEW == nssv_STRING_VIEW_DEFAULT) && nssv_HAVE_STD_STRING_VIEW)) - -#define nssv_HAVE_STARTS_WITH (nssv_CPP20_OR_GREATER || !nssv_USES_STD_STRING_VIEW) -#define nssv_HAVE_ENDS_WITH nssv_HAVE_STARTS_WITH - -// -// Use C++17 std::string_view: -// - -#if nssv_USES_STD_STRING_VIEW - -#include - -// Extensions for std::string: - -#if nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS - -namespace nonstd { - -template > -std::basic_string to_string(std::basic_string_view v, - Allocator const &a = Allocator()) { - return std::basic_string(v.begin(), v.end(), a); -} - -template -std::basic_string_view to_string_view(std::basic_string const &s) { - return std::basic_string_view(s.data(), s.size()); -} - -// Literal operators sv and _sv: - -#if nssv_CONFIG_STD_SV_OPERATOR - -using namespace std::literals::string_view_literals; - -#endif - -#if nssv_CONFIG_USR_SV_OPERATOR - -inline namespace literals { -inline namespace string_view_literals { - -constexpr std::string_view operator"" _sv(const char *str, size_t len) noexcept // (1) -{ - return std::string_view {str, len}; -} - -constexpr std::u16string_view operator"" _sv(const char16_t *str, size_t len) noexcept // (2) -{ - return std::u16string_view {str, len}; -} - -constexpr std::u32string_view operator"" _sv(const char32_t *str, size_t len) noexcept // (3) -{ - return std::u32string_view {str, len}; -} - -constexpr std::wstring_view operator"" _sv(const wchar_t *str, size_t len) noexcept // (4) -{ - return std::wstring_view {str, len}; -} - -} // namespace string_view_literals -} // namespace literals - -#endif // nssv_CONFIG_USR_SV_OPERATOR - -} // namespace nonstd - -#endif // nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS - -namespace nonstd { - -using std::basic_string_view; -using std::string_view; -using std::u16string_view; -using std::u32string_view; -using std::wstring_view; - -// literal "sv" and "_sv", see above - -using std::operator==; -using std::operator!=; -using std::operator<; -using std::operator<=; -using std::operator>; -using std::operator>=; - -using std::operator<<; - -} // namespace nonstd - -#else // nssv_HAVE_STD_STRING_VIEW - -// -// Before C++17: use string_view lite: -// - -// Compiler versions: -// -// MSVC++ 6.0 _MSC_VER == 1200 (Visual Studio 6.0) -// MSVC++ 7.0 _MSC_VER == 1300 (Visual Studio .NET 2002) -// MSVC++ 7.1 _MSC_VER == 1310 (Visual Studio .NET 2003) -// MSVC++ 8.0 _MSC_VER == 1400 (Visual Studio 2005) -// MSVC++ 9.0 _MSC_VER == 1500 (Visual Studio 2008) -// MSVC++ 10.0 _MSC_VER == 1600 (Visual Studio 2010) -// MSVC++ 11.0 _MSC_VER == 1700 (Visual Studio 2012) -// MSVC++ 12.0 _MSC_VER == 1800 (Visual Studio 2013) -// MSVC++ 14.0 _MSC_VER == 1900 (Visual Studio 2015) -// MSVC++ 14.1 _MSC_VER >= 1910 (Visual Studio 2017) - -#if defined(_MSC_VER) && !defined(__clang__) -#define nssv_COMPILER_MSVC_VER (_MSC_VER) -#define nssv_COMPILER_MSVC_VERSION (_MSC_VER / 10 - 10 * (5 + (_MSC_VER < 1900))) -#else -#define nssv_COMPILER_MSVC_VER 0 -#define nssv_COMPILER_MSVC_VERSION 0 -#endif - -#define nssv_COMPILER_VERSION(major, minor, patch) (10 * (10 * (major) + (minor)) + (patch)) - -#if defined(__clang__) -#define nssv_COMPILER_CLANG_VERSION nssv_COMPILER_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__) -#else -#define nssv_COMPILER_CLANG_VERSION 0 -#endif - -#if defined(__GNUC__) && !defined(__clang__) -#define nssv_COMPILER_GNUC_VERSION nssv_COMPILER_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) -#else -#define nssv_COMPILER_GNUC_VERSION 0 -#endif - -// half-open range [lo..hi): -#define nssv_BETWEEN(v, lo, hi) ((lo) <= (v) && (v) < (hi)) - -// Presence of language and library features: - -#ifdef _HAS_CPP0X -#define nssv_HAS_CPP0X _HAS_CPP0X -#else -#define nssv_HAS_CPP0X 0 -#endif - -// Unless defined otherwise below, consider VC14 as C++11 for variant-lite: - -#if nssv_COMPILER_MSVC_VER >= 1900 -#undef nssv_CPP11_OR_GREATER -#define nssv_CPP11_OR_GREATER 1 -#endif - -#define nssv_CPP11_90 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1500) -#define nssv_CPP11_100 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1600) -#define nssv_CPP11_110 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1700) -#define nssv_CPP11_120 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1800) -#define nssv_CPP11_140 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1900) -#define nssv_CPP11_141 (nssv_CPP11_OR_GREATER_ || nssv_COMPILER_MSVC_VER >= 1910) - -#define nssv_CPP14_000 (nssv_CPP14_OR_GREATER) -#define nssv_CPP17_000 (nssv_CPP17_OR_GREATER) - -// Presence of C++11 language features: - -#define nssv_HAVE_CONSTEXPR_11 nssv_CPP11_140 -#define nssv_HAVE_EXPLICIT_CONVERSION nssv_CPP11_140 -#define nssv_HAVE_INLINE_NAMESPACE nssv_CPP11_140 -#define nssv_HAVE_NOEXCEPT nssv_CPP11_140 -#define nssv_HAVE_NULLPTR nssv_CPP11_100 -#define nssv_HAVE_REF_QUALIFIER nssv_CPP11_140 -#define nssv_HAVE_UNICODE_LITERALS nssv_CPP11_140 -#define nssv_HAVE_USER_DEFINED_LITERALS nssv_CPP11_140 -#define nssv_HAVE_WCHAR16_T nssv_CPP11_100 -#define nssv_HAVE_WCHAR32_T nssv_CPP11_100 - -#if !((nssv_CPP11_OR_GREATER && nssv_COMPILER_CLANG_VERSION) || nssv_BETWEEN(nssv_COMPILER_CLANG_VERSION, 300, 400)) -#define nssv_HAVE_STD_DEFINED_LITERALS nssv_CPP11_140 -#else -#define nssv_HAVE_STD_DEFINED_LITERALS 0 -#endif - -// Presence of C++14 language features: - -#define nssv_HAVE_CONSTEXPR_14 nssv_CPP14_000 - -// Presence of C++17 language features: - -#define nssv_HAVE_NODISCARD nssv_CPP17_000 - -// Presence of C++ library features: - -#define nssv_HAVE_STD_HASH nssv_CPP11_120 - -// C++ feature usage: - -#if nssv_HAVE_CONSTEXPR_11 -#define nssv_constexpr constexpr -#else -#define nssv_constexpr /*constexpr*/ -#endif - -#if nssv_HAVE_CONSTEXPR_14 -#define nssv_constexpr14 constexpr -#else -#define nssv_constexpr14 /*constexpr*/ -#endif - -#if nssv_HAVE_EXPLICIT_CONVERSION -#define nssv_explicit explicit -#else -#define nssv_explicit /*explicit*/ -#endif - -#if nssv_HAVE_INLINE_NAMESPACE -#define nssv_inline_ns inline -#else -#define nssv_inline_ns /*inline*/ -#endif - -#if nssv_HAVE_NOEXCEPT -#define nssv_noexcept noexcept -#else -#define nssv_noexcept /*noexcept*/ -#endif - -//#if nssv_HAVE_REF_QUALIFIER -//# define nssv_ref_qual & -//# define nssv_refref_qual && -//#else -//# define nssv_ref_qual /*&*/ -//# define nssv_refref_qual /*&&*/ -//#endif - -#if nssv_HAVE_NULLPTR -#define nssv_nullptr nullptr -#else -#define nssv_nullptr NULL -#endif - -#if nssv_HAVE_NODISCARD -#define nssv_nodiscard [[nodiscard]] -#else -#define nssv_nodiscard /*[[nodiscard]]*/ -#endif - -// Additional includes: - -#include -#include -#include -#include -#include -#include // std::char_traits<> - -#if !nssv_CONFIG_NO_EXCEPTIONS -#include -#endif - -#if nssv_CPP11_OR_GREATER -#include -#endif - -// Clang, GNUC, MSVC warning suppression macros: - -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wreserved-user-defined-literal" -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wuser-defined-literals" -#elif defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wliteral-suffix" -#endif // __clang__ - -#if nssv_COMPILER_MSVC_VERSION >= 140 -#define nssv_SUPPRESS_MSGSL_WARNING(expr) [[gsl::suppress(expr)]] -#define nssv_SUPPRESS_MSVC_WARNING(code, descr) __pragma(warning(suppress : code)) -#define nssv_DISABLE_MSVC_WARNINGS(codes) __pragma(warning(push)) __pragma(warning(disable : codes)) -#else -#define nssv_SUPPRESS_MSGSL_WARNING(expr) -#define nssv_SUPPRESS_MSVC_WARNING(code, descr) -#define nssv_DISABLE_MSVC_WARNINGS(codes) -#endif - -#if defined(__clang__) -#define nssv_RESTORE_WARNINGS() _Pragma("clang diagnostic pop") -#elif defined(__GNUC__) -#define nssv_RESTORE_WARNINGS() _Pragma("GCC diagnostic pop") -#elif nssv_COMPILER_MSVC_VERSION >= 140 -#define nssv_RESTORE_WARNINGS() __pragma(warning(pop)) -#else -#define nssv_RESTORE_WARNINGS() -#endif - -// Suppress the following MSVC (GSL) warnings: -// - C4455, non-gsl : 'operator ""sv': literal suffix identifiers that do not -// start with an underscore are reserved -// - C26472, gsl::t.1 : don't use a static_cast for arithmetic conversions; -// use brace initialization, gsl::narrow_cast or gsl::narow -// - C26481: gsl::b.1 : don't use pointer arithmetic. Use span instead - -nssv_DISABLE_MSVC_WARNINGS(4455 26481 26472) - // nssv_DISABLE_CLANG_WARNINGS( "-Wuser-defined-literals" ) - // nssv_DISABLE_GNUC_WARNINGS( -Wliteral-suffix ) - - namespace nonstd { - namespace sv_lite { - -#if nssv_CPP11_OR_GREATER - - namespace detail { - - // Expect tail call optimization to make length() non-recursive: - - template inline constexpr std::size_t length(CharT *s, std::size_t result = 0) { - return *s == '\0' ? result : length(s + 1, result + 1); - } - - } // namespace detail - -#endif // nssv_CPP11_OR_GREATER - - template > class basic_string_view; - - // - // basic_string_view: - // - - template */ - > - class basic_string_view { - public: - // Member types: - - typedef Traits traits_type; - typedef CharT value_type; - - typedef CharT *pointer; - typedef CharT const *const_pointer; - typedef CharT &reference; - typedef CharT const &const_reference; - - typedef const_pointer iterator; - typedef const_pointer const_iterator; - typedef std::reverse_iterator reverse_iterator; - typedef std::reverse_iterator const_reverse_iterator; - - typedef std::size_t size_type; - typedef std::ptrdiff_t difference_type; - - // 24.4.2.1 Construction and assignment: - - nssv_constexpr basic_string_view() nssv_noexcept : data_(nssv_nullptr), size_(0) {} - -#if nssv_CPP11_OR_GREATER - nssv_constexpr basic_string_view(basic_string_view const &other) nssv_noexcept = default; -#else - nssv_constexpr basic_string_view(basic_string_view const &other) nssv_noexcept : data_(other.data_), - size_(other.size_) {} -#endif - - nssv_constexpr basic_string_view(CharT const *s, size_type count) nssv_noexcept // non-standard noexcept - : data_(s), - size_(count) {} - - nssv_constexpr basic_string_view(CharT const *s) nssv_noexcept // non-standard noexcept - : data_(s) -#if nssv_CPP17_OR_GREATER - , - size_(Traits::length(s)) -#elif nssv_CPP11_OR_GREATER - , - size_(detail::length(s)) -#else - , - size_(Traits::length(s)) -#endif - { - } - - // Assignment: - -#if nssv_CPP11_OR_GREATER - nssv_constexpr14 basic_string_view &operator=(basic_string_view const &other) nssv_noexcept = default; -#else - nssv_constexpr14 basic_string_view &operator=(basic_string_view const &other) nssv_noexcept { - data_ = other.data_; - size_ = other.size_; - return *this; - } -#endif - - // 24.4.2.2 Iterator support: - - nssv_constexpr const_iterator begin() const nssv_noexcept { return data_; } - nssv_constexpr const_iterator end() const nssv_noexcept { return data_ + size_; } - - nssv_constexpr const_iterator cbegin() const nssv_noexcept { return begin(); } - nssv_constexpr const_iterator cend() const nssv_noexcept { return end(); } - - nssv_constexpr const_reverse_iterator rbegin() const nssv_noexcept { return const_reverse_iterator(end()); } - nssv_constexpr const_reverse_iterator rend() const nssv_noexcept { return const_reverse_iterator(begin()); } - - nssv_constexpr const_reverse_iterator crbegin() const nssv_noexcept { return rbegin(); } - nssv_constexpr const_reverse_iterator crend() const nssv_noexcept { return rend(); } - - // 24.4.2.3 Capacity: - - nssv_constexpr size_type size() const nssv_noexcept { return size_; } - nssv_constexpr size_type length() const nssv_noexcept { return size_; } - nssv_constexpr size_type max_size() const nssv_noexcept { return (std::numeric_limits::max)(); } - - // since C++20 - nssv_nodiscard nssv_constexpr bool empty() const nssv_noexcept { return 0 == size_; } - - // 24.4.2.4 Element access: - - nssv_constexpr const_reference operator[](size_type pos) const { return data_at(pos); } - - nssv_constexpr14 const_reference at(size_type pos) const { -#if nssv_CONFIG_NO_EXCEPTIONS - assert(pos < size()); -#else - if (pos >= size()) { - throw std::out_of_range("nonstd::string_view::at()"); - } -#endif - return data_at(pos); - } - - nssv_constexpr const_reference front() const { return data_at(0); } - nssv_constexpr const_reference back() const { return data_at(size() - 1); } - - nssv_constexpr const_pointer data() const nssv_noexcept { return data_; } - - // 24.4.2.5 Modifiers: - - nssv_constexpr14 void remove_prefix(size_type n) { - assert(n <= size()); - data_ += n; - size_ -= n; - } - - nssv_constexpr14 void remove_suffix(size_type n) { - assert(n <= size()); - size_ -= n; - } - - nssv_constexpr14 void swap(basic_string_view &other) nssv_noexcept { - using std::swap; - swap(data_, other.data_); - swap(size_, other.size_); - } - - // 24.4.2.6 String operations: - - size_type copy(CharT *dest, size_type n, size_type pos = 0) const { -#if nssv_CONFIG_NO_EXCEPTIONS - assert(pos <= size()); -#else - if (pos > size()) { - throw std::out_of_range("nonstd::string_view::copy()"); - } -#endif - const size_type rlen = (std::min)(n, size() - pos); - - (void)Traits::copy(dest, data() + pos, rlen); - - return rlen; - } - - nssv_constexpr14 basic_string_view substr(size_type pos = 0, size_type n = npos) const { -#if nssv_CONFIG_NO_EXCEPTIONS - assert(pos <= size()); -#else - if (pos > size()) { - throw std::out_of_range("nonstd::string_view::substr()"); - } -#endif - return basic_string_view(data() + pos, (std::min)(n, size() - pos)); - } - - // compare(), 6x: - - nssv_constexpr14 int compare(basic_string_view other) const nssv_noexcept // (1) - { - if (const int result = Traits::compare(data(), other.data(), (std::min)(size(), other.size()))) { - return result; - } - - return size() == other.size() ? 0 : size() < other.size() ? -1 : 1; - } - - nssv_constexpr int compare(size_type pos1, size_type n1, basic_string_view other) const // (2) - { - return substr(pos1, n1).compare(other); - } - - nssv_constexpr int compare(size_type pos1, size_type n1, basic_string_view other, size_type pos2, - size_type n2) const // (3) - { - return substr(pos1, n1).compare(other.substr(pos2, n2)); - } - - nssv_constexpr int compare(CharT const *s) const // (4) - { - return compare(basic_string_view(s)); - } - - nssv_constexpr int compare(size_type pos1, size_type n1, CharT const *s) const // (5) - { - return substr(pos1, n1).compare(basic_string_view(s)); - } - - nssv_constexpr int compare(size_type pos1, size_type n1, CharT const *s, size_type n2) const // (6) - { - return substr(pos1, n1).compare(basic_string_view(s, n2)); - } - - // 24.4.2.7 Searching: - - // starts_with(), 3x, since C++20: - - nssv_constexpr bool starts_with(basic_string_view v) const nssv_noexcept // (1) - { - return size() >= v.size() && compare(0, v.size(), v) == 0; - } - - nssv_constexpr bool starts_with(CharT c) const nssv_noexcept // (2) - { - return starts_with(basic_string_view(&c, 1)); - } - - nssv_constexpr bool starts_with(CharT const *s) const // (3) - { - return starts_with(basic_string_view(s)); - } - - // ends_with(), 3x, since C++20: - - nssv_constexpr bool ends_with(basic_string_view v) const nssv_noexcept // (1) - { - return size() >= v.size() && compare(size() - v.size(), npos, v) == 0; - } - - nssv_constexpr bool ends_with(CharT c) const nssv_noexcept // (2) - { - return ends_with(basic_string_view(&c, 1)); - } - - nssv_constexpr bool ends_with(CharT const *s) const // (3) - { - return ends_with(basic_string_view(s)); - } - - // find(), 4x: - - nssv_constexpr14 size_type find(basic_string_view v, size_type pos = 0) const nssv_noexcept // (1) - { - return assert(v.size() == 0 || v.data() != nssv_nullptr), - pos >= size() ? npos : to_pos(std::search(cbegin() + pos, cend(), v.cbegin(), v.cend(), Traits::eq)); - } - - nssv_constexpr14 size_type find(CharT c, size_type pos = 0) const nssv_noexcept // (2) - { - return find(basic_string_view(&c, 1), pos); - } - - nssv_constexpr14 size_type find(CharT const *s, size_type pos, size_type n) const // (3) - { - return find(basic_string_view(s, n), pos); - } - - nssv_constexpr14 size_type find(CharT const *s, size_type pos = 0) const // (4) - { - return find(basic_string_view(s), pos); - } - - // rfind(), 4x: - - nssv_constexpr14 size_type rfind(basic_string_view v, size_type pos = npos) const nssv_noexcept // (1) - { - if (size() < v.size()) { - return npos; - } - - if (v.empty()) { - return (std::min)(size(), pos); - } - - const_iterator last = cbegin() + (std::min)(size() - v.size(), pos) + v.size(); - const_iterator result = std::find_end(cbegin(), last, v.cbegin(), v.cend(), Traits::eq); - - return result != last ? size_type(result - cbegin()) : npos; - } - - nssv_constexpr14 size_type rfind(CharT c, size_type pos = npos) const nssv_noexcept // (2) - { - return rfind(basic_string_view(&c, 1), pos); - } - - nssv_constexpr14 size_type rfind(CharT const *s, size_type pos, size_type n) const // (3) - { - return rfind(basic_string_view(s, n), pos); - } - - nssv_constexpr14 size_type rfind(CharT const *s, size_type pos = npos) const // (4) - { - return rfind(basic_string_view(s), pos); - } - - // find_first_of(), 4x: - - nssv_constexpr size_type find_first_of(basic_string_view v, size_type pos = 0) const nssv_noexcept // (1) - { - return pos >= size() ? npos - : to_pos(std::find_first_of(cbegin() + pos, cend(), v.cbegin(), v.cend(), Traits::eq)); - } - - nssv_constexpr size_type find_first_of(CharT c, size_type pos = 0) const nssv_noexcept // (2) - { - return find_first_of(basic_string_view(&c, 1), pos); - } - - nssv_constexpr size_type find_first_of(CharT const *s, size_type pos, size_type n) const // (3) - { - return find_first_of(basic_string_view(s, n), pos); - } - - nssv_constexpr size_type find_first_of(CharT const *s, size_type pos = 0) const // (4) - { - return find_first_of(basic_string_view(s), pos); - } - - // find_last_of(), 4x: - - nssv_constexpr size_type find_last_of(basic_string_view v, size_type pos = npos) const nssv_noexcept // (1) - { - return empty() ? npos - : pos >= size() ? find_last_of(v, size() - 1) - : to_pos(std::find_first_of(const_reverse_iterator(cbegin() + pos + 1), crend(), - v.cbegin(), v.cend(), Traits::eq)); - } - - nssv_constexpr size_type find_last_of(CharT c, size_type pos = npos) const nssv_noexcept // (2) - { - return find_last_of(basic_string_view(&c, 1), pos); - } - - nssv_constexpr size_type find_last_of(CharT const *s, size_type pos, size_type count) const // (3) - { - return find_last_of(basic_string_view(s, count), pos); - } - - nssv_constexpr size_type find_last_of(CharT const *s, size_type pos = npos) const // (4) - { - return find_last_of(basic_string_view(s), pos); - } - - // find_first_not_of(), 4x: - - nssv_constexpr size_type find_first_not_of(basic_string_view v, size_type pos = 0) const nssv_noexcept // (1) - { - return pos >= size() ? npos : to_pos(std::find_if(cbegin() + pos, cend(), not_in_view(v))); - } - - nssv_constexpr size_type find_first_not_of(CharT c, size_type pos = 0) const nssv_noexcept // (2) - { - return find_first_not_of(basic_string_view(&c, 1), pos); - } - - nssv_constexpr size_type find_first_not_of(CharT const *s, size_type pos, size_type count) const // (3) - { - return find_first_not_of(basic_string_view(s, count), pos); - } - - nssv_constexpr size_type find_first_not_of(CharT const *s, size_type pos = 0) const // (4) - { - return find_first_not_of(basic_string_view(s), pos); - } - - // find_last_not_of(), 4x: - - nssv_constexpr size_type find_last_not_of(basic_string_view v, size_type pos = npos) const nssv_noexcept // (1) - { - return empty() ? npos - : pos >= size() - ? find_last_not_of(v, size() - 1) - : to_pos(std::find_if(const_reverse_iterator(cbegin() + pos + 1), crend(), not_in_view(v))); - } - - nssv_constexpr size_type find_last_not_of(CharT c, size_type pos = npos) const nssv_noexcept // (2) - { - return find_last_not_of(basic_string_view(&c, 1), pos); - } - - nssv_constexpr size_type find_last_not_of(CharT const *s, size_type pos, size_type count) const // (3) - { - return find_last_not_of(basic_string_view(s, count), pos); - } - - nssv_constexpr size_type find_last_not_of(CharT const *s, size_type pos = npos) const // (4) - { - return find_last_not_of(basic_string_view(s), pos); - } - - // Constants: - -#if nssv_CPP17_OR_GREATER - static nssv_constexpr size_type npos = size_type(-1); -#elif nssv_CPP11_OR_GREATER - enum : size_type { npos = size_type(-1) }; -#else - enum { npos = size_type(-1) }; -#endif - - private: - struct not_in_view { - const basic_string_view v; - - nssv_constexpr explicit not_in_view(basic_string_view v) : v(v) {} - - nssv_constexpr bool operator()(CharT c) const { return npos == v.find_first_of(c); } - }; - - nssv_constexpr size_type to_pos(const_iterator it) const { return it == cend() ? npos : size_type(it - cbegin()); } - - nssv_constexpr size_type to_pos(const_reverse_iterator it) const { - return it == crend() ? npos : size_type(crend() - it - 1); - } - - nssv_constexpr const_reference data_at(size_type pos) const { -#if nssv_BETWEEN(nssv_COMPILER_GNUC_VERSION, 1, 500) - return data_[pos]; -#else - return assert(pos < size()), data_[pos]; -#endif - } - - private: - const_pointer data_; - size_type size_; - - public: -#if nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS - - template - basic_string_view(std::basic_string const &s) nssv_noexcept : data_(s.data()), - size_(s.size()) {} - -#if nssv_HAVE_EXPLICIT_CONVERSION - - template explicit operator std::basic_string() const { - return to_string(Allocator()); - } - -#endif // nssv_HAVE_EXPLICIT_CONVERSION - -#if nssv_CPP11_OR_GREATER - - template > - std::basic_string to_string(Allocator const &a = Allocator()) const { - return std::basic_string(begin(), end(), a); - } - -#else - - std::basic_string to_string() const { return std::basic_string(begin(), end()); } - - template std::basic_string to_string(Allocator const &a) const { - return std::basic_string(begin(), end(), a); - } - -#endif // nssv_CPP11_OR_GREATER - -#endif // nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS - }; - - // - // Non-member functions: - // - - // 24.4.3 Non-member comparison functions: - // lexicographically compare two string views (function template): - - template - nssv_constexpr bool operator==(basic_string_view lhs, - basic_string_view rhs) nssv_noexcept { - return lhs.compare(rhs) == 0; - } - - template - nssv_constexpr bool operator!=(basic_string_view lhs, - basic_string_view rhs) nssv_noexcept { - return lhs.compare(rhs) != 0; - } - - template - nssv_constexpr bool operator<(basic_string_view lhs, - basic_string_view rhs) nssv_noexcept { - return lhs.compare(rhs) < 0; - } - - template - nssv_constexpr bool operator<=(basic_string_view lhs, - basic_string_view rhs) nssv_noexcept { - return lhs.compare(rhs) <= 0; - } - - template - nssv_constexpr bool operator>(basic_string_view lhs, - basic_string_view rhs) nssv_noexcept { - return lhs.compare(rhs) > 0; - } - - template - nssv_constexpr bool operator>=(basic_string_view lhs, - basic_string_view rhs) nssv_noexcept { - return lhs.compare(rhs) >= 0; - } - - // Let S be basic_string_view, and sv be an instance of S. - // Implementations shall provide sufficient additional overloads marked - // constexpr and noexcept so that an object t with an implicit conversion - // to S can be compared according to Table 67. - -#if !nssv_CPP11_OR_GREATER || nssv_BETWEEN(nssv_COMPILER_MSVC_VERSION, 100, 141) - - // accomodate for older compilers: - - // == - - template - nssv_constexpr bool operator==(basic_string_view lhs, char const *rhs) nssv_noexcept { - return lhs.compare(rhs) == 0; - } - - template - nssv_constexpr bool operator==(char const *lhs, basic_string_view rhs) nssv_noexcept { - return rhs.compare(lhs) == 0; - } - - template - nssv_constexpr bool operator==(basic_string_view lhs, - std::basic_string rhs) nssv_noexcept { - return lhs.size() == rhs.size() && lhs.compare(rhs) == 0; - } - - template - nssv_constexpr bool operator==(std::basic_string rhs, - basic_string_view lhs) nssv_noexcept { - return lhs.size() == rhs.size() && lhs.compare(rhs) == 0; - } - - // != - - template - nssv_constexpr bool operator!=(basic_string_view lhs, char const *rhs) nssv_noexcept { - return lhs.compare(rhs) != 0; - } - - template - nssv_constexpr bool operator!=(char const *lhs, basic_string_view rhs) nssv_noexcept { - return rhs.compare(lhs) != 0; - } - - template - nssv_constexpr bool operator!=(basic_string_view lhs, - std::basic_string rhs) nssv_noexcept { - return lhs.size() != rhs.size() && lhs.compare(rhs) != 0; - } - - template - nssv_constexpr bool operator!=(std::basic_string rhs, - basic_string_view lhs) nssv_noexcept { - return lhs.size() != rhs.size() || rhs.compare(lhs) != 0; - } - - // < - - template - nssv_constexpr bool operator<(basic_string_view lhs, char const *rhs) nssv_noexcept { - return lhs.compare(rhs) < 0; - } - - template - nssv_constexpr bool operator<(char const *lhs, basic_string_view rhs) nssv_noexcept { - return rhs.compare(lhs) > 0; - } - - template - nssv_constexpr bool operator<(basic_string_view lhs, - std::basic_string rhs) nssv_noexcept { - return lhs.compare(rhs) < 0; - } - - template - nssv_constexpr bool operator<(std::basic_string rhs, - basic_string_view lhs) nssv_noexcept { - return rhs.compare(lhs) > 0; - } - - // <= - - template - nssv_constexpr bool operator<=(basic_string_view lhs, char const *rhs) nssv_noexcept { - return lhs.compare(rhs) <= 0; - } - - template - nssv_constexpr bool operator<=(char const *lhs, basic_string_view rhs) nssv_noexcept { - return rhs.compare(lhs) >= 0; - } - - template - nssv_constexpr bool operator<=(basic_string_view lhs, - std::basic_string rhs) nssv_noexcept { - return lhs.compare(rhs) <= 0; - } - - template - nssv_constexpr bool operator<=(std::basic_string rhs, - basic_string_view lhs) nssv_noexcept { - return rhs.compare(lhs) >= 0; - } - - // > - - template - nssv_constexpr bool operator>(basic_string_view lhs, char const *rhs) nssv_noexcept { - return lhs.compare(rhs) > 0; - } - - template - nssv_constexpr bool operator>(char const *lhs, basic_string_view rhs) nssv_noexcept { - return rhs.compare(lhs) < 0; - } - - template - nssv_constexpr bool operator>(basic_string_view lhs, - std::basic_string rhs) nssv_noexcept { - return lhs.compare(rhs) > 0; - } - - template - nssv_constexpr bool operator>(std::basic_string rhs, - basic_string_view lhs) nssv_noexcept { - return rhs.compare(lhs) < 0; - } - - // >= - - template - nssv_constexpr bool operator>=(basic_string_view lhs, char const *rhs) nssv_noexcept { - return lhs.compare(rhs) >= 0; - } - - template - nssv_constexpr bool operator>=(char const *lhs, basic_string_view rhs) nssv_noexcept { - return rhs.compare(lhs) <= 0; - } - - template - nssv_constexpr bool operator>=(basic_string_view lhs, - std::basic_string rhs) nssv_noexcept { - return lhs.compare(rhs) >= 0; - } - - template - nssv_constexpr bool operator>=(std::basic_string rhs, - basic_string_view lhs) nssv_noexcept { - return rhs.compare(lhs) <= 0; - } - -#else // newer compilers: - -#define nssv_BASIC_STRING_VIEW_I(T, U) typename std::decay>::type - -#if nssv_BETWEEN(nssv_COMPILER_MSVC_VERSION, 140, 150) -#define nssv_MSVC_ORDER(x) , int = x -#else -#define nssv_MSVC_ORDER(x) /*, int=x*/ -#endif - - // == - - template - nssv_constexpr bool operator==(basic_string_view lhs, - nssv_BASIC_STRING_VIEW_I(CharT, Traits) rhs) nssv_noexcept { - return lhs.compare(rhs) == 0; - } - - template - nssv_constexpr bool operator==(nssv_BASIC_STRING_VIEW_I(CharT, Traits) lhs, - basic_string_view rhs) nssv_noexcept { - return lhs.size() == rhs.size() && lhs.compare(rhs) == 0; - } - - // != - - template - nssv_constexpr bool operator!=(basic_string_view lhs, - nssv_BASIC_STRING_VIEW_I(CharT, Traits) rhs) nssv_noexcept { - return lhs.size() != rhs.size() || lhs.compare(rhs) != 0; - } - - template - nssv_constexpr bool operator!=(nssv_BASIC_STRING_VIEW_I(CharT, Traits) lhs, - basic_string_view rhs) nssv_noexcept { - return lhs.compare(rhs) != 0; - } - - // < - - template - nssv_constexpr bool operator<(basic_string_view lhs, - nssv_BASIC_STRING_VIEW_I(CharT, Traits) rhs) nssv_noexcept { - return lhs.compare(rhs) < 0; - } - - template - nssv_constexpr bool operator<(nssv_BASIC_STRING_VIEW_I(CharT, Traits) lhs, - basic_string_view rhs) nssv_noexcept { - return lhs.compare(rhs) < 0; - } - - // <= - - template - nssv_constexpr bool operator<=(basic_string_view lhs, - nssv_BASIC_STRING_VIEW_I(CharT, Traits) rhs) nssv_noexcept { - return lhs.compare(rhs) <= 0; - } - - template - nssv_constexpr bool operator<=(nssv_BASIC_STRING_VIEW_I(CharT, Traits) lhs, - basic_string_view rhs) nssv_noexcept { - return lhs.compare(rhs) <= 0; - } - - // > - - template - nssv_constexpr bool operator>(basic_string_view lhs, - nssv_BASIC_STRING_VIEW_I(CharT, Traits) rhs) nssv_noexcept { - return lhs.compare(rhs) > 0; - } - - template - nssv_constexpr bool operator>(nssv_BASIC_STRING_VIEW_I(CharT, Traits) lhs, - basic_string_view rhs) nssv_noexcept { - return lhs.compare(rhs) > 0; - } - - // >= - - template - nssv_constexpr bool operator>=(basic_string_view lhs, - nssv_BASIC_STRING_VIEW_I(CharT, Traits) rhs) nssv_noexcept { - return lhs.compare(rhs) >= 0; - } - - template - nssv_constexpr bool operator>=(nssv_BASIC_STRING_VIEW_I(CharT, Traits) lhs, - basic_string_view rhs) nssv_noexcept { - return lhs.compare(rhs) >= 0; - } - -#undef nssv_MSVC_ORDER -#undef nssv_BASIC_STRING_VIEW_I - -#endif // compiler-dependent approach to comparisons - - // 24.4.4 Inserters and extractors: - - namespace detail { - - template void write_padding(Stream &os, std::streamsize n) { - for (std::streamsize i = 0; i < n; ++i) - os.rdbuf()->sputc(os.fill()); - } - - template Stream &write_to_stream(Stream &os, View const &sv) { - typename Stream::sentry sentry(os); - - if (!os) - return os; - - const std::streamsize length = static_cast(sv.length()); - - // Whether, and how, to pad: - const bool pad = (length < os.width()); - const bool left_pad = pad && (os.flags() & std::ios_base::adjustfield) == std::ios_base::right; - - if (left_pad) - write_padding(os, os.width() - length); - - // Write span characters: - os.rdbuf()->sputn(sv.begin(), length); - - if (pad && !left_pad) - write_padding(os, os.width() - length); - - // Reset output stream width: - os.width(0); - - return os; - } - - } // namespace detail - - template - std::basic_ostream &operator<<(std::basic_ostream &os, - basic_string_view sv) { - return detail::write_to_stream(os, sv); - } - - // Several typedefs for common character types are provided: - - typedef basic_string_view string_view; - typedef basic_string_view wstring_view; -#if nssv_HAVE_WCHAR16_T - typedef basic_string_view u16string_view; - typedef basic_string_view u32string_view; -#endif - - } // namespace sv_lite -} // namespace nonstd::sv_lite - -// -// 24.4.6 Suffix for basic_string_view literals: -// - -#if nssv_HAVE_USER_DEFINED_LITERALS - -namespace nonstd { -nssv_inline_ns namespace literals { - nssv_inline_ns namespace string_view_literals { - -#if nssv_CONFIG_STD_SV_OPERATOR && nssv_HAVE_STD_DEFINED_LITERALS - - nssv_constexpr nonstd::sv_lite::string_view operator"" sv(const char *str, size_t len) nssv_noexcept // (1) - { - return nonstd::sv_lite::string_view {str, len}; - } - - nssv_constexpr nonstd::sv_lite::u16string_view operator"" sv(const char16_t *str, size_t len) nssv_noexcept // (2) - { - return nonstd::sv_lite::u16string_view {str, len}; - } - - nssv_constexpr nonstd::sv_lite::u32string_view operator"" sv(const char32_t *str, size_t len) nssv_noexcept // (3) - { - return nonstd::sv_lite::u32string_view {str, len}; - } - - nssv_constexpr nonstd::sv_lite::wstring_view operator"" sv(const wchar_t *str, size_t len) nssv_noexcept // (4) - { - return nonstd::sv_lite::wstring_view {str, len}; - } - -#endif // nssv_CONFIG_STD_SV_OPERATOR && nssv_HAVE_STD_DEFINED_LITERALS - -#if nssv_CONFIG_USR_SV_OPERATOR - - nssv_constexpr nonstd::sv_lite::string_view operator"" _sv(const char *str, size_t len) nssv_noexcept // (1) - { - return nonstd::sv_lite::string_view {str, len}; - } - - nssv_constexpr nonstd::sv_lite::u16string_view operator"" _sv(const char16_t *str, size_t len) nssv_noexcept // (2) - { - return nonstd::sv_lite::u16string_view {str, len}; - } - - nssv_constexpr nonstd::sv_lite::u32string_view operator"" _sv(const char32_t *str, size_t len) nssv_noexcept // (3) - { - return nonstd::sv_lite::u32string_view {str, len}; - } - - nssv_constexpr nonstd::sv_lite::wstring_view operator"" _sv(const wchar_t *str, size_t len) nssv_noexcept // (4) - { - return nonstd::sv_lite::wstring_view {str, len}; - } - -#endif // nssv_CONFIG_USR_SV_OPERATOR - } -} -} // namespace nonstd - -#endif - -// -// Extensions for std::string: -// - -#if nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS - -namespace nonstd { -namespace sv_lite { - -// Exclude MSVC 14 (19.00): it yields ambiguous to_string(): - -#if nssv_CPP11_OR_GREATER && nssv_COMPILER_MSVC_VERSION != 140 - -template > -std::basic_string to_string(basic_string_view v, - Allocator const &a = Allocator()) { - return std::basic_string(v.begin(), v.end(), a); -} - -#else - -template std::basic_string to_string(basic_string_view v) { - return std::basic_string(v.begin(), v.end()); -} - -template -std::basic_string to_string(basic_string_view v, Allocator const &a) { - return std::basic_string(v.begin(), v.end(), a); -} - -#endif // nssv_CPP11_OR_GREATER - -template -basic_string_view to_string_view(std::basic_string const &s) { - return basic_string_view(s.data(), s.size()); -} - -} // namespace sv_lite -} // namespace nonstd - -#endif // nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS - -// -// make types and algorithms available in namespace nonstd: -// - -namespace nonstd { - -using sv_lite::basic_string_view; -using sv_lite::string_view; -using sv_lite::wstring_view; - -#if nssv_HAVE_WCHAR16_T -using sv_lite::u16string_view; -#endif -#if nssv_HAVE_WCHAR32_T -using sv_lite::u32string_view; -#endif - -// literal "sv" - -using sv_lite::operator==; -using sv_lite::operator!=; -using sv_lite::operator<; -using sv_lite::operator<=; -using sv_lite::operator>; -using sv_lite::operator>=; - -using sv_lite::operator<<; - -#if nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS -using sv_lite::to_string; -using sv_lite::to_string_view; -#endif - -} // namespace nonstd - -// 24.4.5 Hash support (C++11): - -// Note: The hash value of a string view object is equal to the hash value of -// the corresponding string object. - -#if nssv_HAVE_STD_HASH - -#include - -namespace std { - -template <> struct hash { -public: - std::size_t operator()(nonstd::string_view v) const nssv_noexcept { - return std::hash()(std::string(v.data(), v.size())); - } -}; - -template <> struct hash { -public: - std::size_t operator()(nonstd::wstring_view v) const nssv_noexcept { - return std::hash()(std::wstring(v.data(), v.size())); - } -}; - -template <> struct hash { -public: - std::size_t operator()(nonstd::u16string_view v) const nssv_noexcept { - return std::hash()(std::u16string(v.data(), v.size())); - } -}; - -template <> struct hash { -public: - std::size_t operator()(nonstd::u32string_view v) const nssv_noexcept { - return std::hash()(std::u32string(v.data(), v.size())); - } -}; - -} // namespace std - -#endif // nssv_HAVE_STD_HASH - -nssv_RESTORE_WARNINGS() - -#endif // nssv_HAVE_STD_STRING_VIEW -#endif // NONSTD_SV_LITE_H_INCLUDED - - -namespace inja { - -/*! - * \brief Class for lexer configuration. - */ -struct LexerConfig { - std::string statement_open {"{%"}; - std::string statement_open_no_lstrip {"{%+"}; - std::string statement_open_force_lstrip {"{%-"}; - std::string statement_close {"%}"}; - std::string statement_close_force_rstrip {"-%}"}; - std::string line_statement {"##"}; - std::string expression_open {"{{"}; - std::string expression_open_force_lstrip {"{{-"}; - std::string expression_close {"}}"}; - std::string expression_close_force_rstrip {"-}}"}; - std::string comment_open {"{#"}; - std::string comment_close {"#}"}; - std::string open_chars {"#{"}; - - bool trim_blocks {false}; - bool lstrip_blocks {false}; - - void update_open_chars() { - open_chars = ""; - if (open_chars.find(line_statement[0]) == std::string::npos) { - open_chars += line_statement[0]; - } - if (open_chars.find(statement_open[0]) == std::string::npos) { - open_chars += statement_open[0]; - } - if (open_chars.find(statement_open_no_lstrip[0]) == std::string::npos) { - open_chars += statement_open_no_lstrip[0]; - } - if (open_chars.find(statement_open_force_lstrip[0]) == std::string::npos) { - open_chars += statement_open_force_lstrip[0]; - } - if (open_chars.find(expression_open[0]) == std::string::npos) { - open_chars += expression_open[0]; - } - if (open_chars.find(expression_open_force_lstrip[0]) == std::string::npos) { - open_chars += expression_open_force_lstrip[0]; - } - if (open_chars.find(comment_open[0]) == std::string::npos) { - open_chars += comment_open[0]; - } - } -}; - -/*! - * \brief Class for parser configuration. - */ -struct ParserConfig { - bool search_included_templates_in_files {true}; -}; - -/*! - * \brief Class for render configuration. - */ -struct RenderConfig { - bool throw_at_missing_includes {true}; -}; - -} // namespace inja - -#endif // INCLUDE_INJA_CONFIG_HPP_ - -// #include "function_storage.hpp" -// Copyright (c) 2020 Pantor. All rights reserved. - -#ifndef INCLUDE_INJA_FUNCTION_STORAGE_HPP_ -#define INCLUDE_INJA_FUNCTION_STORAGE_HPP_ - -#include - -// #include "string_view.hpp" - - -namespace inja { - -using json = nlohmann::json; - -using Arguments = std::vector; -using CallbackFunction = std::function; -using VoidCallbackFunction = std::function; - -/*! - * \brief Class for builtin functions and user-defined callbacks. - */ -class FunctionStorage { -public: - enum class Operation { - Not, - And, - Or, - In, - Equal, - NotEqual, - Greater, - GreaterEqual, - Less, - LessEqual, - Add, - Subtract, - Multiplication, - Division, - Power, - Modulo, - AtId, - At, - Default, - DivisibleBy, - Even, - Exists, - ExistsInObject, - First, - Float, - Int, - IsArray, - IsBoolean, - IsFloat, - IsInteger, - IsNumber, - IsObject, - IsString, - Last, - Length, - Lower, - Max, - Min, - Odd, - Range, - Round, - Sort, - Upper, - Callback, - ParenLeft, - ParenRight, - None, - }; - - struct FunctionData { - explicit FunctionData(const Operation &op, const CallbackFunction &cb = CallbackFunction{}) : operation(op), callback(cb) {} - const Operation operation; - const CallbackFunction callback; - }; - -private: - const int VARIADIC {-1}; - - std::map, FunctionData> function_storage = { - {std::make_pair("at", 2), FunctionData { Operation::At }}, - {std::make_pair("default", 2), FunctionData { Operation::Default }}, - {std::make_pair("divisibleBy", 2), FunctionData { Operation::DivisibleBy }}, - {std::make_pair("even", 1), FunctionData { Operation::Even }}, - {std::make_pair("exists", 1), FunctionData { Operation::Exists }}, - {std::make_pair("existsIn", 2), FunctionData { Operation::ExistsInObject }}, - {std::make_pair("first", 1), FunctionData { Operation::First }}, - {std::make_pair("float", 1), FunctionData { Operation::Float }}, - {std::make_pair("int", 1), FunctionData { Operation::Int }}, - {std::make_pair("isArray", 1), FunctionData { Operation::IsArray }}, - {std::make_pair("isBoolean", 1), FunctionData { Operation::IsBoolean }}, - {std::make_pair("isFloat", 1), FunctionData { Operation::IsFloat }}, - {std::make_pair("isInteger", 1), FunctionData { Operation::IsInteger }}, - {std::make_pair("isNumber", 1), FunctionData { Operation::IsNumber }}, - {std::make_pair("isObject", 1), FunctionData { Operation::IsObject }}, - {std::make_pair("isString", 1), FunctionData { Operation::IsString }}, - {std::make_pair("last", 1), FunctionData { Operation::Last }}, - {std::make_pair("length", 1), FunctionData { Operation::Length }}, - {std::make_pair("lower", 1), FunctionData { Operation::Lower }}, - {std::make_pair("max", 1), FunctionData { Operation::Max }}, - {std::make_pair("min", 1), FunctionData { Operation::Min }}, - {std::make_pair("odd", 1), FunctionData { Operation::Odd }}, - {std::make_pair("range", 1), FunctionData { Operation::Range }}, - {std::make_pair("round", 2), FunctionData { Operation::Round }}, - {std::make_pair("sort", 1), FunctionData { Operation::Sort }}, - {std::make_pair("upper", 1), FunctionData { Operation::Upper }}, - }; - -public: - void add_builtin(nonstd::string_view name, int num_args, Operation op) { - function_storage.emplace(std::make_pair(static_cast(name), num_args), FunctionData { op }); - } - - void add_callback(nonstd::string_view name, int num_args, const CallbackFunction &callback) { - function_storage.emplace(std::make_pair(static_cast(name), num_args), FunctionData { Operation::Callback, callback }); - } - - FunctionData find_function(nonstd::string_view name, int num_args) const { - auto it = function_storage.find(std::make_pair(static_cast(name), num_args)); - if (it != function_storage.end()) { - return it->second; - - // Find variadic function - } else if (num_args > 0) { - it = function_storage.find(std::make_pair(static_cast(name), VARIADIC)); - if (it != function_storage.end()) { - return it->second; - } - } - - return FunctionData { Operation::None }; - } -}; - -} // namespace inja - -#endif // INCLUDE_INJA_FUNCTION_STORAGE_HPP_ - -// #include "parser.hpp" -// Copyright (c) 2020 Pantor. All rights reserved. - -#ifndef INCLUDE_INJA_PARSER_HPP_ -#define INCLUDE_INJA_PARSER_HPP_ - -#include -#include -#include -#include -#include -#include - -// #include "config.hpp" - -// #include "exceptions.hpp" -// Copyright (c) 2020 Pantor. All rights reserved. - -#ifndef INCLUDE_INJA_EXCEPTIONS_HPP_ -#define INCLUDE_INJA_EXCEPTIONS_HPP_ - -#include -#include - -namespace inja { - -struct SourceLocation { - size_t line; - size_t column; -}; - -struct InjaError : public std::runtime_error { - const std::string type; - const std::string message; - - const SourceLocation location; - - explicit InjaError(const std::string &type, const std::string &message) - : std::runtime_error("[inja.exception." + type + "] " + message), type(type), message(message), location({0, 0}) {} - - explicit InjaError(const std::string &type, const std::string &message, SourceLocation location) - : std::runtime_error("[inja.exception." + type + "] (at " + std::to_string(location.line) + ":" + - std::to_string(location.column) + ") " + message), - type(type), message(message), location(location) {} -}; - -struct ParserError : public InjaError { - explicit ParserError(const std::string &message, SourceLocation location) : InjaError("parser_error", message, location) {} -}; - -struct RenderError : public InjaError { - explicit RenderError(const std::string &message, SourceLocation location) : InjaError("render_error", message, location) {} -}; - -struct FileError : public InjaError { - explicit FileError(const std::string &message) : InjaError("file_error", message) {} - explicit FileError(const std::string &message, SourceLocation location) : InjaError("file_error", message, location) {} -}; - -struct JsonError : public InjaError { - explicit JsonError(const std::string &message, SourceLocation location) : InjaError("json_error", message, location) {} -}; - -} // namespace inja - -#endif // INCLUDE_INJA_EXCEPTIONS_HPP_ - -// #include "function_storage.hpp" - -// #include "lexer.hpp" -// Copyright (c) 2020 Pantor. All rights reserved. - -#ifndef INCLUDE_INJA_LEXER_HPP_ -#define INCLUDE_INJA_LEXER_HPP_ - -#include -#include - -// #include "config.hpp" - -// #include "token.hpp" -// Copyright (c) 2020 Pantor. All rights reserved. - -#ifndef INCLUDE_INJA_TOKEN_HPP_ -#define INCLUDE_INJA_TOKEN_HPP_ - -#include - -// #include "string_view.hpp" - - -namespace inja { - -/*! - * \brief Helper-class for the inja Lexer. - */ -struct Token { - enum class Kind { - Text, - ExpressionOpen, // {{ - ExpressionClose, // }} - LineStatementOpen, // ## - LineStatementClose, // \n - StatementOpen, // {% - StatementClose, // %} - CommentOpen, // {# - CommentClose, // #} - Id, // this, this.foo - Number, // 1, 2, -1, 5.2, -5.3 - String, // "this" - Plus, // + - Minus, // - - Times, // * - Slash, // / - Percent, // % - Power, // ^ - Comma, // , - Dot, // . - Colon, // : - LeftParen, // ( - RightParen, // ) - LeftBracket, // [ - RightBracket, // ] - LeftBrace, // { - RightBrace, // } - Equal, // == - NotEqual, // != - GreaterThan, // > - GreaterEqual, // >= - LessThan, // < - LessEqual, // <= - Unknown, - Eof, - }; - - Kind kind {Kind::Unknown}; - nonstd::string_view text; - - explicit constexpr Token() = default; - explicit constexpr Token(Kind kind, nonstd::string_view text) : kind(kind), text(text) {} - - std::string describe() const { - switch (kind) { - case Kind::Text: - return ""; - case Kind::LineStatementClose: - return ""; - case Kind::Eof: - return ""; - default: - return static_cast(text); - } - } -}; - -} // namespace inja - -#endif // INCLUDE_INJA_TOKEN_HPP_ - -// #include "utils.hpp" -// Copyright (c) 2020 Pantor. All rights reserved. - -#ifndef INCLUDE_INJA_UTILS_HPP_ -#define INCLUDE_INJA_UTILS_HPP_ - -#include -#include -#include -#include - -// #include "exceptions.hpp" - -// #include "string_view.hpp" - - -namespace inja { - -inline void open_file_or_throw(const std::string &path, std::ifstream &file) { - file.exceptions(std::ifstream::failbit | std::ifstream::badbit); - try { - file.open(path); - } catch (const std::ios_base::failure & /*e*/) { - throw FileError("failed accessing file at '" + path + "'"); - } -} - -namespace string_view { -inline nonstd::string_view slice(nonstd::string_view view, size_t start, size_t end) { - start = std::min(start, view.size()); - end = std::min(std::max(start, end), view.size()); - return view.substr(start, end - start); -} - -inline std::pair split(nonstd::string_view view, char Separator) { - size_t idx = view.find(Separator); - if (idx == nonstd::string_view::npos) { - return std::make_pair(view, nonstd::string_view()); - } - return std::make_pair(slice(view, 0, idx), slice(view, idx + 1, nonstd::string_view::npos)); -} - -inline bool starts_with(nonstd::string_view view, nonstd::string_view prefix) { - return (view.size() >= prefix.size() && view.compare(0, prefix.size(), prefix) == 0); -} -} // namespace string_view - -inline SourceLocation get_source_location(nonstd::string_view content, size_t pos) { - // Get line and offset position (starts at 1:1) - auto sliced = string_view::slice(content, 0, pos); - std::size_t last_newline = sliced.rfind("\n"); - - if (last_newline == nonstd::string_view::npos) { - return {1, sliced.length() + 1}; - } - - // Count newlines - size_t count_lines = 0; - size_t search_start = 0; - while (search_start <= sliced.size()) { - search_start = sliced.find("\n", search_start) + 1; - if (search_start == 0) { - break; - } - count_lines += 1; - } - - return {count_lines + 1, sliced.length() - last_newline}; -} - -} // namespace inja - -#endif // INCLUDE_INJA_UTILS_HPP_ - - -namespace inja { - -/*! - * \brief Class for lexing an inja Template. - */ -class Lexer { - enum class State { - Text, - ExpressionStart, - ExpressionStartForceLstrip, - ExpressionBody, - LineStart, - LineBody, - StatementStart, - StatementStartNoLstrip, - StatementStartForceLstrip, - StatementBody, - CommentStart, - CommentBody, - }; - - enum class MinusState { - Operator, - Number, - }; - - const LexerConfig &config; - - State state; - MinusState minus_state; - nonstd::string_view m_in; - size_t tok_start; - size_t pos; - - - Token scan_body(nonstd::string_view close, Token::Kind closeKind, nonstd::string_view close_trim = nonstd::string_view(), bool trim = false) { - again: - // skip whitespace (except for \n as it might be a close) - if (tok_start >= m_in.size()) { - return make_token(Token::Kind::Eof); - } - char ch = m_in[tok_start]; - if (ch == ' ' || ch == '\t' || ch == '\r') { - tok_start += 1; - goto again; - } - - // check for close - if (!close_trim.empty() && inja::string_view::starts_with(m_in.substr(tok_start), close_trim)) { - state = State::Text; - pos = tok_start + close_trim.size(); - Token tok = make_token(closeKind); - skip_whitespaces_and_newlines(); - return tok; - } - - if (inja::string_view::starts_with(m_in.substr(tok_start), close)) { - state = State::Text; - pos = tok_start + close.size(); - Token tok = make_token(closeKind); - if (trim) { - skip_whitespaces_and_first_newline(); - } - return tok; - } - - // skip \n - if (ch == '\n') { - tok_start += 1; - goto again; - } - - pos = tok_start + 1; - if (std::isalpha(ch)) { - minus_state = MinusState::Operator; - return scan_id(); - } - - MinusState current_minus_state = minus_state; - if (minus_state == MinusState::Operator) { - minus_state = MinusState::Number; - } - - switch (ch) { - case '+': - return make_token(Token::Kind::Plus); - case '-': - if (current_minus_state == MinusState::Operator) { - return make_token(Token::Kind::Minus); - } - return scan_number(); - case '*': - return make_token(Token::Kind::Times); - case '/': - return make_token(Token::Kind::Slash); - case '^': - return make_token(Token::Kind::Power); - case '%': - return make_token(Token::Kind::Percent); - case '.': - return make_token(Token::Kind::Dot); - case ',': - return make_token(Token::Kind::Comma); - case ':': - return make_token(Token::Kind::Colon); - case '(': - return make_token(Token::Kind::LeftParen); - case ')': - minus_state = MinusState::Operator; - return make_token(Token::Kind::RightParen); - case '[': - return make_token(Token::Kind::LeftBracket); - case ']': - minus_state = MinusState::Operator; - return make_token(Token::Kind::RightBracket); - case '{': - return make_token(Token::Kind::LeftBrace); - case '}': - minus_state = MinusState::Operator; - return make_token(Token::Kind::RightBrace); - case '>': - if (pos < m_in.size() && m_in[pos] == '=') { - pos += 1; - return make_token(Token::Kind::GreaterEqual); - } - return make_token(Token::Kind::GreaterThan); - case '<': - if (pos < m_in.size() && m_in[pos] == '=') { - pos += 1; - return make_token(Token::Kind::LessEqual); - } - return make_token(Token::Kind::LessThan); - case '=': - if (pos < m_in.size() && m_in[pos] == '=') { - pos += 1; - return make_token(Token::Kind::Equal); - } - return make_token(Token::Kind::Unknown); - case '!': - if (pos < m_in.size() && m_in[pos] == '=') { - pos += 1; - return make_token(Token::Kind::NotEqual); - } - return make_token(Token::Kind::Unknown); - case '\"': - return scan_string(); - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - minus_state = MinusState::Operator; - return scan_number(); - case '_': - minus_state = MinusState::Operator; - return scan_id(); - default: - return make_token(Token::Kind::Unknown); - } - } - - Token scan_id() { - for (;;) { - if (pos >= m_in.size()) { - break; - } - char ch = m_in[pos]; - if (!std::isalnum(ch) && ch != '.' && ch != '/' && ch != '_' && ch != '-') { - break; - } - pos += 1; - } - return make_token(Token::Kind::Id); - } - - Token scan_number() { - for (;;) { - if (pos >= m_in.size()) { - break; - } - char ch = m_in[pos]; - // be very permissive in lexer (we'll catch errors when conversion happens) - if (!std::isdigit(ch) && ch != '.' && ch != 'e' && ch != 'E' && ch != '+' && ch != '-') { - break; - } - pos += 1; - } - return make_token(Token::Kind::Number); - } - - Token scan_string() { - bool escape {false}; - for (;;) { - if (pos >= m_in.size()) { - break; - } - char ch = m_in[pos++]; - if (ch == '\\') { - escape = true; - } else if (!escape && ch == m_in[tok_start]) { - break; - } else { - escape = false; - } - } - return make_token(Token::Kind::String); - } - - Token make_token(Token::Kind kind) const { return Token(kind, string_view::slice(m_in, tok_start, pos)); } - - void skip_whitespaces_and_newlines() { - if (pos < m_in.size()) { - while (pos < m_in.size() && (m_in[pos] == ' ' || m_in[pos] == '\t' || m_in[pos] == '\n' || m_in[pos] == '\r')) { - pos += 1; - } - } - } - - void skip_whitespaces_and_first_newline() { - if (pos < m_in.size()) { - while (pos < m_in.size() && (m_in[pos] == ' ' || m_in[pos] == '\t')) { - pos += 1; - } - } - - if (pos < m_in.size()) { - char ch = m_in[pos]; - if (ch == '\n') { - pos += 1; - } else if (ch == '\r') { - pos += 1; - if (pos < m_in.size() && m_in[pos] == '\n') { - pos += 1; - } - } - } - } - - static nonstd::string_view clear_final_line_if_whitespace(nonstd::string_view text) { - nonstd::string_view result = text; - while (!result.empty()) { - char ch = result.back(); - if (ch == ' ' || ch == '\t') { - result.remove_suffix(1); - } else if (ch == '\n' || ch == '\r') { - break; - } else { - return text; - } - } - return result; - } - -public: - explicit Lexer(const LexerConfig &config) : config(config), state(State::Text), minus_state(MinusState::Number) {} - - SourceLocation current_position() const { - return get_source_location(m_in, tok_start); - } - - void start(nonstd::string_view input) { - m_in = input; - tok_start = 0; - pos = 0; - state = State::Text; - minus_state = MinusState::Number; - - // Consume byte order mark (BOM) for UTF-8 - if (inja::string_view::starts_with(m_in, "\xEF\xBB\xBF")) { - m_in = m_in.substr(3); - } - } - - Token scan() { - tok_start = pos; - - again: - if (tok_start >= m_in.size()) { - return make_token(Token::Kind::Eof); - } - - switch (state) { - default: - case State::Text: { - // fast-scan to first open character - size_t open_start = m_in.substr(pos).find_first_of(config.open_chars); - if (open_start == nonstd::string_view::npos) { - // didn't find open, return remaining text as text token - pos = m_in.size(); - return make_token(Token::Kind::Text); - } - pos += open_start; - - // try to match one of the opening sequences, and get the close - nonstd::string_view open_str = m_in.substr(pos); - bool must_lstrip = false; - if (inja::string_view::starts_with(open_str, config.expression_open)) { - if (inja::string_view::starts_with(open_str, config.expression_open_force_lstrip)) { - state = State::ExpressionStartForceLstrip; - must_lstrip = true; - } else { - state = State::ExpressionStart; - } - } else if (inja::string_view::starts_with(open_str, config.statement_open)) { - if (inja::string_view::starts_with(open_str, config.statement_open_no_lstrip)) { - state = State::StatementStartNoLstrip; - } else if (inja::string_view::starts_with(open_str, config.statement_open_force_lstrip )) { - state = State::StatementStartForceLstrip; - must_lstrip = true; - } else { - state = State::StatementStart; - must_lstrip = config.lstrip_blocks; - } - } else if (inja::string_view::starts_with(open_str, config.comment_open)) { - state = State::CommentStart; - must_lstrip = config.lstrip_blocks; - } else if ((pos == 0 || m_in[pos - 1] == '\n') && inja::string_view::starts_with(open_str, config.line_statement)) { - state = State::LineStart; - } else { - pos += 1; // wasn't actually an opening sequence - goto again; - } - - nonstd::string_view text = string_view::slice(m_in, tok_start, pos); - if (must_lstrip) { - text = clear_final_line_if_whitespace(text); - } - - if (text.empty()) { - goto again; // don't generate empty token - } - return Token(Token::Kind::Text, text); - } - case State::ExpressionStart: { - state = State::ExpressionBody; - pos += config.expression_open.size(); - return make_token(Token::Kind::ExpressionOpen); - } - case State::ExpressionStartForceLstrip: { - state = State::ExpressionBody; - pos += config.expression_open_force_lstrip.size(); - return make_token(Token::Kind::ExpressionOpen); - } - case State::LineStart: { - state = State::LineBody; - pos += config.line_statement.size(); - return make_token(Token::Kind::LineStatementOpen); - } - case State::StatementStart: { - state = State::StatementBody; - pos += config.statement_open.size(); - return make_token(Token::Kind::StatementOpen); - } - case State::StatementStartNoLstrip: { - state = State::StatementBody; - pos += config.statement_open_no_lstrip.size(); - return make_token(Token::Kind::StatementOpen); - } - case State::StatementStartForceLstrip: { - state = State::StatementBody; - pos += config.statement_open_force_lstrip.size(); - return make_token(Token::Kind::StatementOpen); - } - case State::CommentStart: { - state = State::CommentBody; - pos += config.comment_open.size(); - return make_token(Token::Kind::CommentOpen); - } - case State::ExpressionBody: - return scan_body(config.expression_close, Token::Kind::ExpressionClose, config.expression_close_force_rstrip); - case State::LineBody: - return scan_body("\n", Token::Kind::LineStatementClose); - case State::StatementBody: - return scan_body(config.statement_close, Token::Kind::StatementClose, config.statement_close_force_rstrip, config.trim_blocks); - case State::CommentBody: { - // fast-scan to comment close - size_t end = m_in.substr(pos).find(config.comment_close); - if (end == nonstd::string_view::npos) { - pos = m_in.size(); - return make_token(Token::Kind::Eof); - } - // return the entire comment in the close token - state = State::Text; - pos += end + config.comment_close.size(); - Token tok = make_token(Token::Kind::CommentClose); - if (config.trim_blocks) { - skip_whitespaces_and_first_newline(); - } - return tok; - } - } - } - - const LexerConfig &get_config() const { - return config; - } -}; - -} // namespace inja - -#endif // INCLUDE_INJA_LEXER_HPP_ - -// #include "node.hpp" -// Copyright (c) 2020 Pantor. All rights reserved. - -#ifndef INCLUDE_INJA_NODE_HPP_ -#define INCLUDE_INJA_NODE_HPP_ - -#include -#include - -#include - -// #include "function_storage.hpp" - -// #include "string_view.hpp" - - - -namespace inja { - -class NodeVisitor; -class BlockNode; -class TextNode; -class ExpressionNode; -class LiteralNode; -class JsonNode; -class FunctionNode; -class ExpressionListNode; -class StatementNode; -class ForStatementNode; -class ForArrayStatementNode; -class ForObjectStatementNode; -class IfStatementNode; -class IncludeStatementNode; -class SetStatementNode; - - -class NodeVisitor { -public: - virtual void visit(const BlockNode& node) = 0; - virtual void visit(const TextNode& node) = 0; - virtual void visit(const ExpressionNode& node) = 0; - virtual void visit(const LiteralNode& node) = 0; - virtual void visit(const JsonNode& node) = 0; - virtual void visit(const FunctionNode& node) = 0; - virtual void visit(const ExpressionListNode& node) = 0; - virtual void visit(const StatementNode& node) = 0; - virtual void visit(const ForStatementNode& node) = 0; - virtual void visit(const ForArrayStatementNode& node) = 0; - virtual void visit(const ForObjectStatementNode& node) = 0; - virtual void visit(const IfStatementNode& node) = 0; - virtual void visit(const IncludeStatementNode& node) = 0; - virtual void visit(const SetStatementNode& node) = 0; -}; - -/*! - * \brief Base node class for the abstract syntax tree (AST). - */ -class AstNode { -public: - virtual void accept(NodeVisitor& v) const = 0; - - size_t pos; - - AstNode(size_t pos) : pos(pos) { } - virtual ~AstNode() { }; -}; - - -class BlockNode : public AstNode { -public: - std::vector> nodes; - - explicit BlockNode() : AstNode(0) {} - - void accept(NodeVisitor& v) const { - v.visit(*this); - } -}; - -class TextNode : public AstNode { -public: - const size_t length; - - explicit TextNode(size_t pos, size_t length): AstNode(pos), length(length) { } - - void accept(NodeVisitor& v) const { - v.visit(*this); - } -}; - -class ExpressionNode : public AstNode { -public: - explicit ExpressionNode(size_t pos) : AstNode(pos) {} - - void accept(NodeVisitor& v) const { - v.visit(*this); - } -}; - -class LiteralNode : public ExpressionNode { -public: - const nlohmann::json value; - - explicit LiteralNode(const nlohmann::json& value, size_t pos) : ExpressionNode(pos), value(value) { } - - void accept(NodeVisitor& v) const { - v.visit(*this); - } -}; - -class JsonNode : public ExpressionNode { -public: - const std::string name; - const json::json_pointer ptr; - - static std::string convert_dot_to_json_ptr(nonstd::string_view ptr_name) { - std::string result; - do { - nonstd::string_view part; - std::tie(part, ptr_name) = string_view::split(ptr_name, '.'); - result.push_back('/'); - result.append(part.begin(), part.end()); - } while (!ptr_name.empty()); - return result; - } - - explicit JsonNode(nonstd::string_view ptr_name, size_t pos) : ExpressionNode(pos), name(ptr_name), ptr(json::json_pointer(convert_dot_to_json_ptr(ptr_name))) { } - - void accept(NodeVisitor& v) const { - v.visit(*this); - } -}; - -class FunctionNode : public ExpressionNode { - using Op = FunctionStorage::Operation; - -public: - enum class Associativity { - Left, - Right, - }; - - unsigned int precedence; - Associativity associativity; - - Op operation; - - std::string name; - int number_args; // Should also be negative -> -1 for unknown number - CallbackFunction callback; - - explicit FunctionNode(nonstd::string_view name, size_t pos) : ExpressionNode(pos), precedence(8), associativity(Associativity::Left), operation(Op::Callback), name(name), number_args(1) { } - explicit FunctionNode(Op operation, size_t pos) : ExpressionNode(pos), operation(operation), number_args(1) { - switch (operation) { - case Op::Not: { - precedence = 4; - associativity = Associativity::Left; - } break; - case Op::And: { - precedence = 1; - associativity = Associativity::Left; - } break; - case Op::Or: { - precedence = 1; - associativity = Associativity::Left; - } break; - case Op::In: { - precedence = 2; - associativity = Associativity::Left; - } break; - case Op::Equal: { - precedence = 2; - associativity = Associativity::Left; - } break; - case Op::NotEqual: { - precedence = 2; - associativity = Associativity::Left; - } break; - case Op::Greater: { - precedence = 2; - associativity = Associativity::Left; - } break; - case Op::GreaterEqual: { - precedence = 2; - associativity = Associativity::Left; - } break; - case Op::Less: { - precedence = 2; - associativity = Associativity::Left; - } break; - case Op::LessEqual: { - precedence = 2; - associativity = Associativity::Left; - } break; - case Op::Add: { - precedence = 3; - associativity = Associativity::Left; - } break; - case Op::Subtract: { - precedence = 3; - associativity = Associativity::Left; - } break; - case Op::Multiplication: { - precedence = 4; - associativity = Associativity::Left; - } break; - case Op::Division: { - precedence = 4; - associativity = Associativity::Left; - } break; - case Op::Power: { - precedence = 5; - associativity = Associativity::Right; - } break; - case Op::Modulo: { - precedence = 4; - associativity = Associativity::Left; - } break; - case Op::AtId: { - precedence = 8; - associativity = Associativity::Left; - } break; - default: { - precedence = 1; - associativity = Associativity::Left; - } - } - } - - void accept(NodeVisitor& v) const { - v.visit(*this); - } -}; - -class ExpressionListNode : public AstNode { -public: - std::vector> rpn_output; - - explicit ExpressionListNode() : AstNode(0) { } - explicit ExpressionListNode(size_t pos) : AstNode(pos) { } - - void accept(NodeVisitor& v) const { - v.visit(*this); - } -}; - -class StatementNode : public AstNode { -public: - StatementNode(size_t pos) : AstNode(pos) { } - - virtual void accept(NodeVisitor& v) const = 0; -}; - -class ForStatementNode : public StatementNode { -public: - ExpressionListNode condition; - BlockNode body; - BlockNode *const parent; - - ForStatementNode(BlockNode *const parent, size_t pos) : StatementNode(pos), parent(parent) { } - - virtual void accept(NodeVisitor& v) const = 0; -}; - -class ForArrayStatementNode : public ForStatementNode { -public: - const std::string value; - - explicit ForArrayStatementNode(const std::string& value, BlockNode *const parent, size_t pos) : ForStatementNode(parent, pos), value(value) { } - - void accept(NodeVisitor& v) const { - v.visit(*this); - } -}; - -class ForObjectStatementNode : public ForStatementNode { -public: - const std::string key; - const std::string value; - - explicit ForObjectStatementNode(const std::string& key, const std::string& value, BlockNode *const parent, size_t pos) : ForStatementNode(parent, pos), key(key), value(value) { } - - void accept(NodeVisitor& v) const { - v.visit(*this); - } -}; - -class IfStatementNode : public StatementNode { -public: - ExpressionListNode condition; - BlockNode true_statement; - BlockNode false_statement; - BlockNode *const parent; - - const bool is_nested; - bool has_false_statement {false}; - - explicit IfStatementNode(BlockNode *const parent, size_t pos) : StatementNode(pos), parent(parent), is_nested(false) { } - explicit IfStatementNode(bool is_nested, BlockNode *const parent, size_t pos) : StatementNode(pos), parent(parent), is_nested(is_nested) { } - - void accept(NodeVisitor& v) const { - v.visit(*this); - } -}; - -class IncludeStatementNode : public StatementNode { -public: - const std::string file; - - explicit IncludeStatementNode(const std::string& file, size_t pos) : StatementNode(pos), file(file) { } - - void accept(NodeVisitor& v) const { - v.visit(*this); - }; -}; - -class SetStatementNode : public StatementNode { -public: - const std::string key; - ExpressionListNode expression; - - explicit SetStatementNode(const std::string& key, size_t pos) : StatementNode(pos), key(key) { } - - void accept(NodeVisitor& v) const { - v.visit(*this); - }; -}; - -} // namespace inja - -#endif // INCLUDE_INJA_NODE_HPP_ - -// #include "template.hpp" -// Copyright (c) 2019 Pantor. All rights reserved. - -#ifndef INCLUDE_INJA_TEMPLATE_HPP_ -#define INCLUDE_INJA_TEMPLATE_HPP_ - -#include -#include -#include -#include - -// #include "node.hpp" - -// #include "statistics.hpp" -// Copyright (c) 2019 Pantor. All rights reserved. - -#ifndef INCLUDE_INJA_STATISTICS_HPP_ -#define INCLUDE_INJA_STATISTICS_HPP_ - -// #include "node.hpp" - - - -namespace inja { - -/*! - * \brief A class for counting statistics on a Template. - */ -class StatisticsVisitor : public NodeVisitor { - void visit(const BlockNode& node) { - for (auto& n : node.nodes) { - n->accept(*this); - } - } - - void visit(const TextNode&) { } - void visit(const ExpressionNode&) { } - void visit(const LiteralNode&) { } - - void visit(const JsonNode&) { - variable_counter += 1; - } - - void visit(const FunctionNode&) { } - - void visit(const ExpressionListNode& node) { - for (auto& n : node.rpn_output) { - n->accept(*this); - } - } - - void visit(const StatementNode&) { } - void visit(const ForStatementNode&) { } - - void visit(const ForArrayStatementNode& node) { - node.condition.accept(*this); - node.body.accept(*this); - } - - void visit(const ForObjectStatementNode& node) { - node.condition.accept(*this); - node.body.accept(*this); - } - - void visit(const IfStatementNode& node) { - node.condition.accept(*this); - node.true_statement.accept(*this); - node.false_statement.accept(*this); - } - - void visit(const IncludeStatementNode&) { } - - void visit(const SetStatementNode&) { } - -public: - unsigned int variable_counter; - - explicit StatisticsVisitor() : variable_counter(0) { } -}; - -} // namespace inja - -#endif // INCLUDE_INJA_STATISTICS_HPP_ - - - -namespace inja { - -/*! - * \brief The main inja Template. - */ -struct Template { - BlockNode root; - std::string content; - - explicit Template() { } - explicit Template(const std::string& content): content(content) { } - - /// Return number of variables (total number, not distinct ones) in the template - int count_variables() { - auto statistic_visitor = StatisticsVisitor(); - root.accept(statistic_visitor); - return statistic_visitor.variable_counter; - } -}; - -using TemplateStorage = std::map; - -} // namespace inja - -#endif // INCLUDE_INJA_TEMPLATE_HPP_ - -// #include "token.hpp" - -// #include "utils.hpp" - - -#include - -namespace inja { - -/*! - * \brief Class for parsing an inja Template. - */ -class Parser { - const ParserConfig &config; - - Lexer lexer; - TemplateStorage &template_storage; - const FunctionStorage &function_storage; - - Token tok, peek_tok; - bool have_peek_tok {false}; - - size_t current_paren_level {0}; - size_t current_bracket_level {0}; - size_t current_brace_level {0}; - - nonstd::string_view json_literal_start; - - BlockNode *current_block {nullptr}; - ExpressionListNode *current_expression_list {nullptr}; - std::stack> function_stack; - - std::stack> operator_stack; - std::stack if_statement_stack; - std::stack for_statement_stack; - - void throw_parser_error(const std::string &message) { - throw ParserError(message, lexer.current_position()); - } - - void get_next_token() { - if (have_peek_tok) { - tok = peek_tok; - have_peek_tok = false; - } else { - tok = lexer.scan(); - } - } - - void get_peek_token() { - if (!have_peek_tok) { - peek_tok = lexer.scan(); - have_peek_tok = true; - } - } - - void add_json_literal(const char* content_ptr) { - nonstd::string_view json_text(json_literal_start.data(), tok.text.data() - json_literal_start.data() + tok.text.size()); - current_expression_list->rpn_output.emplace_back(std::make_shared(json::parse(json_text), json_text.data() - content_ptr)); - } - - bool parse_expression(Template &tmpl, Token::Kind closing) { - while (tok.kind != closing && tok.kind != Token::Kind::Eof) { - // Literals - switch (tok.kind) { - case Token::Kind::String: { - if (current_brace_level == 0 && current_bracket_level == 0) { - json_literal_start = tok.text; - add_json_literal(tmpl.content.c_str()); - } - - } break; - case Token::Kind::Number: { - if (current_brace_level == 0 && current_bracket_level == 0) { - json_literal_start = tok.text; - add_json_literal(tmpl.content.c_str()); - } - - } break; - case Token::Kind::LeftBracket: { - if (current_brace_level == 0 && current_bracket_level == 0) { - json_literal_start = tok.text; - } - current_bracket_level += 1; - - } break; - case Token::Kind::LeftBrace: { - if (current_brace_level == 0 && current_bracket_level == 0) { - json_literal_start = tok.text; - } - current_brace_level += 1; - - } break; - case Token::Kind::RightBracket: { - if (current_bracket_level == 0) { - throw_parser_error("unexpected ']'"); - } - - current_bracket_level -= 1; - if (current_brace_level == 0 && current_bracket_level == 0) { - add_json_literal(tmpl.content.c_str()); - } - - } break; - case Token::Kind::RightBrace: { - if (current_brace_level == 0) { - throw_parser_error("unexpected '}'"); - } - - current_brace_level -= 1; - if (current_brace_level == 0 && current_bracket_level == 0) { - add_json_literal(tmpl.content.c_str()); - } - - } break; - case Token::Kind::Id: { - get_peek_token(); - - // Json Literal - if (tok.text == static_cast("true") || tok.text == static_cast("false") || tok.text == static_cast("null")) { - if (current_brace_level == 0 && current_bracket_level == 0) { - json_literal_start = tok.text; - add_json_literal(tmpl.content.c_str()); - } - - // Operator - } else if (tok.text == "and" || tok.text == "or" || tok.text == "in" || tok.text == "not") { - goto parse_operator; - - // Functions - } else if (peek_tok.kind == Token::Kind::LeftParen) { - operator_stack.emplace(std::make_shared(static_cast(tok.text), tok.text.data() - tmpl.content.c_str())); - function_stack.emplace(operator_stack.top().get(), current_paren_level); - - // Variables - } else { - current_expression_list->rpn_output.emplace_back(std::make_shared(static_cast(tok.text), tok.text.data() - tmpl.content.c_str())); - } - - // Operators - } break; - case Token::Kind::Equal: - case Token::Kind::NotEqual: - case Token::Kind::GreaterThan: - case Token::Kind::GreaterEqual: - case Token::Kind::LessThan: - case Token::Kind::LessEqual: - case Token::Kind::Plus: - case Token::Kind::Minus: - case Token::Kind::Times: - case Token::Kind::Slash: - case Token::Kind::Power: - case Token::Kind::Percent: - case Token::Kind::Dot: { - - parse_operator: - FunctionStorage::Operation operation; - switch (tok.kind) { - case Token::Kind::Id: { - if (tok.text == "and") { - operation = FunctionStorage::Operation::And; - } else if (tok.text == "or") { - operation = FunctionStorage::Operation::Or; - } else if (tok.text == "in") { - operation = FunctionStorage::Operation::In; - } else if (tok.text == "not") { - operation = FunctionStorage::Operation::Not; - } else { - throw_parser_error("unknown operator in parser."); - } - } break; - case Token::Kind::Equal: { - operation = FunctionStorage::Operation::Equal; - } break; - case Token::Kind::NotEqual: { - operation = FunctionStorage::Operation::NotEqual; - } break; - case Token::Kind::GreaterThan: { - operation = FunctionStorage::Operation::Greater; - } break; - case Token::Kind::GreaterEqual: { - operation = FunctionStorage::Operation::GreaterEqual; - } break; - case Token::Kind::LessThan: { - operation = FunctionStorage::Operation::Less; - } break; - case Token::Kind::LessEqual: { - operation = FunctionStorage::Operation::LessEqual; - } break; - case Token::Kind::Plus: { - operation = FunctionStorage::Operation::Add; - } break; - case Token::Kind::Minus: { - operation = FunctionStorage::Operation::Subtract; - } break; - case Token::Kind::Times: { - operation = FunctionStorage::Operation::Multiplication; - } break; - case Token::Kind::Slash: { - operation = FunctionStorage::Operation::Division; - } break; - case Token::Kind::Power: { - operation = FunctionStorage::Operation::Power; - } break; - case Token::Kind::Percent: { - operation = FunctionStorage::Operation::Modulo; - } break; - case Token::Kind::Dot: { - operation = FunctionStorage::Operation::AtId; - } break; - default: { - throw_parser_error("unknown operator in parser."); - } - } - auto function_node = std::make_shared(operation, tok.text.data() - tmpl.content.c_str()); - - while (!operator_stack.empty() && ((operator_stack.top()->precedence > function_node->precedence) || (operator_stack.top()->precedence == function_node->precedence && function_node->associativity == FunctionNode::Associativity::Left)) && (operator_stack.top()->operation != FunctionStorage::Operation::ParenLeft)) { - current_expression_list->rpn_output.emplace_back(operator_stack.top()); - operator_stack.pop(); - } - - operator_stack.emplace(function_node); - - } break; - case Token::Kind::Comma: { - if (current_brace_level == 0 && current_bracket_level == 0) { - if (function_stack.empty()) { - throw_parser_error("unexpected ','"); - } - - function_stack.top().first->number_args += 1; - } - - } break; - case Token::Kind::Colon: { - if (current_brace_level == 0 && current_bracket_level == 0) { - throw_parser_error("unexpected ':'"); - } - - } break; - case Token::Kind::LeftParen: { - current_paren_level += 1; - operator_stack.emplace(std::make_shared(FunctionStorage::Operation::ParenLeft, tok.text.data() - tmpl.content.c_str())); - - get_peek_token(); - if (peek_tok.kind == Token::Kind::RightParen) { - if (!function_stack.empty() && function_stack.top().second == current_paren_level - 1) { - function_stack.top().first->number_args = 0; - } - } - - } break; - case Token::Kind::RightParen: { - current_paren_level -= 1; - while (!operator_stack.empty() && operator_stack.top()->operation != FunctionStorage::Operation::ParenLeft) { - current_expression_list->rpn_output.emplace_back(operator_stack.top()); - operator_stack.pop(); - } - - if (!operator_stack.empty() && operator_stack.top()->operation == FunctionStorage::Operation::ParenLeft) { - operator_stack.pop(); - } - - if (!function_stack.empty() && function_stack.top().second == current_paren_level) { - auto func = function_stack.top().first; - auto function_data = function_storage.find_function(func->name, func->number_args); - if (function_data.operation == FunctionStorage::Operation::None) { - throw_parser_error("unknown function " + func->name); - } - func->operation = function_data.operation; - if (function_data.operation == FunctionStorage::Operation::Callback) { - func->callback = function_data.callback; - } - - if (operator_stack.empty()) { - throw_parser_error("internal error at function " + func->name); - } - - current_expression_list->rpn_output.emplace_back(operator_stack.top()); - operator_stack.pop(); - function_stack.pop(); - } - } - default: - break; - } - - get_next_token(); - } - - while (!operator_stack.empty()) { - current_expression_list->rpn_output.emplace_back(operator_stack.top()); - operator_stack.pop(); - } - - return true; - } - - bool parse_statement(Template &tmpl, Token::Kind closing, nonstd::string_view path) { - if (tok.kind != Token::Kind::Id) { - return false; - } - - if (tok.text == static_cast("if")) { - get_next_token(); - - auto if_statement_node = std::make_shared(current_block, tok.text.data() - tmpl.content.c_str()); - current_block->nodes.emplace_back(if_statement_node); - if_statement_stack.emplace(if_statement_node.get()); - current_block = &if_statement_node->true_statement; - current_expression_list = &if_statement_node->condition; - - if (!parse_expression(tmpl, closing)) { - return false; - } - - } else if (tok.text == static_cast("else")) { - if (if_statement_stack.empty()) { - throw_parser_error("else without matching if"); - } - auto &if_statement_data = if_statement_stack.top(); - get_next_token(); - - if_statement_data->has_false_statement = true; - current_block = &if_statement_data->false_statement; - - // Chained else if - if (tok.kind == Token::Kind::Id && tok.text == static_cast("if")) { - get_next_token(); - - auto if_statement_node = std::make_shared(true, current_block, tok.text.data() - tmpl.content.c_str()); - current_block->nodes.emplace_back(if_statement_node); - if_statement_stack.emplace(if_statement_node.get()); - current_block = &if_statement_node->true_statement; - current_expression_list = &if_statement_node->condition; - - if (!parse_expression(tmpl, closing)) { - return false; - } - } - - } else if (tok.text == static_cast("endif")) { - if (if_statement_stack.empty()) { - throw_parser_error("endif without matching if"); - } - - // Nested if statements - while (if_statement_stack.top()->is_nested) { - if_statement_stack.pop(); - } - - auto &if_statement_data = if_statement_stack.top(); - get_next_token(); - - current_block = if_statement_data->parent; - if_statement_stack.pop(); - - } else if (tok.text == static_cast("for")) { - get_next_token(); - - // options: for a in arr; for a, b in obj - if (tok.kind != Token::Kind::Id) { - throw_parser_error("expected id, got '" + tok.describe() + "'"); - } - - Token value_token = tok; - get_next_token(); - - // Object type - std::shared_ptr for_statement_node; - if (tok.kind == Token::Kind::Comma) { - get_next_token(); - if (tok.kind != Token::Kind::Id) { - throw_parser_error("expected id, got '" + tok.describe() + "'"); - } - - Token key_token = std::move(value_token); - value_token = tok; - get_next_token(); - - for_statement_node = std::make_shared(static_cast(key_token.text), static_cast(value_token.text), current_block, tok.text.data() - tmpl.content.c_str()); - - // Array type - } else { - for_statement_node = std::make_shared(static_cast(value_token.text), current_block, tok.text.data() - tmpl.content.c_str()); - } - - current_block->nodes.emplace_back(for_statement_node); - for_statement_stack.emplace(for_statement_node.get()); - current_block = &for_statement_node->body; - current_expression_list = &for_statement_node->condition; - - if (tok.kind != Token::Kind::Id || tok.text != static_cast("in")) { - throw_parser_error("expected 'in', got '" + tok.describe() + "'"); - } - get_next_token(); - - if (!parse_expression(tmpl, closing)) { - return false; - } - - } else if (tok.text == static_cast("endfor")) { - if (for_statement_stack.empty()) { - throw_parser_error("endfor without matching for"); - } - - auto &for_statement_data = for_statement_stack.top(); - get_next_token(); - - current_block = for_statement_data->parent; - for_statement_stack.pop(); - - } else if (tok.text == static_cast("include")) { - get_next_token(); - - if (tok.kind != Token::Kind::String) { - throw_parser_error("expected string, got '" + tok.describe() + "'"); - } - - // Build the relative path - json json_name = json::parse(tok.text); - std::string pathname = static_cast(path); - pathname += json_name.get_ref(); - if (pathname.compare(0, 2, "./") == 0) { - pathname.erase(0, 2); - } - // sys::path::remove_dots(pathname, true, sys::path::Style::posix); - - if (config.search_included_templates_in_files && template_storage.find(pathname) == template_storage.end()) { - auto include_template = Template(load_file(pathname)); - template_storage.emplace(pathname, include_template); - parse_into_template(template_storage[pathname], pathname); - } - - current_block->nodes.emplace_back(std::make_shared(pathname, tok.text.data() - tmpl.content.c_str())); - - get_next_token(); - - } else if (tok.text == static_cast("set")) { - get_next_token(); - - if (tok.kind != Token::Kind::Id) { - throw_parser_error("expected variable name, got '" + tok.describe() + "'"); - } - - std::string key = static_cast(tok.text); - get_next_token(); - - auto set_statement_node = std::make_shared(key, tok.text.data() - tmpl.content.c_str()); - current_block->nodes.emplace_back(set_statement_node); - current_expression_list = &set_statement_node->expression; - - if (tok.text != static_cast("=")) { - throw_parser_error("expected '=', got '" + tok.describe() + "'"); - } - get_next_token(); - - if (!parse_expression(tmpl, closing)) { - return false; - } - - } else { - return false; - } - return true; - } - - void parse_into(Template &tmpl, nonstd::string_view path) { - lexer.start(tmpl.content); - current_block = &tmpl.root; - - for (;;) { - get_next_token(); - switch (tok.kind) { - case Token::Kind::Eof: { - if (!if_statement_stack.empty()) { - throw_parser_error("unmatched if"); - } - if (!for_statement_stack.empty()) { - throw_parser_error("unmatched for"); - } - } return; - case Token::Kind::Text: { - current_block->nodes.emplace_back(std::make_shared(tok.text.data() - tmpl.content.c_str(), tok.text.size())); - } break; - case Token::Kind::StatementOpen: { - get_next_token(); - if (!parse_statement(tmpl, Token::Kind::StatementClose, path)) { - throw_parser_error("expected statement, got '" + tok.describe() + "'"); - } - if (tok.kind != Token::Kind::StatementClose) { - throw_parser_error("expected statement close, got '" + tok.describe() + "'"); - } - } break; - case Token::Kind::LineStatementOpen: { - get_next_token(); - if (!parse_statement(tmpl, Token::Kind::LineStatementClose, path)) { - throw_parser_error("expected statement, got '" + tok.describe() + "'"); - } - if (tok.kind != Token::Kind::LineStatementClose && tok.kind != Token::Kind::Eof) { - throw_parser_error("expected line statement close, got '" + tok.describe() + "'"); - } - } break; - case Token::Kind::ExpressionOpen: { - get_next_token(); - - auto expression_list_node = std::make_shared(tok.text.data() - tmpl.content.c_str()); - current_block->nodes.emplace_back(expression_list_node); - current_expression_list = expression_list_node.get(); - - if (!parse_expression(tmpl, Token::Kind::ExpressionClose)) { - throw_parser_error("expected expression, got '" + tok.describe() + "'"); - } - - if (tok.kind != Token::Kind::ExpressionClose) { - throw_parser_error("expected expression close, got '" + tok.describe() + "'"); - } - } break; - case Token::Kind::CommentOpen: { - get_next_token(); - if (tok.kind != Token::Kind::CommentClose) { - throw_parser_error("expected comment close, got '" + tok.describe() + "'"); - } - } break; - default: { - throw_parser_error("unexpected token '" + tok.describe() + "'"); - } break; - } - } - } - - -public: - explicit Parser(const ParserConfig &parser_config, const LexerConfig &lexer_config, - TemplateStorage &template_storage, const FunctionStorage &function_storage) - : config(parser_config), lexer(lexer_config), template_storage(template_storage), function_storage(function_storage) { } - - Template parse(nonstd::string_view input, nonstd::string_view path) { - auto result = Template(static_cast(input)); - parse_into(result, path); - return result; - } - - Template parse(nonstd::string_view input) { - return parse(input, "./"); - } - - void parse_into_template(Template& tmpl, nonstd::string_view filename) { - nonstd::string_view path = filename.substr(0, filename.find_last_of("/\\") + 1); - - // StringRef path = sys::path::parent_path(filename); - auto sub_parser = Parser(config, lexer.get_config(), template_storage, function_storage); - sub_parser.parse_into(tmpl, path); - } - - std::string load_file(nonstd::string_view filename) { - std::ifstream file; - open_file_or_throw(static_cast(filename), file); - std::string text((std::istreambuf_iterator(file)), std::istreambuf_iterator()); - return text; - } -}; - -} // namespace inja - -#endif // INCLUDE_INJA_PARSER_HPP_ - -// #include "renderer.hpp" -// Copyright (c) 2020 Pantor. All rights reserved. - -#ifndef INCLUDE_INJA_RENDERER_HPP_ -#define INCLUDE_INJA_RENDERER_HPP_ - -#include -#include -#include -#include -#include - -#include - -// #include "config.hpp" - -// #include "exceptions.hpp" - -// #include "node.hpp" - -// #include "template.hpp" - -// #include "utils.hpp" - - -namespace inja { - -/*! - * \brief Class for rendering a Template with data. - */ -class Renderer : public NodeVisitor { - using Op = FunctionStorage::Operation; - - const RenderConfig config; - const Template *current_template; - const TemplateStorage &template_storage; - const FunctionStorage &function_storage; - - const json *json_input; - std::ostream *output_stream; - - json json_additional_data; - json* current_loop_data = &json_additional_data["loop"]; - - std::vector> json_tmp_stack; - std::stack json_eval_stack; - std::stack not_found_stack; - - bool truthy(const json* data) const { - if (data->is_boolean()) { - return data->get(); - } else if (data->is_number()) { - return (*data != 0); - } else if (data->is_null()) { - return false; - } - return !data->empty(); - } - - void print_json(const std::shared_ptr value) { - if (value->is_string()) { - *output_stream << value->get_ref(); - } else if (value->is_number_integer()) { - *output_stream << value->get(); - } else if (value->is_null()) { - } else { - *output_stream << value->dump(); - } - } - - const std::shared_ptr eval_expression_list(const ExpressionListNode& expression_list) { - for (auto& expression : expression_list.rpn_output) { - expression->accept(*this); - } - - if (json_eval_stack.empty()) { - throw_renderer_error("empty expression", expression_list); - } else if (json_eval_stack.size() != 1) { - throw_renderer_error("malformed expression", expression_list); - } - - auto result = json_eval_stack.top(); - json_eval_stack.pop(); - - if (!result) { - if (not_found_stack.empty()) { - throw_renderer_error("expression could not be evaluated", expression_list); - } - - auto node = not_found_stack.top(); - not_found_stack.pop(); - - throw_renderer_error("variable '" + static_cast(node->name) + "' not found", *node); - } - return std::make_shared(*result); - } - - void throw_renderer_error(const std::string &message, const AstNode& node) { - SourceLocation loc = get_source_location(current_template->content, node.pos); - throw RenderError(message, loc); - } - - template - std::array get_arguments(const AstNode& node) { - if (json_eval_stack.size() < N) { - throw_renderer_error("function needs " + std::to_string(N) + " variables, but has only found " + std::to_string(json_eval_stack.size()), node); - } - - std::array result; - for (size_t i = 0; i < N; i += 1) { - result[N - i - 1] = json_eval_stack.top(); - json_eval_stack.pop(); - - if (!result[N - i - 1]) { - auto json_node = not_found_stack.top(); - not_found_stack.pop(); - - if (throw_not_found) { - throw_renderer_error("variable '" + static_cast(json_node->name) + "' not found", *json_node); - } - } - } - return result; - } - - template - Arguments get_argument_vector(size_t N, const AstNode& node) { - Arguments result {N}; - for (size_t i = 0; i < N; i += 1) { - result[N - i - 1] = json_eval_stack.top(); - json_eval_stack.pop(); - - if (!result[N - i - 1]) { - auto json_node = not_found_stack.top(); - not_found_stack.pop(); - - if (throw_not_found) { - throw_renderer_error("variable '" + static_cast(json_node->name) + "' not found", *json_node); - } - } - } - return result; - } - - void visit(const BlockNode& node) { - for (auto& n : node.nodes) { - n->accept(*this); - } - } - - void visit(const TextNode& node) { - output_stream->write(current_template->content.c_str() + node.pos, node.length); - } - - void visit(const ExpressionNode&) { } - - void visit(const LiteralNode& node) { - json_eval_stack.push(&node.value); - } - - void visit(const JsonNode& node) { - if (json_additional_data.contains(node.ptr)) { - json_eval_stack.push(&(json_additional_data[node.ptr])); - - } else if (json_input->contains(node.ptr)) { - json_eval_stack.push(&(*json_input)[node.ptr]); - - } else { - // Try to evaluate as a no-argument callback - auto function_data = function_storage.find_function(node.name, 0); - if (function_data.operation == FunctionStorage::Operation::Callback) { - Arguments empty_args {}; - auto value = std::make_shared(function_data.callback(empty_args)); - json_tmp_stack.push_back(value); - json_eval_stack.push(value.get()); - - } else { - json_eval_stack.push(nullptr); - not_found_stack.emplace(&node); - } - } - } - - void visit(const FunctionNode& node) { - std::shared_ptr result_ptr; - - switch (node.operation) { - case Op::Not: { - auto args = get_arguments<1>(node); - result_ptr = std::make_shared(!truthy(args[0])); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::And: { - auto args = get_arguments<2>(node); - result_ptr = std::make_shared(truthy(args[0]) && truthy(args[1])); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Or: { - auto args = get_arguments<2>(node); - result_ptr = std::make_shared(truthy(args[0]) || truthy(args[1])); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::In: { - auto args = get_arguments<2>(node); - result_ptr = std::make_shared(std::find(args[1]->begin(), args[1]->end(), *args[0]) != args[1]->end()); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Equal: { - auto args = get_arguments<2>(node); - result_ptr = std::make_shared(*args[0] == *args[1]); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::NotEqual: { - auto args = get_arguments<2>(node); - result_ptr = std::make_shared(*args[0] != *args[1]); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Greater: { - auto args = get_arguments<2>(node); - result_ptr = std::make_shared(*args[0] > *args[1]); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::GreaterEqual: { - auto args = get_arguments<2>(node); - result_ptr = std::make_shared(*args[0] >= *args[1]); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Less: { - auto args = get_arguments<2>(node); - result_ptr = std::make_shared(*args[0] < *args[1]); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::LessEqual: { - auto args = get_arguments<2>(node); - result_ptr = std::make_shared(*args[0] <= *args[1]); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Add: { - auto args = get_arguments<2>(node); - if (args[0]->is_string() && args[1]->is_string()) { - result_ptr = std::make_shared(args[0]->get_ref() + args[1]->get_ref()); - json_tmp_stack.push_back(result_ptr); - } else if (args[0]->is_number_integer() && args[1]->is_number_integer()) { - result_ptr = std::make_shared(args[0]->get() + args[1]->get()); - json_tmp_stack.push_back(result_ptr); - } else { - result_ptr = std::make_shared(args[0]->get() + args[1]->get()); - json_tmp_stack.push_back(result_ptr); - } - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Subtract: { - auto args = get_arguments<2>(node); - if (args[0]->is_number_integer() && args[1]->is_number_integer()) { - result_ptr = std::make_shared(args[0]->get() - args[1]->get()); - json_tmp_stack.push_back(result_ptr); - } else { - result_ptr = std::make_shared(args[0]->get() - args[1]->get()); - json_tmp_stack.push_back(result_ptr); - } - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Multiplication: { - auto args = get_arguments<2>(node); - if (args[0]->is_number_integer() && args[1]->is_number_integer()) { - result_ptr = std::make_shared(args[0]->get() * args[1]->get()); - json_tmp_stack.push_back(result_ptr); - } else { - result_ptr = std::make_shared(args[0]->get() * args[1]->get()); - json_tmp_stack.push_back(result_ptr); - } - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Division: { - auto args = get_arguments<2>(node); - if (args[1]->get() == 0) { - throw_renderer_error("division by zero", node); - } - result_ptr = std::make_shared(args[0]->get() / args[1]->get()); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Power: { - auto args = get_arguments<2>(node); - if (args[0]->is_number_integer() && args[1]->get() >= 0) { - int result = std::pow(args[0]->get(), args[1]->get()); - result_ptr = std::make_shared(std::move(result)); - json_tmp_stack.push_back(result_ptr); - } else { - double result = std::pow(args[0]->get(), args[1]->get()); - result_ptr = std::make_shared(std::move(result)); - json_tmp_stack.push_back(result_ptr); - } - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Modulo: { - auto args = get_arguments<2>(node); - result_ptr = std::make_shared(args[0]->get() % args[1]->get()); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::AtId: { - json_eval_stack.pop(); // Pop id nullptr - auto container = get_arguments<1, false>(node)[0]; - if (not_found_stack.empty()) { - throw_renderer_error("could not find element with given name", node); - } - auto id_node = not_found_stack.top(); - not_found_stack.pop(); - json_eval_stack.push(&container->at(id_node->name)); - } break; - case Op::At: { - auto args = get_arguments<2>(node); - json_eval_stack.push(&args[0]->at(args[1]->get())); - } break; - case Op::Default: { - auto default_arg = get_arguments<1>(node)[0]; - auto test_arg = get_arguments<1, false>(node)[0]; - json_eval_stack.push(test_arg ? test_arg : default_arg); - } break; - case Op::DivisibleBy: { - auto args = get_arguments<2>(node); - int divisor = args[1]->get(); - result_ptr = std::make_shared((divisor != 0) && (args[0]->get() % divisor == 0)); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Even: { - result_ptr = std::make_shared(get_arguments<1>(node)[0]->get() % 2 == 0); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Exists: { - auto &&name = get_arguments<1>(node)[0]->get_ref(); - result_ptr = std::make_shared(json_input->contains(json::json_pointer(JsonNode::convert_dot_to_json_ptr(name)))); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::ExistsInObject: { - auto args = get_arguments<2>(node); - auto &&name = args[1]->get_ref(); - result_ptr = std::make_shared(args[0]->find(name) != args[0]->end()); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::First: { - auto result = &get_arguments<1>(node)[0]->front(); - json_eval_stack.push(result); - } break; - case Op::Float: { - result_ptr = std::make_shared(std::stod(get_arguments<1>(node)[0]->get_ref())); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Int: { - result_ptr = std::make_shared(std::stoi(get_arguments<1>(node)[0]->get_ref())); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Last: { - auto result = &get_arguments<1>(node)[0]->back(); - json_eval_stack.push(result); - } break; - case Op::Length: { - auto val = get_arguments<1>(node)[0]; - if (val->is_string()) { - result_ptr = std::make_shared(val->get_ref().length()); - } else { - result_ptr = std::make_shared(val->size()); - } - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Lower: { - std::string result = get_arguments<1>(node)[0]->get(); - std::transform(result.begin(), result.end(), result.begin(), ::tolower); - result_ptr = std::make_shared(std::move(result)); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Max: { - auto args = get_arguments<1>(node); - auto result = std::max_element(args[0]->begin(), args[0]->end()); - json_eval_stack.push(&(*result)); - } break; - case Op::Min: { - auto args = get_arguments<1>(node); - auto result = std::min_element(args[0]->begin(), args[0]->end()); - json_eval_stack.push(&(*result)); - } break; - case Op::Odd: { - result_ptr = std::make_shared(get_arguments<1>(node)[0]->get() % 2 != 0); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Range: { - std::vector result(get_arguments<1>(node)[0]->get()); - std::iota(result.begin(), result.end(), 0); - result_ptr = std::make_shared(std::move(result)); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Round: { - auto args = get_arguments<2>(node); - int precision = args[1]->get(); - double result = std::round(args[0]->get() * std::pow(10.0, precision)) / std::pow(10.0, precision); - result_ptr = std::make_shared(std::move(result)); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Sort: { - result_ptr = std::make_shared(get_arguments<1>(node)[0]->get>()); - std::sort(result_ptr->begin(), result_ptr->end()); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Upper: { - std::string result = get_arguments<1>(node)[0]->get(); - std::transform(result.begin(), result.end(), result.begin(), ::toupper); - result_ptr = std::make_shared(std::move(result)); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::IsBoolean: { - result_ptr = std::make_shared(get_arguments<1>(node)[0]->is_boolean()); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::IsNumber: { - result_ptr = std::make_shared(get_arguments<1>(node)[0]->is_number()); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::IsInteger: { - result_ptr = std::make_shared(get_arguments<1>(node)[0]->is_number_integer()); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::IsFloat: { - result_ptr = std::make_shared(get_arguments<1>(node)[0]->is_number_float()); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::IsObject: { - result_ptr = std::make_shared(get_arguments<1>(node)[0]->is_object()); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::IsArray: { - result_ptr = std::make_shared(get_arguments<1>(node)[0]->is_array()); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::IsString: { - result_ptr = std::make_shared(get_arguments<1>(node)[0]->is_string()); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::Callback: { - auto args = get_argument_vector(node.number_args, node); - result_ptr = std::make_shared(node.callback(args)); - json_tmp_stack.push_back(result_ptr); - json_eval_stack.push(result_ptr.get()); - } break; - case Op::ParenLeft: - case Op::ParenRight: - case Op::None: - break; - } - } - - void visit(const ExpressionListNode& node) { - print_json(eval_expression_list(node)); - } - - void visit(const StatementNode&) { } - - void visit(const ForStatementNode&) { } - - void visit(const ForArrayStatementNode& node) { - auto result = eval_expression_list(node.condition); - if (!result->is_array()) { - throw_renderer_error("object must be an array", node); - } - - if (!current_loop_data->empty()) { - auto tmp = *current_loop_data; // Because of clang-3 - (*current_loop_data)["parent"] = std::move(tmp); - } - - size_t index = 0; - (*current_loop_data)["is_first"] = true; - (*current_loop_data)["is_last"] = (result->size() <= 1); - for (auto it = result->begin(); it != result->end(); ++it) { - json_additional_data[static_cast(node.value)] = *it; - - (*current_loop_data)["index"] = index; - (*current_loop_data)["index1"] = index + 1; - if (index == 1) { - (*current_loop_data)["is_first"] = false; - } - if (index == result->size() - 1) { - (*current_loop_data)["is_last"] = true; - } - - node.body.accept(*this); - ++index; - } - - json_additional_data[static_cast(node.value)].clear(); - if (!(*current_loop_data)["parent"].empty()) { - auto tmp = (*current_loop_data)["parent"]; - *current_loop_data = std::move(tmp); - } else { - current_loop_data = &json_additional_data["loop"]; - } - } - - void visit(const ForObjectStatementNode& node) { - auto result = eval_expression_list(node.condition); - if (!result->is_object()) { - throw_renderer_error("object must be an object", node); - } - - if (!current_loop_data->empty()) { - (*current_loop_data)["parent"] = std::move(*current_loop_data); - } - - size_t index = 0; - (*current_loop_data)["is_first"] = true; - (*current_loop_data)["is_last"] = (result->size() <= 1); - for (auto it = result->begin(); it != result->end(); ++it) { - json_additional_data[static_cast(node.key)] = it.key(); - json_additional_data[static_cast(node.value)] = it.value(); - - (*current_loop_data)["index"] = index; - (*current_loop_data)["index1"] = index + 1; - if (index == 1) { - (*current_loop_data)["is_first"] = false; - } - if (index == result->size() - 1) { - (*current_loop_data)["is_last"] = true; - } - - node.body.accept(*this); - ++index; - } - - json_additional_data[static_cast(node.key)].clear(); - json_additional_data[static_cast(node.value)].clear(); - if (!(*current_loop_data)["parent"].empty()) { - *current_loop_data = std::move((*current_loop_data)["parent"]); - } else { - current_loop_data = &json_additional_data["loop"]; - } - } - - void visit(const IfStatementNode& node) { - auto result = eval_expression_list(node.condition); - if (truthy(result.get())) { - node.true_statement.accept(*this); - } else if (node.has_false_statement) { - node.false_statement.accept(*this); - } - } - - void visit(const IncludeStatementNode& node) { - auto sub_renderer = Renderer(config, template_storage, function_storage); - auto included_template_it = template_storage.find(node.file); - - if (included_template_it != template_storage.end()) { - sub_renderer.render_to(*output_stream, included_template_it->second, *json_input, &json_additional_data); - } else if (config.throw_at_missing_includes) { - throw_renderer_error("include '" + node.file + "' not found", node); - } - } - - void visit(const SetStatementNode& node) { - json_additional_data[node.key] = *eval_expression_list(node.expression); - } - -public: - Renderer(const RenderConfig& config, const TemplateStorage &template_storage, const FunctionStorage &function_storage) - : config(config), template_storage(template_storage), function_storage(function_storage) { } - - void render_to(std::ostream &os, const Template &tmpl, const json &data, json *loop_data = nullptr) { - output_stream = &os; - current_template = &tmpl; - json_input = &data; - if (loop_data) { - json_additional_data = *loop_data; - current_loop_data = &json_additional_data["loop"]; - } - - current_template->root.accept(*this); - - json_tmp_stack.clear(); - } -}; - -} // namespace inja - -#endif // INCLUDE_INJA_RENDERER_HPP_ - -// #include "string_view.hpp" - -// #include "template.hpp" - -// #include "utils.hpp" - - -namespace inja { - -using json = nlohmann::json; - -/*! - * \brief Class for changing the configuration. - */ -class Environment { - std::string input_path; - std::string output_path; - - LexerConfig lexer_config; - ParserConfig parser_config; - RenderConfig render_config; - - FunctionStorage function_storage; - TemplateStorage template_storage; - -public: - Environment() : Environment("") {} - - explicit Environment(const std::string &global_path) : input_path(global_path), output_path(global_path) {} - - Environment(const std::string &input_path, const std::string &output_path) - : input_path(input_path), output_path(output_path) {} - - /// Sets the opener and closer for template statements - void set_statement(const std::string &open, const std::string &close) { - lexer_config.statement_open = open; - lexer_config.statement_open_no_lstrip = open + "+"; - lexer_config.statement_open_force_lstrip = open + "-"; - lexer_config.statement_close = close; - lexer_config.statement_close_force_rstrip = "-" + close; - lexer_config.update_open_chars(); - } - - /// Sets the opener for template line statements - void set_line_statement(const std::string &open) { - lexer_config.line_statement = open; - lexer_config.update_open_chars(); - } - - /// Sets the opener and closer for template expressions - void set_expression(const std::string &open, const std::string &close) { - lexer_config.expression_open = open; - lexer_config.expression_open_force_lstrip = open + "-"; - lexer_config.expression_close = close; - lexer_config.expression_close_force_rstrip = "-" + close; - lexer_config.update_open_chars(); - } - - /// Sets the opener and closer for template comments - void set_comment(const std::string &open, const std::string &close) { - lexer_config.comment_open = open; - lexer_config.comment_close = close; - lexer_config.update_open_chars(); - } - - /// Sets whether to remove the first newline after a block - void set_trim_blocks(bool trim_blocks) { - lexer_config.trim_blocks = trim_blocks; - } - - /// Sets whether to strip the spaces and tabs from the start of a line to a block - void set_lstrip_blocks(bool lstrip_blocks) { - lexer_config.lstrip_blocks = lstrip_blocks; - } - - /// Sets the element notation syntax - void set_search_included_templates_in_files(bool search_in_files) { - parser_config.search_included_templates_in_files = search_in_files; - } - - /// Sets whether a missing include will throw an error - void set_throw_at_missing_includes(bool will_throw) { - render_config.throw_at_missing_includes = will_throw; - } - - Template parse(nonstd::string_view input) { - Parser parser(parser_config, lexer_config, template_storage, function_storage); - return parser.parse(input); - } - - Template parse_template(const std::string &filename) { - Parser parser(parser_config, lexer_config, template_storage, function_storage); - auto result = Template(parser.load_file(input_path + static_cast(filename))); - parser.parse_into_template(result, input_path + static_cast(filename)); - return result; - } - - Template parse_file(const std::string &filename) { - return parse_template(filename); - } - - std::string render(nonstd::string_view input, const json &data) { return render(parse(input), data); } - - std::string render(const Template &tmpl, const json &data) { - std::stringstream os; - render_to(os, tmpl, data); - return os.str(); - } - - std::string render_file(const std::string &filename, const json &data) { - return render(parse_template(filename), data); - } - - std::string render_file_with_json_file(const std::string &filename, const std::string &filename_data) { - const json data = load_json(filename_data); - return render_file(filename, data); - } - - void write(const std::string &filename, const json &data, const std::string &filename_out) { - std::ofstream file(output_path + filename_out); - file << render_file(filename, data); - file.close(); - } - - void write(const Template &temp, const json &data, const std::string &filename_out) { - std::ofstream file(output_path + filename_out); - file << render(temp, data); - file.close(); - } - - void write_with_json_file(const std::string &filename, const std::string &filename_data, - const std::string &filename_out) { - const json data = load_json(filename_data); - write(filename, data, filename_out); - } - - void write_with_json_file(const Template &temp, const std::string &filename_data, const std::string &filename_out) { - const json data = load_json(filename_data); - write(temp, data, filename_out); - } - - std::ostream &render_to(std::ostream &os, const Template &tmpl, const json &data) { - Renderer(render_config, template_storage, function_storage).render_to(os, tmpl, data); - return os; - } - - std::string load_file(const std::string &filename) { - Parser parser(parser_config, lexer_config, template_storage, function_storage); - return parser.load_file(input_path + filename); - } - - json load_json(const std::string &filename) { - std::ifstream file; - open_file_or_throw(input_path + filename, file); - json j; - file >> j; - return j; - } - - /*! - @brief Adds a variadic callback - */ - void add_callback(const std::string &name, const CallbackFunction &callback) { - add_callback(name, -1, callback); - } - - /*! - @brief Adds a variadic void callback - */ - void add_void_callback(const std::string &name, const VoidCallbackFunction &callback) { - add_void_callback(name, -1, callback); - } - - /*! - @brief Adds a callback with given number or arguments - */ - void add_callback(const std::string &name, int num_args, const CallbackFunction &callback) { - function_storage.add_callback(name, num_args, callback); - } - - /*! - @brief Adds a void callback with given number or arguments - */ - void add_void_callback(const std::string &name, int num_args, const VoidCallbackFunction &callback) { - function_storage.add_callback(name, num_args, [callback](Arguments& args) { callback(args); return json(); }); - } - - /** Includes a template with a given name into the environment. - * Then, a template can be rendered in another template using the - * include "" syntax. - */ - void include_template(const std::string &name, const Template &tmpl) { - template_storage[name] = tmpl; - } -}; - -/*! -@brief render with default settings to a string -*/ -inline std::string render(nonstd::string_view input, const json &data) { - return Environment().render(input, data); -} - -/*! -@brief render with default settings to the given output stream -*/ -inline void render_to(std::ostream &os, nonstd::string_view input, const json &data) { - Environment env; - env.render_to(os, env.parse(input), data); -} - -} // namespace inja - -#endif // INCLUDE_INJA_ENVIRONMENT_HPP_ - -// #include "exceptions.hpp" - -// #include "parser.hpp" - -// #include "renderer.hpp" - -// #include "string_view.hpp" - -// #include "template.hpp" - +#include "environment.hpp" +#include "exceptions.hpp" +#include "parser.hpp" +#include "renderer.hpp" +#include "string_view.hpp" +#include "template.hpp" #endif // INCLUDE_INJA_INJA_HPP_ diff --git a/tools/jsonproc/jsonproc.cpp b/tools/jsonproc/jsonproc.cpp index 48905da4e..e7cdf2a62 100644 --- a/tools/jsonproc/jsonproc.cpp +++ b/tools/jsonproc/jsonproc.cpp @@ -8,7 +8,7 @@ #include using std::string; using std::to_string; -#include +#include "inja.hpp" using namespace inja; using json = nlohmann::json; @@ -132,6 +132,41 @@ int main(int argc, char *argv[]) std::cout << args.at(0)->get() << std::endl; }); + env.add_callback("fmtInt", 3, [](Arguments& args) { + int num = args.at(0)->get(); + int ndigits = args.at(1)->get(); + int format = args.at(2)->get(); + char buf[ndigits + 1]; + bool printing_zeros = (format == 2); + int pow10 = 1; + for (int i = 1; i < ndigits; i++) { + pow10 *= 10; + } + char *ptr = buf; + while (pow10 > 0) { + div_t div_result = div(num, pow10); + num = div_result.rem; + pow10 /= 10; + if (div_result.quot != 0) { + printing_zeros = true; + } else if (!printing_zeros) { + if (pow10 == 0) { + printing_zeros = true; + } else { + if (format == 1) { + *ptr++ = ' '; + } + continue; + } + } + if (div_result.quot != 0 || printing_zeros) { + *ptr++ = '0' + div_result.quot; + } + } + *ptr = 0; + return string{buf}; + }); + try { env.write_with_json_file(templateFilepath, jsonfilepath, outputFilepath); diff --git a/tools/jsonproc/lexer.hpp b/tools/jsonproc/lexer.hpp new file mode 100644 index 000000000..58768e416 --- /dev/null +++ b/tools/jsonproc/lexer.hpp @@ -0,0 +1,434 @@ +#ifndef INCLUDE_INJA_LEXER_HPP_ +#define INCLUDE_INJA_LEXER_HPP_ + +#include +#include + +#include "config.hpp" +#include "token.hpp" +#include "utils.hpp" + +namespace inja { + +/*! + * \brief Class for lexing an inja Template. + */ +class Lexer { + enum class State { + Text, + ExpressionStart, + ExpressionStartForceLstrip, + ExpressionBody, + LineStart, + LineBody, + StatementStart, + StatementStartNoLstrip, + StatementStartForceLstrip, + StatementBody, + CommentStart, + CommentStartForceLstrip, + CommentBody, + }; + + enum class MinusState { + Operator, + Number, + }; + + const LexerConfig &config; + + State state; + MinusState minus_state; + nonstd::string_view m_in; + size_t tok_start; + size_t pos; + + + Token scan_body(nonstd::string_view close, Token::Kind closeKind, nonstd::string_view close_trim = nonstd::string_view(), bool trim = false) { + again: + // skip whitespace (except for \n as it might be a close) + if (tok_start >= m_in.size()) { + return make_token(Token::Kind::Eof); + } + const char ch = m_in[tok_start]; + if (ch == ' ' || ch == '\t' || ch == '\r') { + tok_start += 1; + goto again; + } + + // check for close + if (!close_trim.empty() && inja::string_view::starts_with(m_in.substr(tok_start), close_trim)) { + state = State::Text; + pos = tok_start + close_trim.size(); + const Token tok = make_token(closeKind); + skip_whitespaces_and_newlines(); + return tok; + } + + if (inja::string_view::starts_with(m_in.substr(tok_start), close)) { + state = State::Text; + pos = tok_start + close.size(); + const Token tok = make_token(closeKind); + if (trim) { + skip_whitespaces_and_first_newline(); + } + return tok; + } + + // skip \n + if (ch == '\n') { + tok_start += 1; + goto again; + } + + pos = tok_start + 1; + if (std::isalpha(ch)) { + minus_state = MinusState::Operator; + return scan_id(); + } + + const MinusState current_minus_state = minus_state; + if (minus_state == MinusState::Operator) { + minus_state = MinusState::Number; + } + + switch (ch) { + case '+': + return make_token(Token::Kind::Plus); + case '-': + if (current_minus_state == MinusState::Operator) { + return make_token(Token::Kind::Minus); + } + return scan_number(); + case '*': + return make_token(Token::Kind::Times); + case '/': + return make_token(Token::Kind::Slash); + case '^': + return make_token(Token::Kind::Power); + case '%': + return make_token(Token::Kind::Percent); + case '.': + return make_token(Token::Kind::Dot); + case ',': + return make_token(Token::Kind::Comma); + case ':': + return make_token(Token::Kind::Colon); + case '(': + return make_token(Token::Kind::LeftParen); + case ')': + minus_state = MinusState::Operator; + return make_token(Token::Kind::RightParen); + case '[': + return make_token(Token::Kind::LeftBracket); + case ']': + minus_state = MinusState::Operator; + return make_token(Token::Kind::RightBracket); + case '{': + return make_token(Token::Kind::LeftBrace); + case '}': + minus_state = MinusState::Operator; + return make_token(Token::Kind::RightBrace); + case '>': + if (pos < m_in.size() && m_in[pos] == '=') { + pos += 1; + return make_token(Token::Kind::GreaterEqual); + } + return make_token(Token::Kind::GreaterThan); + case '<': + if (pos < m_in.size() && m_in[pos] == '=') { + pos += 1; + return make_token(Token::Kind::LessEqual); + } + return make_token(Token::Kind::LessThan); + case '=': + if (pos < m_in.size() && m_in[pos] == '=') { + pos += 1; + return make_token(Token::Kind::Equal); + } + return make_token(Token::Kind::Unknown); + case '!': + if (pos < m_in.size() && m_in[pos] == '=') { + pos += 1; + return make_token(Token::Kind::NotEqual); + } + return make_token(Token::Kind::Unknown); + case '\"': + return scan_string(); + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + minus_state = MinusState::Operator; + return scan_number(); + case '_': + case '@': + case '$': + minus_state = MinusState::Operator; + return scan_id(); + default: + return make_token(Token::Kind::Unknown); + } + } + + Token scan_id() { + for (;;) { + if (pos >= m_in.size()) { + break; + } + const char ch = m_in[pos]; + if (!std::isalnum(ch) && ch != '.' && ch != '/' && ch != '_' && ch != '-') { + break; + } + pos += 1; + } + return make_token(Token::Kind::Id); + } + + Token scan_number() { + for (;;) { + if (pos >= m_in.size()) { + break; + } + const char ch = m_in[pos]; + // be very permissive in lexer (we'll catch errors when conversion happens) + if (!std::isdigit(ch) && ch != '.' && ch != 'e' && ch != 'E' && ch != '+' && ch != '-') { + break; + } + pos += 1; + } + return make_token(Token::Kind::Number); + } + + Token scan_string() { + bool escape {false}; + for (;;) { + if (pos >= m_in.size()) { + break; + } + const char ch = m_in[pos++]; + if (ch == '\\') { + escape = true; + } else if (!escape && ch == m_in[tok_start]) { + break; + } else { + escape = false; + } + } + return make_token(Token::Kind::String); + } + + Token make_token(Token::Kind kind) const { return Token(kind, string_view::slice(m_in, tok_start, pos)); } + + void skip_whitespaces_and_newlines() { + if (pos < m_in.size()) { + while (pos < m_in.size() && (m_in[pos] == ' ' || m_in[pos] == '\t' || m_in[pos] == '\n' || m_in[pos] == '\r')) { + pos += 1; + } + } + } + + void skip_whitespaces_and_first_newline() { + if (pos < m_in.size()) { + while (pos < m_in.size() && (m_in[pos] == ' ' || m_in[pos] == '\t')) { + pos += 1; + } + } + + if (pos < m_in.size()) { + const char ch = m_in[pos]; + if (ch == '\n') { + pos += 1; + } else if (ch == '\r') { + pos += 1; + if (pos < m_in.size() && m_in[pos] == '\n') { + pos += 1; + } + } + } + } + + static nonstd::string_view clear_final_line_if_whitespace(nonstd::string_view text) { + nonstd::string_view result = text; + while (!result.empty()) { + const char ch = result.back(); + if (ch == ' ' || ch == '\t') { + result.remove_suffix(1); + } else if (ch == '\n' || ch == '\r') { + break; + } else { + return text; + } + } + return result; + } + +public: + explicit Lexer(const LexerConfig &config) : config(config), state(State::Text), minus_state(MinusState::Number) {} + + SourceLocation current_position() const { + return get_source_location(m_in, tok_start); + } + + void start(nonstd::string_view input) { + m_in = input; + tok_start = 0; + pos = 0; + state = State::Text; + minus_state = MinusState::Number; + + // Consume byte order mark (BOM) for UTF-8 + if (inja::string_view::starts_with(m_in, "\xEF\xBB\xBF")) { + m_in = m_in.substr(3); + } + } + + Token scan() { + tok_start = pos; + + again: + if (tok_start >= m_in.size()) { + return make_token(Token::Kind::Eof); + } + + switch (state) { + default: + case State::Text: { + // fast-scan to first open character + const size_t open_start = m_in.substr(pos).find_first_of(config.open_chars); + if (open_start == nonstd::string_view::npos) { + // didn't find open, return remaining text as text token + pos = m_in.size(); + return make_token(Token::Kind::Text); + } + pos += open_start; + + // try to match one of the opening sequences, and get the close + nonstd::string_view open_str = m_in.substr(pos); + bool must_lstrip = false; + if (inja::string_view::starts_with(open_str, config.expression_open)) { + if (inja::string_view::starts_with(open_str, config.expression_open_force_lstrip)) { + state = State::ExpressionStartForceLstrip; + must_lstrip = true; + } else { + state = State::ExpressionStart; + } + } else if (inja::string_view::starts_with(open_str, config.statement_open)) { + if (inja::string_view::starts_with(open_str, config.statement_open_no_lstrip)) { + state = State::StatementStartNoLstrip; + } else if (inja::string_view::starts_with(open_str, config.statement_open_force_lstrip )) { + state = State::StatementStartForceLstrip; + must_lstrip = true; + } else { + state = State::StatementStart; + must_lstrip = config.lstrip_blocks; + } + } else if (inja::string_view::starts_with(open_str, config.comment_open)) { + if (inja::string_view::starts_with(open_str, config.comment_open_force_lstrip)) { + state = State::CommentStartForceLstrip; + must_lstrip = true; + } else { + state = State::CommentStart; + must_lstrip = config.lstrip_blocks; + } + } else if ((pos == 0 || m_in[pos - 1] == '\n') && inja::string_view::starts_with(open_str, config.line_statement)) { + state = State::LineStart; + } else { + pos += 1; // wasn't actually an opening sequence + goto again; + } + + nonstd::string_view text = string_view::slice(m_in, tok_start, pos); + if (must_lstrip) { + text = clear_final_line_if_whitespace(text); + } + + if (text.empty()) { + goto again; // don't generate empty token + } + return Token(Token::Kind::Text, text); + } + case State::ExpressionStart: { + state = State::ExpressionBody; + pos += config.expression_open.size(); + return make_token(Token::Kind::ExpressionOpen); + } + case State::ExpressionStartForceLstrip: { + state = State::ExpressionBody; + pos += config.expression_open_force_lstrip.size(); + return make_token(Token::Kind::ExpressionOpen); + } + case State::LineStart: { + state = State::LineBody; + pos += config.line_statement.size(); + return make_token(Token::Kind::LineStatementOpen); + } + case State::StatementStart: { + state = State::StatementBody; + pos += config.statement_open.size(); + return make_token(Token::Kind::StatementOpen); + } + case State::StatementStartNoLstrip: { + state = State::StatementBody; + pos += config.statement_open_no_lstrip.size(); + return make_token(Token::Kind::StatementOpen); + } + case State::StatementStartForceLstrip: { + state = State::StatementBody; + pos += config.statement_open_force_lstrip.size(); + return make_token(Token::Kind::StatementOpen); + } + case State::CommentStart: { + state = State::CommentBody; + pos += config.comment_open.size(); + return make_token(Token::Kind::CommentOpen); + } + case State::CommentStartForceLstrip: { + state = State::CommentBody; + pos += config.comment_open_force_lstrip.size(); + return make_token(Token::Kind::CommentOpen); + } + case State::ExpressionBody: + return scan_body(config.expression_close, Token::Kind::ExpressionClose, config.expression_close_force_rstrip); + case State::LineBody: + return scan_body("\n", Token::Kind::LineStatementClose); + case State::StatementBody: + return scan_body(config.statement_close, Token::Kind::StatementClose, config.statement_close_force_rstrip, config.trim_blocks); + case State::CommentBody: { + // fast-scan to comment close + const size_t end = m_in.substr(pos).find(config.comment_close); + if (end == nonstd::string_view::npos) { + pos = m_in.size(); + return make_token(Token::Kind::Eof); + } + + // Check for trim pattern + const bool must_rstrip = inja::string_view::starts_with(m_in.substr(pos + end - 1), config.comment_close_force_rstrip); + + // return the entire comment in the close token + state = State::Text; + pos += end + config.comment_close.size(); + Token tok = make_token(Token::Kind::CommentClose); + + if (must_rstrip || config.trim_blocks) { + skip_whitespaces_and_first_newline(); + } + return tok; + } + } + } + + const LexerConfig &get_config() const { + return config; + } +}; + +} // namespace inja + +#endif // INCLUDE_INJA_LEXER_HPP_ diff --git a/tools/jsonproc/nlohmann/LICENSE.MIT b/tools/jsonproc/nlohmann/LICENSE.MIT new file mode 100644 index 000000000..00599afe6 --- /dev/null +++ b/tools/jsonproc/nlohmann/LICENSE.MIT @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2013-2017 Niels Lohmann + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/tools/jsonproc/nlohmann/json.hpp b/tools/jsonproc/nlohmann/json.hpp index cc822a543..cb27e0581 100644 --- a/tools/jsonproc/nlohmann/json.hpp +++ b/tools/jsonproc/nlohmann/json.hpp @@ -1,12 +1,12 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ -| | |__ | | | | | | version 3.8.0 +| | |__ | | | | | | version 3.10.5 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . SPDX-License-Identifier: MIT -Copyright (c) 2013-2019 Niels Lohmann . +Copyright (c) 2013-2022 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -27,19 +27,29 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/****************************************************************************\ + * Note on documentation: The source files contain links to the online * + * documentation of the public API at https://json.nlohmann.me. This URL * + * contains the most recent documentation and should also be applicable to * + * previous versions; documentation for deprecated functions is not * + * removed, but marked deprecated. See "Generate documentation" section in * + * file doc/README.md. * +\****************************************************************************/ + #ifndef INCLUDE_NLOHMANN_JSON_HPP_ #define INCLUDE_NLOHMANN_JSON_HPP_ #define NLOHMANN_JSON_VERSION_MAJOR 3 -#define NLOHMANN_JSON_VERSION_MINOR 8 -#define NLOHMANN_JSON_VERSION_PATCH 0 +#define NLOHMANN_JSON_VERSION_MINOR 10 +#define NLOHMANN_JSON_VERSION_PATCH 5 #include // all_of, find, for_each -#include // assert #include // nullptr_t, ptrdiff_t, size_t #include // hash, less #include // initializer_list -#include // istream, ostream +#ifndef JSON_NO_IO + #include // istream, ostream +#endif // JSON_NO_IO #include // random_access_iterator_tag #include // unique_ptr #include // accumulate @@ -50,6 +60,7 @@ SOFTWARE. // #include +#include #include // #include @@ -67,57 +78,108 @@ SOFTWARE. #include // pair, declval #include // valarray -// #include - - -// Header is removed in C++20. -// See for more information. - -#if __cplusplus <= 201703L - #include // and, not, or -#endif - // #include #include // exception #include // runtime_error #include // to_string +#include // vector -// #include +// #include +#include // array #include // size_t +#include // uint8_t +#include // string namespace nlohmann { namespace detail { -/// struct to capture the start position of the current token -struct position_t -{ - /// the total number of characters read - std::size_t chars_read_total = 0; - /// the number of characters read in the current line - std::size_t chars_read_current_line = 0; - /// the number of lines read - std::size_t lines_read = 0; +/////////////////////////// +// JSON type enumeration // +/////////////////////////// - /// conversion to size_t to preserve SAX interface - constexpr operator size_t() const - { - return chars_read_total; - } +/*! +@brief the JSON type enumeration + +This enumeration collects the different JSON types. It is internally used to +distinguish the stored values, and the functions @ref basic_json::is_null(), +@ref basic_json::is_object(), @ref basic_json::is_array(), +@ref basic_json::is_string(), @ref basic_json::is_boolean(), +@ref basic_json::is_number() (with @ref basic_json::is_number_integer(), +@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()), +@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and +@ref basic_json::is_structured() rely on it. + +@note There are three enumeration entries (number_integer, number_unsigned, and +number_float), because the library distinguishes these three types for numbers: +@ref basic_json::number_unsigned_t is used for unsigned integers, +@ref basic_json::number_integer_t is used for signed integers, and +@ref basic_json::number_float_t is used for floating-point numbers or to +approximate integers which do not fit in the limits of their respective type. + +@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON +value with the default value for a given type + +@since version 1.0.0 +*/ +enum class value_t : std::uint8_t +{ + null, ///< null value + object, ///< object (unordered set of name/value pairs) + array, ///< array (ordered collection of values) + string, ///< string value + boolean, ///< boolean value + number_integer, ///< number value (signed integer) + number_unsigned, ///< number value (unsigned integer) + number_float, ///< number value (floating-point) + binary, ///< binary array (ordered collection of bytes) + discarded ///< discarded by the parser callback function }; -} // namespace detail -} // namespace nlohmann +/*! +@brief comparison operator for JSON types +Returns an ordering that is similar to Python: +- order: null < boolean < number < object < array < string < binary +- furthermore, each type is not smaller than itself +- discarded values are not comparable +- binary is represented as a b"" string in python and directly comparable to a + string; however, making a binary array directly comparable with a string would + be surprising behavior in a JSON file. + +@since version 1.0.0 +*/ +inline bool operator<(const value_t lhs, const value_t rhs) noexcept +{ + static constexpr std::array order = {{ + 0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */, + 1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */, + 6 /* binary */ + } + }; + + const auto l_index = static_cast(lhs); + const auto r_index = static_cast(rhs); + return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index]; +} +} // namespace detail +} // namespace nlohmann + +// #include + + +#include // #include -#include // pair +#include // declval, pair // #include + + /* Hedley - https://nemequ.github.io/hedley * Created by Evan Nemerson * @@ -130,11 +192,11 @@ struct position_t * SPDX-License-Identifier: CC0-1.0 */ -#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 13) +#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15) #if defined(JSON_HEDLEY_VERSION) #undef JSON_HEDLEY_VERSION #endif -#define JSON_HEDLEY_VERSION 13 +#define JSON_HEDLEY_VERSION 15 #if defined(JSON_HEDLEY_STRINGIFY_EX) #undef JSON_HEDLEY_STRINGIFY_EX @@ -207,18 +269,18 @@ struct position_t #if defined(JSON_HEDLEY_MSVC_VERSION) #undef JSON_HEDLEY_MSVC_VERSION #endif -#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) +#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL) #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100) -#elif defined(_MSC_FULL_VER) +#elif defined(_MSC_FULL_VER) && !defined(__ICL) #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10) -#elif defined(_MSC_VER) +#elif defined(_MSC_VER) && !defined(__ICL) #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0) #endif #if defined(JSON_HEDLEY_MSVC_VERSION_CHECK) #undef JSON_HEDLEY_MSVC_VERSION_CHECK #endif -#if !defined(_MSC_VER) +#if !defined(JSON_HEDLEY_MSVC_VERSION) #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0) #elif defined(_MSC_VER) && (_MSC_VER >= 1400) #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch))) @@ -231,9 +293,9 @@ struct position_t #if defined(JSON_HEDLEY_INTEL_VERSION) #undef JSON_HEDLEY_INTEL_VERSION #endif -#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) +#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL) #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE) -#elif defined(__INTEL_COMPILER) +#elif defined(__INTEL_COMPILER) && !defined(__ICL) #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0) #endif @@ -246,6 +308,22 @@ struct position_t #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0) #endif +#if defined(JSON_HEDLEY_INTEL_CL_VERSION) + #undef JSON_HEDLEY_INTEL_CL_VERSION +#endif +#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL) + #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0) +#endif + +#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK) + #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_INTEL_CL_VERSION) + #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0) +#endif + #if defined(JSON_HEDLEY_PGI_VERSION) #undef JSON_HEDLEY_PGI_VERSION #endif @@ -485,7 +563,7 @@ struct position_t #if __VER__ > 1000 #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000)) #else - #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(VER / 100, __VER__ % 100, 0) + #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0) #endif #endif @@ -562,6 +640,22 @@ struct position_t #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0) #endif +#if defined(JSON_HEDLEY_MCST_LCC_VERSION) + #undef JSON_HEDLEY_MCST_LCC_VERSION +#endif +#if defined(__LCC__) && defined(__LCC_MINOR__) + #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__) +#endif + +#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK) + #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_MCST_LCC_VERSION) + #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0) +#endif + #if defined(JSON_HEDLEY_GCC_VERSION) #undef JSON_HEDLEY_GCC_VERSION #endif @@ -571,6 +665,7 @@ struct position_t !defined(JSON_HEDLEY_INTEL_VERSION) && \ !defined(JSON_HEDLEY_PGI_VERSION) && \ !defined(JSON_HEDLEY_ARM_VERSION) && \ + !defined(JSON_HEDLEY_CRAY_VERSION) && \ !defined(JSON_HEDLEY_TI_VERSION) && \ !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \ !defined(JSON_HEDLEY_TI_CL430_VERSION) && \ @@ -578,7 +673,8 @@ struct position_t !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \ !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \ !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \ - !defined(__COMPCERT__) + !defined(__COMPCERT__) && \ + !defined(JSON_HEDLEY_MCST_LCC_VERSION) #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION #endif @@ -594,17 +690,21 @@ struct position_t #if defined(JSON_HEDLEY_HAS_ATTRIBUTE) #undef JSON_HEDLEY_HAS_ATTRIBUTE #endif -#if defined(__has_attribute) - #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute) +#if \ + defined(__has_attribute) && \ + ( \ + (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \ + ) +# define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute) #else - #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0) +# define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0) #endif #if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE) #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE #endif #if defined(__has_attribute) - #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute) + #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) #else #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) #endif @@ -613,7 +713,7 @@ struct position_t #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE #endif #if defined(__has_attribute) - #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute) + #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) #else #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) #endif @@ -798,6 +898,72 @@ struct position_t #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) #endif +#if \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ + defined(__clang__) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \ + (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR)) + #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value) +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) + #define JSON_HEDLEY_PRAGMA(value) __pragma(value) +#else + #define JSON_HEDLEY_PRAGMA(value) +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH) + #undef JSON_HEDLEY_DIAGNOSTIC_PUSH +#endif +#if defined(JSON_HEDLEY_DIAGNOSTIC_POP) + #undef JSON_HEDLEY_DIAGNOSTIC_POP +#endif +#if defined(__clang__) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop") +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push)) + #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop)) +#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop") +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop") +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") +#else + #define JSON_HEDLEY_DIAGNOSTIC_PUSH + #define JSON_HEDLEY_DIAGNOSTIC_POP +#endif + /* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for HEDLEY INTERNAL USE ONLY. API subject to change without notice. */ #if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_) @@ -806,12 +972,22 @@ struct position_t #if defined(__cplusplus) # if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat") # if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions") -# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ +# if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions") +# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ + _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \ + _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \ + xpr \ + JSON_HEDLEY_DIAGNOSTIC_POP +# else +# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ JSON_HEDLEY_DIAGNOSTIC_PUSH \ _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \ xpr \ JSON_HEDLEY_DIAGNOSTIC_POP +# endif # else # define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ JSON_HEDLEY_DIAGNOSTIC_PUSH \ @@ -876,7 +1052,7 @@ struct position_t # define JSON_HEDLEY_CPP_CAST(T, expr) \ JSON_HEDLEY_DIAGNOSTIC_PUSH \ _Pragma("diag_suppress=Pe137") \ - JSON_HEDLEY_DIAGNOSTIC_POP \ + JSON_HEDLEY_DIAGNOSTIC_POP # else # define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr)) # endif @@ -884,70 +1060,6 @@ struct position_t # define JSON_HEDLEY_CPP_CAST(T, expr) (expr) #endif -#if \ - (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ - defined(__clang__) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ - JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \ - JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \ - JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \ - (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR)) - #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value) -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) - #define JSON_HEDLEY_PRAGMA(value) __pragma(value) -#else - #define JSON_HEDLEY_PRAGMA(value) -#endif - -#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH) - #undef JSON_HEDLEY_DIAGNOSTIC_PUSH -#endif -#if defined(JSON_HEDLEY_DIAGNOSTIC_POP) - #undef JSON_HEDLEY_DIAGNOSTIC_POP -#endif -#if defined(__clang__) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop") -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") -#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop") -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push)) - #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop)) -#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop") -#elif \ - JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ - JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ - JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \ - JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ - JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop") -#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) - #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") - #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") -#else - #define JSON_HEDLEY_DIAGNOSTIC_PUSH - #define JSON_HEDLEY_DIAGNOSTIC_POP -#endif - #if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED) #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED #endif @@ -955,12 +1067,18 @@ struct position_t #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") #elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)") +#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786)) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445") #elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444") #elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") #elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996)) +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444") #elif \ JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ @@ -993,6 +1111,8 @@ struct position_t #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"") #elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)") +#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161)) #elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675") #elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) @@ -1009,6 +1129,8 @@ struct position_t #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163") #elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161") +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161") #else #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS #endif @@ -1022,8 +1144,12 @@ struct position_t #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") #elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)") +#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292)) #elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030)) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098") #elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097") #elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus) @@ -1035,6 +1161,8 @@ struct position_t #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173") #elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097") +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097") #else #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES #endif @@ -1052,20 +1180,34 @@ struct position_t #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL #endif +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunused-function") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505)) +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION +#endif + #if defined(JSON_HEDLEY_DEPRECATED) #undef JSON_HEDLEY_DEPRECATED #endif #if defined(JSON_HEDLEY_DEPRECATED_FOR) #undef JSON_HEDLEY_DEPRECATED_FOR #endif -#if JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) +#if \ + JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since)) #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement)) -#elif defined(__cplusplus) && (__cplusplus >= 201402L) - #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]]) - #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]]) #elif \ - JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) || \ + (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \ JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \ @@ -1075,9 +1217,13 @@ struct position_t JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since))) #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement))) +#elif defined(__cplusplus) && (__cplusplus >= 201402L) + #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]]) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]]) #elif \ JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \ JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ @@ -1092,12 +1238,15 @@ struct position_t (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__)) #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__)) #elif \ JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ - JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) + JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated) #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated) #elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) @@ -1114,7 +1263,8 @@ struct position_t #if \ JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \ JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since))) #else #define JSON_HEDLEY_UNAVAILABLE(available_since) @@ -1126,13 +1276,7 @@ struct position_t #if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG) #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG #endif -#if (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L) - #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]]) -#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) - #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) - #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) -#elif \ +#if \ JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \ JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ @@ -1148,9 +1292,16 @@ struct position_t JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__)) #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__)) +#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L) + #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]]) +#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) + #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) #elif defined(_Check_return_) /* SAL */ #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_ #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_ @@ -1166,7 +1317,8 @@ struct position_t JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \ JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) + JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position))) #else #define JSON_HEDLEY_SENTINEL(position) @@ -1177,7 +1329,9 @@ struct position_t #endif #if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) #define JSON_HEDLEY_NO_RETURN __noreturn -#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) +#elif \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L #define JSON_HEDLEY_NO_RETURN _Noreturn @@ -1199,11 +1353,14 @@ struct position_t (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) #elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return") -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_NO_RETURN __declspec(noreturn) #elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus) #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;") @@ -1235,7 +1392,8 @@ struct position_t #endif #if \ JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_ASSUME(expr) __assume(expr) #elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume) #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr) @@ -1253,7 +1411,9 @@ struct position_t JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ - JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable() #elif defined(JSON_HEDLEY_ASSUME) #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0) @@ -1331,7 +1491,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check))) #elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0) #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check)) @@ -1367,15 +1528,16 @@ JSON_HEDLEY_DIAGNOSTIC_POP #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr)) #endif #if \ - JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) + (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) # define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability( (expr), (value), (probability)) # define JSON_HEDLEY_PREDICT_TRUE(expr, probability) __builtin_expect_with_probability(!!(expr), 1 , (probability)) # define JSON_HEDLEY_PREDICT_FALSE(expr, probability) __builtin_expect_with_probability(!!(expr), 0 , (probability)) # define JSON_HEDLEY_LIKELY(expr) __builtin_expect (!!(expr), 1 ) # define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect (!!(expr), 0 ) #elif \ - JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) || \ + (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \ JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ @@ -1389,7 +1551,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) + JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) # define JSON_HEDLEY_PREDICT(expr, expected, probability) \ (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))) # define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \ @@ -1435,11 +1598,14 @@ JSON_HEDLEY_DIAGNOSTIC_POP (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_MALLOC __attribute__((__malloc__)) #elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory") -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(14, 0, 0) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_MALLOC __declspec(restrict) #else #define JSON_HEDLEY_MALLOC @@ -1466,7 +1632,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) # define JSON_HEDLEY_PURE __attribute__((__pure__)) #elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) # define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data") @@ -1502,7 +1669,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ - JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_CONST __attribute__((__const__)) #elif \ JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) @@ -1520,6 +1688,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ @@ -1529,7 +1698,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \ JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ - defined(__clang__) + defined(__clang__) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_RESTRICT __restrict #elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus) #define JSON_HEDLEY_RESTRICT _Restrict @@ -1550,13 +1720,15 @@ JSON_HEDLEY_DIAGNOSTIC_POP #define JSON_HEDLEY_INLINE __inline__ #elif \ JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \ JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \ JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_INLINE __inline #else #define JSON_HEDLEY_INLINE @@ -1582,9 +1754,13 @@ JSON_HEDLEY_DIAGNOSTIC_POP (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) # define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) # define JSON_HEDLEY_ALWAYS_INLINE __forceinline #elif defined(__cplusplus) && \ ( \ @@ -1622,9 +1798,13 @@ JSON_HEDLEY_DIAGNOSTIC_POP (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ - JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__)) -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline) #elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0) #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline") @@ -1667,7 +1847,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \ ) \ - ) + ) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) # define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden"))) # define JSON_HEDLEY_PUBLIC __attribute__((__visibility__("default"))) # else @@ -1683,10 +1864,12 @@ JSON_HEDLEY_DIAGNOSTIC_POP #if \ JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \ JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ - JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__)) #elif \ JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) #define JSON_HEDLEY_NO_THROW __declspec(nothrow) #else @@ -1698,7 +1881,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP #endif #if \ JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) + JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__)) #elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough) #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]]) @@ -1715,7 +1899,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP #endif #if \ JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \ - JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) + JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__)) #elif defined(_Ret_notnull_) /* SAL */ #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_ @@ -1757,7 +1942,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \ - JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) + JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr) #endif #if !defined(__cplusplus) @@ -1781,7 +1967,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP !defined(JSON_HEDLEY_SUNPRO_VERSION) && \ !defined(JSON_HEDLEY_PGI_VERSION) && \ !defined(JSON_HEDLEY_IAR_VERSION)) || \ - JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) || \ + (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \ JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \ JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \ @@ -1851,7 +2037,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP #if \ !defined(__cplusplus) && ( \ (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \ - JSON_HEDLEY_HAS_FEATURE(c_static_assert) || \ + (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \ JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ defined(_Static_assert) \ @@ -1859,7 +2045,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP # define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message) #elif \ (defined(__cplusplus) && (__cplusplus >= 201103L)) || \ - JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) + JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) # define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message)) #else # define JSON_HEDLEY_STATIC_ASSERT(expr, message) @@ -1919,7 +2106,9 @@ JSON_HEDLEY_DIAGNOSTIC_POP JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) # define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg) -#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) # define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg)) #else # define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg) @@ -1955,8 +2144,10 @@ JSON_HEDLEY_DIAGNOSTIC_POP #if defined(JSON_HEDLEY_FLAGS) #undef JSON_HEDLEY_FLAGS #endif -#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) +#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion")) #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__)) +#else + #define JSON_HEDLEY_FLAGS #endif #if defined(JSON_HEDLEY_FLAGS_CAST) @@ -1976,7 +2167,9 @@ JSON_HEDLEY_DIAGNOSTIC_POP #if defined(JSON_HEDLEY_EMPTY_BASES) #undef JSON_HEDLEY_EMPTY_BASES #endif -#if JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0) +#if \ + (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases) #else #define JSON_HEDLEY_EMPTY_BASES @@ -2030,6 +2223,83 @@ JSON_HEDLEY_DIAGNOSTIC_POP #endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */ +// #include + + +#include + +// #include + + +namespace nlohmann +{ +namespace detail +{ +template struct make_void +{ + using type = void; +}; +template using void_t = typename make_void::type; +} // namespace detail +} // namespace nlohmann + + +// https://en.cppreference.com/w/cpp/experimental/is_detected +namespace nlohmann +{ +namespace detail +{ +struct nonesuch +{ + nonesuch() = delete; + ~nonesuch() = delete; + nonesuch(nonesuch const&) = delete; + nonesuch(nonesuch const&&) = delete; + void operator=(nonesuch const&) = delete; + void operator=(nonesuch&&) = delete; +}; + +template class Op, + class... Args> +struct detector +{ + using value_t = std::false_type; + using type = Default; +}; + +template class Op, class... Args> +struct detector>, Op, Args...> +{ + using value_t = std::true_type; + using type = Op; +}; + +template class Op, class... Args> +using is_detected = typename detector::value_t; + +template class Op, class... Args> +struct is_detected_lazy : is_detected { }; + +template class Op, class... Args> +using detected_t = typename detector::type; + +template class Op, class... Args> +using detected_or = detector; + +template class Op, class... Args> +using detected_or_t = typename detected_or::type; + +template class Op, class... Args> +using is_detected_exact = std::is_same>; + +template class Op, class... Args> +using is_detected_convertible = + std::is_convertible, To>; +} // namespace detail +} // namespace nlohmann + // This file contains all internal macro definitions // You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them @@ -2048,26 +2318,90 @@ JSON_HEDLEY_DIAGNOSTIC_POP #endif // C++ language standard detection -#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464 - #define JSON_HAS_CPP_17 - #define JSON_HAS_CPP_14 -#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1) - #define JSON_HAS_CPP_14 +// if the user manually specified the used c++ version this is skipped +#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11) + #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L) + #define JSON_HAS_CPP_20 + #define JSON_HAS_CPP_17 + #define JSON_HAS_CPP_14 + #elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464 + #define JSON_HAS_CPP_17 + #define JSON_HAS_CPP_14 + #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1) + #define JSON_HAS_CPP_14 + #endif + // the cpp 11 flag is always specified because it is the minimal required version + #define JSON_HAS_CPP_11 #endif -// disable float-equal warnings on GCC/clang -#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wfloat-equal" +#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM) + #ifdef JSON_HAS_CPP_17 + #if defined(__cpp_lib_filesystem) + #define JSON_HAS_FILESYSTEM 1 + #elif defined(__cpp_lib_experimental_filesystem) + #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 + #elif !defined(__has_include) + #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 + #elif __has_include() + #define JSON_HAS_FILESYSTEM 1 + #elif __has_include() + #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 + #endif + + // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/ + #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support + #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support + #if defined(__clang_major__) && __clang_major__ < 7 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support + #if defined(_MSC_VER) && _MSC_VER < 1940 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before iOS 13 + #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before macOS Catalina + #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + #endif +#endif + +#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0 +#endif + +#ifndef JSON_HAS_FILESYSTEM + #define JSON_HAS_FILESYSTEM 0 #endif // disable documentation warnings on clang #if defined(__clang__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdocumentation" + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wdocumentation" + #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" #endif -// allow to disable exceptions +// allow disabling exceptions #if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION) #define JSON_THROW(exception) throw exception #define JSON_TRY try @@ -2101,6 +2435,19 @@ JSON_HEDLEY_DIAGNOSTIC_POP #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER #endif +// allow overriding assert +#if !defined(JSON_ASSERT) + #include // assert + #define JSON_ASSERT(x) assert(x) +#endif + +// allow to access some private functions (needed by the test suite) +#if defined(JSON_TESTS_PRIVATE) + #define JSON_PRIVATE_UNLESS_TESTED public +#else + #define JSON_PRIVATE_UNLESS_TESTED private +#endif + /*! @brief macro to briefly define a mapping between an enum and JSON @def NLOHMANN_JSON_SERIALIZE_ENUM @@ -2149,6 +2496,304 @@ JSON_HEDLEY_DIAGNOSTIC_POP NumberIntegerType, NumberUnsignedType, NumberFloatType, \ AllocatorType, JSONSerializer, BinaryType> +// Macros to simplify conversion from/to types + +#define NLOHMANN_JSON_EXPAND( x ) x +#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME +#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \ + NLOHMANN_JSON_PASTE64, \ + NLOHMANN_JSON_PASTE63, \ + NLOHMANN_JSON_PASTE62, \ + NLOHMANN_JSON_PASTE61, \ + NLOHMANN_JSON_PASTE60, \ + NLOHMANN_JSON_PASTE59, \ + NLOHMANN_JSON_PASTE58, \ + NLOHMANN_JSON_PASTE57, \ + NLOHMANN_JSON_PASTE56, \ + NLOHMANN_JSON_PASTE55, \ + NLOHMANN_JSON_PASTE54, \ + NLOHMANN_JSON_PASTE53, \ + NLOHMANN_JSON_PASTE52, \ + NLOHMANN_JSON_PASTE51, \ + NLOHMANN_JSON_PASTE50, \ + NLOHMANN_JSON_PASTE49, \ + NLOHMANN_JSON_PASTE48, \ + NLOHMANN_JSON_PASTE47, \ + NLOHMANN_JSON_PASTE46, \ + NLOHMANN_JSON_PASTE45, \ + NLOHMANN_JSON_PASTE44, \ + NLOHMANN_JSON_PASTE43, \ + NLOHMANN_JSON_PASTE42, \ + NLOHMANN_JSON_PASTE41, \ + NLOHMANN_JSON_PASTE40, \ + NLOHMANN_JSON_PASTE39, \ + NLOHMANN_JSON_PASTE38, \ + NLOHMANN_JSON_PASTE37, \ + NLOHMANN_JSON_PASTE36, \ + NLOHMANN_JSON_PASTE35, \ + NLOHMANN_JSON_PASTE34, \ + NLOHMANN_JSON_PASTE33, \ + NLOHMANN_JSON_PASTE32, \ + NLOHMANN_JSON_PASTE31, \ + NLOHMANN_JSON_PASTE30, \ + NLOHMANN_JSON_PASTE29, \ + NLOHMANN_JSON_PASTE28, \ + NLOHMANN_JSON_PASTE27, \ + NLOHMANN_JSON_PASTE26, \ + NLOHMANN_JSON_PASTE25, \ + NLOHMANN_JSON_PASTE24, \ + NLOHMANN_JSON_PASTE23, \ + NLOHMANN_JSON_PASTE22, \ + NLOHMANN_JSON_PASTE21, \ + NLOHMANN_JSON_PASTE20, \ + NLOHMANN_JSON_PASTE19, \ + NLOHMANN_JSON_PASTE18, \ + NLOHMANN_JSON_PASTE17, \ + NLOHMANN_JSON_PASTE16, \ + NLOHMANN_JSON_PASTE15, \ + NLOHMANN_JSON_PASTE14, \ + NLOHMANN_JSON_PASTE13, \ + NLOHMANN_JSON_PASTE12, \ + NLOHMANN_JSON_PASTE11, \ + NLOHMANN_JSON_PASTE10, \ + NLOHMANN_JSON_PASTE9, \ + NLOHMANN_JSON_PASTE8, \ + NLOHMANN_JSON_PASTE7, \ + NLOHMANN_JSON_PASTE6, \ + NLOHMANN_JSON_PASTE5, \ + NLOHMANN_JSON_PASTE4, \ + NLOHMANN_JSON_PASTE3, \ + NLOHMANN_JSON_PASTE2, \ + NLOHMANN_JSON_PASTE1)(__VA_ARGS__)) +#define NLOHMANN_JSON_PASTE2(func, v1) func(v1) +#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2) +#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3) +#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4) +#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5) +#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6) +#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7) +#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8) +#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9) +#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10) +#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) +#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) +#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) +#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) +#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) +#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) +#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) +#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) +#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) +#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) +#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) +#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) +#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) +#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) +#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) +#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) +#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) +#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) +#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) +#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) +#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) +#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) +#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) +#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) +#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) +#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) +#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) +#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) +#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) +#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) +#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) +#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) +#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) +#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) +#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) +#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) +#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) +#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) +#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) +#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) +#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) +#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) +#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) +#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) +#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) +#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) +#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) +#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) +#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) +#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) +#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) +#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) +#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) + +#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1; +#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1); + +/*! +@brief macro +@def NLOHMANN_DEFINE_TYPE_INTRUSIVE +@since version 3.9.0 +*/ +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...) \ + friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ + friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } + +/*! +@brief macro +@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE +@since version 3.9.0 +*/ +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...) \ + inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ + inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } + + +// inspired from https://stackoverflow.com/a/26745591 +// allows to call any std function as if (e.g. with begin): +// using std::begin; begin(x); +// +// it allows using the detected idiom to retrieve the return type +// of such an expression +#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name) \ + namespace detail { \ + using std::std_name; \ + \ + template \ + using result_of_##std_name = decltype(std_name(std::declval()...)); \ + } \ + \ + namespace detail2 { \ + struct std_name##_tag \ + { \ + }; \ + \ + template \ + std_name##_tag std_name(T&&...); \ + \ + template \ + using result_of_##std_name = decltype(std_name(std::declval()...)); \ + \ + template \ + struct would_call_std_##std_name \ + { \ + static constexpr auto const value = ::nlohmann::detail:: \ + is_detected_exact::value; \ + }; \ + } /* namespace detail2 */ \ + \ + template \ + struct would_call_std_##std_name : detail2::would_call_std_##std_name \ + { \ + } + +#ifndef JSON_USE_IMPLICIT_CONVERSIONS + #define JSON_USE_IMPLICIT_CONVERSIONS 1 +#endif + +#if JSON_USE_IMPLICIT_CONVERSIONS + #define JSON_EXPLICIT +#else + #define JSON_EXPLICIT explicit +#endif + +#ifndef JSON_DIAGNOSTICS + #define JSON_DIAGNOSTICS 0 +#endif + + +namespace nlohmann +{ +namespace detail +{ + +/*! +@brief replace all occurrences of a substring by another string + +@param[in,out] s the string to manipulate; changed so that all + occurrences of @a f are replaced with @a t +@param[in] f the substring to replace with @a t +@param[in] t the string to replace @a f + +@pre The search string @a f must not be empty. **This precondition is +enforced with an assertion.** + +@since version 2.0.0 +*/ +inline void replace_substring(std::string& s, const std::string& f, + const std::string& t) +{ + JSON_ASSERT(!f.empty()); + for (auto pos = s.find(f); // find first occurrence of f + pos != std::string::npos; // make sure f was found + s.replace(pos, f.size(), t), // replace with t, and + pos = s.find(f, pos + t.size())) // find next occurrence of f + {} +} + +/*! + * @brief string escaping as described in RFC 6901 (Sect. 4) + * @param[in] s string to escape + * @return escaped string + * + * Note the order of escaping "~" to "~0" and "/" to "~1" is important. + */ +inline std::string escape(std::string s) +{ + replace_substring(s, "~", "~0"); + replace_substring(s, "/", "~1"); + return s; +} + +/*! + * @brief string unescaping as described in RFC 6901 (Sect. 4) + * @param[in] s string to unescape + * @return unescaped string + * + * Note the order of escaping "~1" to "/" and "~0" to "~" is important. + */ +static void unescape(std::string& s) +{ + replace_substring(s, "~1", "/"); + replace_substring(s, "~0", "~"); +} + +} // namespace detail +} // namespace nlohmann + +// #include + + +#include // size_t + +namespace nlohmann +{ +namespace detail +{ +/// struct to capture the start position of the current token +struct position_t +{ + /// the total number of characters read + std::size_t chars_read_total = 0; + /// the number of characters read in the current line + std::size_t chars_read_current_line = 0; + /// the number of lines read + std::size_t lines_read = 0; + + /// conversion to size_t to preserve SAX interface + constexpr operator size_t() const + { + return chars_read_total; + } +}; + +} // namespace detail +} // namespace nlohmann + +// #include + namespace nlohmann { @@ -2158,105 +2803,100 @@ namespace detail // exceptions // //////////////// -/*! -@brief general exception of the @ref basic_json class - -This class is an extension of `std::exception` objects with a member @a id for -exception ids. It is used as the base class for all exceptions thrown by the -@ref basic_json class. This class can hence be used as "wildcard" to catch -exceptions. - -Subclasses: -- @ref parse_error for exceptions indicating a parse error -- @ref invalid_iterator for exceptions indicating errors with iterators -- @ref type_error for exceptions indicating executing a member function with - a wrong type -- @ref out_of_range for exceptions indicating access out of the defined range -- @ref other_error for exceptions indicating other library errors - -@internal -@note To have nothrow-copy-constructible exceptions, we internally use - `std::runtime_error` which can cope with arbitrary-length error messages. - Intermediate strings are built with static functions and then passed to - the actual constructor. -@endinternal - -@liveexample{The following code shows how arbitrary library exceptions can be -caught.,exception} - -@since version 3.0.0 -*/ +/// @brief general exception of the @ref basic_json class +/// @sa https://json.nlohmann.me/api/basic_json/exception/ class exception : public std::exception { public: /// returns the explanatory string - JSON_HEDLEY_RETURNS_NON_NULL const char* what() const noexcept override { return m.what(); } /// the id of the exception - const int id; + const int id; // NOLINT(cppcoreguidelines-non-private-member-variables-in-classes) protected: JSON_HEDLEY_NON_NULL(3) - exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} + exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} // NOLINT(bugprone-throw-keyword-missing) static std::string name(const std::string& ename, int id_) { return "[json.exception." + ename + "." + std::to_string(id_) + "] "; } + template + static std::string diagnostics(const BasicJsonType& leaf_element) + { +#if JSON_DIAGNOSTICS + std::vector tokens; + for (const auto* current = &leaf_element; current->m_parent != nullptr; current = current->m_parent) + { + switch (current->m_parent->type()) + { + case value_t::array: + { + for (std::size_t i = 0; i < current->m_parent->m_value.array->size(); ++i) + { + if (¤t->m_parent->m_value.array->operator[](i) == current) + { + tokens.emplace_back(std::to_string(i)); + break; + } + } + break; + } + + case value_t::object: + { + for (const auto& element : *current->m_parent->m_value.object) + { + if (&element.second == current) + { + tokens.emplace_back(element.first.c_str()); + break; + } + } + break; + } + + case value_t::null: // LCOV_EXCL_LINE + case value_t::string: // LCOV_EXCL_LINE + case value_t::boolean: // LCOV_EXCL_LINE + case value_t::number_integer: // LCOV_EXCL_LINE + case value_t::number_unsigned: // LCOV_EXCL_LINE + case value_t::number_float: // LCOV_EXCL_LINE + case value_t::binary: // LCOV_EXCL_LINE + case value_t::discarded: // LCOV_EXCL_LINE + default: // LCOV_EXCL_LINE + break; // LCOV_EXCL_LINE + } + } + + if (tokens.empty()) + { + return ""; + } + + return "(" + std::accumulate(tokens.rbegin(), tokens.rend(), std::string{}, + [](const std::string & a, const std::string & b) + { + return a + "/" + detail::escape(b); + }) + ") "; +#else + static_cast(leaf_element); + return ""; +#endif + } + private: /// an exception object as storage for error messages std::runtime_error m; }; -/*! -@brief exception indicating a parse error - -This exception is thrown by the library when a parse error occurs. Parse errors -can occur during the deserialization of JSON text, CBOR, MessagePack, as well -as when using JSON Patch. - -Member @a byte holds the byte index of the last read character in the input -file. - -Exceptions have ids 1xx. - -name / id | example message | description ------------------------------- | --------------- | ------------------------- -json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position. -json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point. -json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid. -json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects. -json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors. -json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`. -json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character. -json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences. -json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number. -json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read. -json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read. -json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read. -json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet). - -@note For an input with n bytes, 1 is the index of the first character and n+1 - is the index of the terminating null byte or the end of file. This also - holds true when reading a byte vector (CBOR or MessagePack). - -@liveexample{The following code shows how a `parse_error` exception can be -caught.,parse_error} - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref invalid_iterator for exceptions indicating errors with iterators -@sa - @ref type_error for exceptions indicating executing a member function with - a wrong type -@sa - @ref out_of_range for exceptions indicating access out of the defined range -@sa - @ref other_error for exceptions indicating other library errors - -@since version 3.0.0 -*/ +/// @brief exception indicating a parse error +/// @sa https://json.nlohmann.me/api/basic_json/parse_error/ class parse_error : public exception { public: @@ -2269,19 +2909,21 @@ class parse_error : public exception @param[in] what_arg the explanatory string @return parse_error object */ - static parse_error create(int id_, const position_t& pos, const std::string& what_arg) + template + static parse_error create(int id_, const position_t& pos, const std::string& what_arg, const BasicJsonType& context) { std::string w = exception::name("parse_error", id_) + "parse error" + - position_string(pos) + ": " + what_arg; - return parse_error(id_, pos.chars_read_total, w.c_str()); + position_string(pos) + ": " + exception::diagnostics(context) + what_arg; + return {id_, pos.chars_read_total, w.c_str()}; } - static parse_error create(int id_, std::size_t byte_, const std::string& what_arg) + template + static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, const BasicJsonType& context) { std::string w = exception::name("parse_error", id_) + "parse error" + (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") + - ": " + what_arg; - return parse_error(id_, byte_, w.c_str()); + ": " + exception::diagnostics(context) + what_arg; + return {id_, byte_, w.c_str()}; } /*! @@ -2306,50 +2948,16 @@ class parse_error : public exception } }; -/*! -@brief exception indicating errors with iterators - -This exception is thrown if iterators passed to a library function do not match -the expected semantics. - -Exceptions have ids 2xx. - -name / id | example message | description ------------------------------------ | --------------- | ------------------------- -json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid. -json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion. -json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from. -json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid. -json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid. -json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range. -json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key. -json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered. -json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered. -json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid. -json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to. -json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container. -json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered. -json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin(). - -@liveexample{The following code shows how an `invalid_iterator` exception can be -caught.,invalid_iterator} - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref parse_error for exceptions indicating a parse error -@sa - @ref type_error for exceptions indicating executing a member function with - a wrong type -@sa - @ref out_of_range for exceptions indicating access out of the defined range -@sa - @ref other_error for exceptions indicating other library errors - -@since version 3.0.0 -*/ +/// @brief exception indicating errors with iterators +/// @sa https://json.nlohmann.me/api/basic_json/invalid_iterator/ class invalid_iterator : public exception { public: - static invalid_iterator create(int id_, const std::string& what_arg) + template + static invalid_iterator create(int id_, const std::string& what_arg, const BasicJsonType& context) { - std::string w = exception::name("invalid_iterator", id_) + what_arg; - return invalid_iterator(id_, w.c_str()); + std::string w = exception::name("invalid_iterator", id_) + exception::diagnostics(context) + what_arg; + return {id_, w.c_str()}; } private: @@ -2358,52 +2966,16 @@ class invalid_iterator : public exception : exception(id_, what_arg) {} }; -/*! -@brief exception indicating executing a member function with a wrong type - -This exception is thrown in case of a type error; that is, a library function is -executed on a JSON value whose type does not match the expected semantics. - -Exceptions have ids 3xx. - -name / id | example message | description ------------------------------ | --------------- | ------------------------- -json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead. -json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types. -json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t &. -json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types. -json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types. -json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types. -json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types. -json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types. -json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types. -json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types. -json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types. -json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types. -json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined. -json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers. -json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive. -json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. | -json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) | - -@liveexample{The following code shows how a `type_error` exception can be -caught.,type_error} - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref parse_error for exceptions indicating a parse error -@sa - @ref invalid_iterator for exceptions indicating errors with iterators -@sa - @ref out_of_range for exceptions indicating access out of the defined range -@sa - @ref other_error for exceptions indicating other library errors - -@since version 3.0.0 -*/ +/// @brief exception indicating executing a member function with a wrong type +/// @sa https://json.nlohmann.me/api/basic_json/type_error/ class type_error : public exception { public: - static type_error create(int id_, const std::string& what_arg) + template + static type_error create(int id_, const std::string& what_arg, const BasicJsonType& context) { - std::string w = exception::name("type_error", id_) + what_arg; - return type_error(id_, w.c_str()); + std::string w = exception::name("type_error", id_) + exception::diagnostics(context) + what_arg; + return {id_, w.c_str()}; } private: @@ -2411,46 +2983,16 @@ class type_error : public exception type_error(int id_, const char* what_arg) : exception(id_, what_arg) {} }; -/*! -@brief exception indicating access out of the defined range - -This exception is thrown in case a library function is called on an input -parameter that exceeds the expected range, for instance in case of array -indices or nonexisting object keys. - -Exceptions have ids 4xx. - -name / id | example message | description -------------------------------- | --------------- | ------------------------- -json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1. -json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it. -json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object. -json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved. -json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value. -json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF. -json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. | -json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. | -json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string | - -@liveexample{The following code shows how an `out_of_range` exception can be -caught.,out_of_range} - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref parse_error for exceptions indicating a parse error -@sa - @ref invalid_iterator for exceptions indicating errors with iterators -@sa - @ref type_error for exceptions indicating executing a member function with - a wrong type -@sa - @ref other_error for exceptions indicating other library errors - -@since version 3.0.0 -*/ +/// @brief exception indicating access out of the defined range +/// @sa https://json.nlohmann.me/api/basic_json/out_of_range/ class out_of_range : public exception { public: - static out_of_range create(int id_, const std::string& what_arg) + template + static out_of_range create(int id_, const std::string& what_arg, const BasicJsonType& context) { - std::string w = exception::name("out_of_range", id_) + what_arg; - return out_of_range(id_, w.c_str()); + std::string w = exception::name("out_of_range", id_) + exception::diagnostics(context) + what_arg; + return {id_, w.c_str()}; } private: @@ -2458,43 +3000,23 @@ class out_of_range : public exception out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {} }; -/*! -@brief exception indicating other library errors - -This exception is thrown in case of errors that cannot be classified with the -other exception types. - -Exceptions have ids 5xx. - -name / id | example message | description ------------------------------- | --------------- | ------------------------- -json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed. - -@sa - @ref exception for the base class of the library exceptions -@sa - @ref parse_error for exceptions indicating a parse error -@sa - @ref invalid_iterator for exceptions indicating errors with iterators -@sa - @ref type_error for exceptions indicating executing a member function with - a wrong type -@sa - @ref out_of_range for exceptions indicating access out of the defined range - -@liveexample{The following code shows how an `other_error` exception can be -caught.,other_error} - -@since version 3.0.0 -*/ +/// @brief exception indicating other library errors +/// @sa https://json.nlohmann.me/api/basic_json/other_error/ class other_error : public exception { public: - static other_error create(int id_, const std::string& what_arg) + template + static other_error create(int id_, const std::string& what_arg, const BasicJsonType& context) { - std::string w = exception::name("other_error", id_) + what_arg; - return other_error(id_, w.c_str()); + std::string w = exception::name("other_error", id_) + exception::diagnostics(context) + what_arg; + return {id_, w.c_str()}; } private: JSON_HEDLEY_NON_NULL(3) other_error(int id_, const char* what_arg) : exception(id_, what_arg) {} }; + } // namespace detail } // namespace nlohmann @@ -2505,52 +3027,141 @@ class other_error : public exception #include // size_t #include // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type +#include // index_sequence, make_index_sequence, index_sequence_for -// #include +// #include namespace nlohmann { namespace detail { -// alias templates to reduce boilerplate -template -using enable_if_t = typename std::enable_if::type; template using uncvref_t = typename std::remove_cv::type>::type; -// implementation of C++14 index_sequence and affiliates -// source: https://stackoverflow.com/a/32223343 -template -struct index_sequence +#ifdef JSON_HAS_CPP_14 + +// the following utilities are natively available in C++14 +using std::enable_if_t; +using std::index_sequence; +using std::make_index_sequence; +using std::index_sequence_for; + +#else + +// alias templates to reduce boilerplate +template +using enable_if_t = typename std::enable_if::type; + +// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h +// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0. + +//// START OF CODE FROM GOOGLE ABSEIL + +// integer_sequence +// +// Class template representing a compile-time integer sequence. An instantiation +// of `integer_sequence` has a sequence of integers encoded in its +// type through its template arguments (which is a common need when +// working with C++11 variadic templates). `absl::integer_sequence` is designed +// to be a drop-in replacement for C++14's `std::integer_sequence`. +// +// Example: +// +// template< class T, T... Ints > +// void user_function(integer_sequence); +// +// int main() +// { +// // user_function's `T` will be deduced to `int` and `Ints...` +// // will be deduced to `0, 1, 2, 3, 4`. +// user_function(make_integer_sequence()); +// } +template +struct integer_sequence { - using type = index_sequence; - using value_type = std::size_t; + using value_type = T; static constexpr std::size_t size() noexcept { return sizeof...(Ints); } }; -template -struct merge_and_renumber; +// index_sequence +// +// A helper template for an `integer_sequence` of `size_t`, +// `absl::index_sequence` is designed to be a drop-in replacement for C++14's +// `std::index_sequence`. +template +using index_sequence = integer_sequence; -template -struct merge_and_renumber, index_sequence> - : index_sequence < I1..., (sizeof...(I1) + I2)... > {}; +namespace utility_internal +{ -template -struct make_index_sequence - : merge_and_renumber < typename make_index_sequence < N / 2 >::type, - typename make_index_sequence < N - N / 2 >::type > {}; +template +struct Extend; -template<> struct make_index_sequence<0> : index_sequence<> {}; -template<> struct make_index_sequence<1> : index_sequence<0> {}; +// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency. +template +struct Extend, SeqSize, 0> +{ + using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >; +}; -template +template +struct Extend, SeqSize, 1> +{ + using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >; +}; + +// Recursion helper for 'make_integer_sequence'. +// 'Gen::type' is an alias for 'integer_sequence'. +template +struct Gen +{ + using type = + typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type; +}; + +template +struct Gen +{ + using type = integer_sequence; +}; + +} // namespace utility_internal + +// Compile-time sequences of integers + +// make_integer_sequence +// +// This template alias is equivalent to +// `integer_sequence`, and is designed to be a drop-in +// replacement for C++14's `std::make_integer_sequence`. +template +using make_integer_sequence = typename utility_internal::Gen::type; + +// make_index_sequence +// +// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`, +// and is designed to be a drop-in replacement for C++14's +// `std::make_index_sequence`. +template +using make_index_sequence = make_integer_sequence; + +// index_sequence_for +// +// Converts a typename pack into an index sequence of the same length, and +// is designed to be a drop-in replacement for C++14's +// `std::index_sequence_for()` +template using index_sequence_for = make_index_sequence; +//// END OF CODE FROM GOOGLE ABSEIL + +#endif + // dispatch utility (taken from ranges-v3) template struct priority_tag : priority_tag < N - 1 > {}; template<> struct priority_tag<0> {}; @@ -2563,7 +3174,20 @@ struct static_const }; template -constexpr T static_const::value; +constexpr T static_const::value; // NOLINT(readability-redundant-declaration) + +} // namespace detail +} // namespace nlohmann + +// #include + + +namespace nlohmann +{ +namespace detail +{ +// dispatching helper struct +template struct identity_tag {}; } // namespace detail } // namespace nlohmann @@ -2573,8 +3197,10 @@ constexpr T static_const::value; #include // numeric_limits #include // false_type, is_constructible, is_integral, is_same, true_type #include // declval +#include // tuple + +// #include -// #include // #include @@ -2583,19 +3209,6 @@ constexpr T static_const::value; // #include - -namespace nlohmann -{ -namespace detail -{ -template struct make_void -{ - using type = void; -}; -template using void_t = typename make_void::type; -} // namespace detail -} // namespace nlohmann - // #include @@ -2603,10 +3216,10 @@ namespace nlohmann { namespace detail { -template +template struct iterator_types {}; -template +template struct iterator_types < It, void_t +template struct iterator_traits { }; -template +template struct iterator_traits < T, enable_if_t < !std::is_pointer::value >> : iterator_types { }; -template +template struct iterator_traits::value>> { using iterator_category = std::random_access_iterator_tag; @@ -2644,71 +3257,32 @@ struct iterator_traits::value>> } // namespace detail } // namespace nlohmann +// #include + + // #include + +namespace nlohmann +{ +NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin); +} // namespace nlohmann + +// #include + + +// #include + + +namespace nlohmann +{ +NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end); +} // namespace nlohmann + // #include // #include - -#include - -// #include - - -// https://en.cppreference.com/w/cpp/experimental/is_detected -namespace nlohmann -{ -namespace detail -{ -struct nonesuch -{ - nonesuch() = delete; - ~nonesuch() = delete; - nonesuch(nonesuch const&) = delete; - nonesuch(nonesuch const&&) = delete; - void operator=(nonesuch const&) = delete; - void operator=(nonesuch&&) = delete; -}; - -template class Op, - class... Args> -struct detector -{ - using value_t = std::false_type; - using type = Default; -}; - -template class Op, class... Args> -struct detector>, Op, Args...> -{ - using value_t = std::true_type; - using type = Op; -}; - -template