[gbrainy] Move games.xml variables evaluation code to the game.xml for post-processing. Also some fixes

[Jordi Mas <jmas src gnome org>]

commit 07b20d40052aa0fe4b507e54ff291865dc2f3aed
Author: Jordi Mas <jmas softcatala org>
Date:   Sat Jun 19 09:30:10 2010 +0200

    Move games.xml variables evaluation code to the game.xml for post-processing. Also some fixes

 src/Core/Main/Xml/GameXml.cs           |  200 +++++++++++++++++++++++++++++---
 src/Core/Main/Xml/GameXmlDefinition.cs |    1 +
 src/Core/Main/Xml/GameXmlFactory.cs    |  136 +---------------------
 3 files changed, 187 insertions(+), 150 deletions(-)
---
diff --git a/src/Core/Main/Xml/GameXml.cs b/src/Core/Main/Xml/GameXml.cs
index 6170b8f..69c9788 100644
--- a/src/Core/Main/Xml/GameXml.cs
+++ b/src/Core/Main/Xml/GameXml.cs
@@ -21,6 +21,10 @@ using System;
 using System.ComponentModel;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+
+using Mono.CSharp;
 using Mono.Unix;
 
 namespace gbrainy.Core.Main
@@ -45,9 +49,11 @@ namespace gbrainy.Core.Main
 		// Shared with all instances
 		static List <GameXmlDefinition> games;
 		static List <DefinitionLocator> locators;
+		static bool? monofix_needed;
 
 		DefinitionLocator current;
 		GameXmlDefinition game;
+		string question, answer, rationale;
 
 		static public List <GameXmlDefinition> Definitions {
 			set {
@@ -65,24 +71,11 @@ namespace gbrainy.Core.Main
 		}
 
 		public override string Question {
-			get {
-				if (game.Variants.Count > 0 && game.Variants[current.Variant].Question != null)
-					return Catalog.GetString (game.Variants[current.Variant].Question);
-				else
-					return Catalog.GetString (game.Question);
-			}
+			get { return question; }
 		}
 
 		public override string Rationale {
-			get {
-				if (game.Variants.Count > 0 && game.Variants[current.Variant].Rationale != null)
-					return Catalog.GetString (game.Variants[current.Variant].Rationale);
-				else
-					if (String.IsNullOrEmpty (game.Rationale) == false)
-						return Catalog.GetString (game.Rationale);
-					else
-						return null;
-			}
+			get { return rationale; }
 		}
 
 		public override string Tip {
@@ -99,10 +92,38 @@ namespace gbrainy.Core.Main
 
 		protected override void Initialize ()
 		{
-			if (game.Variants.Count > 0 && game.Variants[current.Variant].Answer != null)
-				right_answer = game.Variants[current.Variant].Answer;
+			string variables;
+			bool variants;
+
+			variants = game.Variants.Count > 0;
+
+			if (variants && game.Variants[current.Variant].Question != null)
+				question = Catalog.GetString (game.Variants[current.Variant].Question);
 			else
-				right_answer = game.Answer;
+				question = Catalog.GetString (game.Question);
+
+			if (variants && game.Variants[current.Variant].Answer != null)
+				answer = Catalog.GetString (game.Variants[current.Variant].Answer);
+			else
+				answer = Catalog.GetString (game.Answer);
+
+			if (variants && game.Variants[current.Variant].Rationale != null)
+				rationale = Catalog.GetString (game.Variants[current.Variant].Rationale);
+			else
+				rationale = Catalog.GetString (game.Rationale);
+
+			if (variants && game.Variants[current.Variant].Variables != null)
+				variables = game.Variants[current.Variant].Variables;
+			else
+				variables = game.Variables;
+
+			// Evaluate code
+			EvaluateVariables (variables);
+			question = ReplaceVariables (question);
+			answer = ReplaceVariables (answer);
+			rationale = ReplaceVariables (rationale);
+
+			right_answer = answer;
 		}
 
 		public override int Variants {
@@ -147,5 +168,148 @@ namespace gbrainy.Core.Main
 					locators.Add (new DefinitionLocator (game, variant));
 			}
 		}
+
+		/*
+			Code evaluation functions
+		*/
+
+		static void EvaluateVariables (string code)
+		{
+			string eval;
+
+			try
+			{
+				// Using's for the variables section
+				// We need to evaluate either declarations (like using) or expression/statements separately
+				eval = "using System;\n";
+				Mono.CSharp.Evaluator.Run (eval);
+
+				// Infrastructure for the user available
+				eval = "Random random = new Random ();\n";
+				Mono.CSharp.Evaluator.Run (eval);
+				Mono.CSharp.Evaluator.Run (code);
+			}
+
+			catch (Exception e)
+			{
+				Console.WriteLine ("GameXml. Error in games.xml: {0} when evaluating variable definition [{1}]", e.Message, code);
+			}
+		}
+
+		// Before Mono 2.6 (rev. 156533) there is no line separator between vars
+		static string FixGetVars (string str)
+		{
+			if (monofix_needed == null)
+			{
+				string eval, vars;
+
+				eval = "int a = 1; int b = 1;";
+				Evaluator.Run (eval);
+				vars = Evaluator.GetVars ();
+
+				monofix_needed = vars.IndexOf (System.Environment.NewLine) == -1;
+			}
+
+			if (monofix_needed == false)
+				return str;
+
+			// We just guarantee that int, doubles, and float are separated as modern Mono versions do
+			StringBuilder output = new StringBuilder ();
+			string [] keywords = new string [] {"int", "double", "float"};
+			int pos = 0, cur = 0, tmp_pos, keyword;
+
+			while (pos != -1)
+			{
+				pos = keyword = -1;
+				// Look for the nearest of these keywords
+				for (int i = 0; i < keywords.Length; i++)
+				{
+					tmp_pos = str.IndexOf (keywords [i], cur);
+					if (tmp_pos == -1)
+						continue;
+
+					if (pos == -1 || pos > 0 && tmp_pos < pos) {
+						keyword = i;
+						pos = tmp_pos;
+					}
+				}
+
+				if (pos == -1)
+					continue;
+
+				output.Append (str.Substring (cur, pos - cur));
+				output.AppendLine ();
+				output.Append (str.Substring (pos, keywords[keyword].Length));
+				cur = pos + keywords[keyword].Length;
+			}
+
+			output.Append (str.Substring (cur, str.Length - cur));
+			return output.ToString ();
+		}
+
+		static string GetVarValue (string vars, string _var)
+		{
+			const string exp = "([a-z0-9._%+-]+) ([a-z0-9._%+-]+) (=) ([0-9]+)";
+			Match match;
+			int idx, cur, newline_len;
+			string line;
+
+			Regex regex = new Regex (exp, RegexOptions.IgnoreCase);
+
+			newline_len = System.Environment.NewLine.Length;
+			cur = 0;
+
+			do
+			{
+				// Process a line
+				idx = vars.IndexOf (System.Environment.NewLine, cur);
+				if (idx == -1) idx = vars.Length;
+
+				line = vars.Substring (cur, idx - cur);
+				cur = idx + newline_len;
+				match = regex.Match (line);
+
+				//  "int num = 2";
+				//   group 1 -> int,  group 2 -> num,  group 3 -> =, group 4 -> 2
+				if (match.Groups.Count == 5)
+				{
+					if (match.Groups[2].Value == _var)
+						return match.Groups[4].Value;
+				}
+
+			} while (cur < vars.Length);
+
+			return string.Empty;
+		}
+
+		static string ReplaceVariables (string str)
+		{
+			const string exp = "\\[[a-z]+\\]+";
+			string eval, var, vars, var_value;
+			Regex regex;
+			Match match;
+
+			if (String.IsNullOrEmpty (str))
+				return str;
+
+			regex = new Regex (exp, RegexOptions.IgnoreCase);
+			match = regex.Match (str);
+
+			vars = Evaluator.GetVars ();
+			vars = FixGetVars (vars);
+
+			while (String.IsNullOrEmpty (match.Value) == false)
+			{
+				var = match.Value.Substring (1, match.Value.Length - 2);
+				var_value = GetVarValue (vars, var);
+
+				if (String.IsNullOrEmpty (var_value) == false)
+					str = str.Replace (match.Value, var_value);
+
+				match = match.NextMatch ();
+			}
+			return str;
+		}
+
 	}
 }
diff --git a/src/Core/Main/Xml/GameXmlDefinition.cs b/src/Core/Main/Xml/GameXmlDefinition.cs
index 49339de..e6abe0d 100644
--- a/src/Core/Main/Xml/GameXmlDefinition.cs
+++ b/src/Core/Main/Xml/GameXmlDefinition.cs
@@ -38,6 +38,7 @@ namespace gbrainy.Core.Main
 		public string Tip { get; set; }
 		public string Rationale { get; set; }
 		public string Answer { get; set; }
+		public string Variables { get; set; }
 
 		public SVGImage Image;
 
diff --git a/src/Core/Main/Xml/GameXmlFactory.cs b/src/Core/Main/Xml/GameXmlFactory.cs
index 5a9010c..639ac23 100644
--- a/src/Core/Main/Xml/GameXmlFactory.cs
+++ b/src/Core/Main/Xml/GameXmlFactory.cs
@@ -20,11 +20,8 @@
 using System;
 using System.Xml;
 using System.IO;
-using System.Text;
 using System.Collections.Generic;
 using System.Globalization;
-using Mono.CSharp;
-using System.Text.RegularExpressions;
 
 using Mono.Unix;
 
@@ -34,7 +31,6 @@ namespace gbrainy.Core.Main
 	{
 		static List <GameXmlDefinition> games;
 		static bool read = false;
-		static bool? monofix_needed;
 
 		static GamesXmlFactory ()
 		{
@@ -82,14 +78,6 @@ namespace gbrainy.Core.Main
 							game = new GameXmlDefinition ();
 						} else if (reader.NodeType == XmlNodeType.EndElement) {
 
-							for (int i = 0; i < game.Variants.Count; i++)
-							{
-								game.Variants[i].Question = ReplaceVariables (game.Variants[i].Question);
-								game.Variants[i].Answer = ReplaceVariables (game.Variants[i].Answer);
-							}
-
-							game.Question = ReplaceVariables (game.Question);
-							game.Answer = ReplaceVariables (game.Answer);
 							games.Add (game);
 						}
 						break;
@@ -207,22 +195,11 @@ namespace gbrainy.Core.Main
 						}
 						break;
 					case "variables":
-					{
-						string eval;
-
-						// Using's for the variables section
-						// We need to evaluate either declarations (like using) or expression/statements separately
-						eval = "using System;\n";
-						Mono.CSharp.Evaluator.Run (eval);
-
-						// Infrastructure for the user available
-						eval = "Random random = new Random ();\n";
-						Mono.CSharp.Evaluator.Run (eval);
-
-						eval = reader.ReadElementString ();
-						Mono.CSharp.Evaluator.Run (eval);
+						if (processing_variant)
+							game.Variants[variant].Variables = reader.ReadElementString ();
+						else
+							game.Variables = reader.ReadElementString ();
 						break;
-					}
 					default:
 						if (String.IsNullOrEmpty (name) == false)
 							Console.WriteLine ("GameXmlFactory. Unsupported tag: {0}", name);
@@ -244,110 +221,5 @@ namespace gbrainy.Core.Main
 			}
 		}
 
-		// Before Mono 2.6 (rev. 156533) there is no line separator between vars
-		static string FixGetVars (string str)
-		{
-			if (monofix_needed == null)
-			{
-				string eval, vars;
-
-				eval = "int a = 1; int b = 1;";
-				Evaluator.Run (eval);
-				vars = Evaluator.GetVars ();
-
-				monofix_needed = vars.IndexOf (System.Environment.NewLine) == -1;
-			}
-
-			if (monofix_needed == false)
-				return str;
-
-			// We just guarantee that int, doubles, and float are separated as modern Mono versions do
-			StringBuilder output = new StringBuilder ();
-			string [] keywords = new string [] {"int", "double", "float"};
-			int pos = 0, cur = 0;
-
-			while (pos != -1)
-			{
-				for (int i = 0; i < keywords.Length; i++)
-				{
-					pos = str.IndexOf (keywords [i], cur);
-					if (pos != -1)
-					{
-						output.Append (str.Substring (cur, pos - cur));
-						output.AppendLine ();
-						output.Append (str.Substring (pos, keywords[i].Length));
-						cur = pos + keywords[i].Length;
-						break;
-					}
-				}
-			}
-
-			output.Append (str.Substring (cur, str.Length - cur));
-			return output.ToString ();
-		}
-
-		static string GetVarValue (string vars, string _var)
-		{
-			const string exp = "([a-z0-9._%+-]+) ([a-z0-9._%+-]+) (=) ([0-9]+)";
-			Match match;
-			int idx, cur, newline_len;
-			string line;
-
-			Regex regex = new Regex (exp, RegexOptions.IgnoreCase);
-
-			newline_len = System.Environment.NewLine.Length;
-			cur = 0;
-
-			do
-			{
-				// Process a line
-				idx = vars.IndexOf (System.Environment.NewLine, cur);
-				if (idx == -1) idx = vars.Length;
-
-				line = vars.Substring (cur, idx - cur);
-				cur = idx + newline_len;
-				match = regex.Match (line);
-
-				//  "int num = 2";
-				//   group 1 -> int,  group 2 -> num,  group 3 -> =, group 4 -> 2
-				if (match.Groups.Count == 5)
-				{
-					if (match.Groups[2].Value == _var)
-						return match.Groups[4].Value;
-				}
-
-			} while (cur < vars.Length);
-
-			return string.Empty;
-		}
-
-		static string ReplaceVariables (string str)
-		{
-			const string exp = "\\[[a-z]+\\]+";
-			string eval, var, vars, var_value;
-			Regex regex;
-			Match match;
-
-			if (String.IsNullOrEmpty (str))
-				return str;
-
-			regex = new Regex (exp, RegexOptions.IgnoreCase);
-			match = regex.Match (str);
-
-			while (String.IsNullOrEmpty (match.Value) == false)
-			{
-				var = match.Value.Substring (1, match.Value.Length - 2);
-				vars = Evaluator.GetVars ();
-				vars = FixGetVars (vars);
-
-				var_value = GetVarValue (vars, var);
-
-				if (String.IsNullOrEmpty (var_value) == false)
-					str = str.Replace (match.Value, var_value);
-
-				match = match.NextMatch ();
-			}
-			return str;
-		}
 	}
 }