Two experimental SML converters.

3 files changed, 192 insertions, 2 deletions

diff --git a/demo.stage b/demo.stage
index 5ba0c13..c644522 100644
--- a/demo.stage
+++ b/demo.stage
@@ -133,9 +133,9 @@ situation <<beachEast>>
         }
         enter
         {
-                display('''You're standing on a narrow stretch of beach.  The ocean
+                display('''You're standing on a narrow stretch of beach.[break]  The ocean
                         sparkles to the north, there's a cliff face just to the south.  The
-                        beach extends westward.  To the east are some jagged rocks.''');
+                        beach extends [green>westward<green].  To the east are some jagged rocks.''');
         }
 }
 
diff --git a/src/options.cpp b/src/options.cpp
index 1cc76ce..0f84e1c 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -67,6 +67,189 @@ 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 )
+{
+        if( iLineLen + sNextToken.getSize() + 1 >= 78 )
+        {
+                sio << sCurLine << sio.nl;
+                iLineLen = 0;
+                sCurLine = sNextToken;
+
+        }
+        else
+        {
+                sCurLine += sNextToken;
+        }
+        iLineLen += sNextToken.getSize() + 1;
+        sCurLine += " ";
+        sNextToken.clear();
+}
+
+void smlToConsole( const SmlNode *pNode, Bu::String &sCurLine,
+                Bu::String &sNextToken, int &iLineLen, int &iState )
+{
+//      sio << "Begin: iState = " << iState << sio.nl;
+        switch( pNode->getType() )
+        {
+                case SmlNode::typeRoot:
+                        for( SmlNode::SmlNodeList::const_iterator i =
+                                 pNode->getChildren().begin(); i; i++ )
+                        {
+                                smlToConsole( *i, sCurLine, sNextToken, iLineLen, iState );
+                        }
+                        break;
+
+                case SmlNode::typeText:
+                        {
+                                Bu::String::const_iterator iBgn = pNode->getText().begin();
+                                Bu::String::const_iterator iEnd = iBgn;
+                                for(;iBgn;)
+                                {
+//                                      sio << iState << ": [" << (iBgn?*iBgn:'-') << ":"
+//                                              << (iEnd?*iEnd:'-') << "]"
+//                                              << sio.nl;
+                                        int iTmpLen = 0;
+                                        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;
+                                                        }
+                                                        else if( *iEnd == ' ' || *iEnd == '\n' ||
+                                                                *iEnd == '\r' || *iEnd == '\t' )
+                                                        {
+                                                                sNextToken.append( iBgn, iEnd );
+                                                                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 );
+                                                        }
+                                                        break;
+                                        }
+                                }
+                        }
+                        break;
+
+                case SmlNode::typeTag:
+                        if( pNode->getChildren().isEmpty() )
+                        {
+                                if( pNode->getText() == "break" )
+                                {
+                                        appendToken( sCurLine, sNextToken, iLineLen );
+                                        if( !sCurLine.isEmpty() )
+                                                sio << sCurLine << sio.nl;
+                                        sCurLine.clear();
+                                        iLineLen = 0;
+                                        iState = 0;
+                                }
+                        }
+                        else
+                        {
+                                for( SmlNode::SmlNodeList::const_iterator i =
+                                         pNode->getChildren().begin(); i; i++ )
+                                {
+                                        smlToConsole( *i, sCurLine, sNextToken, iLineLen, iState );
+                                }
+                        }
+                        break;
+        }
+
+//      sio << "Green? \x1b[1mhello\x1b[0m huh" << 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;
@@ -80,6 +263,9 @@ int Options::smlTest( Bu::Array<Bu::String> aArgs )
 
         SmlNode *pRoot = SmlNode::parse( sContent );
         sio << *pRoot << sio.nl;
+
+        smlToConsole( pRoot );
+
         delete pRoot;
 
         exit( 0 );
diff --git a/src/smlnode.cpp b/src/smlnode.cpp
index a9e533d..e2f8a74 100644
--- a/src/smlnode.cpp
+++ b/src/smlnode.cpp
@@ -13,6 +13,10 @@ SmlNode::SmlNode( Type eType, const Bu::String &sText, SmlNode *pParent ) :
 
 SmlNode::~SmlNode()
 {
+        for( SmlNodeList::iterator i = lChildren.begin(); i; i++ )
+        {
+                delete *i;
+        }
 }
 
 SmlNode *SmlNode::parse( const Bu::String &sSrc )