From e38a0a1d64da8c616b695556291affd1aaa51f78 Mon Sep 17 00:00:00 2001
From: Crazylemon64 <tlrgue17@gmail.com>
Date: Sun, 14 Aug 2016 11:33:33 -0700
Subject: [PATCH] Cleaner associativity viewing

We've got a cap of 500 elements on lists we're looking at, so this isn't
going to break the bank
---
 code/datums/datumvars.dm | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index c1ae0098d3f..e087ef45917 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -53,7 +53,7 @@
 										location.href=alist\[0\].href;
 									}
 								}
-							}catch(err) {   }
+							}catch(err) {	 }
 						}
 						return
 					}
@@ -74,7 +74,7 @@
 										return
 									}
 								}
-							}catch(err) {  }
+							}catch(err) {	}
 						}
 						return
 					}
@@ -95,7 +95,7 @@
 										return
 									}
 								}
-							}catch(err) {  }
+							}catch(err) {	}
 						}
 						return
 					}
@@ -121,7 +121,7 @@
 									vars_ol.removeChild(li);
 									i--;
 								}
-							}catch(err) {   }
+							}catch(err) {	 }
 						}
 					}
 					var lis_new = vars_ol.getElementsByTagName("li");
@@ -379,16 +379,21 @@ body
 
 		if(L.len > 0 && !(name == "underlays" || name == "overlays" || name == "vars" || L.len > 500))
 			// not sure if this is completely right...
-			if(0)   //(L.vars.len > 0)
+			if(0)	 //(L.vars.len > 0)
 				html += "<ol>"
 				html += "</ol>"
 			else
 				html += "<ul>"
-				var/index = 1
+				// First loop to check for associativity
 				var/associative = FALSE
 				for(var/entry in L)
-					if(!(isnum(entry) || (isnull(L[entry]) && !associative)))
-					 	associative = TRUE
+					if(!(isnum(entry) || isnull(L[entry])))
+						associative = TRUE
+						break
+				// then we do it again! Except now with knowledge of associativity
+				var/index = 1
+				for(var/entry in L)
+					if(associative)
 						html += debug_variable(entry, L[entry], level + 1)
 					else
 						html += debug_variable(index, L[index], level + 1)
@@ -925,7 +930,7 @@ body
 			to_chat(usr, "Mob doesn't know that language.")
 
 	else if(href_list["addverb"])
-		if(!check_rights(R_DEBUG))      return
+		if(!check_rights(R_DEBUG))			return
 
 		var/mob/living/H = locate(href_list["addverb"])
 
@@ -957,7 +962,7 @@ body
 			log_admin("[key_name(usr)] has given [key_name(H)] the verb [verb]")
 
 	else if(href_list["remverb"])
-		if(!check_rights(R_DEBUG))      return
+		if(!check_rights(R_DEBUG))			return
 
 		var/mob/H = locate(href_list["remverb"])
 
@@ -1055,7 +1060,7 @@ body
 
 		var/Text = href_list["adjustDamage"]
 
-		var/amount =  input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num
+		var/amount =	input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num
 
 		if(!L)
 			to_chat(usr, "Mob doesn't exist anymore")