From 33abea62211d43229cd85c20d3c9adaf689804cb Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Tue, 10 Oct 2006 17:22:05 +0000
Subject: [PATCH] 'ported' scripting code to work with unicode and the rest of
 MSE

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@14 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 src/data/card.cpp          |  1 +
 src/data/field.cpp         | 27 ++++++++++++++++---
 src/data/field.hpp         | 14 +++++-----
 src/data/game.cpp          |  1 +
 src/data/set.cpp           |  1 +
 src/data/settings.cpp      |  3 ++-
 src/data/symbol.cpp        |  1 +
 src/mse.vcproj             | 55 +++++++++++++++++++++++++++++++++-----
 src/script/dependency.cpp  | 27 ++++++++++---------
 src/script/parser.cpp      | 34 +++++++++++------------
 src/script/script.cpp      | 13 +++++----
 src/script/value.cpp       | 53 ++++++++++++++++++++++--------------
 src/script/value.hpp       | 50 +++++++++++++++-------------------
 src/util/error.hpp         | 16 +++++++++++
 src/util/io/get_member.cpp |  5 ++++
 src/util/io/get_member.hpp | 11 +++++---
 src/util/io/writer.cpp     |  4 +--
 src/util/reflect.hpp       | 16 +++++++++--
 src/util/smart_ptr.hpp     | 36 ++++++++++++++++++++++++-
 19 files changed, 259 insertions(+), 109 deletions(-)

diff --git a/src/data/card.cpp b/src/data/card.cpp
index aea44857..9edc57bd 100644
--- a/src/data/card.cpp
+++ b/src/data/card.cpp
@@ -10,6 +10,7 @@
 #include <data/game.hpp>
 #include <data/field.hpp>
 #include <util/error.hpp>
+#include <script/value.hpp>
 
 DECLARE_TYPEOF_COLLECTION(FieldP);
 
diff --git a/src/data/field.cpp b/src/data/field.cpp
index 2991cedf..2d2bbdb3 100644
--- a/src/data/field.cpp
+++ b/src/data/field.cpp
@@ -7,10 +7,30 @@
 // ----------------------------------------------------------------------------- : Includes
 
 #include <data/field.hpp>
+#include <data/field/text.hpp>
 
 // ----------------------------------------------------------------------------- : Field
 
+Field::Field()
+	: index          (0) // sensible default?
+	, editable       (true)
+	, saveValue      (true)
+	, showStatistics (true)
+	, identifying    (false)
+	, cardListColumn (-1)
+	, cardListWidth  (100)
+	, cardListAllow  (true)
+//	, cardListAlign  (ALIGN_LEFT)
+	, tabIndex       (0)
+{}
+
+Field::~Field() {}
+
 IMPLEMENT_REFLECTION(Field) {
+	if (!tag.reading()) {
+		String type = typeName();
+		REFLECT_N("type", type);
+	}
 }
 
 template <>
@@ -18,10 +38,11 @@ shared_ptr<Field> read_new<Field>(Reader& reader) {
 	// there must be a type specified
 	String type;
 	reader.handle(_("type"), type);
-//	if (type == _("text")) {
-//	} else {
+	if (type == _("text")) {
+		return new_shared<TextField>();
+	} else {
 		throw "TODO";
-//	}
+	}
 }
 
 
diff --git a/src/data/field.hpp b/src/data/field.hpp
index 0b00d4e1..68bec717 100644
--- a/src/data/field.hpp
+++ b/src/data/field.hpp
@@ -41,14 +41,14 @@ class Field {
 	
 	/// Creates a new Value corresponding to this Field
 	/** thisP is a smart pointer to this */
-	virtual ValueP newValue(FieldP thisP) = 0;
+	virtual ValueP newValue(const FieldP& thisP) const = 0;
 	/// Creates a new Style corresponding to this Field
 	/** thisP is a smart pointer to this */
-	virtual StyleP newStyle(FieldP thisP) = 0;
+	virtual StyleP newStyle(const FieldP& thisP) const = 0;
 	/// create a copy of this field
-	virtual FieldP clone() = 0;
+	virtual FieldP clone() const = 0;
 	/// Type of this field
-	virtual String typeName() = 0;
+	virtual String typeName() const = 0;
 	
   private:
 	DECLARE_REFLECTION_VIRTUAL();
@@ -60,6 +60,7 @@ shared_ptr<Field> read_new<Field>(Reader& reader);
 
 // ----------------------------------------------------------------------------- : Style
 
+/// Style information needed to display a Value in a Field.
 class Style {
   public:
 	virtual ~Style();
@@ -72,13 +73,14 @@ void initObject(const FieldP&, StyleP&);
 
 // ----------------------------------------------------------------------------- : Value
 
+/// A specific value 'in' a Field.
 class Value {
   public:
 	virtual ~Value();
 	
 	/// Create a copy of this value
-	virtual ValueP clone() = 0;
-	
+	virtual ValueP clone() const = 0;
+		
   private:
 	DECLARE_REFLECTION_VIRTUAL();
 };
diff --git a/src/data/game.cpp b/src/data/game.cpp
index 7e3599ba..32be72a6 100644
--- a/src/data/game.cpp
+++ b/src/data/game.cpp
@@ -9,6 +9,7 @@
 #include <data/game.hpp>
 #include <data/field.hpp>
 #include <util/io/package_manager.hpp>
+#include <script/value.hpp>
 
 // ----------------------------------------------------------------------------- : Game
 
diff --git a/src/data/set.cpp b/src/data/set.cpp
index d7ab1ceb..c580b783 100644
--- a/src/data/set.cpp
+++ b/src/data/set.cpp
@@ -8,6 +8,7 @@
 
 #include <data/set.hpp>
 #include <data/card.hpp>
+#include <script/value.hpp>
 
 // ----------------------------------------------------------------------------- : Set
 
diff --git a/src/data/settings.cpp b/src/data/settings.cpp
index ada38498..af60e2e0 100644
--- a/src/data/settings.cpp
+++ b/src/data/settings.cpp
@@ -13,6 +13,7 @@
 #include <util/io/writer.hpp>
 #include <wx/filename.h>
 #include <wx/wfstream.h>
+#include <script/value.hpp>
 
 // ----------------------------------------------------------------------------- : Extra types
 
@@ -105,7 +106,7 @@ IMPLEMENT_REFLECTION(Settings) {
 	REFLECT_N("check updates",       checkUpdates);
 //	ioAll(io, "game settings", gameSettings);
 //	ioStyleSettings(io);
-	REFLECT_N("default style settings", defaultStyleSettings);
+//	REFLECT_N("default style settings", defaultStyleSettings);
 }
 
 void Settings::read() {
diff --git a/src/data/symbol.cpp b/src/data/symbol.cpp
index cea18780..465518be 100644
--- a/src/data/symbol.cpp
+++ b/src/data/symbol.cpp
@@ -8,6 +8,7 @@
 
 #include <data/symbol.hpp>
 #include <gfx/bezier.hpp>
+#include <script/value.hpp>
 
 DECLARE_TYPEOF_COLLECTION(SymbolPartP);
 DECLARE_TYPEOF_COLLECTION(ControlPointP);
diff --git a/src/mse.vcproj b/src/mse.vcproj
index 5eb8a089..fb2f02a9 100644
--- a/src/mse.vcproj
+++ b/src/mse.vcproj
@@ -555,12 +555,6 @@
 			<File
 				RelativePath=".\data\card.hpp">
 			</File>
-			<File
-				RelativePath=".\data\field.cpp">
-			</File>
-			<File
-				RelativePath=".\data\field.hpp">
-			</File>
 			<File
 				RelativePath=".\data\game.cpp">
 			</File>
@@ -674,6 +668,22 @@
 					RelativePath=".\data\format\mws.cpp">
 				</File>
 			</Filter>
+			<Filter
+				Name="field"
+				Filter="">
+				<File
+					RelativePath=".\data\field.cpp">
+				</File>
+				<File
+					RelativePath=".\data\field.hpp">
+				</File>
+				<File
+					RelativePath=".\data\field\text.cpp">
+				</File>
+				<File
+					RelativePath=".\data\field\text.hpp">
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="util"
@@ -759,6 +769,12 @@
 			<Filter
 				Name="io"
 				Filter="">
+				<File
+					RelativePath=".\util\io\get_member.cpp">
+				</File>
+				<File
+					RelativePath=".\util\io\get_member.hpp">
+				</File>
 				<File
 					RelativePath=".\util\io\package.cpp">
 					<FileConfiguration
@@ -900,6 +916,33 @@
 		<Filter
 			Name="script"
 			Filter="">
+			<File
+				RelativePath=".\script\context.cpp">
+			</File>
+			<File
+				RelativePath=".\script\context.hpp">
+			</File>
+			<File
+				RelativePath=".\script\dependency.cpp">
+			</File>
+			<File
+				RelativePath=".\script\parser.cpp">
+			</File>
+			<File
+				RelativePath=".\script\parser.hpp">
+			</File>
+			<File
+				RelativePath=".\script\script.cpp">
+			</File>
+			<File
+				RelativePath=".\script\script.hpp">
+			</File>
+			<File
+				RelativePath=".\script\value.cpp">
+			</File>
+			<File
+				RelativePath=".\script\value.hpp">
+			</File>
 		</Filter>
 		<File
 			RelativePath=".\code_template.cpp">
diff --git a/src/script/dependency.cpp b/src/script/dependency.cpp
index b5b262ed..453d563a 100644
--- a/src/script/dependency.cpp
+++ b/src/script/dependency.cpp
@@ -20,7 +20,7 @@ DECLARE_TYPEOF_COLLECTION(Context::Binding);
 class DependencyDummy : public ScriptIterator {
   public:
 	virtual ScriptType type() const { return SCRIPT_DUMMY; }
-	virtual String typeName() const { return "dummy"; }
+	virtual String typeName() const { return _("dummy"); }
 	virtual ScriptValueP next() { return ScriptValueP(); }
 };
 
@@ -39,7 +39,7 @@ class DependencyUnion : public ScriptValue {
 	{}
 	
 	virtual ScriptType type() const { return SCRIPT_DUMMY; }
-	virtual String typeName() const { return "union of " + a->typeName() + " and " + b->typeName(); }
+	virtual String typeName() const { return _("union of ") + a->typeName() + _(" and ") + b->typeName(); }
 	
 	virtual ScriptValueP dependencies(Context& ctx, const Dependency& dep) const {
 		return unified( a->dependencies(ctx,dep), b->dependencies(ctx,dep));
@@ -85,22 +85,25 @@ ScriptValueP Context::dependencies(const Dependency& dep, const Script& script)
 	//   - member operator; and it signals a dependency.
 	//   - looper construction
 	//   - + for function composition
+	// Variable assignments are performed as normall.
 	// Jumps are tricky:
-	//   - I_JUMP:        Just follow them, but see below
-	//   - I_JUMP_IF_NOT: We don't know the value of the condition, evaluate both branches.
-	//                    The simple solution would be to use recursion to fork off one of the cases.
-	//                    This could result in an exponential increase in execution time,
-	//                    because the analysis after an if statement is duplicated.
-	//                    A better solution is to evalutate branches 'in parallel'. After the if statement
-	//                    the net stack effect is +1, the top element will then be a DependencyUnion object.
-	//                    To detect the joining of the branches we look for I_JUMPs, the non jumping branch will have
-	//                    a I_JUMP at the end, when we encounter it we start evaluating the other if branch.
 	//   - I_LOOP:        We want to prevent infinite loops, the solution is that after the first
 	//                    iteration we set the looper to a dummy value, so the loop is only executed once.
 	//                    TODO: This could result in false negatives when iterating over things like fields.
 	//                          We ignore this, because loops are usually only used for exporting, where dependency
 	//                          analysis is not used anyway.
-	// Variable assignments are performed as normall.
+	//   - I_JUMP_IF_NOT: We don't know the value of the condition, so we must evaluate both branches.
+	//                    The simple solution would be to use recursion to fork off one of the cases.
+	//                    This could result in an exponential increase in execution time,
+	//                    because the analysis after an if statement is duplicated.
+	//                    A better solution is to evalutate branches 'in parallel'.
+	//                    We create a jump record for taking the branch, and evaluate the fall through case.
+	//                    When later a jump record points to the current instruction the stack and variables of that
+	//                    record are unify with the current execution path.
+	//   - I_JUMP:        We must can not follow all jumps, because they may lead to a point beyond a jump record,
+	//                    we can then no longer hope to unify with that jump record.
+	//                    Instead we create a new jump record, and follow the jump record with the lowest target address.
+	//                    This story doesn't hold for backwards jumps, we can safely follow those (see I_LOOP above)
 	
 	// Scope for evaluating this script.
 	size_t stack_size = stack.size();
diff --git a/src/script/parser.cpp b/src/script/parser.cpp
index dc6ff8d3..0d17c2c1 100644
--- a/src/script/parser.cpp
+++ b/src/script/parser.cpp
@@ -10,10 +10,13 @@
 #include <script/parser.hpp>
 #include <util/error.hpp>
 #include <stack>
-#include <boost/lexical_cast.hpp> //%%
 
 DECLARE_TYPEOF_COLLECTION(int);
 
+#ifdef __WXMSW__
+#define TokenType TokenType_ // some stupid windows header uses our name
+#endif
+
 // ----------------------------------------------------------------------------- : Tokenizing : class
 
 enum TokenType
@@ -70,8 +73,6 @@ class TokenIterator {
 
 // ----------------------------------------------------------------------------- : Characters
 
-// TODO: isxx -> isXX!
-
 bool isAlpha_(Char c) { return isAlpha(c) || c==_('_'); }
 bool isAlnum_(Char c) { return isAlnum(c) || c==_('_'); }
 bool isOper  (Char c) { return c==_('+') || c==_('-') || c==_('*') || c==_('/') || c==_('!') || c==_('.') ||
@@ -102,34 +103,34 @@ const Token& TokenIterator::read() {
 }
 
 void TokenIterator::putBack() {
-	Token t = {TOK_NEWLINE, "\n"};
+	Token t = {TOK_NEWLINE, _("\n")};
 	buffer.insert(buffer.begin(), t);
 }
 
 void TokenIterator::addToken() {
 	if (pos >= input.size()) {
 		// EOF
-		Token t = {TOK_EOF, "end of input"};
+		Token t = {TOK_EOF, _("end of input")};
 		buffer.push_back(t);
 		return;
 	}
 	// read a character from the input
-	Char c = input[pos++];			//% input.GetChar(pos++);
+	Char c = input.GetChar(pos++);
 	if (c == _('\n')) {
-		Token t = { TOK_NEWLINE, "newline" };
+		Token t = {TOK_NEWLINE, _("newline")};
 		buffer.push_back(t);
 	} else if (isSpace(c)) {
 		// ignore
 	} else if (isAlpha(c)) {
 		// name
 		size_t start = pos - 1;
-		while (pos < input.size() && isalnum(input[pos])) ++pos; //%% isAlnum_(input.getChar(pos))) pos++;
+		while (pos < input.size() && isAlnum_(input.GetChar(pos))) ++pos;
 		Token t = {TOK_NAME, cannocialNameForm(input.substr(start, pos-start)) }; // convert name to cannocial form
 		buffer.push_back(t);
 	} else if (isDigit(c)) {
 		// number
 		size_t start = pos - 1;
-		while (pos < input.size() && isDigitOrDot(input[pos])) ++pos;
+		while (pos < input.size() && isDigitOrDot(input.GetChar(pos))) ++pos;
 		String num = input.substr(start, pos-start);
 		Token t = {
 			num.find_first_of('.') == String::npos ? TOK_INT : TOK_DOUBLE,
@@ -172,7 +173,6 @@ void TokenIterator::addToken() {
 		while (pos < input.size() && input[pos] != _('\n')) ++pos;
 	} else {
 		throw ScriptParseError(_("Unknown character in script: '") + String(1,c) + _("'"));
-		assert(false);
 	}
 }
 
@@ -360,14 +360,14 @@ void parseExpr(TokenIterator& input, Script& script, Precedence minPrec) {
 				script.addInstruction(I_GET_VAR, var);
 			}
 		} else if (token == TOK_INT) {
-			long l;
-			l = lexical_cast<long>(token.value);
-			//token.value.toLong(l);
+			long l = 0;
+			//l = lexical_cast<long>(token.value);
+			token.value.ToLong(&l);
 			script.addInstruction(I_PUSH_CONST, toScript(l));
 		} else if (token == TOK_DOUBLE) {
-			double d;
-			d = lexical_cast<double>(token.value);
-			//token.value.toDouble(d);
+			double d = 0;
+			//d = lexical_cast<double>(token.value);
+			token.value.ToDouble(&d);
 			script.addInstruction(I_PUSH_CONST, toScript(d));
 		} else if (token == TOK_STRING) {
 			script.addInstruction(I_PUSH_CONST, toScript(token.value));
@@ -404,7 +404,7 @@ void parseOper(TokenIterator& input, Script& script, Precedence minPrec, Instruc
 				// not an expression. Remove that instruction.
 				Instruction instr = script.getInstructions().back();
 				if (instr.instr != I_GET_VAR) {
-					throw ScriptParseError("Can only assign to variables");
+					throw ScriptParseError(_("Can only assign to variables"));
 				} else {
 					script.getInstructions().pop_back();
 					parseOper(input, script, PREC_SET,  I_SET_VAR, instr.data);
diff --git a/src/script/script.cpp b/src/script/script.cpp
index e92637a1..51f58b34 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -8,17 +8,17 @@
 
 #include <script/script.hpp>
 #include <script/context.hpp>
-#include <boost/lexical_cast.hpp>
+#include <util/error.hpp>
 
 // ----------------------------------------------------------------------------- : Variables
 
-typedef map<string, unsigned int> Variables;
+typedef map<String, unsigned int> Variables;
 Variables variables;
 DECLARE_TYPEOF(Variables);
 
 /// Return a unique name for a variable to allow for faster loopups
 unsigned int stringToVariable(const String& s) {
-	map<string, unsigned int>::iterator it = variables.find(s);
+	map<String, unsigned int>::iterator it = variables.find(s);
 	if (it == variables.end()) {
 		unsigned int v = (unsigned int)variables.size();
 		variables.insert(make_pair(s,v));
@@ -35,7 +35,7 @@ String variableToString(unsigned int v) {
 	FOR_EACH(vi, variables) {
 		if (vi.second == v) return vi.first;
 	}
-	throw "Variable not found: " + lexical_cast<String>(v);
+	throw ScriptError(String(_("Variable not found: ")) << v);
 }
 
 // ----------------------------------------------------------------------------- : Script
@@ -44,7 +44,7 @@ ScriptType Script::type() const {
 	return SCRIPT_SCRIPT_FUN;
 }
 String Script::typeName() const {
-	return "function";
+	return _("function");
 }
 ScriptValueP Script::eval(Context& ctx) const {
 	return ctx.eval(*this);
@@ -90,6 +90,8 @@ unsigned int Script::getLabel() const {
 
 DECLARE_TYPEOF_COLLECTION(Instruction);
 
+#if 0 // debugging
+
 String Script::dumpScript() const {
 	String ret;
 	int pos = 0;
@@ -163,3 +165,4 @@ String Script::dumpInstr(unsigned int pos, Instruction i) const {
 	return ret;
 }
 
+#endif
diff --git a/src/script/value.cpp b/src/script/value.cpp
index c91e4cdd..1e69bda1 100644
--- a/src/script/value.cpp
+++ b/src/script/value.cpp
@@ -8,22 +8,21 @@
 
 #include <script/value.hpp>
 #include <util/error.hpp>
-#include <boost/lexical_cast.hpp> //%%
 #include <boost/pool/singleton_pool.hpp>
 
 // ----------------------------------------------------------------------------- : ScriptValue
 // Base cases
 
-ScriptValue::operator String() const { return "[[" + typeName() + "]]"; }
-ScriptValue::operator int()    const { throw ScriptError("Can't convert from "+typeName()+" to integer number"); }
-ScriptValue::operator double() const { throw ScriptError("Can't convert from "+typeName()+" to real number"   ); }
-ScriptValue::operator Color()  const { throw ScriptError("Can't convert from "+typeName()+" to color"         ); }
+ScriptValue::operator String() const { return _("[[") + typeName() + _("]]"); }
+ScriptValue::operator int()    const { throw ScriptError(_("Can't convert from ")+typeName()+_(" to integer number")); }
+ScriptValue::operator double() const { throw ScriptError(_("Can't convert from ")+typeName()+_(" to real number"   )); }
+ScriptValue::operator Color()  const { throw ScriptError(_("Can't convert from ")+typeName()+_(" to color"         )); }
 ScriptValueP ScriptValue::eval(Context&) const
-                                     { throw ScriptError("Can't convert from "+typeName()+" to function"      ); }
+                                     { throw ScriptError(_("Can't convert from ")+typeName()+_(" to function"      )); }
 ScriptValueP ScriptValue::getMember(const String& name) const
-                                     { throw (typeName() + " has no member '" + name + "'"); }
-ScriptValueP ScriptValue::next()               { throw InternalError("Can't convert from "+typeName()+" to iterator"); }
-ScriptValueP ScriptValue::makeIterator() const { throw ScriptError("Can't convert from "+typeName()+" to collection"); }
+                                     { throw (typeName() + _(" has no member '") + name + _("'")); }
+ScriptValueP ScriptValue::next()               { throw InternalError(_("Can't convert from ")+typeName()+_(" to iterator")); }
+ScriptValueP ScriptValue::makeIterator() const { throw ScriptError(  _("Can't convert from ")+typeName()+_(" to collection")); }
 
 void ScriptValue::signalDependent(Context&, const Dependency&, const String& name) {}
 ScriptValueP ScriptValue::dependencies(   Context&, const Dependency&) const { return scriptNil; }
@@ -32,7 +31,7 @@ ScriptValueP ScriptValue::dependencies(   Context&, const Dependency&) const { r
 // ----------------------------------------------------------------------------- : Iterators
 
 ScriptType ScriptIterator::type() const { return SCRIPT_OBJECT; }
-String ScriptIterator::typeName() const { return "iterator"; }
+String ScriptIterator::typeName() const { return _("iterator"); }
 
 // Iterator over a range of integers
 class ScriptRangeIterator : public ScriptIterator {
@@ -62,8 +61,8 @@ class ScriptInt : public ScriptValue {
   public:
 	ScriptInt(int v) : value(v) {}
 	virtual ScriptType type() const { return SCRIPT_INT; }
-	virtual String typeName() const { return "integer number"; }
-	virtual operator String() const { return lexical_cast<String>(value); }
+	virtual String typeName() const { return _("integer number"); }
+	virtual operator String() const { return String() << value; }
 	virtual operator double() const { return value; }
 	virtual operator int()    const { return value; }
   protected:
@@ -93,8 +92,8 @@ class ScriptDouble : public ScriptValue {
   public:
 	ScriptDouble(double v) : value(v) {}
 	virtual ScriptType type() const { return SCRIPT_DOUBLE; }
-	virtual String typeName() const { return "real number"; }
-	virtual operator String() const { return lexical_cast<String>(value); }
+	virtual String typeName() const { return _("real number"); }
+	virtual operator String() const { return String() << value; }
 	virtual operator double() const { return value; }
 	virtual operator int()    const { return (int)value; }
   private:
@@ -112,10 +111,24 @@ class ScriptString : public ScriptValue {
   public:
 	ScriptString(const String& v) : value(v) {}
 	virtual ScriptType type() const { return SCRIPT_STRING; }
-	virtual String typeName() const { return "string"; }
+	virtual String typeName() const { return _("string"); }
 	virtual operator String() const { return value; }
-	virtual operator double() const { return lexical_cast<double>(value); }
-	virtual operator int()    const { return lexical_cast<int>(value); }
+	virtual operator double() const {
+		double d;
+		if (value.ToDouble(&d)) {
+			return d;
+		} else {
+			throw ScriptError(_("Not a number: '") + value + _("'"));
+		}
+	}
+	virtual operator int()    const {
+		long l;
+		if (value.ToLong(&l)) {
+			return l;
+		} else {
+			throw ScriptError(_("Not a number: '") + value + _("'"));
+		}
+	}
   private:
 	String value;
 };
@@ -132,7 +145,7 @@ class ScriptColor : public ScriptValue {
   public:
 	ScriptColor(const Color& v) : value(v) {}
 	virtual ScriptType type() const { return SCRIPT_COLOR; }
-	virtual String typeName() const { return "color"; }
+	virtual String typeName() const { return _("color"); }
   private:
 	Color value;
 };
@@ -148,8 +161,8 @@ ScriptValueP toScript(const Color& v) {
 class ScriptNil : public ScriptValue {
   public:
 	virtual ScriptType type() const { return SCRIPT_NIL; }
-	virtual String typeName() const { return "nil"; }
-	virtual operator String() const { return ""; }
+	virtual String typeName() const { return _("nil"); }
+	virtual operator String() const { return wxEmptyString; }
 	virtual operator double() const { return 0.0; }
 	virtual operator int()    const { return 0; }
 };
diff --git a/src/script/value.hpp b/src/script/value.hpp
index 5a7a0e3a..670ff2b0 100644
--- a/src/script/value.hpp
+++ b/src/script/value.hpp
@@ -10,35 +10,22 @@
 // ----------------------------------------------------------------------------- : Includes
 
 #include <util/prec.hpp>
+#include <util/error.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/lexical_cast.hpp> //%%
-
-//#ifndef WINVER
-//#define WINVER 0x0501
-//#endif
-//#include <winresrc.h>
-//#include <windef.h>
-//#include <winbase.h> // Interlocked*crement
-#include <windows.h>
-#define TokenType TokenType_
-
-extern "C" {
-   LONG  __cdecl _InterlockedIncrement(LONG volatile *Addend);
-   LONG  __cdecl _InterlockedDecrement(LONG volatile *Addend);
-}
-#pragma intrinsic (_InterlockedIncrement)
-#define InterlockedIncrement _InterlockedIncrement
-#pragma intrinsic (_InterlockedDecrement)
-#define InterlockedDecrement _InterlockedDecrement
-
-//long __declspec(dllimport) __stdcall InterlockedDecrement(long volatile* Addend);
-//long __declspec(dllimport) __stdcall InterlockedIncrement(long volatile* Addend);
-//#pragma intrinsic(_InterlockedIncrement)
-//#pragma intrinsic( _InterlockedDecrement )
-
 class Context;
 class Dependency;
 
+#ifdef _MSC_VER
+	extern "C" {
+		LONG  __cdecl _InterlockedIncrement(LONG volatile *Addend);
+		LONG  __cdecl _InterlockedDecrement(LONG volatile *Addend);
+	}
+	#pragma intrinsic (_InterlockedIncrement)
+	#define InterlockedIncrement _InterlockedIncrement
+	#pragma intrinsic (_InterlockedDecrement)
+	#define InterlockedDecrement _InterlockedDecrement
+#endif
+
 // ----------------------------------------------------------------------------- : ScriptValue
 
 //DECLARE_POINTER_TYPE(ScriptValue);
@@ -161,10 +148,14 @@ class ScriptCollection : public ScriptValue {
   public:
 	inline ScriptCollection(const Collection* v) : value(v) {}
 	virtual ScriptType type() const { return SCRIPT_OBJECT; }
-	virtual String typeName() const { return "collection"; }
+	virtual String typeName() const { return _("collection"); }
 	virtual ScriptValueP getMember(const String& name) const {
-		int index = lexical_cast<int>(name);
-		return toScript(value->at(index));
+		long index;
+		if (name.ToLong(&index)) {
+			return toScript(value->at(index));
+		} else {
+			throw ScriptError(_("Collection has no member ") + name);
+		}
 	}
 	virtual ScriptValueP makeIterator() const {
 		return new_intrusive1<ScriptCollectionIterator<Collection> >(value);
@@ -182,7 +173,7 @@ class ScriptObject : public ScriptValue {
   public:
 	inline ScriptObject(const shared_ptr<T>& v) : value(v) {}
 	virtual ScriptType type() const { return SCRIPT_OBJECT; }
-	virtual String typeName() const { return "object"; }
+	virtual String typeName() const { return _("object"); }
 	virtual ScriptValueP getMember(const String& name) const {
 		GetMember gm(name);
 		gm.handle(*value);
@@ -246,6 +237,7 @@ inline ScriptValueP toScript(const shared_ptr<T>& v) { return new_intrusive1<Scr
  *  @code
  *   SCRIPT_FUNCTION(my_function) {
  *      SCRIPT_PARAM(String, my_string_param);
+ *      ...
  *   }
  *  @endcode
  *  Throws an error if the parameter is not found.
diff --git a/src/util/error.hpp b/src/util/error.hpp
index 1928e37a..bd7d6159 100644
--- a/src/util/error.hpp
+++ b/src/util/error.hpp
@@ -64,5 +64,21 @@ class ParseError : public Error {
 	inline ParseError(const String& str) : Error(str) {}
 };
 
+/// Parse error in a script
+class ScriptParseError : public ParseError {
+  public:
+	inline ScriptParseError(const String& str) : ParseError(str) {}
+	inline ScriptParseError(const String& exp, const String& found)
+		: ParseError(_("Expected '") + exp + _("' instead of '") + found + _("'")) {}
+};
+
+// ----------------------------------------------------------------------------- : Script errors
+
+/// A runtime error in a script
+class ScriptError : public Error {
+  public:
+	inline ScriptError(const String& str) : Error(str) {}
+};
+
 // ----------------------------------------------------------------------------- : EOF
 #endif
diff --git a/src/util/io/get_member.cpp b/src/util/io/get_member.cpp
index 5c9069d0..c5154a4a 100644
--- a/src/util/io/get_member.cpp
+++ b/src/util/io/get_member.cpp
@@ -7,6 +7,7 @@
 // ----------------------------------------------------------------------------- : Includes
 
 #include <util/io/get_member.hpp>
+#include <util/vector2d.hpp>
 #include <script/value.hpp>
 
 // ----------------------------------------------------------------------------- : GetMember
@@ -20,3 +21,7 @@ void GetMember::store(const int           v) { value = toScript(v); }
 void GetMember::store(const unsigned int  v) { value = toScript((int)v); }
 void GetMember::store(const double        v) { value = toScript(v); }
 void GetMember::store(const bool          v) { value = toScript(v); }
+
+void GetMember::store(const Vector2D&     v) {
+	value = toScript(String::Format(_("(%.10lf,%.10lf)"), v.x, v.y));
+}
diff --git a/src/util/io/get_member.hpp b/src/util/io/get_member.hpp
index 1ef7f06c..10408142 100644
--- a/src/util/io/get_member.hpp
+++ b/src/util/io/get_member.hpp
@@ -16,6 +16,8 @@ typedef boost::intrusive_ptr<ScriptValue> ScriptValueP;
 inline void intrusive_ptr_add_ref(ScriptValue* p);
 inline void intrusive_ptr_release(ScriptValue* p);
 
+class Vector2D;
+
 // ----------------------------------------------------------------------------- : GetMember
 
 /// Find a member with a specific name using reflection
@@ -43,6 +45,7 @@ class GetMember {
 	
 	/// Store something in the return value
 	void store(const String&       v);
+	void store(const Vector2D&     v);
 	void store(const int           v);
 	void store(const unsigned int  v);
 	void store(const double        v);
@@ -71,9 +74,9 @@ class GetMember {
 
 // ----------------------------------------------------------------------------- : Reflection for enumerations
 
-/// Implement enum reflection as used by Writer
-#define REFLECT_ENUM_WRITER(Enum)								\
-	template<> void Writer::handle<Enum>(const Enum& enum_) {	\
+/// Implement enum reflection as used by GetMember
+#define REFLECT_ENUM_GET_MEMBER(Enum)							\
+	template<> void GetMember::handle<Enum>(const Enum& enum_) {\
 		EnumGetMember gm(*this);								\
 		reflect_ ## Enum(const_cast<Enum&>(enum_), gm);			\
 	}
@@ -88,7 +91,7 @@ class EnumGetMember {
 	template <typename Enum>
 	inline void handle(const Char* name, Enum value, Enum enum_) {
 		if (enum_ == value) {
-			writer.store(name);
+			getMember.store(name);
 		}
 	}
 	
diff --git a/src/util/io/writer.cpp b/src/util/io/writer.cpp
index 0508c16d..db9879a5 100644
--- a/src/util/io/writer.cpp
+++ b/src/util/io/writer.cpp
@@ -105,7 +105,5 @@ template <> void Writer::handle(const bool& value) {
 // ----------------------------------------------------------------------------- : Handling less basic util types
 
 template <> void Writer::handle(const Vector2D& vec) {
-	String formated;
-	formated.Printf(_("(%.10lf,%.10lf)"), vec.x, vec.y);
-	handle(formated);
+	handle(String::Format(_("(%.10lf,%.10lf)"), vec.x, vec.y));
 }
diff --git a/src/util/reflect.hpp b/src/util/reflect.hpp
index 2ba56eed..880cd2cc 100644
--- a/src/util/reflect.hpp
+++ b/src/util/reflect.hpp
@@ -16,6 +16,7 @@
 
 #include "io/reader.hpp"
 #include "io/writer.hpp"
+#include "io/get_member.hpp"
 
 // ----------------------------------------------------------------------------- : Declaring reflection
 
@@ -27,8 +28,10 @@
 			template<class Tag> void reflect_impl(Tag& tag);			\
 			friend class Reader;										\
 			friend class Writer;										\
+			friend class GetMember;										\
 			void reflect(Reader& reader);								\
-			void reflect(Writer& writer)
+			void reflect(Writer& writer);								\
+			void reflect(GetMember& getMember)
 
 /// Declare that a class supports reflection, which can be overridden in derived classes
 #define DECLARE_REFLECTION_VIRTUAL()									\
@@ -36,8 +39,10 @@
 			template<class Tag> void reflect_impl(Tag& tag);			\
 			friend class Reader;										\
 			friend class Writer;										\
+			friend class GetMember;										\
 			virtual void reflect(Reader& reader);						\
-			virtual void reflect(Writer& writer)
+			virtual void reflect(Writer& writer);						\
+			virtual void reflect(GetMember& getMember)
 
 // ----------------------------------------------------------------------------- : Implementing reflection
 
@@ -47,6 +52,7 @@
  *  Currently creates the methods:
  *  - Reader::handle(Cls&)
  *  - Writer::handle(Cls&)
+ *  - GetMember::handle(Cls&)
  *  Usage:
  *    @code
  *     IMPLEMENT_REFLECTION(MyClass) {
@@ -58,6 +64,7 @@
 #define IMPLEMENT_REFLECTION(Cls)										\
 			REFLECT_OBJECT_READER(Cls)									\
 			REFLECT_OBJECT_WRITER(Cls)									\
+			REFLECT_OBJECT_GET_MEMBER(Cls)								\
 			/* Extra level, so it can be declared virtual */			\
 			void Cls::reflect(Reader& reader) {							\
 				reflect_impl(reader);									\
@@ -65,6 +72,9 @@
 			void Cls::reflect(Writer& writer) {							\
 				reflect_impl(writer);									\
 			}															\
+			void Cls::reflect(GetMember& getMember) {					\
+				reflect_impl(getMember);								\
+			}															\
 			template <class Tag>										\
 			void Cls::reflect_impl(Tag& tag)
 
@@ -93,12 +103,14 @@
  *  Currently creates the methods:
  *   - Reader::handle(Enum&
  *   - Writer::handle(const Enum&)
+ *   - GetMember::handle(const Enum&)
  */
 #define IMPLEMENT_REFLECTION_ENUM(Enum)									\
 			template <class Tag>										\
 			void reflect_ ## Enum (Enum& enum_, Tag& tag);				\
 			REFLECT_ENUM_READER(Enum)									\
 			REFLECT_ENUM_WRITER(Enum)									\
+			REFLECT_ENUM_GET_MEMBER(Enum)								\
 			template <class Tag>										\
 			void reflect_ ## Enum (Enum& enum_, Tag& tag)
 
diff --git a/src/util/smart_ptr.hpp b/src/util/smart_ptr.hpp
index a238fb53..8a1d5255 100644
--- a/src/util/smart_ptr.hpp
+++ b/src/util/smart_ptr.hpp
@@ -14,7 +14,14 @@
 
 // ----------------------------------------------------------------------------- : Includes
 
+// MOVEME
+/// Using intrusive_ptr where possible? (as opposed to smart_ptr)
+#define USE_INTRUSIVE_PTR
+
 #include <boost/shared_ptr.hpp>
+#ifdef USE_INTRUSIVE_PTR
+	#include <boost/intrusive_ptr.hpp>
+#endif
 using namespace boost;
 
 // ----------------------------------------------------------------------------- : Declaring
@@ -31,7 +38,6 @@ template <typename T>
 inline shared_ptr<T> new_shared() {
 	return shared_ptr<T>(new T());
 }
-
 /// Allocate a new shared-pointed object, given one argument to pass to the ctor of T
 template <typename T, typename A0>
 inline shared_ptr<T> new_shared1(const A0& a0) {
@@ -58,5 +64,33 @@ inline shared_ptr<T> new_shared7(const A0& a0, const A1& a1, const A2& a2, const
 	return shared_ptr<T>(new T(a0, a1, a2, a3, a4, a5, a6));
 }
 
+// ----------------------------------------------------------------------------- : Intrusive pointers
+
+#ifdef USE_INTRUSIVE_PTR
+
+	/// Allocate a new intrusive-pointed object
+	template <typename T>
+	inline intrusive_ptr<T> new_intrusive() {
+		return intrusive_ptr<T>(new T());
+	}
+	/// Allocate a new intrusive-pointed object, given one argument to pass to the ctor of T
+	template <typename T, typename A0>
+	inline intrusive_ptr<T> new_intrusive1(const A0& a0) {
+		return intrusive_ptr<T>(new T(a0));
+	}
+	/// Allocate a new intrusive-pointed object, given two arguments to pass to the ctor of T
+	template <typename T, typename A0, typename A1>
+	inline intrusive_ptr<T> new_intrusive2(const A0& a0, const A1& a1) {
+		return intrusive_ptr<T>(new T(a0, a1));
+	}
+
+#else
+	#define intrusive_ptr smart_ptr
+	#define new_intrusive  new_smart
+	#define new_intrusive1 new_smart1
+	#define new_intrusive2 new_smart2
+	#define new_intrusive3 new_smart3
+#endif
+
 // ----------------------------------------------------------------------------- : EOF
 #endif