From 18cb422d37084fed768518e89da6bb7ca5e8f040 Mon Sep 17 00:00:00 2001
From: Mike Buland <eichlan@xagasoft.com>
Date: Mon, 9 Jan 2012 17:08:55 -0700
Subject: Interface plugins are almost done.

At least, the basic console interface is almost done.
---
 src/interface.h          |   2 +-
 src/interfaceconsole.cpp | 222 +++++++++++++++++++++++++++++++++++++++
 src/interfaceconsole.h   |  22 ++++
 src/interfacegats.cpp    |  71 +++++++++++++
 src/interfacegats.h      |  15 +++
 src/interfaceplugger.cpp |  15 +++
 src/interfaceplugger.h   |  20 ++++
 src/options.cpp          | 264 ++++++-----------------------------------------
 src/options.h            |   1 +
 9 files changed, 397 insertions(+), 235 deletions(-)
 create mode 100644 src/interfacegats.cpp
 create mode 100644 src/interfacegats.h
 create mode 100644 src/interfaceplugger.cpp
 create mode 100644 src/interfaceplugger.h

(limited to 'src')

diff --git a/src/interface.h b/src/interface.h
index 4103f93..bc4bd06 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -7,7 +7,7 @@ public:
 	Interface();
 	virtual ~Interface();
 
-	void display();
+	virtual void display( const class SmlNode *pSml )=0;
 };
 
 #endif
diff --git a/src/interfaceconsole.cpp b/src/interfaceconsole.cpp
index 0b1b43f..05ca56c 100644
--- a/src/interfaceconsole.cpp
+++ b/src/interfaceconsole.cpp
@@ -1,5 +1,16 @@
 #include "interfaceconsole.h"
 
+#include "smlnode.h"
+
+#include <bu/sio.h>
+
+#include <bu/plugger.h>
+
+PluginInterface3( plugin_interface_console, console, InterfaceConsole,
+		Interface, "Mike Buland", 1, 0 );
+
+using namespace Bu;
+
 InterfaceConsole::InterfaceConsole()
 {
 }
@@ -8,3 +19,214 @@ InterfaceConsole::~InterfaceConsole()
 {
 }
 
+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 )
+{
+	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 )
+{
+	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;
+}
+
diff --git a/src/interfaceconsole.h b/src/interfaceconsole.h
index 74f88d0..9272087 100644
--- a/src/interfaceconsole.h
+++ b/src/interfaceconsole.h
@@ -3,11 +3,33 @@
 
 #include "interface.h"
 
+#include <bu/list.h>
+#include <bu/string.h>
+
 class InterfaceConsole : public Interface
 {
 public:
 	InterfaceConsole();
 	virtual ~InterfaceConsole();
+
+	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
new file mode 100644
index 0000000..bd936c7
--- /dev/null
+++ b/src/interfacegats.cpp
@@ -0,0 +1,71 @@
+#include "interfacegats.h"
+
+#include "smlnode.h"
+
+#include <bu/plugger.h>
+#include <bu/sio.h>
+
+using namespace Bu;
+
+PluginInterface3( plugin_interface_gats, gats, InterfaceGats,
+		Interface, "Mike Buland", 1, 0 );
+
+InterfaceGats::InterfaceGats()
+{
+}
+
+InterfaceGats::~InterfaceGats()
+{
+}
+
+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;
+	}
+}
+
diff --git a/src/interfacegats.h b/src/interfacegats.h
new file mode 100644
index 0000000..b04abb3
--- /dev/null
+++ b/src/interfacegats.h
@@ -0,0 +1,15 @@
+#ifndef INTERFACE_GATS_H
+#define INETRFACE_GATS_H
+
+#include "interface.h"
+
+class InterfaceGats : public Interface
+{
+public:
+	InterfaceGats();
+	virtual ~InterfaceGats();
+
+	virtual void display( const class SmlNode *pSml );
+};
+
+#endif
diff --git a/src/interfaceplugger.cpp b/src/interfaceplugger.cpp
new file mode 100644
index 0000000..ddb0f9a
--- /dev/null
+++ b/src/interfaceplugger.cpp
@@ -0,0 +1,15 @@
+#include "interfaceplugger.h"
+
+extern struct Bu::PluginInfo plugin_interface_console;
+extern struct Bu::PluginInfo plugin_interface_gats;
+
+InterfacePlugger::InterfacePlugger()
+{
+	registerBuiltinPlugin( &plugin_interface_console );
+	registerBuiltinPlugin( &plugin_interface_gats );
+}
+
+InterfacePlugger::~InterfacePlugger()
+{
+}
+
diff --git a/src/interfaceplugger.h b/src/interfaceplugger.h
new file mode 100644
index 0000000..ee36477
--- /dev/null
+++ b/src/interfaceplugger.h
@@ -0,0 +1,20 @@
+#ifndef INTERFACE_PLUGGER_H
+#define INETRFACE_PLUGGER_H
+
+#include <bu/singleton.h>
+#include <bu/plugger.h>
+#include "interface.h"
+
+class InterfacePlugger : public Bu::Singleton<InterfacePlugger>,
+	public Bu::Plugger<Interface>
+{
+friend class Bu::Singleton<InterfacePlugger>;
+private:
+	InterfacePlugger();
+	virtual ~InterfacePlugger();
+
+public:
+
+};
+
+#endif
diff --git a/src/options.cpp b/src/options.cpp
index c2e7313..ac43dfc 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -10,9 +10,12 @@
 #include <bu/optparser.h>
 #include <bu/sio.h>
 
+#include "interfaceplugger.h"
+
 using namespace Bu;
 
-Options::Options()
+Options::Options() :
+	sInterface("console")
 {
 }
 
@@ -29,12 +32,27 @@ void Options::parse( int argc, char *argv[] )
 	opt.addHelpBanner("usage: " + Bu::String(argv[0]) +
 			" [options] <filename>\n");
 
+	Bu::String sIFaces;
+	Bu::StringList lIFaces = InterfacePlugger::getInstance().getPluginList();
+	bool bBegin = true;
+	for( Bu::List<Bu::String>::const_iterator i = lIFaces.begin(); i; i++ )
+	{
+		if( bBegin )
+			bBegin = false;
+		else
+			sIFaces += ", ";
+		sIFaces += *i;
+	}
+
 	opt.addOption( Bu::slot( this, &Options::smlTest ), "sml-test",
 			"Test SML parser." );
 	opt.addOption( Bu::slot( this, &Options::version ), "version",
 			"Show full version info." );
 	opt.addOption( Bu::slot( this, &Options::builtins ), "builtins",
 			"List available builtins." );
+	opt.addOption( sInterface, 'i', "interface",
+			"Select interface module. Default is " + sInterface + 
+			".  Available modules: " + sIFaces );
 
 	opt.addHelpOption('h', "help");
 	opt.setNonOption( Bu::slot( this, &Options::nonOption ) );
@@ -67,238 +85,6 @@ int Options::builtins( Bu::StrArray aArgs )
 	return 0;
 }
 
-void smlToHtml( const SmlNode *pNode )
-{
-	switch( pNode->getType() )
-	{
-		case SmlNode::typeRoot:
-			sio << "<p>";
-			for( SmlNode::SmlNodeList::const_iterator i =
-				 pNode->getChildren().begin(); i; i++ )
-			{
-				smlToHtml( *i );
-			}
-			sio << "</p>";
-			break;
-
-		case SmlNode::typeText:
-			sio << pNode->getText();
-			break;
-
-		case SmlNode::typeTag:
-			if( pNode->getChildren().isEmpty() )
-			{
-				if( pNode->getText() == "break" )
-					sio << "</p><p>";
-			}
-			else
-			{
-				if( pNode->getText() == "red" )
-				{
-					sio << "<span style=\"color: red;\">";
-					for( SmlNode::SmlNodeList::const_iterator i =
-						 pNode->getChildren().begin(); i; i++ )
-					{
-						smlToHtml( *i );
-					}
-					sio << "</span>";
-				}
-				else if( pNode->getText() == "green" )
-				{
-					sio << "<span style=\"color: green;\">";
-					for( SmlNode::SmlNodeList::const_iterator i =
-						 pNode->getChildren().begin(); i; i++ )
-					{
-						smlToHtml( *i );
-					}
-					sio << "</span>";
-				}
-			}
-			break;
-	}
-}
-
-void 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();
-}
-
-void smlToConsole( 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;
-
-	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" )
-				{
-					sNextToken += "\x1B[0m";
-				}
-				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" )
-					{
-						sNextToken += "\x1B[1;32m";
-					}
-					else if( sTag == "red" )
-					{
-						sNextToken += "\x1B[1;31m";
-					}
-					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;
-}
-/*
-void smlToConsole( const SmlNode *pNode )
-{
-	Bu::String sBuf, sBuf2;
-	int i1 = 0, i2 = 0;
-	smlToConsole( pNode, sBuf, sBuf2, i1, i2 );
-	appendToken( sBuf, sBuf2, i1 );
-	sio << sBuf << sBuf2 << sio.nl;
-}*/
-
 int Options::smlTest( Bu::Array<Bu::String> aArgs )
 {
 	Bu::String sContent;
@@ -313,7 +99,17 @@ int Options::smlTest( Bu::Array<Bu::String> aArgs )
 	SmlNode *pRoot = SmlNode::parse( sContent );
 	sio << *pRoot << sio.nl;
 
-	smlToConsole( pRoot );
+	try
+	{
+		InterfacePlugger &ip = InterfacePlugger::getInstance();
+		Interface *pIface = ip.instantiate( sInterface );
+		pIface->display( pRoot );
+		ip.destroy( pIface );
+	}
+	catch( Bu::HashException &e )
+	{
+		sio << "No such interface found." << sio.nl;
+	}
 
 	delete pRoot;
 
diff --git a/src/options.h b/src/options.h
index b97285b..3012a58 100644
--- a/src/options.h
+++ b/src/options.h
@@ -16,6 +16,7 @@ public:
 	void parse( int argc, char *argv[] );
 
 	Bu::String sFile;
+	Bu::String sInterface;
 
 protected:
 	int version( Bu::Array<Bu::String> aArgs );
-- 
cgit v1.2.3