Text archives Help

---

Author: bigler
Date: Fri Feb 22 12:17:28 2008
New Revision: 2109

Modified:
   trunk/Core/Util/genCallbacks.py
Log:
Core/Util/genCallbacks.py

  Fleshed out the member variables for static callback helper functions.

  Function.templateParameter no longer returns an extra space.


Modified: trunk/Core/Util/genCallbacks.py
==============================================================================
--- trunk/Core/Util/genCallbacks.py     (original)
+++ trunk/Core/Util/genCallbacks.py     Fri Feb 22 12:17:28 2008
@@ -45,7 +45,7 @@
         arg_list = self.typeList()
         if (len(arg_list) == 0):
             return ""
-        return "template<" + format(arg_list, prefix="typename") + "> "
+        return "template<" + format(arg_list, prefix="typename") + ">"
 
     def baseName(self, withTemplate=False):
         base = "CallbackBase_%dData" % self.num_call_time_args
@@ -180,7 +180,8 @@
             num_call_time_args = function.num_call_time_args
             num_creation_time_args = function.num_creation_time_args
             self.write("// %d call time args --- %d creation time args" % 
(num_call_time_args, num_creation_time_args))
-            self.write(function.templateParameter() + "static")
+            tp = function.templateParameter()
+            self.write("%s%sstatic" % (tp, tp and ' ')) # add a space based 
on if tp is ''.
             self.write(function.baseName(withTemplate=True) + "*")
             self.write("create(void (*pmf)(" + format(function.typeList()) + 
")" + function.functionArgList() + ") {")
             self.indent()
@@ -289,7 +290,9 @@
             self.indent()
             self.write("%s(void (*pmf)(%s)%s)" % (class_name, 
format(function.typeList()), function.functionArgList()))
             self.indent()
-            self.write(": pmf(pmf)%s" % "member_var_initialization" )
+            args = function.argList(prefix="arg")
+            args = map(lambda a: "%s(%s)" % (a,a), args)
+            self.write(": pmf(pmf)%s" % format( args, begin_seperator=", " ) 
)
             self.unindent()
             self.write("{")
             self.write("}")
@@ -306,7 +309,9 @@
             self.write("private:")
             self.indent()
             self.write("void (*pmf)(%s);" % format(function.typeList()))
-            self.write("// member variables")
+            map(lambda A,a: self.write("%s %s;" % (A,a)),
+                function.argList(prefix="Arg"),
+                function.argList(prefix="arg"))
             self.unindent()
             self.write("};")
             self.write("")

---

• [Manta] r2109 - trunk/Core/Util, James Bigler, 02/22/2008

---

Archive powered by MHonArc 2.6.16.