Special tokens fix from PoB PR #9749

Just in case PoE 2 decides to add a new stat description format that includes 2 words like reminder text in PoE 1

Author: LocalIdentity

src/Data/StatDescriptions/stat_descriptions.lua

@@ -2577,13 +2577,13 @@ return {
 			},
 			[4]={
 				[1]={
-					k="canonical_stat",
-					v=1
-				},
-				[2]={
 					k="canonical_line",
 					v=true
 				},
+				[2]={
+					k="canonical_stat",
+					v=1
+				},
 				limit={
 					[1]={
 						[1]=2,
@@ -10573,13 +10573,13 @@ return {
 			},
 			[2]={
 				[1]={
-					k="canonical_stat",
-					v=2
-				},
-				[2]={
 					k="canonical_line",
 					v=true
 				},
+				[2]={
+					k="canonical_stat",
+					v=2
+				},
 				limit={
 					[1]={
 						[1]="#",
@@ -20086,13 +20086,13 @@ return {
 			},
 			[3]={
 				[1]={
-					k="canonical_stat",
-					v=1
-				},
-				[2]={
 					k="canonical_line",
 					v=true
 				},
+				[2]={
+					k="canonical_stat",
+					v=1
+				},
 				limit={
 					[1]={
 						[1]=1,
@@ -37389,13 +37389,13 @@ return {
 			},
 			[3]={
 				[1]={
-					k="canonical_stat",
-					v=1
-				},
-				[2]={
 					k="canonical_line",
 					v=true
 				},
+				[2]={
+					k="canonical_stat",
+					v=1
+				},
 				limit={
 					[1]={
 						[1]="#",
@@ -51862,13 +51862,13 @@ return {
 					v=1
 				},
 				[2]={
-					k="canonical_stat",
-					v=2
-				},
-				[3]={
 					k="canonical_line",
 					v=true
 				},
+				[3]={
+					k="canonical_stat",
+					v=2
+				},
 				limit={
 					[1]={
 						[1]="#",
@@ -52967,13 +52967,13 @@ return {
 			},
 			[2]={
 				[1]={
-					k="negate",
-					v=1
-				},
-				[2]={
 					k="canonical_line",
 					v=true
 				},
+				[2]={
+					k="negate",
+					v=1
+				},
 				limit={
 					[1]={
 						[1]="#",
@@ -84302,13 +84302,13 @@ return {
 					v=2
 				},
 				[2]={
-					k="canonical_stat",
-					v=1
-				},
-				[3]={
 					k="canonical_line",
 					v=true
 				},
+				[3]={
+					k="canonical_stat",
+					v=1
+				},
 				limit={
 					[1]={
 						[1]="#",

src/Export/Scripts/statdesc.lua

@@ -68,19 +68,33 @@ local function processStatFile(name, changeOutLocation)
 						end
 						table.insert(desc.limit, limit)
 					end
-					for k, v in special:gmatch("([%w%%_]+) (%d+)") do
-						table.insert(desc, {
-							k = k,
-							v = tonumber(v) or v,
-						})
-						nk[k] = v
+					local specialTokens = { }
+					for token in special:gmatch("([%w%%_]+)") do
+						table.insert(specialTokens, token)
 					end
-					if special:match("canonical_line") then
-						table.insert(desc, {
-							k = "canonical_line",
-							v = true,
-						})
-						nk["canonical_line"] = true
+					local tokenIndex = 1
+					while tokenIndex <= #specialTokens do
+						local token = specialTokens[tokenIndex]
+						if token == "canonical_line" then
+							table.insert(desc, {
+								k = "canonical_line",
+								v = true,
+							})
+							nk["canonical_line"] = true
+							tokenIndex = tokenIndex + 1
+						else
+							local value = specialTokens[tokenIndex + 1]
+							if value then
+								table.insert(desc, {
+									k = token,
+									v = tonumber(value) or value,
+								})
+								nk[token] = value
+								tokenIndex = tokenIndex + 2
+							else
+								tokenIndex = tokenIndex + 1
+							end
+						end
 					end
 					if quality:match("gem_quality") then
 						desc[quality] = true

src/Export/statdesc.lua

@@ -69,19 +69,33 @@ function loadStatFile(fileName)
 						end
 						table.insert(desc.limit, limit)
 					end
-					for k, v in special:gmatch("([%w%%_]+) (%d+)") do
-						table.insert(desc, {
-							k = k,
-							v = tonumber(v) or v,
-						})
-						nk[k] = v
+					local specialTokens = { }
+					for token in special:gmatch("([%w%%_]+)") do
+						table.insert(specialTokens, token)
 					end
-					if special:match("canonical_line") then
-						table.insert(desc, {
-							k = "canonical_line",
-							v = true,
-						})
-						nk["canonical_line"] = true
+					local tokenIndex = 1
+					while tokenIndex <= #specialTokens do
+						local token = specialTokens[tokenIndex]
+						if token == "canonical_line" then
+							table.insert(desc, {
+								k = "canonical_line",
+								v = true,
+							})
+							nk["canonical_line"] = true
+							tokenIndex = tokenIndex + 1
+						else
+							local value = specialTokens[tokenIndex + 1]
+							if value then
+								table.insert(desc, {
+									k = token,
+									v = tonumber(value) or value,
+								})
+								nk[token] = value
+								tokenIndex = tokenIndex + 2
+							else
+								tokenIndex = tokenIndex + 1
+							end
+						end
 					end
 					if quality:match("gem_quality") then
 						desc[quality] = true