From 0bdd1441fc95f70f2f86c89c20eb866a9ca2787b Mon Sep 17 00:00:00 2001
From: Mike Buland <eichlan@xagasoft.com>
Date: Wed, 18 Jan 2012 23:33:32 -0700
Subject: Rearranged rendering code.

---
 src/functiondebugstring.cpp |  21 ++++
 src/functiondebugstring.h   |  19 ++++
 src/interfaceconsole.cpp    | 218 +----------------------------------------
 src/interfaceconsole.h      |  15 ---
 src/interfacegats.cpp       |  50 +---------
 src/smlrenderer.cpp         |  10 ++
 src/smlrenderer.h           |  17 ++++
 src/smlrendererhtml.cpp     |  62 ++++++++++++
 src/smlrendererhtml.h       |  15 +++
 src/smlrenderervt100.cpp    | 229 ++++++++++++++++++++++++++++++++++++++++++++
 src/smlrenderervt100.h      |  32 +++++++
 11 files changed, 413 insertions(+), 275 deletions(-)
 create mode 100644 src/functiondebugstring.cpp
 create mode 100644 src/functiondebugstring.h
 create mode 100644 src/smlrenderer.cpp
 create mode 100644 src/smlrenderer.h
 create mode 100644 src/smlrendererhtml.cpp
 create mode 100644 src/smlrendererhtml.h
 create mode 100644 src/smlrenderervt100.cpp
 create mode 100644 src/smlrenderervt100.h

(limited to 'src')

diff --git a/src/functiondebugstring.cpp b/src/functiondebugstring.cpp
new file mode 100644
index 0000000..1c138d7
--- /dev/null
+++ b/src/functiondebugstring.cpp
@@ -0,0 +1,21 @@
+#include "functiondebugstring.h"
+
+#include <bu/sio.h>
+#include "gamestate.h"
+
+using namespace Bu;
+
+FunctionDebugString::FunctionDebugString()
+{
+}
+
+FunctionDebugString::~FunctionDebugString()
+{
+}
+
+void FunctionDebugString::call( class GameState &gState )
+{
+	Variable v = gState.popDeref();
+	gState.push( Variable( Bu::String("%1").arg( v ) ) );
+}
+
diff --git a/src/functiondebugstring.h b/src/functiondebugstring.h
new file mode 100644
index 0000000..cc7c6ac
--- /dev/null
+++ b/src/functiondebugstring.h
@@ -0,0 +1,19 @@
+#ifndef FUNCTION_DEBUG_STRING_H
+#define FUNCTION_DEBUG_STRING_H
+
+#include "function.h"
+
+class FunctionDebugString : public Function
+{
+public:
+	FunctionDebugString();
+	virtual ~FunctionDebugString();
+
+	virtual Bu::String getName() const { return "debugString"; }
+	virtual void call( class GameState &gState );
+
+private:
+	Bu::String format( const Bu::String &sSrc );
+};
+
+#endif
diff --git a/src/interfaceconsole.cpp b/src/interfaceconsole.cpp
index 94b45b9..caa13bf 100644
--- a/src/interfaceconsole.cpp
+++ b/src/interfaceconsole.cpp
@@ -7,6 +7,8 @@
 
 #include <bu/plugger.h>
 
+#include "smlrenderervt100.h"
+
 PluginInterface3( plugin_interface_console, console, InterfaceConsole,
 		Interface, "Mike Buland", 1, 0 );
 
@@ -35,219 +37,9 @@ void InterfaceConsole::run( Game *pGame )
 	}	
 }
 
-void InterfaceConsole::appendToken( Bu::String &sCurLine,
-		Bu::String &sNextToken, int &iLineLen, int &iNextLen )
-{
-	if( iLineLen + iNextLen + 1 >= 78 )
-	{
-		sio << sCurLine << sio.nl;
-		iLineLen = 0;
-		sCurLine = sNextToken;
-	}
-	else
-	{
-		sCurLine += sNextToken;
-	}
-	iLineLen += iNextLen + 1;
-	sCurLine += " ";
-	iNextLen = 0;
-	sNextToken.clear();
-}
-
-Bu::String InterfaceConsole::getVt100Style( const StyleStack &sStyle )
-{
-#ifdef WIN32
-	// Windows...we don't do colors for windows...
-	return "";
-#endif
-
-	if( sStyle.isEmpty() )
-	{
-		return "\x1B[0m";
-	}
-
-	int sCurStyle = 0;
-	for( StyleStack::const_iterator i = sStyle.begin(); i; i++ )
-	{
-//		sio << "Merging in: " << Fmt::hex() << *i << sio.nl;
-		if( ((sCurStyle&stTypeMask) & ((*i)&stTypeMask)) == 0 )
-		{
-			sCurStyle |= *i;
-//			sio << "  -> curStyle = " << Fmt::hex() << *i << sio.nl;
-		}
-	}
-
-	Bu::String sRet;
-
-//	sio << "Color: " << Fmt::hex() << sCurStyle << sio.nl;
-	switch( sCurStyle&stColor )
-	{
-		case stRed:
-			sRet += "\x1B[1;31m";
-			break;
-
-		case stGreen:
-			sRet += "\x1B[1;32m";
-			break;
-	}
-
-	return sRet;
-}
-
-void InterfaceConsole::display( const SmlNode *pNode )
+void InterfaceConsole::display( const class SmlNode *pSml )
 {
-	Bu::String sCurLine;
-	Bu::String sNextToken;
-	int iLineLen = 0;
-	int iNextLen = 0;
-	int iState = 0;
-	typedef Bu::List<SmlNode::SmlNodeList::const_iterator> NodeStack;
-	NodeStack sNode;
-
-	StyleStack sStyle;
-
-	sNode.push( pNode->getChildren().begin() );
-
-	for(;;)
-	{
-		if( !sNode.peek() )
-		{
-			sNode.pop();
-			if( sNode.isEmpty() )
-				break;
-			if( sNode.peek() )
-			{
-			//	sio << "Pop'd: " << (*sNode.peek())->getText() << sio.nl;
-				Bu::String sTag = (*sNode.peek())->getText();
-				if( sTag == "green" || sTag == "red" )
-				{
-					sStyle.pop();
-					sNextToken += getVt100Style( sStyle );
-				}
-				sNode.peek()++;
-				continue;
-			}
-		}
-		if( sNode.isEmpty() )
-		{
-			break;
-		}
-		const SmlNode *pNode = (*sNode.peek());
-		switch( pNode->getType() )
-		{
-			case SmlNode::typeRoot:
-				throw Bu::ExceptionBase("Invalid root.");
-
-			case SmlNode::typeText:
-				{
-			//		sio << "Process text node: " << pNode->getText() <<
-			//			sio.nl;
-					Bu::String::const_iterator iBgn = pNode->getText().begin();
-					Bu::String::const_iterator iEnd = iBgn;
-					int iTmpLen = 0;
-					for(;iBgn;)
-					{
-						switch( iState )
-						{
-							case 0: // begining of paragraph
-								if( iBgn && ( *iBgn == ' ' || *iBgn == '\n' ||
-									*iBgn == '\r' || *iBgn == '\t' ) )
-								{
-									iBgn++;
-								}
-								else
-								{
-									// Here is where you would indent paragraphs
-									iEnd = iBgn;
-									iState = 1;
-								}
-								break;
-
-							case 1: // non-whitespace
-								if( !iEnd )
-								{
-									sNextToken.append( iBgn, iEnd );
-									iBgn = iEnd;
-									iNextLen += iTmpLen;
-									iTmpLen = 0;
-								}
-								else if( *iEnd == ' ' || *iEnd == '\n' ||
-									*iEnd == '\r' || *iEnd == '\t' )
-								{
-									sNextToken.append( iBgn, iEnd );
-									iNextLen += iTmpLen;
-									iTmpLen = 0;
-									iState = 2;
-									iBgn = iEnd;
-								}
-								else
-								{
-									iEnd++;
-									iTmpLen++;
-								}
-								break;
-
-							case 2: // Whitespace
-								if( iBgn && (*iBgn == ' ' || *iBgn == '\n' ||
-									*iBgn == '\r' || *iBgn == '\t') )
-								{
-									iBgn++;
-								}
-								else
-								{
-									iEnd = iBgn;
-									iState = 1;
-									appendToken( sCurLine, sNextToken,
-										iLineLen, iNextLen );
-								}
-								break;
-						}
-					}
-				}
-				break;
-
-			case SmlNode::typeTag:
-				if( pNode->getChildren().isEmpty() )
-				{
-					if( pNode->getText() == "break" )
-					{
-						appendToken( sCurLine, sNextToken, iLineLen, iNextLen );
-						if( !sCurLine.isEmpty() )
-							sio << sCurLine << sio.nl;
-						sCurLine.clear();
-						iLineLen = 0;
-						iState = 0;
-					}
-				}
-				else
-				{
-//					sio << "Push'd: " << pNode->getText() << sio.nl;
-					Bu::String sTag = pNode->getText();
-					if( sTag == "green" )
-					{
-						sStyle.push( stGreen );
-					}
-					else if( sTag == "red" )
-					{
-						sStyle.push( stRed );
-					}
-					sNextToken += getVt100Style( sStyle );
-					sNode.push( pNode->getChildren().begin() );
-					continue;
-/*					for( SmlNode::SmlNodeList::const_iterator i =
-						 pNode->getChildren().begin(); i; i++ )
-					{
-						s
-						smlToConsole( *i, sCurLine, sNextToken, iLineLen, iState );
-					}
-*/					
-				}
-				break;
-		}
-		sNode.peek()++;
-	}
-	if( !sNextToken.isEmpty() )
-		appendToken( sCurLine, sNextToken, iLineLen, iNextLen );
-	sio << sCurLine << sio.nl;
+	SmlRendererVt100 rend;
+	rend.render( sio, pSml );
 }
 
diff --git a/src/interfaceconsole.h b/src/interfaceconsole.h
index 17b07e4..ce48003 100644
--- a/src/interfaceconsole.h
+++ b/src/interfaceconsole.h
@@ -17,21 +17,6 @@ public:
 	virtual void display( const class SmlNode *pSml );
 
 private:
-	enum Style
-	{
-		stRed		= 0x010001,
-		stGreen		= 0x010002,
-
-		stColor		= 0x01000f,
-
-		stTypeMask	= 0xff0000,
-	};
-
-	typedef Bu::List<Style> StyleStack;
-
-	void appendToken( Bu::String &sCurLine, Bu::String &sNextToken,
-		int &iLineLen, int &iNextLen );
-	Bu::String getVt100Style( const StyleStack &sStyle );
 };
 
 #endif
diff --git a/src/interfacegats.cpp b/src/interfacegats.cpp
index c14a8f2..696c6b6 100644
--- a/src/interfacegats.cpp
+++ b/src/interfacegats.cpp
@@ -1,6 +1,7 @@
 #include "interfacegats.h"
 
 #include "smlnode.h"
+#include "smlrendererhtml.h"
 
 #include <bu/plugger.h>
 #include <bu/sio.h>
@@ -24,52 +25,7 @@ void InterfaceGats::run( class Game *pGame )
 
 void InterfaceGats::display( const SmlNode *pSml )
 {
-	switch( pSml->getType() )
-	{
-		case SmlNode::typeRoot:
-			sio << "<p>";
-			for( SmlNode::SmlNodeList::const_iterator i =
-				 pSml->getChildren().begin(); i; i++ )
-			{
-				display( *i );
-			}
-			sio << "</p>";
-			break;
-
-		case SmlNode::typeText:
-			sio << pSml->getText();
-			break;
-
-		case SmlNode::typeTag:
-			if( pSml->getChildren().isEmpty() )
-			{
-				if( pSml->getText() == "break" )
-					sio << "</p><p>";
-			}
-			else
-			{
-				if( pSml->getText() == "red" )
-				{
-					sio << "<span style=\"color: red;\">";
-					for( SmlNode::SmlNodeList::const_iterator i =
-						 pSml->getChildren().begin(); i; i++ )
-					{
-						display( *i );
-					}
-					sio << "</span>";
-				}
-				else if( pSml->getText() == "green" )
-				{
-					sio << "<span style=\"color: green;\">";
-					for( SmlNode::SmlNodeList::const_iterator i =
-						 pSml->getChildren().begin(); i; i++ )
-					{
-						display( *i );
-					}
-					sio << "</span>";
-				}
-			}
-			break;
-	}
+	SmlRendererHtml rend;
+	rend.render( sio, pSml );
 }
 
diff --git a/src/smlrenderer.cpp b/src/smlrenderer.cpp
new file mode 100644
index 0000000..a009439
--- /dev/null
+++ b/src/smlrenderer.cpp
@@ -0,0 +1,10 @@
+#include "smlrenderer.h"
+
+SmlRenderer::SmlRenderer()
+{
+}
+
+SmlRenderer::~SmlRenderer()
+{
+}
+
diff --git a/src/smlrenderer.h b/src/smlrenderer.h
new file mode 100644
index 0000000..aa79189
--- /dev/null
+++ b/src/smlrenderer.h
@@ -0,0 +1,17 @@
+#ifndef SML_RENDERER_H
+#define SML_RENDERER_H
+
+#include <bu/formatter.h>
+
+class SmlNode;
+
+class SmlRenderer
+{
+public:
+	SmlRenderer();
+	virtual ~SmlRenderer();
+
+	virtual void render( Bu::Formatter &f, const SmlNode *pRoot )=0;
+};
+
+#endif
diff --git a/src/smlrendererhtml.cpp b/src/smlrendererhtml.cpp
new file mode 100644
index 0000000..372d1e3
--- /dev/null
+++ b/src/smlrendererhtml.cpp
@@ -0,0 +1,62 @@
+#include "smlrendererhtml.h"
+#include "smlnode.h"
+
+SmlRendererHtml::SmlRendererHtml()
+{
+}
+
+SmlRendererHtml::~SmlRendererHtml()
+{
+}
+
+void SmlRendererHtml::render( Bu::Formatter &f, const SmlNode *pSml )
+{
+	switch( pSml->getType() )
+	{
+		case SmlNode::typeRoot:
+			f << "<p>";
+			for( SmlNode::SmlNodeList::const_iterator i =
+				 pSml->getChildren().begin(); i; i++ )
+			{
+				render( f, *i );
+			}
+			f << "</p>";
+			break;
+
+		case SmlNode::typeText:
+			f << pSml->getText();
+			break;
+
+		case SmlNode::typeTag:
+			if( pSml->getChildren().isEmpty() )
+			{
+				if( pSml->getText() == "break" )
+					f << "</p><p>";
+			}
+			else
+			{
+				if( pSml->getText() == "red" )
+				{
+					f << "<span style=\"color: red;\">";
+					for( SmlNode::SmlNodeList::const_iterator i =
+						 pSml->getChildren().begin(); i; i++ )
+					{
+						render( f, *i );
+					}
+					f << "</span>";
+				}
+				else if( pSml->getText() == "green" )
+				{
+					f << "<span style=\"color: green;\">";
+					for( SmlNode::SmlNodeList::const_iterator i =
+						 pSml->getChildren().begin(); i; i++ )
+					{
+						render( f, *i );
+					}
+					f << "</span>";
+				}
+			}
+			break;
+	}
+}
+
diff --git a/src/smlrendererhtml.h b/src/smlrendererhtml.h
new file mode 100644
index 0000000..fe2e1b3
--- /dev/null
+++ b/src/smlrendererhtml.h
@@ -0,0 +1,15 @@
+#ifndef SML_RENDERER_HTML_H
+#define SML_RENDERER_HTML_H
+
+#include "smlrenderer.h"
+
+class SmlRendererHtml : public SmlRenderer
+{
+public:
+	SmlRendererHtml();
+	virtual ~SmlRendererHtml();
+
+	virtual void render( Bu::Formatter &f, const SmlNode *pRoot );
+};
+
+#endif
diff --git a/src/smlrenderervt100.cpp b/src/smlrenderervt100.cpp
new file mode 100644
index 0000000..2b59d5f
--- /dev/null
+++ b/src/smlrenderervt100.cpp
@@ -0,0 +1,229 @@
+#include "smlrenderervt100.h"
+#include "smlnode.h"
+
+SmlRendererVt100::SmlRendererVt100()
+{
+}
+
+SmlRendererVt100::~SmlRendererVt100()
+{
+}
+
+void SmlRendererVt100::appendToken( Bu::Formatter &f, Bu::String &sCurLine,
+		Bu::String &sNextToken, int &iLineLen, int &iNextLen )
+{
+	if( iLineLen + iNextLen + 1 >= 78 )
+	{
+		f << sCurLine << f.nl;
+		iLineLen = 0;
+		sCurLine = sNextToken;
+	}
+	else
+	{
+		sCurLine += sNextToken;
+	}
+	iLineLen += iNextLen + 1;
+	sCurLine += " ";
+	iNextLen = 0;
+	sNextToken.clear();
+}
+
+Bu::String SmlRendererVt100::getStyle( const StyleStack &sStyle )
+{
+#ifdef WIN32
+	// Windows...we don't do colors for windows...
+	return "";
+#endif
+
+	if( sStyle.isEmpty() )
+	{
+		return "\x1B[0m";
+	}
+
+	int sCurStyle = 0;
+	for( StyleStack::const_iterator i = sStyle.begin(); i; i++ )
+	{
+//		f << "Merging in: " << Fmt::hex() << *i << f.nl;
+		if( ((sCurStyle&stTypeMask) & ((*i)&stTypeMask)) == 0 )
+		{
+			sCurStyle |= *i;
+//			f << "  -> curStyle = " << Fmt::hex() << *i << f.nl;
+		}
+	}
+
+	Bu::String sRet;
+
+//	f << "Color: " << Fmt::hex() << sCurStyle << f.nl;
+	switch( sCurStyle&stColor )
+	{
+		case stRed:
+			sRet += "\x1B[1;31m";
+			break;
+
+		case stGreen:
+			sRet += "\x1B[1;32m";
+			break;
+	}
+
+	return sRet;
+}
+
+void SmlRendererVt100::render( Bu::Formatter &f, const SmlNode *pNode )
+{
+	Bu::String sCurLine;
+	Bu::String sNextToken;
+	int iLineLen = 0;
+	int iNextLen = 0;
+	int iState = 0;
+	typedef Bu::List<SmlNode::SmlNodeList::const_iterator> NodeStack;
+	NodeStack sNode;
+
+	StyleStack sStyle;
+
+	sNode.push( pNode->getChildren().begin() );
+
+	for(;;)
+	{
+		if( !sNode.peek() )
+		{
+			sNode.pop();
+			if( sNode.isEmpty() )
+				break;
+			if( sNode.peek() )
+			{
+			//	f << "Pop'd: " << (*sNode.peek())->getText() << f.nl;
+				Bu::String sTag = (*sNode.peek())->getText();
+				if( sTag == "green" || sTag == "red" )
+				{
+					sStyle.pop();
+					sNextToken += getStyle( sStyle );
+				}
+				sNode.peek()++;
+				continue;
+			}
+		}
+		if( sNode.isEmpty() )
+		{
+			break;
+		}
+		const SmlNode *pNode = (*sNode.peek());
+		switch( pNode->getType() )
+		{
+			case SmlNode::typeRoot:
+				throw Bu::ExceptionBase("Invalid root.");
+
+			case SmlNode::typeText:
+				{
+			//		f << "Process text node: " << pNode->getText() <<
+			//			f.nl;
+					Bu::String::const_iterator iBgn = pNode->getText().begin();
+					Bu::String::const_iterator iEnd = iBgn;
+					int iTmpLen = 0;
+					for(;iBgn;)
+					{
+						switch( iState )
+						{
+							case 0: // begining of paragraph
+								if( iBgn && ( *iBgn == ' ' || *iBgn == '\n' ||
+									*iBgn == '\r' || *iBgn == '\t' ) )
+								{
+									iBgn++;
+								}
+								else
+								{
+									// Here is where you would indent paragraphs
+									iNextLen += 4;
+									sNextToken += "    ";
+									iEnd = iBgn;
+									iState = 1;
+								}
+								break;
+
+							case 1: // non-whitespace
+								if( !iEnd )
+								{
+									sNextToken.append( iBgn, iEnd );
+									iBgn = iEnd;
+									iNextLen += iTmpLen;
+									iTmpLen = 0;
+								}
+								else if( *iEnd == ' ' || *iEnd == '\n' ||
+									*iEnd == '\r' || *iEnd == '\t' )
+								{
+									sNextToken.append( iBgn, iEnd );
+									iNextLen += iTmpLen;
+									iTmpLen = 0;
+									iState = 2;
+									iBgn = iEnd;
+								}
+								else
+								{
+									iEnd++;
+									iTmpLen++;
+								}
+								break;
+
+							case 2: // Whitespace
+								if( iBgn && (*iBgn == ' ' || *iBgn == '\n' ||
+									*iBgn == '\r' || *iBgn == '\t') )
+								{
+									iBgn++;
+								}
+								else
+								{
+									iEnd = iBgn;
+									iState = 1;
+									appendToken( f, sCurLine, sNextToken,
+										iLineLen, iNextLen );
+								}
+								break;
+						}
+					}
+				}
+				break;
+
+			case SmlNode::typeTag:
+				if( pNode->getChildren().isEmpty() )
+				{
+					if( pNode->getText() == "break" )
+					{
+						appendToken( f, sCurLine, sNextToken, iLineLen, iNextLen );
+						if( !sCurLine.isEmpty() )
+							f << sCurLine << f.nl;
+						sCurLine.clear();
+						iLineLen = 0;
+						iState = 0;
+					}
+				}
+				else
+				{
+//					f << "Push'd: " << pNode->getText() << f.nl;
+					Bu::String sTag = pNode->getText();
+					if( sTag == "green" )
+					{
+						sStyle.push( stGreen );
+					}
+					else if( sTag == "red" )
+					{
+						sStyle.push( stRed );
+					}
+					sNextToken += getStyle( sStyle );
+					sNode.push( pNode->getChildren().begin() );
+					continue;
+/*					for( SmlNode::SmlNodeList::const_iterator i =
+						 pNode->getChildren().begin(); i; i++ )
+					{
+						s
+						smlToConsole( *i, sCurLine, sNextToken, iLineLen, iState );
+					}
+*/					
+				}
+				break;
+		}
+		sNode.peek()++;
+	}
+	if( !sNextToken.isEmpty() )
+		appendToken( f, sCurLine, sNextToken, iLineLen, iNextLen );
+	f << sCurLine << f.nl;
+}
+
diff --git a/src/smlrenderervt100.h b/src/smlrenderervt100.h
new file mode 100644
index 0000000..ed5dd42
--- /dev/null
+++ b/src/smlrenderervt100.h
@@ -0,0 +1,32 @@
+#ifndef SML_RENDERER_VT100_H
+#define SML_RENDERER_VT100_H
+
+#include "smlrenderer.h"
+
+class SmlRendererVt100 : public SmlRenderer
+{
+public:
+	SmlRendererVt100();
+	virtual ~SmlRendererVt100();
+
+	virtual void render( Bu::Formatter &f, const SmlNode *pRoot );
+
+private:
+	enum Style
+	{
+		stRed		= 0x010001,
+		stGreen		= 0x010002,
+
+		stColor		= 0x01000f,
+
+		stTypeMask	= 0xff0000,
+	};
+
+	typedef Bu::List<Style> StyleStack;
+
+	void appendToken( Bu::Formatter &f, Bu::String &sCurLine,
+		Bu::String &sNextToken, int &iLineLen, int &iNextLen );
+	Bu::String getStyle( const StyleStack &sStyle );
+};
+
+#endif
-- 
cgit v1.2.3