[Csp-commits] svn:csp r1182 - in trunk/CSP/SimData: . Tools/TaggedRecordCompiler

[<sv...@ww...>]

Author: mkrose
Date: 2004-07-25 13:33:45 -0700 (Sun, 25 Jul 2004)
New Revision: 1182

Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/Tools/TaggedRecordCompiler/trc.py
Log:
Fix parsing of options by the tagged record compiler to allow
namespace prefixes on base classes.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1182

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2004-07-25 19:43:57 UTC (rev 1181)
+++ trunk/CSP/SimData/CHANGES.current	2004-07-25 20:33:45 UTC (rev 1182)
@@ -6,6 +6,9 @@
     faster (and just as safe) as using implicit dynamic_casts via
     Ref assignments.
 
+  * Fix parsing of options by the tagged record compiler to allow
+    namespace prefixes on base classes.
+
 2004-07-21: onsight
   * Add missing include.
 

Modified: trunk/CSP/SimData/Tools/TaggedRecordCompiler/trc.py
===================================================================
--- trunk/CSP/SimData/Tools/TaggedRecordCompiler/trc.py	2004-07-25 19:43:57 UTC (rev 1181)
+++ trunk/CSP/SimData/Tools/TaggedRecordCompiler/trc.py	2004-07-25 20:33:45 UTC (rev 1182)
@@ -61,7 +61,7 @@
 
 class DataPackCompiler:
 
-  re_line = re.compile(r'^(\w*:?:?\w+)(\[\])?\s+(\w*)\s*((?:\s+\w+\s*=\s*\w+)*)\s*({|})?$')
+  re_line = re.compile(r'^(\w*:?:?\w+)(\[\])?\s+(\w*)\s*((?:\s+\w+\s*=\s*[a-zA-Z0-9_:]+)*)\s*({|})?$')
   re_opts = re.compile(r'\s*=\s*')
   re_ns = re.compile(r'namespace\s+([a-zA-Z_][a-zA-Z0-9]*)\s*;?')