[Gridflow-cvs] [svn] commit: r3451 - in /trunk: base/main.rb rubyext.c

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Fri Apr 4 02:09:45 EDT 2008


Author: matju
Date: Fri Apr  4 02:09:44 2008
New Revision: 3451

Log:
remove the ghost of FObject[]

Modified:
    trunk/base/main.rb
    trunk/rubyext.c

Modified: trunk/base/main.rb
==============================================================================
--- trunk/base/main.rb (original)
+++ trunk/base/main.rb Fri Apr  4 02:09:44 2008
@@ -63,25 +63,12 @@
 	died.each {|x| subprocesses.delete x }
 end
 
-def self.parse(m)
-	m = m.gsub(/(\{|\})/," \\1 ").split(/\s+/)
-	m.map! {|x| case x
-		when Integer, Symbol; x
-		when /^[+\-]?[0-9]+$/; x.to_i
-		when String; x.intern
-		end
-	}
-	m
-end
-
 class ::Object; def FloatOrSymbol(x) Float(x) rescue x.intern end end
 
 # adding some functionality to that:
 class FObject
 	class << self
 		# per-class
-		attr_reader :ninlets
-		attr_reader :noutlets
 		def inspect; @pdname or super; end
 		# should it recurse into superclasses?
 		def gfattrs; @gfattrs={} if not defined? @gfattrs; @gfattrs end

Modified: trunk/rubyext.c
==============================================================================
--- trunk/rubyext.c (original)
+++ trunk/rubyext.c Fri Apr  4 02:09:44 2008
@@ -205,9 +205,7 @@
 	int j;
 	Ruby comma = ID2SYM(rb_intern(","));
 	for (j=0; j<argc; j++) if (argv[j]==comma) break;
-
 	int jj = handle_braces(j,argv);
-	fprintf(stderr,"argc=%d j=%d jj=%d\n",argc,j,jj);
 	Ruby rself = rb_funcall2(fclasses[string(rb_str_ptr(argv[0]))]->rself,SI(new),jj-1,argv+1);
 
 	DGS(FObject);
@@ -539,11 +537,6 @@
 	int inlet = INT(argv[0]);
 	argc--, argv++;
 	Ruby foo;
-	if (argc==1 && TYPE(argv[0])==T_STRING /* && argv[0] =~ / / */) {
-		foo = rb_funcall(mGridFlow,SI(parse),1,argv[0]);
-		argc = rb_ary_len(foo);
-		argv = rb_ary_ptr(foo);
-	}
 	if (argc>1) {
 		foo = rb_ary_new4(argc,argv);
 		GridFlow_s_handle_braces(0,foo);



More information about the Gridflow-cvs mailing list