[Gridflow-cvs] [svn] commit: r4919 - in /trunk/src: gridflow.hxx source_filter.rb

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Sun Jan 24 14:40:25 EST 2010


Author: matju
Date: Sun Jan 24 14:40:25 2010
New Revision: 4919

Log:
fix previous commit

Modified:
    trunk/src/gridflow.hxx
    trunk/src/source_filter.rb

Modified: trunk/src/gridflow.hxx
==============================================================================
--- trunk/src/gridflow.hxx (original)
+++ trunk/src/gridflow.hxx Sun Jan 24 14:40:25 2010
@@ -56,8 +56,11 @@
 #define sys_vgui(FMT,ARGS...) sys_vgui(const_cast<char *>(FMT),ARGS)
 #define sys_gui(s) sys_gui(const_cast<char *>(s))
 
-//#define DEF_IN post("> self=%08x %s",long(self),methodspec);
+#ifdef DES_BUGS
+#define DEF_IN(self) post("> self=%08x %s",long(self),methodspec);
+#else
 #define DEF_IN
+#endif
 #define DEF_OUT
 
 #ifndef DESIREDATA

Modified: trunk/src/source_filter.rb
==============================================================================
--- trunk/src/source_filter.rb (original)
+++ trunk/src/source_filter.rb Sun Jan 24 14:40:25 2010
@@ -169,7 +169,7 @@
 	if in_class_block then Out.print "static void " else Out.print "void #{classname}::" end
 	Out.print "#{m.selector}_wrap(#{classname} *self, VA) {"
 	Out.print "static const char *methodspec = \"#{qlass.name}::#{m.selector}(#{unparse_arglist m.arglist,false})\";"
-	Out.print "DEF_IN;"
+	Out.print "DEF_IN(self);"
 	Out.print "#{m.rettype} foo;" if m.rettype!="void"
 	Out.print "if (argc<#{m.minargs}"
 	Out.print "||argc>#{m.maxargs}" if m.maxargs!=-1
@@ -183,7 +183,7 @@
 			Out.print ",convert(argv[#{i}],(#{arg.type}*)0)"
 		end
 	}
-	Out.print "); DEF_OUT;} #{m.rettype} "
+	Out.print "); DEF_OUT(self);} #{m.rettype} "
 	Out.print "#{classname}::" unless in_class_block
 	Out.print m.selector+"(VA"
 	#puts "m=#{m} n=#{n}"
@@ -199,7 +199,7 @@
 	m = parse_methoddecl("void constructor"+line,"(.*)$")
 	Out.print "#{frame.name}(BFObject *bself, MESSAGE) : #{frame.supername}(bself,MESSAGE2) {"
 	Out.print "static const char *methodspec = \"#{frame.name}::#{m.selector}(#{unparse_arglist m.arglist,false})\";"
-	Out.print "DEF_IN;"
+	Out.print "DEF_IN(this);"
 	Out.print "if (argc<#{m.minargs}"
 	Out.print "||argc>#{m.maxargs}" if m.maxargs!=-1
 	Out.print ") RAISE(\"got %d args instead of %d..%d in %s\",argc,#{m.minargs},#{m.maxargs},methodspec);"
@@ -211,7 +211,7 @@
 			Out.print ",convert(argv[#{i}],(#{arg.type}*)0)"
 		end
 	}
-	Out.print ");DEF_OUT;}"
+	Out.print ");DEF_OUT(this);}"
 	Out.print "#{m.rettype} #{m.selector}(MESSAGE"
 	Out.print ", #{unparse_arglist m.arglist}" if m.arglist.length>0
 	Out.print ") "+line[/\{.*/]



More information about the Gridflow-cvs mailing list