From d01233fdf60af2ad4268362cacfea3aa9d97a6ef Mon Sep 17 00:00:00 2001
From: tajchman <tajchman>
Date: Wed, 14 Apr 2004 14:55:24 +0000
Subject: [PATCH] parse DataStreams in IDL files (correction)

---
 src/ModuleGenerator/IDLparser.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ModuleGenerator/IDLparser.py b/src/ModuleGenerator/IDLparser.py
index 6b7b2059f..a653da09e 100644
--- a/src/ModuleGenerator/IDLparser.py
+++ b/src/ModuleGenerator/IDLparser.py
@@ -278,13 +278,13 @@ def parseComment(comment):
         key = m.group(1)
         
         sPorts = comment[m.end():]
-        pattern = word + '\('+word+','+word +','+word+'\),{,1}' + spaces
+        pattern = word + '\('+word+','+word +','+word+'\)' \
+                  + spaces + ',{,1}' + spaces
         while len(sPorts) > 0:
             ## process next DataStreamPort
             ## match a definition like xx(a,b,c) with a possible trailing ,
             ## returns a tuple (xx, a, b, c) and
             ## the remaining part of input string
-
             m = re.match(pattern, sPorts)
             if m is None:
                 raise LookupError, \
@@ -327,7 +327,6 @@ class Service(Tree):
 
     def createDataStreamParameter(self, p):
         L = self.getChild('DataStream-list')
-        print p
         p = dataStreamParameter(p[0], p[2], p[1], p[3])
         L.replaceChild(p)
         return p
@@ -698,7 +697,7 @@ def run(tree, args):
     visitor = ModuleCatalogVisitor(C)
     tree.accept(visitor)
 
-    C.Dump()
+##    C.Dump()
     
     if remove_comp :
         C.removeComponent(remove_comp)
-- 
2.39.2