[PD-cvs] pd/src desire.tk,1.1.2.600.2.115,1.1.2.600.2.116

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12990

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
remove global future


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.115
retrieving revision 1.1.2.600.2.116
diff -C2 -d -r1.1.2.600.2.115 -r1.1.2.600.2.116
*** desire.tk	19 Dec 2006 17:53:13 -0000	1.1.2.600.2.115
--- desire.tk	19 Dec 2006 19:29:54 -0000	1.1.2.600.2.116
***************
*** 241,251 ****
  set serial 0
  proc serial {n obj} {
! 	global serial replyset future
  	if {$n >= $serial} {error "object creation serial number is in the future"}
! 	if {[info exists _($obj:_class)]} {
! 		eval [concat $replyset($n) [list $obj]]
! 	} else {
! 		set future($obj) [list $replyset($n) [list $obj]]
! 	}
  	array unset replyset $n
  }
--- 241,247 ----
  set serial 0
  proc serial {n obj} {
! 	global serial replyset
  	if {$n >= $serial} {error "object creation serial number is in the future"}
! 	eval [concat $replyset($n) [list $obj]]
  	array unset replyset $n
  }
***************
*** 822,826 ****
  			global errorCode errorInfo
  			switch -regexp -- $errorInfo { "^missing close-brace" {
! 				puts "waiting for the end of: [string range $sock_lobby 0 40]"
  				continue
  			}}
--- 818,822 ----
  			global errorCode errorInfo
  			switch -regexp -- $errorInfo { "^missing close-brace" {
! 				#puts "waiting for the end of: [string range $sock_lobby 0 40]"
  				continue
  			}}
***************
*** 1883,1890 ****
  
  def Canvas new_object_insert {canvas obj} {
! 	global future
! 	if {[lsearch $@children $obj] < 0} {
! 		set future($self) [list $self new_object_insert $self $obj]; return
! 	}
  	set wire [$self selection_wire]
  	mset {obj1 outlet obj2 inlet} [$wire report]
--- 1879,1885 ----
  
  def Canvas new_object_insert {canvas obj} {
! #	if {[lsearch $@children $obj] < 0} {
! #		set future($self) [list $self new_object_insert $self $obj]; return
! #	}
  	set wire [$self selection_wire]
  	mset {obj1 outlet obj2 inlet} [$wire report]
***************
*** 4387,4391 ****
  
  proc change {self canvas e {ninlets 0} {noutlets 0}} {
- 	global future
  	foreach mess [pd_mess_split $e] {change_2 $self $mess}
  	#the server ought to take care of this:
--- 4382,4385 ----
***************
*** 4395,4403 ****
  	$self noutlets= $noutlets
  	$self changed
- 	if {[info exists future($self)]} {
- 		set str [join $future($self)]
- 		array unset future $self
- 		eval $str
- 	}
  }
  
--- 4389,4392 ----