- MenuItem Labels can now be empty. Fixes #30

- more debug info on MenuItem parsing errors
- removed an irrelevant import (how did it get there)

Author: john32b

djFlixel/ui/menu/MItemData.hx

@@ -49,19 +49,19 @@
 		- Additionaly {link} has a Confirmation functionality which presents the user
 		  with a question in a popup or a new menu before triggering an action
 		  
-		- You can enable a Confirmation to a link by setting the optional field like this:]
-		  | ?fs=Are you sure?:Yes:No |  or by :
-		  | ?pop=Sure?:Yes:No |
+		- You can enable a Confirmation to a link by setting the optional field like this:
+		  `| ?fs=Are you sure?:Yes:No |`
+		  `| ?pop=Sure?:Yes:No |`
 		  
-		  Notice it is one string with = and : used as a separators "?askid=QUESTION:YES:NO"
+		  Notice it is one string with = and : used as a separators `?askid=QUESTION:YES:NO`
 		  `?fs` means that the question will be presented as a new menu page (autogenerated)
-		  and `?pop` will open a small popup over the item and ask (good for short things)
+		  `?pop` will open a small popup over the item and ask (good for short things)
 		  
-		! :TIP: You can skip the question in the "?pop" style by ommiting the question.
-		         e.g. | ?pop=:Yes:No |
+		  - You can *skip the question* by entering an empty string , like so
+			`?pop=:Yes:No` , notice the `=:`
 				 
-		! :Supports \n newlines in the ASK string, and it will generate multiple labels
-				e.g. | ?fs=First Line\nSecond Line?:yes:no	
+		  - *Supports* `\n` newlines in the ASK string, and it will generate multiple labels
+				e.g. `?fs=First Line\nSecond Line?:yes:no`
 				> will produce two labels for the question. 
 				> This is for cases where the question does not fit the screen
 				 
@@ -148,21 +148,20 @@
 		
 	>> {label}
 		Creates a text element on the menu that is not selectable. Cursor will jump past it
-		
+		- the `ID` field is *optional*
 		examples >>>>>>>>>>>>>>>>>>>>
 		
 		"Advanced Options | label " 			; Note that I didn't put an ID
 		"Advanced Options | label | id_lbl " 	; But if you want, you can declare one
 		"Advanced Options | label | id_lbl |U"  ; Make this label Unselectable. The Cursor will JUMP over it
-				
 		-------------------------------------------------------------
 		
 === For more usage examples, check <MPageData.hx> and <FlxMenu.hx>
 	
 ***********************************************************************/
 package djFlixel.ui.menu;
 
-import flixel.input.actions.FlxActionInput.FlxInputDevice;
+import haxe.Exception;
 import haxe.EnumTools;
 
 enum MItemType {
@@ -224,46 +223,58 @@ class MItemData
 
 	/**
 	   Creates a new Item Data from an encoded String
+		Encoded String Example: "New Game | link | ng+ | optionA | optionB "
 	   @param	str Encoded String. Check <MItemData.hx> header comments for more info on formatting
 	**/
 	public function new(str:String) 
 	{
-		parse(str);
+		try { parse(str); }
+		catch(e:String) {
+			var m = 'Error Parsing line\n"${str}"\n::${e}';
+			throw new Exception(m);
+		}
 	}//---------------------------------------------------;
 
+	// @throws <string> errors
 	function parse(S:String)
 	{
-		// Split " A | B | | | C |" into ['A','B','C']
-		var F = S.split('|').map((i)->StringTools.trim(i)).filter((i)->i.length > 0);
-		/**
-		   F[0] = Label
-		   F[1] = Type
-		   F[2] = ID
-		**/
-		
-		// Get : Label, ItemType, ItemID - which are required for all ItemTypes -
+		/* DEVNOTE:
+			- The string should be in this format 
+				LABEL | TYPE | ID | <optional A> | <optional B>
+			- The string may end with a `|` it will be ignored
+			- The first two fields are mandatory (label does not need the third ID field)
+		 */
+
+		var F = S.split('|').map((i)->StringTools.trim(i));
+
+		if(F.length<2) throw "Insufficient fields";
+
+		// Allowing empty Labels, I am just going to warn
 		label = F.shift();
-		if (label == null) throw 'MenuItem Must have a Label';
-		
+		if(label=="") trace('Warning: Empty label for "${S}"');
+
 		try{
 			type = EnumTools.createByName(MItemType, F.shift());
-		} catch (_) throw 'Wrong MenuItemType at "$label" Typo?';
+		} catch (_)
+			throw 'Undefined TYPE, typo?';
 
 		ID = F.shift();
-		if (ID == null && type != MItemType.label) throw 'ItemData "$label" must have an ID';
+		if ( (ID == null || ID == "") && type != MItemType.label )
+			throw 'No ID defined';
 
-		// -- Must be called after types have finished getting mandatory fields
+		// Processes all optional fields one by one in a custom function
+		// func(key,value)
 		function feed(fn:String->String->Void)
 		{
 			for (i in F)
 			{
-				// Check for universal parameters:
-				// Currently : { |D| , |U| , |AF| }
-			
-				
+				// Handle strings ending with an |
+				if(i=="") continue;
+
+				// Check for universal options first ::
+
 				// |AF| , for autofocusing
-				if (i == "AF")
-				{
+				if (i == "AF") {
 					P.autofocus = true;
 					continue;
 				}
@@ -283,15 +294,15 @@ class MItemData
 				// All other Fields must be in this format "KEY=VALUE"
 				var KV = i.split('=');
 				if (KV.length != 2){
-					throw 'Illegal MenuItem Parameter for $ID';
+					throw 'Illegal Parameter for "${i}"';
 				}
 
 				// |I=Information Text| for attaching some text to the item
 				if (KV[0] == "I") {
 					info = KV[1];
 					continue;
 				}
-				
+
 				// Pass everything else to type specific code
 				fn(KV[0], KV[1]);
 			}
@@ -317,14 +328,13 @@ class MItemData
 					if (k == "fs") P.ltype = 3;
 					P.ask = v.split(":");
 					if (P.ask.length != 3) 
-					  throw 'Improper Ask Format. "Question:Yes:No" - Skip the Question with ":Yes:No"';
+					  throw 'Improper Ask Format';
 				}
 				});
 
-
 
 			case range:
-				if (F[0] == null) throw 'Range Item $ID needs a range';
+				if (F[0] == null) throw 'Must define a Range';
 				var _n = F.shift().split(',');
 				P.c = 0.0;	// I need it to be Float so I can increment with a float later
 				P.step = 1;
@@ -346,7 +356,7 @@ class MItemData
 				}
 
 			case list:
-				if (F[0] == null) throw 'List Item $ID needs a list';
+				if (F[0] == null) throw 'Must define a List';
 				P.c = 0;
 				P.loop = false;
 				P.list = F.shift().split(',');