Hey, Bu::MiniMacro works, that's a funny name. There's still some more to add,

but it does everything I need it to at the moment.

1 files changed, 117 insertions, 0 deletions

diff --git a/src/minimacro.cpp b/src/minimacro.cpp
index 274c13b..374b7de 100644
--- a/src/minimacro.cpp
+++ b/src/minimacro.cpp
@@ -6,12 +6,129 @@
  */
 
 #include "bu/minimacro.h"
+#include "bu/exceptions.h"
 
 Bu::MiniMacro::MiniMacro()
 {
+        hFuncs.insert("toupper", new FuncToUpper() );
+        hFuncs.insert("tolower", new FuncToLower() );
 }
 
 Bu::MiniMacro::~MiniMacro()
 {
 }
 
+Bu::FString Bu::MiniMacro::parse( const Bu::FString &sIn )
+{
+        Bu::FString sOut;
+        for( sCur = sIn.getStr(); *sCur; sCur++ )
+        {
+                if( *sCur == '{' )
+                {
+                        switch( sCur[1] )
+                        {
+                                case '=':
+                                        sCur += 2;
+                                        sOut += parseRepl();
+                                        break;
+
+                                case '?':
+                                        sCur += 2;
+                                        sOut += parseCond();
+                                        break;
+
+                                case ':':
+                                        sCur += 2;
+                                        sOut += parseCmd();
+                                        break;
+
+                                default:
+                                        sOut += *sCur;
+                                        continue;
+                        }
+                }
+                else
+                {
+                        sOut += *sCur;
+                }
+        }
+
+        return sOut;
+}
+
+Bu::FString Bu::MiniMacro::parseRepl()
+{
+        Bu::FString sOut;
+        bool bIsFirst = true;
+        for( const char *sNext = sCur;;)
+        {
+                for(; *sNext != ':' && *sNext != '}' && *sNext != '\0'; sNext++ );
+                if( *sNext == '\0' )
+                        break;
+                Bu::FString sName( sCur, (int)sNext-(int)sCur );
+                if( bIsFirst )
+                {
+                        sOut = hVars[sName];
+                        bIsFirst = false;
+                        printf("Variable: \"%s\"\n", sName.getStr() );
+                }
+                else
+                {
+                        sOut = callFunc( sOut, sName );
+                        printf("Filter: \"%s\"\n", sName.getStr() );
+                }
+                if( *sNext == '}' )
+                {
+                        sCur = sNext;
+                        break;
+                }
+                else if( *sNext == ':' )
+                {
+                }
+                sNext++;
+                sCur = sNext;
+        }
+        return sOut;
+}
+
+Bu::FString Bu::MiniMacro::parseCond()
+{
+        Bu::FString sOut;
+        printf("%20s\n", sCur );
+        return sOut;
+}
+
+Bu::FString Bu::MiniMacro::parseCmd()
+{
+        Bu::FString sOut;
+        printf("%20s\n", sCur );
+        return sOut;
+}
+
+Bu::FString Bu::MiniMacro::callFunc(
+        const Bu::FString &sIn, const Bu::FString &sFunc )
+{
+        int i = sFunc.find('(');
+        if( i < 0 )
+                throw Bu::ExceptionBase("That doesn't look like a function call");
+        Bu::FString sName( sFunc.getStr(), i );
+        StrList lsParams;
+        for( const char *s = sFunc.getStr()+i+1; *s && *s != ')'; s++ )
+        {
+                for(; *s == ' ' || *s == '\t' || *s == '\r' || *s == '\n'; s++ );
+                const char *sNext;
+                for( sNext = s; *sNext && *sNext != ')' && *sNext != ','; sNext++ );
+                Bu::FString p( s, (int)sNext-(int)s );
+                lsParams.append( p );
+                sNext++;
+                s = sNext;
+        }
+        return hFuncs.get( sName )->call( sIn, lsParams );
+}
+
+void Bu::MiniMacro::addVar(
+        const Bu::FString &sName, const Bu::FString &sValue )
+{
+        hVars.insert( sName, sValue );
+}
+