Remove "Dirty hack" for multiple defines in lex_me_harder()

21 files changed, 63 insertions, 21 deletions

diff --git a/src/lib/hash/blake2/info.txt b/src/lib/hash/blake2/info.txt
index 6c6d88afe..b99be4601 100644
--- a/src/lib/hash/blake2/info.txt
+++ b/src/lib/hash/blake2/info.txt
@@ -1 +1,3 @@
-define BLAKE2B 20130131
+<defines>
+BLAKE2B -> 20130131
+</defines>
diff --git a/src/lib/hash/checksum/adler32/info.txt b/src/lib/hash/checksum/adler32/info.txt
index 26ca8b255..4ddcb2e08 100644
--- a/src/lib/hash/checksum/adler32/info.txt
+++ b/src/lib/hash/checksum/adler32/info.txt
@@ -1 +1,3 @@
-define ADLER32 20131128
+<defines>
+ADLER32 -> 20131128
+</defines>
diff --git a/src/lib/hash/checksum/crc24/info.txt b/src/lib/hash/checksum/crc24/info.txt
index c55ad3108..3c5070cc4 100644
--- a/src/lib/hash/checksum/crc24/info.txt
+++ b/src/lib/hash/checksum/crc24/info.txt
@@ -1 +1,3 @@
-define CRC24 20131128
+<defines>
+CRC24 -> 20131128
+</defines>
diff --git a/src/lib/hash/checksum/crc32/info.txt b/src/lib/hash/checksum/crc32/info.txt
index 44bb2b56a..7d3e45239 100644
--- a/src/lib/hash/checksum/crc32/info.txt
+++ b/src/lib/hash/checksum/crc32/info.txt
@@ -1 +1,3 @@
-define CRC32 20131128
+<defines>
+CRC32 -> 20131128
+</defines>
diff --git a/src/lib/hash/comb4p/info.txt b/src/lib/hash/comb4p/info.txt
index 375895610..1bfac599e 100644
--- a/src/lib/hash/comb4p/info.txt
+++ b/src/lib/hash/comb4p/info.txt
@@ -1 +1,3 @@
-define COMB4P 20131128
+<defines>
+COMB4P -> 20131128
+</defines>
diff --git a/src/lib/hash/gost_3411/info.txt b/src/lib/hash/gost_3411/info.txt
index af8eddac6..31749c302 100644
--- a/src/lib/hash/gost_3411/info.txt
+++ b/src/lib/hash/gost_3411/info.txt
@@ -1,4 +1,6 @@
-define GOST_34_11 20131128
+<defines>
+GOST_34_11 -> 20131128
+</defines>
 
 <requires>
 gost_28147
diff --git a/src/lib/hash/keccak/info.txt b/src/lib/hash/keccak/info.txt
index 712a99c76..6f7345af8 100644
--- a/src/lib/hash/keccak/info.txt
+++ b/src/lib/hash/keccak/info.txt
@@ -1,4 +1,6 @@
-define KECCAK 20131128
+<defines>
+KECCAK -> 20131128
+</defines>
 
 <requires>
 sha3
diff --git a/src/lib/hash/md4/info.txt b/src/lib/hash/md4/info.txt
index 8894d4af3..fde5168ad 100644
--- a/src/lib/hash/md4/info.txt
+++ b/src/lib/hash/md4/info.txt
@@ -1,4 +1,6 @@
-define MD4 20131128
+<defines>
+MD4 -> 20131128
+</defines>
 
 <requires>
 mdx_hash
diff --git a/src/lib/hash/md5/info.txt b/src/lib/hash/md5/info.txt
index 8bbf1c3e7..5e0aadec8 100644
--- a/src/lib/hash/md5/info.txt
+++ b/src/lib/hash/md5/info.txt
@@ -1,4 +1,6 @@
-define MD5 20131128
+<defines>
+MD5 -> 20131128
+</defines>
 
 <requires>
 mdx_hash
diff --git a/src/lib/hash/mdx_hash/info.txt b/src/lib/hash/mdx_hash/info.txt
index d9a24c621..6a509f1be 100644
--- a/src/lib/hash/mdx_hash/info.txt
+++ b/src/lib/hash/mdx_hash/info.txt
@@ -1,3 +1,5 @@
-define MDX_HASH_FUNCTION 20131128
+<defines>
+MDX_HASH_FUNCTION -> 20131128
+</defines>
 
 load_on dep
diff --git a/src/lib/hash/par_hash/info.txt b/src/lib/hash/par_hash/info.txt
index 4f559b545..b04e0f4df 100644
--- a/src/lib/hash/par_hash/info.txt
+++ b/src/lib/hash/par_hash/info.txt
@@ -1 +1,3 @@
-define PARALLEL_HASH 20131128
+<defines>
+PARALLEL_HASH -> 20131128
+</defines>
diff --git a/src/lib/hash/rmd160/info.txt b/src/lib/hash/rmd160/info.txt
index 4e1451bb6..53e2f993d 100644
--- a/src/lib/hash/rmd160/info.txt
+++ b/src/lib/hash/rmd160/info.txt
@@ -1,4 +1,6 @@
-define RIPEMD_160 20131128
+<defines>
+RIPEMD_160 -> 20131128
+</defines>
 
 <requires>
 mdx_hash
diff --git a/src/lib/hash/sha1/info.txt b/src/lib/hash/sha1/info.txt
index fffb51275..6d326af1c 100644
--- a/src/lib/hash/sha1/info.txt
+++ b/src/lib/hash/sha1/info.txt
@@ -1,4 +1,6 @@
-define SHA1 20131128
+<defines>
+SHA1 -> 20131128
+</defines>
 
 <requires>
 mdx_hash
diff --git a/src/lib/hash/sha1/sha1_sse2/info.txt b/src/lib/hash/sha1/sha1_sse2/info.txt
index cc1179014..272bf5e8d 100644
--- a/src/lib/hash/sha1/sha1_sse2/info.txt
+++ b/src/lib/hash/sha1/sha1_sse2/info.txt
@@ -1,3 +1,5 @@
-define SHA1_SSE2 20160803
+<defines>
+SHA1_SSE2 -> 20160803
+</defines>
 
 need_isa sse2
diff --git a/src/lib/hash/sha2_32/info.txt b/src/lib/hash/sha2_32/info.txt
index b15db2ede..7992eff26 100644
--- a/src/lib/hash/sha2_32/info.txt
+++ b/src/lib/hash/sha2_32/info.txt
@@ -1,4 +1,6 @@
-define SHA2_32 20131128
+<defines>
+SHA2_32 -> 20131128
+</defines>
 
 <requires>
 mdx_hash
diff --git a/src/lib/hash/sha2_64/info.txt b/src/lib/hash/sha2_64/info.txt
index a457dffec..6fb415a6b 100644
--- a/src/lib/hash/sha2_64/info.txt
+++ b/src/lib/hash/sha2_64/info.txt
@@ -1,4 +1,6 @@
-define SHA2_64 20131128
+<defines>
+SHA2_64 -> 20131128
+</defines>
 
 <requires>
 mdx_hash
diff --git a/src/lib/hash/sha3/info.txt b/src/lib/hash/sha3/info.txt
index f755e9ea5..76ae81bd8 100644
--- a/src/lib/hash/sha3/info.txt
+++ b/src/lib/hash/sha3/info.txt
@@ -1 +1,3 @@
-define SHA3 20161018
+<defines>
+SHA3 -> 20161018
+</defines>
diff --git a/src/lib/hash/shake/info.txt b/src/lib/hash/shake/info.txt
index f579383eb..59a1a852a 100644
--- a/src/lib/hash/shake/info.txt
+++ b/src/lib/hash/shake/info.txt
@@ -1,4 +1,6 @@
-define SHAKE 20161009
+<defines>
+SHAKE -> 20161009
+</defines>
 
 <requires>
 sha3
diff --git a/src/lib/hash/skein/info.txt b/src/lib/hash/skein/info.txt
index 82cc69bc2..3de41289a 100644
--- a/src/lib/hash/skein/info.txt
+++ b/src/lib/hash/skein/info.txt
@@ -1,4 +1,6 @@
-define SKEIN_512 20131128
+<defines>
+SKEIN_512 -> 20131128
+</defines>
 
 <requires>
 threefish
diff --git a/src/lib/hash/tiger/info.txt b/src/lib/hash/tiger/info.txt
index 773f2b037..a244b2f0b 100644
--- a/src/lib/hash/tiger/info.txt
+++ b/src/lib/hash/tiger/info.txt
@@ -1,4 +1,6 @@
-define TIGER 20131128
+<defines>
+TIGER -> 20131128
+</defines>
 
 <requires>
 mdx_hash
diff --git a/src/lib/hash/whirlpool/info.txt b/src/lib/hash/whirlpool/info.txt
index 8b0abc25a..e1a8da77a 100644
--- a/src/lib/hash/whirlpool/info.txt
+++ b/src/lib/hash/whirlpool/info.txt
@@ -1,4 +1,6 @@
-define WHIRLPOOL 20131128
+<defines>
+WHIRLPOOL -> 20131128
+</defines>
 
 <requires>
 mdx_hash