[Gridflow-cvs] [svn] commit: r6563 - in /trunk: src/expr.cxx tests/#expr-test.pd tests/is.pd

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Mon Feb 7 14:53:37 EST 2011


Author: matju
Date: Mon Feb  7 14:53:35 2011
New Revision: 6563

Log:
fixed "wrong number of args" and more

Modified:
    trunk/src/expr.cxx
    trunk/tests/#expr-test.pd
    trunk/tests/is.pd

Modified: trunk/src/expr.cxx
==============================================================================
--- trunk/src/expr.cxx (original)
+++ trunk/src/expr.cxx Mon Feb  7 14:53:35 2011
@@ -91,15 +91,17 @@
 	}
 	// context: 0=outside, 1=plain parens; 2=func parens; 3=brackets
 	int parse (int context, t_atom2 prevop=t_atom2(A_NULL,0)) {
-           	next();
+		int commas=0;
+	  next:	next();
 		switch (int(tok.a_type)) {
 		  case A_OP: { // unary
 			t_symbol *o = tok.a_symbol;
-			if (o==gensym("!") || o==gensym("~")) {parse(context,t_atom2(A_OP1,o));}
-			else if (o==gensym("-")) {parse(context,t_atom2(A_OP1,gensym("unary-")));}
-			else if (o==gensym("+")) {parse(context,t_atom2(A_OP1,gensym("unary+")));}
+			if (o==gensym("!") || o==gensym("~"))   {prevop=t_atom2(A_OP1,o); goto next;}
+			else if (o==gensym("-")) {prevop=t_atom2(A_OP1,gensym("unary-")); goto next;}
+			else if (o==gensym("+")) {prevop=t_atom2(A_OP1,gensym("unary+")); goto next;}
 			else RAISE("can't use '%s' as a unary prefix operator",tok.a_symbol->s_name);
 		  } break;
+		  case A_OPEN: {parse(1); goto infix;}
 		  case A_FLOAT: case A_SYMBOL: case A_VAR:
 			add(tok);
 		  infix: // this section could become another method
@@ -109,8 +111,8 @@
 				int priority1 = prevop.a_type!=A_NULL ? priorities[prevop] : 42;
 				int priority2 =                         priorities[tok];
 				if (!priority2) RAISE("unknown operator '%s'",tok.a_symbol->s_name);
-				if (priority1 <= priority2) {add(prevop); parse(context,tok);}
-				else {parse(context,tok); if (prevop.a_type!=A_NULL) add(prevop);}
+				if (priority1 <= priority2) {add(prevop); prevop=tok; goto next;}
+				else {commas+=parse(context,tok); if (prevop.a_type!=A_NULL) add(prevop);}
 			  } break;
 			  case A_OPEN: { // function (1 or 2 args)
 				t_atom2 a = code.back(); code.pop_back();
@@ -119,7 +121,8 @@
 					RAISE("syntax error (c) tok=%s type=%s",z.data(),zt.data());
 				}
 				t_symbol *o = a.a_symbol; int e = o==gensym("if") ? 3 : TO(Numop *,a)->arity();
-				if (parse(2)!=e) RAISE("wrong number of arguments for '%s'",o->s_name);
+				int n = parse(2)+1;
+				if (n!=e) RAISE("wrong number of arguments for '%s': got %d instead of %d",o->s_name,n,e);
 				code.push_back(t_atom2(e==1?A_OP1:e==2?A_OP:e==3?A_IF:A_CANT,o));
 			  } break;
 			  case A_CLOSE: {
@@ -145,7 +148,8 @@
 			  }  break;
 			  case A_COMMA: {
 			  	if (context!=2) RAISE("can't use comma in this context");
-				return 1+parse(context);
+			  	if (prevop.a_type!=A_NULL) add(prevop);
+				commas++; prevop=t_atom2(A_NULL,0); goto next;
 			  }
 			  default: {
 				string z=tok.to_s(), zt=atomtype_to_s(tok.a_type);
@@ -153,15 +157,15 @@
 			  }
 			}
 		  break;
-		  case A_OPEN: {parse(1); goto infix;}
 		  default: {
 			  string z=tok.to_s(), zt=atomtype_to_s(tok.a_type);
 			  RAISE("syntax error (a) tok=%s type=%s",z.data(),zt.data());
 		  }
 		};
-		return 1;
+		return commas;
 	}
 	\constructor (...) {
+		post("----------------------------------------------------------------");
 		//toks.clear(); code.clear();
 		if (argc) args = join(argc,argv); else args = "0";
 		s = args.data();

Modified: trunk/tests/#expr-test.pd
==============================================================================
--- trunk/tests/#expr-test.pd (original)
+++ trunk/tests/#expr-test.pd Mon Feb  7 14:53:35 2011
@@ -1,261 +1,215 @@
 #N canvas 615 0 909 746 10;
-#X obj 57 88 #expr 2+2;
-#X obj 309 88 #expr 5+5*12+12;
-#X obj 117 88 #expr (2+2);
-#X obj 405 87 #expr 5*5+12*12;
-#X obj 9 141 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+#X obj 9 68 #expr 2+2;
+#X obj 9 188 #expr 5+5*12+12;
+#X obj 9 108 #expr (2+2);
+#X obj 9 227 #expr 5*5+12*12;
+#X obj 9 267 #expr 73%15;
+#X obj 9 307 #expr 0x5555 | 0xAAAA;
+#X obj 9 387 #expr 4<5;
+#X obj 9 427 #expr 4<<5;
+#X obj 9 467 #expr 0||3;
+#X obj 9 28 #expr 2;
+#X obj 9 148 #expr 1000-100-10-1;
+#X obj 9 506 #expr 42!=43;
+#X obj 9 347 #expr -5+3;
+#X obj 9 545 #expr + + + 4;
+#X obj 9 584 #expr - - + - - + - 4;
+#X obj 159 35 #expr ~9;
+#X obj 159 75 #expr !0;
+#X obj 821 46 #expr 2 \; 3 \; 5 \; 7;
+#X obj 821 126 print;
+#X obj 821 29 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
-#X obj 9 158 #expr 73%15;
-#X obj 9 177 display;
-#X obj 81 140 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+#X obj 159 193 #expr $f4+($f5-$f4)*($f1-$f2)/($f3-$f2);
+#X floatatom 750 277 5 0 0 0 - - -;
+#X obj 750 314 display;
+#X obj 750 295 #expr log($f1*3);
+#X obj 748 354 #expr weight($f1);
+#X floatatom 748 336 5 0 0 0 - - -;
+#X obj 748 373 display;
+#X floatatom 649 278 5 0 0 0 - - -;
+#X obj 649 315 display;
+#X obj 649 296 #expr tanh($f1);
+#X obj 159 251 #expr sqrt($f1);
+#X obj 159 369 #expr abs($f1);
+#X floatatom 652 336 5 0 0 0 - - -;
+#X obj 652 373 display;
+#X obj 652 354 #expr rand($f1);
+#X obj 431 350 expr a+b*c;
+#X obj 431 333 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X floatatom 431 369 5 0 0 0 - - -;
+#X obj 544 418 v a;
+#X obj 569 418 v b;
+#X obj 595 418 v c;
+#X floatatom 595 400 5 0 0 0 - - -;
+#X floatatom 569 382 5 0 0 0 - - -;
+#X floatatom 544 364 5 0 0 0 - - -;
+#X floatatom 871 392 5 0 0 0 - - -;
+#X floatatom 748 392 5 0 0 0 - - -;
+#X obj 748 429 display;
+#X obj 541 71 #expr 1 \, 2 \, 3 \; 4 \; 5 \, 6 \; 7 \, 8 \, 9;
+#X obj 748 410 #expr atan2($f1 \, $f2);
+#X obj 544 319 #expr 37 \; 42 \; 69;
+#X obj 544 300 loadbang;
+#X obj 527 300 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 447 387 #expr a+b*c;
+#X floatatom 447 406 5 0 0 0 - - -;
+#X obj 541 31 #expr (1 \, 2);
+#X obj 656 462 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X floatatom 656 499 5 0 0 0 - - -;
+#X obj 757 540 table foo 10;
+#X obj 703 540 loadbang;
+#X msg 703 559 0 2 3 5 7 11 13 17 19 23 29;
+#X obj 703 578 s foo;
+#X obj 656 480 #expr foo[$f1];
+#X floatatom 675 461 5 0 0 0 - - -;
+#X obj 541 51 #expr 1 \, 2;
+#X obj 562 703 #expr tan($f1);
+#X obj 536 616 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 534 658 display;
+#X obj 537 635 #expr grumble+2;
+#X obj 395 615 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X obj 395 654 display;
+#X obj 704 599 table grumble 444;
+#X obj 395 635 expr size("grumble");
+#X obj 159 310 #expr log10($f1);
+#X obj 9 47 is 2;
+#X obj 9 11 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
-#X obj 81 176 display;
-#X obj 81 157 #expr 0x5555 | 0xAAAA;
-#X text 35 177 13;
-#X text 117 176 65535;
-#X obj 213 140 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 213 176 display;
-#X obj 213 157 #expr 4<5;
-#X obj 273 139 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 273 175 display;
-#X obj 273 156 #expr 4<<5;
-#X obj 339 139 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 339 175 display;
-#X obj 339 156 #expr 0||3;
-#X obj 407 206 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 407 242 display;
-#X obj 9 88 #expr 2;
-#X obj 7 353 display;
-#X text 236 176 1;
-#X text 308 175 128;
-#X text 368 175 3;
-#X obj 189 88 #expr 1000-100-10-1;
-#X obj 405 138 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 405 174 display;
-#X obj 405 155 #expr 42!=43;
-#X obj 9 206 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 9 242 display;
-#X obj 9 223 #expr -5+3;
-#X text 29 242 -2;
-#X obj 75 205 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 75 241 display;
-#X obj 75 222 #expr + + + 4;
-#X text 105 241 4;
-#X obj 159 205 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 159 241 display;
-#X obj 159 222 #expr - - + - - + - 4;
-#X text 189 241 -4;
-#X obj 299 207 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 299 243 display;
-#X obj 299 224 #expr ~9;
-#X obj 353 207 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 353 243 display;
-#X obj 353 224 #expr !0;
-#X obj 407 223 #expr -14%13.51;
-#X obj 691 326 #expr 2 \; 3 \; 5 \; 7;
-#X obj 691 406 print;
-#X obj 691 309 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 7 300 unpack 0 0 0 0 0;
-#X msg 7 281 \$1 3 5 7 11;
-#X floatatom 7 263 5 0 0 0 - - -;
-#X obj 7 334 #expr $f4+($f5-$f4)*($f1-$f2)/($f3-$f2);
-#X floatatom 460 275 5 0 0 0 - - -;
-#X obj 460 312 display;
-#X text 327 242 -10;
-#X text 379 242 1;
-#X obj 460 293 #expr log($f1*3);
-#X obj 458 354 #expr weight($f1);
-#X floatatom 458 336 5 0 0 0 - - -;
-#X obj 458 373 display;
-#X floatatom 359 276 5 0 0 0 - - -;
-#X obj 359 313 display;
-#X obj 359 294 #expr tanh($f1);
-#X floatatom 259 276 5 0 0 0 - - -;
-#X obj 259 313 display;
-#X obj 259 294 #expr sqrt($f1);
-#X floatatom 259 336 5 0 0 0 - - -;
-#X obj 259 373 display;
-#X obj 259 354 #expr abs($f1);
-#X floatatom 362 336 5 0 0 0 - - -;
-#X obj 362 373 display;
-#X obj 362 354 #expr rand($f1);
-#X obj 187 571 ../doc/numop;
-#X obj 11 410 expr a+b*c;
-#X obj 11 393 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X floatatom 11 429 5 0 0 0 - - -;
-#X obj 124 478 v a;
-#X obj 149 478 v b;
-#X obj 175 478 v c;
-#X floatatom 175 460 5 0 0 0 - - -;
-#X floatatom 149 442 5 0 0 0 - - -;
-#X floatatom 124 424 5 0 0 0 - - -;
-#X floatatom 581 392 5 0 0 0 - - -;
-#X floatatom 458 392 5 0 0 0 - - -;
-#X obj 458 429 display;
-#X obj 62 514 #expr 1 \, 2 \, 3 \; 4 \; 5 \, 6 \; 7 \, 8 \, 9;
-#X text 67 496 yark;
-#X obj 143 575 print;
-#X obj 45 514 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 458 410 #expr atan2($f1 \, $f2);
-#X obj 341 411 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 358 429 print;
-#X floatatom 358 392 5 0 0 0 - - -;
-#X obj 124 379 #expr 37 \; 42 \; 69;
-#X obj 124 360 loadbang;
-#X obj 107 360 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 27 447 #expr a+b*c;
-#X floatatom 27 466 5 0 0 0 - - -;
-#X floatatom 288 499 5 0 0 0 - - -;
-#X obj 288 463 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 288 480 #expr (1 \, 2);
-#X text 434 174 1;
-#X obj 366 462 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X floatatom 366 499 5 0 0 0 - - -;
-#X obj 467 540 table foo 10;
-#X obj 413 540 loadbang;
-#X msg 413 559 0 2 3 5 7 11 13 17 19 23 29;
-#X obj 413 578 s foo;
-#X obj 366 480 #expr foo[$f1];
-#X floatatom 385 461 5 0 0 0 - - -;
-#X floatatom 288 554 5 0 0 0 - - -;
-#X obj 288 518 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 288 535 #expr 1 \, 2;
-#X obj 358 410 #expr max(1 \, 3);
-#X obj 272 703 #expr tan($f1);
-#X obj 246 616 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 244 658 display;
-#X obj 247 635 #expr grumble+2;
-#X obj 105 615 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X obj 105 654 display;
-#X obj 414 599 table grumble 444;
-#X obj 105 635 expr size("grumble");
-#X obj 415 648 #expr log10($f1);
-#X floatatom 415 629 8 0 0 0 - - -;
-#X floatatom 418 672 8 0 0 0 - - -;
-#X obj 9 107 is 2;
-#X obj 9 71 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
--1;
-#X obj 57 107 is 4;
-#X obj 117 107 is 4;
-#X obj 189 107 is 889;
-#X obj 309 107 is 77;
-#X obj 405 106 is 169;
-#X connect 0 0 133 0;
-#X connect 1 0 136 0;
-#X connect 2 0 134 0;
-#X connect 3 0 137 0;
-#X connect 4 0 5 0;
-#X connect 5 0 6 0;
-#X connect 7 0 9 0;
-#X connect 9 0 8 0;
-#X connect 12 0 14 0;
-#X connect 14 0 13 0;
-#X connect 15 0 17 0;
-#X connect 17 0 16 0;
-#X connect 18 0 20 0;
-#X connect 20 0 19 0;
-#X connect 21 0 50 0;
-#X connect 23 0 131 0;
-#X connect 28 0 135 0;
-#X connect 29 0 31 0;
-#X connect 31 0 30 0;
+#X obj 9 87 is 4;
+#X obj 9 127 is 4;
+#X obj 9 167 is 889;
+#X obj 9 207 is 77;
+#X obj 9 246 is 169;
+#X obj 9 286 is 13;
+#X obj 9 326 is 65535;
+#X obj 9 366 is -2;
+#X obj 9 564 is 4;
+#X obj 9 603 is -4;
+#X obj 159 54 is -10;
+#X obj 159 94 is 1;
+#X obj 9 406 is 1;
+#X obj 9 446 is 128;
+#X obj 9 486 is 3;
+#X obj 9 525 is 1;
+#X obj 9 624 s \$0-A;
+#X obj 159 14 r \$0-A;
+#X msg 159 155 13 3 5 7 11;
+#X obj 159 212 is 27;
+#X msg 159 232 196;
+#X obj 159 270 is 14;
+#X obj 159 174 unpack f f f f f.......................;
+#X obj 797 701 doc_link numop1;
+#X obj 797 720 doc_link numop2;
+#X msg 159 291 100000;
+#X obj 159 329 is 5;
+#X text 538 13 should not create :;
+#X obj 159 115 #expr -14%13.51;
+#X obj 159 134 is 13.02;
+#X text 214 134 = -14+2*13.51;
+#X msg 159 350 -789;
+#X obj 159 388 is 789;
+#X obj 159 449 #expr max((-567) \, 765);
+#X obj 159 468 is 765;
+#X obj 159 428 is 765;
+#X obj 159 409 #expr max(-567 \, 765);
+#X connect 0 0 75 0;
+#X connect 1 0 78 0;
+#X connect 2 0 76 0;
+#X connect 3 0 79 0;
+#X connect 4 0 80 0;
+#X connect 5 0 81 0;
+#X connect 6 0 87 0;
+#X connect 7 0 88 0;
+#X connect 8 0 89 0;
+#X connect 9 0 73 0;
+#X connect 10 0 77 0;
+#X connect 11 0 90 0;
+#X connect 12 0 82 0;
+#X connect 13 0 83 0;
+#X connect 14 0 84 0;
+#X connect 15 0 85 0;
+#X connect 16 0 86 0;
+#X connect 17 0 18 0;
+#X connect 17 1 18 0;
+#X connect 17 2 18 0;
+#X connect 17 3 18 0;
+#X connect 19 0 17 0;
+#X connect 20 0 94 0;
+#X connect 21 0 23 0;
+#X connect 23 0 22 0;
+#X connect 24 0 26 0;
+#X connect 25 0 24 0;
+#X connect 27 0 29 0;
+#X connect 29 0 28 0;
+#X connect 30 0 96 0;
+#X connect 31 0 107 0;
 #X connect 32 0 34 0;
 #X connect 34 0 33 0;
-#X connect 36 0 38 0;
-#X connect 38 0 37 0;
-#X connect 40 0 42 0;
-#X connect 42 0 41 0;
-#X connect 44 0 46 0;
-#X connect 46 0 45 0;
-#X connect 47 0 49 0;
-#X connect 49 0 48 0;
-#X connect 50 0 22 0;
-#X connect 51 0 52 0;
-#X connect 51 1 52 0;
-#X connect 51 2 52 0;
-#X connect 51 3 52 0;
-#X connect 53 0 51 0;
-#X connect 54 0 57 0;
-#X connect 54 1 57 1;
-#X connect 54 2 57 2;
-#X connect 54 3 57 3;
-#X connect 54 4 57 4;
-#X connect 55 0 54 0;
-#X connect 56 0 55 0;
-#X connect 57 0 24 0;
-#X connect 58 0 62 0;
-#X connect 62 0 59 0;
-#X connect 63 0 65 0;
-#X connect 64 0 63 0;
-#X connect 66 0 68 0;
-#X connect 68 0 67 0;
-#X connect 69 0 71 0;
-#X connect 71 0 70 0;
-#X connect 72 0 74 0;
-#X connect 74 0 73 0;
-#X connect 75 0 77 0;
-#X connect 77 0 76 0;
-#X connect 79 0 81 0;
-#X connect 80 0 79 0;
-#X connect 80 0 102 0;
-#X connect 85 0 84 0;
-#X connect 86 0 83 0;
-#X connect 87 0 82 0;
-#X connect 88 0 95 1;
-#X connect 89 0 95 0;
-#X connect 91 0 93 0;
-#X connect 91 1 93 0;
-#X connect 91 2 93 0;
-#X connect 91 3 93 0;
-#X connect 94 0 91 0;
-#X connect 95 0 90 0;
-#X connect 96 0 119 0;
-#X connect 98 0 119 0;
-#X connect 99 0 87 0;
-#X connect 99 1 86 0;
-#X connect 99 2 85 0;
-#X connect 100 0 99 0;
-#X connect 101 0 99 0;
-#X connect 102 0 103 0;
-#X connect 105 0 106 0;
-#X connect 106 0 104 0;
-#X connect 108 0 114 0;
-#X connect 111 0 112 0;
-#X connect 112 0 113 0;
-#X connect 114 0 109 0;
-#X connect 115 0 114 0;
-#X connect 117 0 118 0;
-#X connect 118 0 116 0;
-#X connect 119 0 97 0;
-#X connect 121 0 123 0;
-#X connect 123 0 122 0;
-#X connect 124 0 127 0;
-#X connect 127 0 125 0;
-#X connect 128 0 130 0;
-#X connect 129 0 128 0;
-#X connect 131 1 0 0;
-#X connect 132 0 23 0;
-#X connect 133 1 2 0;
-#X connect 134 1 28 0;
-#X connect 135 1 1 0;
-#X connect 136 1 3 0;
+#X connect 35 0 37 0;
+#X connect 36 0 35 0;
+#X connect 36 0 52 0;
+#X connect 41 0 40 0;
+#X connect 42 0 39 0;
+#X connect 43 0 38 0;
+#X connect 44 0 48 1;
+#X connect 45 0 48 0;
+#X connect 48 0 46 0;
+#X connect 49 0 43 0;
+#X connect 49 1 42 0;
+#X connect 49 2 41 0;
+#X connect 50 0 49 0;
+#X connect 51 0 49 0;
+#X connect 52 0 53 0;
+#X connect 55 0 61 0;
+#X connect 58 0 59 0;
+#X connect 59 0 60 0;
+#X connect 61 0 56 0;
+#X connect 62 0 61 0;
+#X connect 65 0 67 0;
+#X connect 67 0 66 0;
+#X connect 68 0 71 0;
+#X connect 71 0 69 0;
+#X connect 72 0 101 0;
+#X connect 73 0 0 0;
+#X connect 74 0 9 0;
+#X connect 75 0 2 0;
+#X connect 76 0 10 0;
+#X connect 77 0 1 0;
+#X connect 78 0 3 0;
+#X connect 79 0 4 0;
+#X connect 80 0 5 0;
+#X connect 81 0 12 0;
+#X connect 82 0 6 0;
+#X connect 83 0 14 0;
+#X connect 84 0 91 0;
+#X connect 85 0 16 0;
+#X connect 86 0 103 0;
+#X connect 87 0 7 0;
+#X connect 88 0 8 0;
+#X connect 89 0 11 0;
+#X connect 90 0 13 0;
+#X connect 92 0 15 0;
+#X connect 93 0 97 0;
+#X connect 94 0 95 0;
+#X connect 95 0 30 0;
+#X connect 96 0 100 0;
+#X connect 97 0 20 0;
+#X connect 97 1 20 1;
+#X connect 97 2 20 2;
+#X connect 97 3 20 3;
+#X connect 97 4 20 4;
+#X connect 100 0 72 0;
+#X connect 101 0 106 0;
+#X connect 103 0 104 0;
+#X connect 104 0 93 0;
+#X connect 106 0 31 0;
+#X connect 107 0 111 0;
+#X connect 108 0 109 0;
+#X connect 110 0 108 0;
+#X connect 111 0 110 0;

Modified: trunk/tests/is.pd
==============================================================================
--- trunk/tests/is.pd (original)
+++ trunk/tests/is.pd Mon Feb  7 14:53:35 2011
@@ -1,8 +1,7 @@
 #N canvas 0 0 450 300 10;
 #X obj 10 12 inlet;
 #X obj 37 50 == \$1;
-#X obj 10 259 outlet;
-#X obj 52 259 outlet;
+#X obj 37 145 outlet;
 #X obj 64 126 print ok;
 #X msg 64 107 list \$1;
 #X obj 10 31 t f f;
@@ -11,14 +10,14 @@
 #X obj 37 88 t b f;
 #X obj 10 176 list append \$1;
 #X msg 10 195 got \$1 instead of \$2;
-#X connect 0 0 6 0;
-#X connect 1 0 8 1;
-#X connect 5 0 4 0;
-#X connect 6 0 8 0;
-#X connect 6 1 1 0;
-#X connect 8 0 10 0;
-#X connect 8 1 9 0;
-#X connect 9 0 3 0;
-#X connect 9 1 5 0;
-#X connect 10 0 11 0;
-#X connect 11 0 7 0;
+#X connect 0 0 5 0;
+#X connect 1 0 7 1;
+#X connect 4 0 3 0;
+#X connect 5 0 7 0;
+#X connect 5 1 1 0;
+#X connect 7 0 9 0;
+#X connect 7 1 8 0;
+#X connect 8 0 2 0;
+#X connect 8 1 4 0;
+#X connect 9 0 10 0;
+#X connect 10 0 6 0;



More information about the Gridflow-cvs mailing list