[Gridflow-cvs] [svn] commit: r6371 - in /trunk/src: gridflow.cxx numop2.cxx

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Mon Sep 27 16:13:20 EDT 2010


Author: matju
Date: Mon Sep 27 16:13:19 2010
New Revision: 6371

Log:
merge vop_dict into op_dict because vecops and other numops never have conflicting names

Modified:
    trunk/src/gridflow.cxx
    trunk/src/numop2.cxx

Modified: trunk/src/gridflow.cxx
==============================================================================
--- trunk/src/gridflow.cxx (original)
+++ trunk/src/gridflow.cxx Mon Sep 27 16:13:19 2010
@@ -243,10 +243,8 @@
 Numop *convert(const t_atom2 &x, Numop **bogus) {
 	if (x.a_type!=A_SYMBOL) RAISE("expected numop (as symbol)");
 	string k = string(x.a_symbol->s_name);
-	if (op_dict.find(k)==op_dict.end()) {
-		if (vop_dict.find(k)==vop_dict.end()) RAISE("expected two-input-operator, not '%s'", k.data());
-		return vop_dict[k];
-	} else return op_dict[k];
+	if (op_dict.find(k)==op_dict.end()) RAISE("expected two-input-operator, not '%s'", k.data());
+	return op_dict[k];
 }
 
 int Numop::arity () {RAISE("Numop::arity() : pure-virtual function called !");}

Modified: trunk/src/numop2.cxx
==============================================================================
--- trunk/src/numop2.cxx (original)
+++ trunk/src/numop2.cxx Mon Sep 27 16:13:19 2010
@@ -415,12 +415,11 @@
 #ifdef PASS1
 map<string,NumberType *> number_type_dict;
 map<string,Numop *> op_dict;
-map<string,Numop *> vop_dict;
 void startup_numop2 () {
-	INIT_TABLE( op_dict,op_table1)
-	INIT_TABLE( op_dict,op_table2)
-	INIT_TABLE( op_dict,op_table3)
-	INIT_TABLE(vop_dict,op_table4)
+	INIT_TABLE(op_dict,op_table1)
+	INIT_TABLE(op_dict,op_table2)
+	INIT_TABLE(op_dict,op_table3)
+	INIT_TABLE(op_dict,op_table4)
 	INIT_TABLE(number_type_dict,number_type_table)
 
 	for (int i=0; i<COUNT(number_type_table); i++) {



More information about the Gridflow-cvs mailing list