""

svn path=/trunk/; revision=1826

1 files changed, 193 insertions, 181 deletions

diff --git a/externals/grill/flext/source/flmsg.cpp b/externals/grill/flext/source/flmsg.cpp
index e586274e..3191edc0 100755
--- a/externals/grill/flext/source/flmsg.cpp
+++ b/externals/grill/flext/source/flmsg.cpp
@@ -16,60 +16,60 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 
 bool flext_base::CallMeth(const MethItem &m,int argc,const t_atom *argv)
 {
-	bool ret = false;
-	int ix;
-	t_any aargs[FLEXT_MAXMETHARGS];
-	bool ok = true;
-	for(ix = 0; ix < argc && ok; ++ix) {
-		switch(m.args[ix]) {
-		case a_float: {
-			if(IsFloat(argv[ix])) aargs[ix].ft = GetFloat(argv[ix]);
-			else if(IsInt(argv[ix])) aargs[ix].ft = (float)GetInt(argv[ix]);
-			else ok = false;
-			
-			if(ok) FLEXT_LOG2("int arg %i = %f",ix,aargs[ix].ft);
-			break;
-		}
-		case a_int: {
-			if(IsFloat(argv[ix])) aargs[ix].it = (int)GetFloat(argv[ix]);
-			else if(IsInt(argv[ix])) aargs[ix].it = GetInt(argv[ix]);
-			else ok = false;
-			
-			if(ok) FLEXT_LOG2("float arg %i = %i",ix,aargs[ix].it);
-			break;
-		}
-		case a_symbol: {
-			if(IsSymbol(argv[ix])) aargs[ix].st = GetSymbol(argv[ix]);
-			else ok = false;
-			
-			if(ok) FLEXT_LOG2("symbol arg %i = %s",ix,GetString(aargs[ix].st));
-			break;
-		}
+    bool ret = false;
+    int ix;
+    t_any aargs[FLEXT_MAXMETHARGS];
+    bool ok = true;
+    for(ix = 0; ix < argc && ok; ++ix) {
+        switch(m.args[ix]) {
+        case a_float: {
+            if(IsFloat(argv[ix])) aargs[ix].ft = GetFloat(argv[ix]);
+            else if(IsInt(argv[ix])) aargs[ix].ft = (float)GetInt(argv[ix]);
+            else ok = false;
+            
+            if(ok) FLEXT_LOG2("int arg %i = %f",ix,aargs[ix].ft);
+            break;
+        }
+        case a_int: {
+            if(IsFloat(argv[ix])) aargs[ix].it = (int)GetFloat(argv[ix]);
+            else if(IsInt(argv[ix])) aargs[ix].it = GetInt(argv[ix]);
+            else ok = false;
+            
+            if(ok) FLEXT_LOG2("float arg %i = %i",ix,aargs[ix].it);
+            break;
+        }
+        case a_symbol: {
+            if(IsSymbol(argv[ix])) aargs[ix].st = GetSymbol(argv[ix]);
+            else ok = false;
+            
+            if(ok) FLEXT_LOG2("symbol arg %i = %s",ix,GetString(aargs[ix].st));
+            break;
+        }
 #if FLEXT_SYS == FLEXT_SYS_PD
-		case a_pointer: {
-			if(IsPointer(argv[ix])) aargs[ix].pt = (t_gpointer *)GetPointer(argv[ix]);
-			else ok = false;
-			break;
-		}
+        case a_pointer: {
+            if(IsPointer(argv[ix])) aargs[ix].pt = (t_gpointer *)GetPointer(argv[ix]);
+            else ok = false;
+            break;
+        }
 #endif
-		default:
-			error("Argument type illegal");
-			ok = false;
-		}
-	}
-
-	if(ok && ix == argc) {
-		switch(argc) {
-		case 0:	ret = ((methfun_0)m.fun)(this); break;
-		case 1:	ret = ((methfun_1)m.fun)(this,aargs[0]); break;
-		case 2:	ret = ((methfun_2)m.fun)(this,aargs[0],aargs[1]); break;
-		case 3:	ret = ((methfun_3)m.fun)(this,aargs[0],aargs[1],aargs[2]); break;
-		case 4:	ret = ((methfun_4)m.fun)(this,aargs[0],aargs[1],aargs[2],aargs[3]); break;
-		case 5:	ret = ((methfun_5)m.fun)(this,aargs[0],aargs[1],aargs[2],aargs[3],aargs[4]); break;
-		}
-	}
-	
-	return ret;
+        default:
+            error("Argument type illegal");
+            ok = false;
+        }
+    }
+
+    if(ok && ix == argc) {
+        switch(argc) {
+        case 0: ret = ((methfun_0)m.fun)(this); break;
+        case 1: ret = ((methfun_1)m.fun)(this,aargs[0]); break;
+        case 2: ret = ((methfun_2)m.fun)(this,aargs[0],aargs[1]); break;
+        case 3: ret = ((methfun_3)m.fun)(this,aargs[0],aargs[1],aargs[2]); break;
+        case 4: ret = ((methfun_4)m.fun)(this,aargs[0],aargs[1],aargs[2],aargs[3]); break;
+        case 5: ret = ((methfun_5)m.fun)(this,aargs[0],aargs[1],aargs[2],aargs[3],aargs[4]); break;
+        }
+    }
+    
+    return ret;
 }
 
 bool flext_base::TryMethTag(Item *lst,const t_symbol *tag,int argc,const t_atom *argv)
@@ -78,29 +78,29 @@ bool flext_base::TryMethTag(Item *lst,const t_symbol *tag,int argc,const t_atom
         MethItem *m = (MethItem *)lst;
 
 //        FLEXT_LOG3("found method tag %s: inlet=%i, argc=%i",GetString(tag),m->inlet,argc);
-	
-		if(m->attr) {
-			// attributes are treated differently
-
-			if(m->attr->IsGet())
-				return DumpAttrib(tag,m->attr);
-			else
-				return SetAttrib(tag,m->attr,argc,argv);
-		}
-		else {
-			if(m->argc == 1) {
-				// try list
-				if(m->args[0] == a_list && ((methfun_V)m->fun)(this,argc,const_cast<t_atom *>(argv))) return true;
-
-				// try anything
-				if(m->args[0] == a_any && ((methfun_A)m->fun)(this,tag,argc,const_cast<t_atom *>(argv))) return true;
-			}
-
-			// try matching number of args
-			if(argc == m->argc && CallMeth(*m,argc,argv)) return true;
-		}
-	}
-	return false;
+    
+        if(m->attr) {
+            // attributes are treated differently
+
+            if(m->attr->IsGet())
+                return DumpAttrib(tag,m->attr);
+            else
+                return SetAttrib(tag,m->attr,argc,argv);
+        }
+        else {
+            if(m->argc == 1) {
+                // try list
+                if(m->args[0] == a_list && ((methfun_V)m->fun)(this,argc,const_cast<t_atom *>(argv))) return true;
+
+                // try anything
+                if(m->args[0] == a_any && ((methfun_A)m->fun)(this,tag,argc,const_cast<t_atom *>(argv))) return true;
+            }
+
+            // try matching number of args
+            if(argc == m->argc && CallMeth(*m,argc,argv)) return true;
+        }
+    }
+    return false;
 }
 
 bool flext_base::TryMethSym(Item *lst,const t_symbol *s)
@@ -108,14 +108,14 @@ bool flext_base::TryMethSym(Item *lst,const t_symbol *s)
     for(; lst; lst = lst->nxt) {
         MethItem *m = (MethItem *)lst;
 
-		if(!m->IsAttr()) {
-//			FLEXT_LOG3("found symbol method for %s: inlet=%i, symbol=%s",GetString(m->tag),m->inlet,GetString(s));
+        if(!m->IsAttr()) {
+//          FLEXT_LOG3("found symbol method for %s: inlet=%i, symbol=%s",GetString(m->tag),m->inlet,GetString(s));
 
-			t_any sym; sym.st = const_cast<t_symbol *>(s);
-			if(((methfun_1)m->fun)(this,sym)) return true;
-		}
-	}
-	return false;
+            t_any sym; sym.st = const_cast<t_symbol *>(s);
+            if(((methfun_1)m->fun)(this,sym)) return true;
+        }
+    }
+    return false;
 }
 
 bool flext_base::TryMethAny(Item *lst,const t_symbol *s,int argc,const t_atom *argv)
@@ -123,141 +123,153 @@ bool flext_base::TryMethAny(Item *lst,const t_symbol *s,int argc,const t_atom *a
     for(; lst; lst = lst->nxt) {
         MethItem *m = (MethItem *)lst;
 
-		if(!m->IsAttr() && m->argc == 1 && m->args[0] == a_any) {
-//			FLEXT_LOG4("found any method for %s: inlet=%i, symbol=%s, argc=%i",GetString(m->tag),m->inlet,GetString(s),argc);
+        if(!m->IsAttr() && m->argc == 1 && m->args[0] == a_any) {
+//          FLEXT_LOG4("found any method for %s: inlet=%i, symbol=%s, argc=%i",GetString(m->tag),m->inlet,GetString(s),argc);
 
-			if(((methfun_A)m->fun)(this,s,argc,const_cast<t_atom *>(argv))) return true;
-		}
+            if(((methfun_A)m->fun)(this,s,argc,const_cast<t_atom *>(argv))) return true;
+        }
     }
     return false;
 }
 
 /*! \brief Find a method item for a specific tag and arguments
-	\remark All attributes are also stored in the method list and retrieved by a member of the method item
+    \remark All attributes are also stored in the method list and retrieved by a member of the method item
 */
 bool flext_base::FindMeth(int inlet,const t_symbol *s,int argc,const t_atom *argv)
 {
     Item *lst;
 
-	// search for exactly matching tag
-	if((lst = methhead->FindList(s,inlet)) != NULL && TryMethTag(lst,s,argc,argv)) return true;
-	if((lst = clmethhead->FindList(s,inlet)) != NULL && TryMethTag(lst,s,argc,argv)) return true;
-	
-	// if no list args, then search for pure symbol 
-	if(!argc) {
-		if((lst = methhead->FindList(sym_symbol,inlet)) != NULL && TryMethSym(lst,s)) return true;
-		if((lst = clmethhead->FindList(sym_symbol,inlet)) != NULL && TryMethSym(lst,s)) return true;
-	}
-	
-	// otherwise search for anything
-	if((lst = methhead->FindList(sym_anything,inlet)) != NULL && TryMethAny(lst,s,argc,argv)) return true;
-	if((lst = clmethhead->FindList(sym_anything,inlet)) != NULL && TryMethAny(lst,s,argc,argv)) return true;
-
-	// if nothing found try any inlet
-	return inlet >= 0 && FindMeth(-1,s,argc,argv);
+    // search for exactly matching tag
+    if((lst = methhead->FindList(s,inlet)) != NULL && TryMethTag(lst,s,argc,argv)) return true;
+    if((lst = clmethhead->FindList(s,inlet)) != NULL && TryMethTag(lst,s,argc,argv)) return true;
+    
+    // if no list args, then search for pure symbol 
+    if(!argc) {
+        if((lst = methhead->FindList(sym_symbol,inlet)) != NULL && TryMethSym(lst,s)) return true;
+        if((lst = clmethhead->FindList(sym_symbol,inlet)) != NULL && TryMethSym(lst,s)) return true;
+    }
+    
+    // otherwise search for anything
+    if((lst = methhead->FindList(sym_anything,inlet)) != NULL && TryMethAny(lst,s,argc,argv)) return true;
+    if((lst = clmethhead->FindList(sym_anything,inlet)) != NULL && TryMethAny(lst,s,argc,argv)) return true;
+
+    // if nothing found try any inlet
+    return inlet >= 0 && FindMeth(-1,s,argc,argv);
 }
 
 /*! \brief All the message processing
-	The messages of all the inlets go here and are promoted to the registered callback functions
+    The messages of all the inlets go here and are promoted to the registered callback functions
 */
 bool flext_base::m_methodmain(int inlet,const t_symbol *s,int argc,const t_atom *argv)
 {
-	static bool trap = false;
+    static bool trap = false;
+
+    curtag = s;
+
+//  post("methodmain inlet:%i args:%i symbol:%s",inlet,argc,s?GetString(s):"");
 
-	curtag = s;
+    bool ret = FindMeth(inlet,s,argc,argv);
+    if(ret) goto end;
 
-//	post("methodmain inlet:%i args:%i symbol:%s",inlet,argc,s?GetString(s):"");
-	
-	bool ret = FindMeth(inlet,s,argc,argv);
-	if(ret) goto end;
+    try {
 
 #if FLEXT_SYS == FLEXT_SYS_MAX
-	// If float message is not explicitly handled: try int handler instead
-	if(argc == 1 && s == sym_float && !trap) {
-		t_atom fl;
-		SetInt(fl,GetAInt(argv[0]));
-		trap = true;
-		ret = m_methodmain(inlet,sym_int,1,&fl);
-		trap = false;
-	}
-	if(ret) goto end;
-	
-	// If int message is not explicitly handled: try float handler instead
-	if(argc == 1 && s == sym_int && !trap) {
-		t_atom fl;
-		SetFloat(fl,GetAFloat(argv[0]));
-		trap = true;
-		ret = m_methodmain(inlet,sym_float,1,&fl);
-		trap = false;
-	}
-	if(ret) goto end;
+        // If float message is not explicitly handled: try int handler instead
+        if(argc == 1 && s == sym_float && !trap) {
+            t_atom fl;
+            SetInt(fl,GetAInt(argv[0]));
+            trap = true;
+            ret = m_methodmain(inlet,sym_int,1,&fl);
+            trap = false;
+        }
+        if(ret) goto end;
+        
+        // If int message is not explicitly handled: try float handler instead
+        if(argc == 1 && s == sym_int && !trap) {
+            t_atom fl;
+            SetFloat(fl,GetAFloat(argv[0]));
+            trap = true;
+            ret = m_methodmain(inlet,sym_float,1,&fl);
+            trap = false;
+        }
+        if(ret) goto end;
 #endif
-	
-	// If float or int message is not explicitly handled: try list handler instead
-	if(!trap && argc == 1 && (s == sym_float
+        
+        // If float or int message is not explicitly handled: try list handler instead
+        if(!trap && argc == 1 && (s == sym_float
 #if FLEXT_SYS == FLEXT_SYS_MAX
-		|| s == sym_int
+            || s == sym_int
 #endif
-	)) {
-		t_atom list;
-		if(s == sym_float) 
-			SetFloat(list,GetFloat(argv[0]));
+        )) {
+            t_atom list;
+            if(s == sym_float) 
+                SetFloat(list,GetFloat(argv[0]));
 #if FLEXT_SYS == FLEXT_SYS_MAX
-		else if(s == sym_int)
-			SetInt(list,GetInt(argv[0]));
+            else if(s == sym_int)
+                SetInt(list,GetInt(argv[0]));
 #endif
 
-		trap = true;
-		ret = m_methodmain(inlet,sym_list,1,&list);
-		trap = false;
-	}
-	if(ret) goto end;
-
-	// If symbol message (pure anything without args) is not explicitly handled: try list handler instead
-	if(!trap && argc == 0) {
-		t_atom list;
-		SetSymbol(list,s);
-		trap = true;
-		ret = m_methodmain(inlet,sym_list,1,&list);
-		trap = false;
-	}
-	if(ret) goto end;
-
-	// if distmsgs is switched on then distribute list elements over inlets (Max/MSP behavior)
-	if(distmsgs && !trap && inlet == 0 && s == sym_list && insigs <= 1) {
-		int i = incnt;
-		if(i > argc) i = argc;
-		for(--i; i >= 0; --i) { // right to left distribution
-			const t_symbol *sym = NULL;
-			if(IsFloat(argv[i])) sym = sym_float;
-			else if(IsInt(argv[i])) sym = sym_int;
-			else if(IsSymbol(argv[i])) sym = sym_symbol;
+            trap = true;
+            ret = m_methodmain(inlet,sym_list,1,&list);
+            trap = false;
+        }
+        if(ret) goto end;
+
+        // If symbol message (pure anything without args) is not explicitly handled: try list handler instead
+        if(!trap && argc == 0) {
+            t_atom list;
+            SetSymbol(list,s);
+            trap = true;
+            ret = m_methodmain(inlet,sym_list,1,&list);
+            trap = false;
+        }
+        if(ret) goto end;
+
+        // if distmsgs is switched on then distribute list elements over inlets (Max/MSP behavior)
+        if(distmsgs && !trap && inlet == 0 && s == sym_list && insigs <= 1) {
+            int i = incnt;
+            if(i > argc) i = argc;
+            for(--i; i >= 0; --i) { // right to left distribution
+                const t_symbol *sym = NULL;
+                if(IsFloat(argv[i])) sym = sym_float;
+                else if(IsInt(argv[i])) sym = sym_int;
+                else if(IsSymbol(argv[i])) sym = sym_symbol;
 #if FLEXT_SYS == FLEXT_SYS_PD
-			else if(IsPointer(argv[i])) sym = sym_pointer;  // can pointer atoms occur here?
+                else if(IsPointer(argv[i])) sym = sym_pointer;  // can pointer atoms occur here?
 #endif
-			if(sym) {
-				trap = true;
-				m_methodmain(i,sym,1,argv+i);			
-				trap = false;
-			}
-		}
-		
-		ret = true;
-	}
-	
-	if(!ret && !trap) ret = m_method_(inlet,s,argc,argv);
-	
+                if(sym) {
+                    trap = true;
+                    m_methodmain(i,sym,1,argv+i);           
+                    trap = false;
+                }
+            }
+            
+            ret = true;
+        }
+        
+        if(!ret && !trap) ret = m_method_(inlet,s,argc,argv);
+    }
+    catch(std::exception &x) {
+        error("%s - Exception while processing method: %s",thisName(),x.what());
+    }
+    catch(const char *txt) {
+    	error("%s - Exception while processing method: %s",thisName(),txt);
+    }
+    catch(...) {
+    	error("%s - Unknown exception while processing method",thisName());
+    }
+
 end:
-	curtag = NULL;
+    curtag = NULL;
 
-	return ret; // true if appropriate handler was found and called
+    return ret; // true if appropriate handler was found and called
 }
 
 bool flext_base::m_method_(int inlet,const t_symbol *s,int argc,const t_atom *argv) 
 {
 //#ifdef FLEXT_DEBUG
-	post("%s: message unhandled - inlet:%i args:%i symbol:%s",thisName(),inlet,argc,s?GetString(s):"");
+    post("%s: message unhandled - inlet:%i args:%i symbol:%s",thisName(),inlet,argc,s?GetString(s):"");
 //#endif
-	return false;
+    return false;
 }