[pygccxml-commit] SF.net SVN: pygccxml: [524] pyplusplus_dev/pyplusplus/function_transformers /subst.py

[<mb...@us...>]

Revision: 524
          http://svn.sourceforge.net/pygccxml/?rev=524&view=rev
Author:   mbaas
Date:     2006-09-06 06:55:04 -0700 (Wed, 06 Sep 2006)

Log Message:
-----------
Allow optional curly braces around a variable name to separate a variable from subsequent text. (so far only on non-block variables, but block variables don't need this anyway)

Modified Paths:
--------------
    pyplusplus_dev/pyplusplus/function_transformers/subst.py

Modified: pyplusplus_dev/pyplusplus/function_transformers/subst.py
===================================================================
--- pyplusplus_dev/pyplusplus/function_transformers/subst.py	2006-09-05 19:14:44 UTC (rev 523)
+++ pyplusplus_dev/pyplusplus/function_transformers/subst.py	2006-09-06 13:55:04 UTC (rev 524)
@@ -108,7 +108,7 @@
         code = "\n".join(lines)
 
         # Replace the non-block variables...
-        varexpr = re.compile("\$[a-zA-Z_]+")
+        varexpr = re.compile("\$[a-zA-Z_]+|\$\{[a-zA-Z_]+\}")
         while 1:
             m = varexpr.search(code)
             if m==None:
@@ -116,6 +116,8 @@
             s = m.start()
             e = m.end()
             key = code[s+1:e]
+            if key[0]=="{":
+                key = key[1:-1]
             code = "%s%s%s"%(code[:s], getattr(self, key, ""), code[e:])
 
         # Replace trailing blanks on each line...


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.