Loads of updates to several systems, see each for what really changed, the

biggest are the updates to the exception framework, and to the pproc system,
which is almost a competitor to popt already...

1 files changed, 91 insertions, 2 deletions

diff --git a/src/pproc.cpp b/src/pproc.cpp
index f5cb869..ea836eb 100644
--- a/src/pproc.cpp
+++ b/src/pproc.cpp
@@ -2,8 +2,76 @@
 #include <string.h>
 #include "pproc.h"
 
+void pprocHelp( PPROC *pproc )
+{
+        for( int j = 0; pproc[j].proc || pproc[j].stateVar; j++ )
+        {
+                printf("%c, %s - %s\n",
+                        pproc[j].cChar,
+                        pproc[j].lpWord,
+                        pproc[j].shortHelp );
+        }
+}
+
+void grabParamAsData( PPROC *pproc, char *str, int *aind, int *cind )
+{
+        switch( pproc->cMode & PPROC_TYPE )
+        {
+                case PPROC_BOOL_TRUE:
+                        *((bool *)pproc->stateVar) = true;
+                        break;
+                        
+                case PPROC_BOOL_FALSE:
+                        *((bool *)pproc->stateVar) = false;
+                        break;
+                        
+                case PPROC_BOOL_TOGGLE:
+                        *((bool *)pproc->stateVar) = !(*((bool *)pproc->stateVar));
+                        break;
+                        
+                case PPROC_CHAR:
+                        (*cind)++;
+                        *((char *)pproc->stateVar) = str[(*cind)];
+                        break;
+                        
+                case PPROC_SHORT:
+                        break;
+                        
+                case PPROC_LONG:
+                        break;
+                        
+                case PPREC_LONG_LONG:
+                        break;
+                        
+                case PPROC_UCHAR:
+                        break;
+                        
+                case PPROC_USHORT:
+                        break;
+                        
+                case PPROC_ULONG:
+                        break;
+                        
+                case PPREC_ULONG_LONG:
+                        break;
+                        
+                case PPROC_FLOAT:
+                        break;
+                        
+                case PPROC_DOUBLE:
+                        break;
+                        
+                case PPROC_LONG_DOUBLE:
+                        break;
+                        
+                case PPROC_STRING:
+                        break;
+        }
+}
+
 void processParams( int argc, char *argv[], PPROC *pproc )
 {
+        bool bUsed;
         // Loop over all the params except the first, no params, no looping!
         for( int j = 1; j < argc; j++ )
         {
@@ -12,6 +80,7 @@ void processParams( int argc, char *argv[], PPROC *pproc )
                 {
                         if( argv[j][1] == '-' )
                         {
+                                bUsed = false;
                                 // Proccess a long-word param string
                                 for( int k = 0;
                                         pproc[k].proc != NULL || pproc[k].stateVar != NULL;
@@ -19,19 +88,29 @@ void processParams( int argc, char *argv[], PPROC *pproc )
                                 {
                                         if( !strcmp( pproc[k].lpWord, &argv[j][2] ) )
                                         {
+                                                bUsed = true;
                                                 if( pproc[k].proc != NULL )
                                                 {
                                                         j += pproc[k].proc( argc-j, &argv[j] );
                                                 }
                                                 if( pproc[k].stateVar != NULL )
                                                 {
-                                                        (*(pproc[k].stateVar)) = pproc[k].bSetState;
+                                                        grabParamAsData( &pproc[k], argv[j+1], &j, &k );
                                                 }
+                                                break;
+                                        }
+                                }
+                                if( !bUsed )
+                                {
+                                        if( !strcmp( "help", &argv[j][2] ) )
+                                        {
+                                                pprocHelp( pproc );
                                         }
                                 }
                         }
                         else
                         {
+                                bUsed = false;
                                 // Process a one char param string
                                 for( int k = 0;
                                         pproc[k].proc != NULL || pproc[k].stateVar != NULL;
@@ -39,14 +118,24 @@ void processParams( int argc, char *argv[], PPROC *pproc )
                                 {
                                         if( pproc[k].cChar == argv[j][1] )
                                         {
+                                                bUsed = true;
                                                 if( pproc[k].proc != NULL )
                                                 {
                                                         j += pproc[k].proc( argc-j, &argv[j] );
                                                 }
                                                 if( pproc[k].stateVar != NULL )
                                                 {
-                                                        (*(pproc[k].stateVar)) = pproc[k].bSetState;
+                                                        int tmp = 1;
+                                                        grabParamAsData( &pproc[k], argv[j], &j, &tmp );
                                                 }
+                                                break;
+                                        }
+                                }
+                                if( !bUsed )
+                                {
+                                        if( argv[j][1] == 'h' )
+                                        {
+                                                pprocHelp( pproc );
                                         }
                                 }
                         }