passenger 4.0.48 → 4.0.49

data/ext/common/agents/LoggingAgent/AdminController.h

@@ -41,16 +41,16 @@ class AdminController: public MessageServer::Handler {
 private:
 	struct SpecificContext: public MessageServer::ClientContext {
 	};
-	
+
 	typedef MessageServer::CommonClientContext CommonClientContext;
-	
+
 	LoggingServerPtr server;
-	
-	
+
+
 	/*********************************************
 	 * Message handler methods
 	 *********************************************/
-	
+
 	void processStatus(CommonClientContext &commonContext, SpecificContext *specificContext,
 		const vector<string> &args)
 	{
@@ -60,16 +60,16 @@ private:
 		server->dump(stream);
 		writeScalarMessage(commonContext.fd, stream.str());
 	}
-	
+
 public:
 	AdminController(const LoggingServerPtr &server) {
 		this->server = server;
 	}
-	
+
 	virtual MessageServer::ClientContextPtr newClient(CommonClientContext &commonContext) {
 		return boost::make_shared<SpecificContext>();
 	}
-	
+
 	virtual bool processMessage(CommonClientContext &commonContext,
 	                            MessageServer::ClientContextPtr &_specificContext,
 	                            const vector<string> &args)

data/ext/common/agents/LoggingAgent/DataStoreId.h

@@ -42,11 +42,11 @@ private:
 	unsigned short groupNameSize;
 	unsigned short nodeNameSize;
 	unsigned short categorySize;
-	
+
 	size_t totalSize() const {
 		return groupNameSize + nodeNameSize + categorySize + 3;
 	}
-	
+
 	StaticString toStaticString() const {
 		if (id == NULL) {
 			return StaticString();
@@ -54,7 +54,7 @@ private:
 			return StaticString(id, totalSize());
 		}
 	}
-	
+
 public:
 	DataStoreId(const StaticString &groupName, const StaticString &nodeName,
 		const StaticString &category)
@@ -62,35 +62,35 @@ public:
 		assert(groupName.size() <= USHRT_MAX);
 		assert(nodeName.size() <= USHRT_MAX);
 		assert(category.size() <= USHRT_MAX);
-		
+
 		char *end;
-		
+
 		id = new char[groupName.size() + nodeName.size() +
 			category.size() + 3];
 		end = id;
-		
+
 		memcpy(end, groupName.c_str(), groupName.size());
 		groupNameSize = groupName.size();
 		end += groupName.size();
 		*end = '\0';
 		end++;
-		
+
 		memcpy(end, nodeName.c_str(), nodeName.size());
 		nodeNameSize = nodeName.size();
 		end += nodeName.size();
 		*end = '\0';
 		end++;
-		
+
 		memcpy(end, category.c_str(), category.size());
 		categorySize = category.size();
 		end += category.size();
 		*end = '\0';
 	}
-	
+
 	DataStoreId() {
 		id = NULL;
 	}
-	
+
 	DataStoreId(const DataStoreId &other) {
 		if (other.id == NULL) {
 			id = NULL;
@@ -102,11 +102,11 @@ public:
 			categorySize = other.categorySize;
 		}
 	}
-	
+
 	~DataStoreId() {
 		delete id;
 	}
-	
+
 	DataStoreId &operator=(const DataStoreId &other) {
 		if (other.id == NULL) {
 			delete id;
@@ -127,11 +127,11 @@ public:
 			return *this;
 		}
 	}
-	
+
 	bool operator<(const DataStoreId &other) const {
 		return toStaticString() < other.toStaticString();
 	}
-	
+
 	bool operator==(const DataStoreId &other) const {
 		if (id == NULL) {
 			return other.id == NULL;
@@ -143,7 +143,7 @@ public:
 			}
 		}
 	}
-	
+
 	StaticString getGroupName() const {
 		if (id != NULL) {
 			return StaticString(id, groupNameSize);
@@ -151,7 +151,7 @@ public:
 			return StaticString();
 		}
 	}
-	
+
 	StaticString getNodeName() const {
 		if (id != NULL) {
 			return StaticString(id + groupNameSize + 1,
@@ -160,7 +160,7 @@ public:
 			return StaticString();
 		}
 	}
-	
+
 	StaticString getCategory() const {
 		if (id != NULL) {
 			return StaticString(id + groupNameSize + 1 + nodeNameSize + 1,

data/ext/common/agents/LoggingAgent/FilterSupport.h

@@ -81,23 +81,23 @@ public:
 		IDENTIFIER,
 		END_OF_DATA
 	};
-	
+
 	enum TokenOptions {
 		NO_OPTIONS = 0,
 		REGEXP_OPTION_CASE_INSENSITIVE = 1
 	};
-	
+
 	struct Token {
 		TokenType type;
 		int options;
 		unsigned int pos;
 		unsigned int size;
 		StaticString rawValue;
-		
+
 		Token() {
 			type = NONE;
 		}
-		
+
 		Token(TokenType _type, unsigned int _pos, unsigned int _size, const StaticString &_rawValue)
 			: type(_type),
 			  options(NO_OPTIONS),
@@ -105,7 +105,7 @@ public:
 			  size(_size),
 			  rawValue(_rawValue)
 			{ }
-		
+
 		string toString() const {
 			return Tokenizer::typeToString(type);
 		}
@@ -115,47 +115,47 @@ private:
 	StaticString data;
 	bool debug;
 	unsigned int pos;
-	
+
 	static bool isWhitespace(char ch) {
 		return ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n';
 	}
-	
+
 	void skipWhitespaces() {
 		while (pos < data.size() && isWhitespace(data[pos])) {
 			pos++;
 		}
 	}
-	
+
 	unsigned int available() const {
 		return data.size() - pos;
 	}
-	
+
 	char current() const {
 		return data[pos];
 	}
-	
+
 	char next() const {
 		return data[pos + 1];
 	}
-	
+
 	static bool isIdentifierChar(char ch) {
 		return (ch >= 'a' && ch <= 'z')
 			|| (ch >= 'A' && ch <= 'Z')
 			|| (ch >= '0' && ch <= '9')
 			|| ch == '_';
 	}
-	
+
 	static bool isDigit(char ch) {
 		return ch >= '0' && ch <= '9';
 	}
-	
+
 	Token logToken(const Token &token) const {
 		if (debug) {
 			printf("# Token: %s\n", token.toString().c_str());
 		}
 		return token;
 	}
-	
+
 	void raiseSyntaxError(const string &message = "") {
 		string msg = "Syntax error at character " + toString(pos + 1);
 		if (!message.empty()) {
@@ -164,14 +164,14 @@ private:
 		}
 		throw SyntaxError(msg);
 	}
-	
+
 	void expectingAtLeast(unsigned int size) {
 		if (available() < size) {
 			raiseSyntaxError("at least " + toString(size) +
 				" more characters expected");
 		}
 	}
-	
+
 	void expectingNextChar(char ch) {
 		expectingAtLeast(2);
 		if (next() != ch) {
@@ -180,13 +180,13 @@ private:
 				"'");
 		}
 	}
-	
+
 	Token matchToken(TokenType type, unsigned int size = 0) {
 		unsigned int oldPos = pos;
 		pos += size;
 		return Token(type, oldPos, size, data.substr(oldPos, size));
 	}
-	
+
 	Token matchTokensStartingWithNegation() {
 		expectingAtLeast(2);
 		switch (next()) {
@@ -199,17 +199,17 @@ private:
 			return Token(); // Shut up compiler warning.
 		};
 	}
-	
+
 	Token matchAnd() {
 		expectingNextChar('&');
 		return matchToken(AND, 2);
 	}
-	
+
 	Token matchOr() {
 		expectingNextChar('|');
 		return matchToken(OR, 2);
 	}
-	
+
 	Token matchTokensStartingWithEquals() {
 		expectingAtLeast(2);
 		switch (next()) {
@@ -222,7 +222,7 @@ private:
 			return Token(); // Shut up compiler warning.
 		}
 	}
-	
+
 	Token matchTokensStartingWithGreaterThan() {
 		if (available() == 0 || next() != '=') {
 			return matchToken(GREATER_THAN, 1);
@@ -230,7 +230,7 @@ private:
 			return matchToken(GREATER_THAN_OR_EQUALS, 2);
 		}
 	}
-	
+
 	Token matchTokensStartingWithLessThan() {
 		if (available() == 0 || next() != '=') {
 			return matchToken(LESS_THAN, 1);
@@ -238,14 +238,14 @@ private:
 			return matchToken(LESS_THAN_OR_EQUALS, 2);
 		}
 	}
-	
+
 	Token matchRegexp(char terminator) {
 		unsigned int start = pos;
 		bool endFound = false;
-		
+
 		// Match initial quote slash.
 		pos++;
-		
+
 		// Match rest of regexp including terminating slash.
 		while (pos < data.size() && !endFound) {
 			char ch = current();
@@ -263,10 +263,10 @@ private:
 				pos++;
 			}
 		}
-		
+
 		if (endFound) {
 			Token t(REGEXP, start, pos - start, data.substr(start, pos - start));
-			
+
 			// Match regexp options.
 			endFound = false;
 			while (pos < data.size() && !endFound) {
@@ -278,21 +278,21 @@ private:
 				}
 				pos++;
 			}
-			
+
 			return t;
 		} else {
 			raiseSyntaxError("unterminated regular expression");
 			return Token(); // Shut up compiler warning.
 		}
 	}
-	
+
 	Token matchString(char terminator) {
 		unsigned int start = pos;
 		bool endFound = false;
-		
+
 		// Match initial quote character.
 		pos++;
-		
+
 		// Match rest of string including terminating quote.
 		while (pos < data.size() && !endFound) {
 			char ch = current();
@@ -310,7 +310,7 @@ private:
 				pos++;
 			}
 		}
-		
+
 		if (endFound) {
 			return Token(STRING, start, pos - start, data.substr(start, pos - start));
 		} else {
@@ -318,20 +318,20 @@ private:
 			return Token(); // Shut up compiler warning.
 		}
 	}
-	
+
 	Token matchInteger() {
 		unsigned int start = pos;
-		
+
 		// Accept initial minus or digit.
 		pos++;
-		
+
 		while (pos < data.size() && isDigit(data[pos])) {
 			pos++;
 		}
-		
+
 		return Token(INTEGER, start, pos - start, data.substr(start, pos - start));
 	}
-	
+
 	Token matchIdentifier() {
 		char ch = current();
 		if ((ch >= 'a' && ch <= 'z') ||
@@ -342,7 +342,7 @@ private:
 			while (pos < data.size() && isIdentifierChar(current())) {
 				pos++;
 			}
-			
+
 			StaticString val = data.substr(start, pos - start);
 			if (val == "true") {
 				return Token(TRUE_LIT, start, pos - start, val);
@@ -363,13 +363,13 @@ public:
 		this->debug = debug;
 		pos = 0;
 	}
-	
+
 	Token getNext() {
 		skipWhitespaces();
 		if (pos >= data.size()) {
 			return logToken(Token(END_OF_DATA, data.size(), 0, ""));
 		}
-		
+
 		switch (current()) {
 		case '!':
 			return logToken(matchTokensStartingWithNegation());
@@ -413,7 +413,7 @@ public:
 			}
 		}
 	}
-	
+
 	static string typeToString(TokenType type) {
 		switch (type) {
 		case NONE:
@@ -487,9 +487,9 @@ public:
 		STATUS_CODE,
 		GC_TIME
 	};
-	
+
 	virtual ~Context() { }
-	
+
 	virtual string getURI() const = 0;
 	virtual string getController() const = 0;
 	virtual int getResponseTime() const = 0;
@@ -497,11 +497,11 @@ public:
 	virtual int getStatusCode() const = 0;
 	virtual int getGcTime() const = 0;
 	virtual bool hasHint(const string &name) const = 0;
-	
+
 	int getResponseTimeWithoutGc() const {
 		return getResponseTime() - getGcTime();
 	}
-	
+
 	string queryStringField(FieldIdentifier id) const {
 		switch (id) {
 		case URI:
@@ -522,7 +522,7 @@ public:
 			return "";
 		}
 	}
-	
+
 	int queryIntField(FieldIdentifier id) const {
 		switch (id) {
 		case RESPONSE_TIME:
@@ -537,7 +537,7 @@ public:
 			return 0;
 		}
 	}
-	
+
 	bool queryBoolField(FieldIdentifier id) const {
 		switch (id) {
 		case URI:
@@ -558,7 +558,7 @@ public:
 			return false;
 		}
 	}
-	
+
 	static ValueType getFieldType(FieldIdentifier id) {
 		switch (id) {
 		case URI:
@@ -585,37 +585,37 @@ public:
 	int statusCode;
 	int gcTime;
 	set<string> hints;
-	
+
 	SimpleContext() {
 		responseTime = 0;
 		statusCode = 0;
 		gcTime = 0;
 	}
-	
+
 	virtual string getURI() const {
 		return uri;
 	}
-	
+
 	virtual string getController() const {
 		return controller;
 	}
-	
+
 	virtual int getResponseTime() const {
 		return responseTime;
 	}
-	
+
 	virtual string getStatus() const {
 		return status;
 	}
-	
+
 	virtual int getStatusCode() const {
 		return statusCode;
 	}
-	
+
 	virtual int getGcTime() const {
 		return gcTime;
 	}
-	
+
 	virtual bool hasHint(const string &name) const {
 		return hints.find(name) != hints.end();
 	}
@@ -625,7 +625,7 @@ class ContextFromLog: public Context {
 private:
 	StaticString logData;
 	mutable SimpleContext *parsedData;
-	
+
 	struct ParseState {
 		unsigned long long requestProcessingStart;
 		unsigned long long requestProcessingEnd;
@@ -634,7 +634,7 @@ private:
 		unsigned long long gcTimeStart;
 		unsigned long long gcTimeEnd;
 	};
-	
+
 	static void parseLine(const StaticString &txnId, unsigned long long timestamp,
 		const StaticString &data, SimpleContext &ctx, ParseState &state)
 	{
@@ -662,7 +662,7 @@ private:
 			StaticString value = data.substr(data.find(':') + 2);
 			state.gcTimeEnd = stringToULL(value);
 		}
-		
+
 		if (state.smallestTimestamp == 0 || timestamp < state.smallestTimestamp) {
 			state.smallestTimestamp = timestamp;
 		}
@@ -670,14 +670,14 @@ private:
 			state.largestTimestamp = timestamp;
 		}
 	}
-	
+
 	static void reallyParse(const StaticString &data, SimpleContext &ctx) {
 		const char *current = data.data();
 		const char *end     = data.data() + data.size();
-		
+
 		ParseState state;
 		memset(&state, 0, sizeof(state));
-		
+
 		while (current < end) {
 			current = skipNewlines(current, end);
 			if (current < end) {
@@ -688,7 +688,7 @@ private:
 					unsigned long long timestamp;
 					unsigned int writeCount;
 					StaticString lineData;
-					
+
 					// If we want to do more complicated analysis we should sort
 					// the lines but for the purposes of ContextFromLog
 					// analyzing the data without sorting is good enough.
@@ -700,19 +700,19 @@ private:
 				current = endOfLine;
 			}
 		}
-		
+
 		if (state.requestProcessingEnd != 0) {
 			ctx.responseTime = int(state.requestProcessingEnd -
 				state.requestProcessingStart);
 		} else if (state.smallestTimestamp != 0) {
 			ctx.responseTime = state.largestTimestamp - state.smallestTimestamp;
 		}
-		
+
 		if (state.gcTimeEnd != 0) {
 			ctx.gcTime = state.gcTimeEnd - state.gcTimeStart;
 		}
 	}
-	
+
 	static bool splitLine(const StaticString &line, StaticString &txnId,
 		unsigned long long &timestamp, unsigned int &writeCount,
 		StaticString &data)
@@ -721,17 +721,17 @@ private:
 		if (firstDelim == string::npos) {
 			return false;
 		}
-		
+
 		size_t secondDelim = line.find(' ', firstDelim + 1);
 		if (secondDelim == string::npos) {
 			return false;
 		}
-		
+
 		size_t thirdDelim = line.find(' ', secondDelim + 1);
 		if (thirdDelim == string::npos) {
 			return false;
 		}
-		
+
 		txnId = line.substr(0, firstDelim);
 		timestamp = hexatriToULL(line.substr(firstDelim + 1, secondDelim - firstDelim - 1));
 		writeCount = (unsigned int) hexatriToULL(line.substr(secondDelim + 1,
@@ -739,7 +739,7 @@ private:
 		data = line.substr(thirdDelim + 1);
 		return true;
 	}
-	
+
 	static unsigned long long extractEventTimestamp(const StaticString &data) {
 		size_t pos = data.find('(');
 		if (pos == string::npos) {
@@ -757,29 +757,29 @@ private:
 			}
 		}
 	}
-	
+
 	static bool isNewline(char ch) {
 		return ch == '\n' || ch == '\r';
 	}
-	
+
 	static bool isDigit(char ch) {
 		return ch >= '0' && ch <= '9';
 	}
-	
+
 	static const char *skipNewlines(const char *current, const char *end) {
 		while (current < end && isNewline(*current)) {
 			current++;
 		}
 		return current;
 	}
-	
+
 	static const char *findEndOfLine(const char *current, const char *end) {
 		while (current < end && !isNewline(*current)) {
 			current++;
 		}
 		return current;
 	}
-	
+
 	SimpleContext *parse() const {
 		if (parsedData == NULL) {
 			auto_ptr<SimpleContext> ctx(new SimpleContext());
@@ -788,41 +788,41 @@ private:
 		}
 		return parsedData;
 	}
-	
+
 public:
 	ContextFromLog(const StaticString &logData) {
 		this->logData = logData;
 		parsedData = NULL;
 	}
-	
+
 	~ContextFromLog() {
 		delete parsedData;
 	}
-	
+
 	virtual string getURI() const {
 		return parse()->uri;
 	}
-	
+
 	virtual string getController() const {
 		return parse()->getController();
 	}
-	
+
 	virtual int getResponseTime() const {
 		return parse()->getResponseTime();
 	}
-	
+
 	virtual string getStatus() const {
 		return parse()->getStatus();
 	}
-	
+
 	virtual int getStatusCode() const {
 		return parse()->getStatusCode();
 	}
-	
+
 	virtual int getGcTime() const {
 		return parse()->getGcTime();
 	}
-	
+
 	virtual bool hasHint(const string &name) const {
 		return parse()->hasHint(name);
 	}
@@ -833,7 +833,7 @@ class Filter {
 private:
 	typedef Tokenizer::Token Token;
 	typedef Tokenizer::TokenType TokenType;
-	
+
 	struct BooleanComponent;
 	struct MultiExpression;
 	struct Comparison;
@@ -842,17 +842,17 @@ private:
 	typedef boost::shared_ptr<MultiExpression> MultiExpressionPtr;
 	typedef boost::shared_ptr<Comparison> ComparisonPtr;
 	typedef boost::shared_ptr<FunctionCall> FunctionCallPtr;
-	
+
 	struct BooleanComponent {
 		virtual ~BooleanComponent() { }
 		virtual bool evaluate(const Context &ctx) = 0;
 	};
-	
+
 	enum LogicalOperator {
 		AND,
 		OR
 	};
-	
+
 	enum Comparator {
 		MATCHES,
 		NOT_MATCHES,
@@ -864,21 +864,21 @@ private:
 		LESS_THAN_OR_EQUALS,
 		UNKNOWN_COMPARATOR
 	};
-	
+
 	struct MultiExpression: public BooleanComponent {
 		struct Part {
 			LogicalOperator theOperator;
 			BooleanComponentPtr expression;
 		};
-		
+
 		BooleanComponentPtr firstExpression;
 		vector<Part> rest;
-		
+
 		virtual bool evaluate(const Context &ctx) {
 			bool result = firstExpression->evaluate(ctx);
 			unsigned int i = 0;
 			bool done = i == rest.size();
-			
+
 			while (!done) {
 				Part &nextPart = rest[i];
 				if (nextPart.theOperator == AND) {
@@ -890,23 +890,23 @@ private:
 				i++;
 				done = done || i == rest.size();
 			}
-			
+
 			return result;
 		}
 	};
-	
+
 	struct Negation: public BooleanComponent {
 		BooleanComponentPtr expr;
-		
+
 		Negation(const BooleanComponentPtr &e)
 			: expr(e)
 			{ }
-		
+
 		virtual bool evaluate(const Context &ctx) {
 			return !expr->evaluate(ctx);
 		}
 	};
-	
+
 	struct Value {
 		enum Source {
 			REGEXP_LITERAL,
@@ -915,7 +915,7 @@ private:
 			BOOLEAN_LITERAL,
 			CONTEXT_FIELD_IDENTIFIER
 		};
-		
+
 		Source source;
 		union {
 			struct {
@@ -930,16 +930,16 @@ private:
 			bool boolValue;
 			Context::FieldIdentifier contextFieldIdentifier;
 		} u;
-		
+
 		Value() {
 			source = INTEGER_LITERAL;
 			u.intValue = 0;
 		}
-		
+
 		Value(const Value &other) {
 			initializeFrom(other);
 		}
-		
+
 		Value(bool regexp, const StaticString &value, bool caseInsensitive = false) {
 			if (regexp) {
 				source = REGEXP_LITERAL;
@@ -961,32 +961,32 @@ private:
 					options);
 			}
 		}
-		
+
 		Value(int val) {
 			source = INTEGER_LITERAL;
 			u.intValue = val;
 		}
-		
+
 		Value(bool val) {
 			source = BOOLEAN_LITERAL;
 			u.boolValue = val;
 		}
-		
+
 		Value(Context::FieldIdentifier identifier) {
 			source = CONTEXT_FIELD_IDENTIFIER;
 			u.contextFieldIdentifier = identifier;
 		}
-		
+
 		~Value() {
 			freeStorage();
 		}
-		
+
 		Value &operator=(const Value &other) {
 			freeStorage();
 			initializeFrom(other);
 			return *this;
 		}
-		
+
 		regex_t *getRegexpValue(const Context &ctx) const {
 			if (source == REGEXP_LITERAL) {
 				return &storedRegexp();
@@ -994,7 +994,7 @@ private:
 				return NULL;
 			}
 		}
-		
+
 		string getStringValue(const Context &ctx) const {
 			switch (source) {
 			case REGEXP_LITERAL:
@@ -1014,7 +1014,7 @@ private:
 				return "";
 			}
 		}
-		
+
 		int getIntegerValue(const Context &ctx) const {
 			switch (source) {
 			case REGEXP_LITERAL:
@@ -1031,7 +1031,7 @@ private:
 				return 0;
 			}
 		}
-		
+
 		bool getBooleanValue(const Context &ctx) const {
 			switch (source) {
 			case REGEXP_LITERAL:
@@ -1048,7 +1048,7 @@ private:
 				return 0;
 			}
 		}
-		
+
 		ValueType getType() const {
 			switch (source) {
 			case REGEXP_LITERAL:
@@ -1065,16 +1065,16 @@ private:
 				return UNKNOWN_TYPE;
 			}
 		}
-	
+
 	private:
 		const string &storedString() const {
 			return *u.stringOrRegexpValue.stringPointer;
 		}
-		
+
 		regex_t &storedRegexp() const {
 			return (regex_t &) u.stringOrRegexpValue.regexp.regexp;
 		}
-		
+
 		void freeStorage() {
 			if (source == REGEXP_LITERAL || source == STRING_LITERAL) {
 				storedString().~string();
@@ -1083,7 +1083,7 @@ private:
 				}
 			}
 		}
-		
+
 		void initializeFrom(const Value &other) {
 			int options;
 			source = other.source;
@@ -1116,24 +1116,24 @@ private:
 			}
 		}
 	};
-	
+
 	struct SingleValueComponent: public BooleanComponent {
 		Value val;
-		
+
 		SingleValueComponent(const Value &v)
 			: val(v)
 			{ }
-		
+
 		virtual bool evaluate(const Context &ctx) {
 			return val.getBooleanValue(ctx);
 		}
 	};
-	
+
 	struct Comparison: public BooleanComponent {
 		Value subject;
 		Comparator comparator;
 		Value object;
-		
+
 		virtual bool evaluate(const Context &ctx) {
 			switch (subject.getType()) {
 			case STRING_TYPE:
@@ -1147,7 +1147,7 @@ private:
 				return false;
 			}
 		}
-	
+
 	private:
 		bool compareStringOrRegexp(const string &str, const Context &ctx) {
 			switch (comparator) {
@@ -1164,7 +1164,7 @@ private:
 				return false;
 			}
 		}
-		
+
 		bool compareInteger(int value, const Context &ctx) {
 			int value2 = object.getIntegerValue(ctx);
 			switch (comparator) {
@@ -1185,7 +1185,7 @@ private:
 				return false;
 			}
 		}
-		
+
 		bool compareBoolean(bool value, const Context &ctx) {
 			bool value2 = object.getBooleanValue(ctx);
 			switch (comparator) {
@@ -1199,45 +1199,45 @@ private:
 			}
 		}
 	};
-	
+
 	struct FunctionCall: public BooleanComponent {
 		vector<Value> arguments;
-		
+
 		virtual void checkArguments() const = 0;
 	};
-	
+
 	struct StartsWithFunctionCall: public FunctionCall {
 		virtual bool evaluate(const Context &ctx) {
 			return startsWith(arguments[0].getStringValue(ctx),
 				arguments[1].getStringValue(ctx));
 		}
-		
+
 		virtual void checkArguments() const {
 			if (arguments.size() != 2) {
-				throw SyntaxError("you passed " + toString(arguments.size()) + 
+				throw SyntaxError("you passed " + toString(arguments.size()) +
 					" argument(s) to starts_with(), but it accepts exactly 2 arguments");
 			}
 		}
 	};
-	
+
 	struct HasHintFunctionCall: public FunctionCall {
 		virtual bool evaluate(const Context &ctx) {
 			return ctx.hasHint(arguments[0].getStringValue(ctx));
 		}
-		
+
 		virtual void checkArguments() const {
 			if (arguments.size() != 1) {
-				throw SyntaxError("you passed " + toString(arguments.size()) + 
+				throw SyntaxError("you passed " + toString(arguments.size()) +
 					" argument(s) to has_hint(), but it accepts exactly 1 argument");
 			}
 		}
 	};
-	
+
 	Tokenizer tokenizer;
 	BooleanComponentPtr root;
 	Token lookahead;
 	bool debug;
-	
+
 	static bool isLiteralToken(const Token &token) {
 		return token.type == Tokenizer::REGEXP
 			|| token.type == Tokenizer::STRING
@@ -1245,16 +1245,16 @@ private:
 			|| token.type == Tokenizer::TRUE_LIT
 			|| token.type == Tokenizer::FALSE_LIT;
 	}
-	
+
 	static bool isValueToken(const Token &token) {
 		return isLiteralToken(token) || token.type == Tokenizer::IDENTIFIER;
 	}
-	
+
 	static bool isLogicalOperatorToken(const Token &token) {
 		return token.type == Tokenizer::AND
 			|| token.type == Tokenizer::OR;
 	}
-	
+
 	static Comparator determineComparator(Tokenizer::TokenType type) {
 		switch (type) {
 		case Tokenizer::MATCHES:
@@ -1277,7 +1277,7 @@ private:
 			return UNKNOWN_COMPARATOR;
 		}
 	}
-	
+
 	static bool comparatorAcceptsValueTypes(Comparator cmp, ValueType subjectType, ValueType objectType) {
 		switch (cmp) {
 		case MATCHES:
@@ -1297,11 +1297,11 @@ private:
 			return false; // Shut up compiler warning.
 		}
 	}
-	
+
 	static string unescapeCString(const StaticString &data) {
 		string result;
 		result.reserve(data.size());
-		
+
 		const char *current = data.data();
 		const char *end     = data.data() + data.size();
 		while (current < end) {
@@ -1331,10 +1331,10 @@ private:
 				current++;
 			}
 		}
-		
+
 		return result;
 	}
-	
+
 	void logMatch(int level, const char *name) const {
 		if (level > 100) {
 			// If level is too deep then it's probably a bug.
@@ -1347,15 +1347,15 @@ private:
 			printf("Matching: %s\n", name);
 		}
 	}
-	
+
 	Token peek() const {
 		return lookahead;
 	}
-	
+
 	bool peek(Tokenizer::TokenType type) const {
 		return lookahead.type == type;
 	}
-	
+
 	Token match(TokenType type) {
 		if (lookahead.type == type) {
 			return match();
@@ -1366,13 +1366,13 @@ private:
 			return Token(); // Shut up compiler warning.
 		}
 	}
-	
+
 	Token match() {
 		Token old = lookahead;
 		lookahead = tokenizer.getNext();
 		return old;
 	}
-	
+
 	void raiseSyntaxError(const string &msg = "", const Token &token = Token()) {
 		if (token.type != Tokenizer::NONE) {
 			string message = "at character " + toString(token.pos + 1);
@@ -1385,11 +1385,11 @@ private:
 			throw SyntaxError(msg);
 		}
 	}
-	
+
 	BooleanComponentPtr matchMultiExpression(int level) {
 		logMatch(level, "matchMultiExpression()");
 		MultiExpressionPtr result = boost::make_shared<MultiExpression>();
-		
+
 		result->firstExpression = matchExpression(level + 1);
 		while (isLogicalOperatorToken(peek())) {
 			MultiExpression::Part part;
@@ -1397,19 +1397,19 @@ private:
 			part.expression  = matchExpression(level + 1);
 			result->rest.push_back(part);
 		}
-		
+
 		return result;
 	}
-	
+
 	BooleanComponentPtr matchExpression(int level) {
 		logMatch(level, "matchExpression()");
 		bool negate = false;
-		
+
 		if (peek(Tokenizer::NOT)) {
 			match();
 			negate = true;
 		}
-		
+
 		Token next = peek();
 		if (next.type == Tokenizer::LPARENTHESIS) {
 			match();
@@ -1424,7 +1424,7 @@ private:
 			BooleanComponentPtr component;
 			Token &current = next;
 			match();
-			
+
 			if (peek(Tokenizer::LPARENTHESIS)) {
 				component = matchFunctionCall(level + 1, current);
 			} else if (determineComparator(peek().type) != UNKNOWN_COMPARATOR) {
@@ -1434,7 +1434,7 @@ private:
 			} else {
 				raiseSyntaxError("expected a function call, comparison or boolean literal", current);
 			}
-			
+
 			if (negate) {
 				return boost::make_shared<Negation>(component);
 			} else {
@@ -1445,12 +1445,12 @@ private:
 			return BooleanComponentPtr(); // Shut up compiler warning.
 		}
 	}
-	
+
 	BooleanComponentPtr matchSingleValueComponent(int level, const Token &token) {
 		logMatch(level, "matchSingleValueComponent()");
 		return boost::make_shared<SingleValueComponent>(matchLiteral(level + 1, token));
 	}
-	
+
 	ComparisonPtr matchComparison(int level, const Token &subjectToken) {
 		logMatch(level, "matchComparison()");
 		ComparisonPtr comparison = boost::make_shared<Comparison>();
@@ -1462,11 +1462,11 @@ private:
 		}
 		return comparison;
 	}
-	
+
 	FunctionCallPtr matchFunctionCall(int level, const Token &id) {
 		logMatch(level, "matchFunctionCall()");
 		FunctionCallPtr function;
-		
+
 		if (id.rawValue == "starts_with") {
 			function = boost::make_shared<StartsWithFunctionCall>();
 		} else if (id.rawValue == "has_hint") {
@@ -1474,7 +1474,7 @@ private:
 		} else {
 			raiseSyntaxError("unknown function '" + id.rawValue + "'", id);
 		}
-		
+
 		match(Tokenizer::LPARENTHESIS);
 		if (isValueToken(peek())) {
 			function->arguments.push_back(matchValue(level + 1, match()));
@@ -1487,7 +1487,7 @@ private:
 		function->checkArguments();
 		return function;
 	}
-	
+
 	Value matchValue(int level, const Token &token) {
 		logMatch(level, "matchValue()");
 		if (isLiteralToken(token)) {
@@ -1500,7 +1500,7 @@ private:
 			return Value(); // Shut up compiler warning.
 		}
 	}
-	
+
 	LogicalOperator matchOperator(int level) {
 		logMatch(level, "matchOperator()");
 		if (peek(Tokenizer::AND)) {
@@ -1516,7 +1516,7 @@ private:
 			return AND; // Shut up compiler warning.
 		}
 	}
-	
+
 	Comparator matchComparator(int level) {
 		logMatch(level, "matchComparator()");
 		Comparator comparator = determineComparator(peek().type);
@@ -1529,7 +1529,7 @@ private:
 			return comparator;
 		}
 	}
-	
+
 	Value matchLiteral(int level, const Token &token) {
 		logMatch(level, "matchLiteral()");
 		if (token.type == Tokenizer::REGEXP) {
@@ -1553,7 +1553,7 @@ private:
 			return Value(); // Shut up compiler warning.
 		}
 	}
-	
+
 	Value matchContextFieldIdentifier(int level, const Token &token) {
 		logMatch(level, "matchContextFieldIdentifier()");
 		if (token.rawValue == "uri") {
@@ -1575,7 +1575,7 @@ private:
 			return Value(); // Shut up compiler warning.
 		}
 	}
-	
+
 public:
 	Filter(const StaticString &source, bool debug = false)
 		: tokenizer(source, debug)
@@ -1586,7 +1586,7 @@ public:
 		logMatch(0, "end of data");
 		match(Tokenizer::END_OF_DATA);
 	}
-	
+
 	bool run(const Context &ctx) {
 		return root->evaluate(ctx);
 	}