Changeset d62f422 in sasview

Timestamp:

Jan 4, 2012 5:36:38 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

dbddbf5

Parents:

ef93acb

Message:

updated WrapperGenerator? to deal with both pre- and post-refactor models.

File:

• sansmodels/src/python_wrapper/WrapperGenerator.py (modified) (2 diffs)

sansmodels/src/python_wrapper/WrapperGenerator.py

@@ -69 +69 @@
         self.inStruct = False
         self.foundCPP = False
+        self.inParDefs = False
         ## Name of struct for the c object
         self.structName = None
@@ -213 +214 @@
             if line.count("class")>0:
                 # We are entering a class definition
-                self.inStruct = True
+                self.inParDefs = True
                 self.foundCPP = True
-                class_name = line.replace('}','')
-                class_name = class_name.replace('class','')
-                self.inStruct = class_name.strip()
-            
-            if self.inStruct and line.count("}")>0:
-                # We are exiting a struct block
-                self.inStruct = False
                 
             # Old-Style C struct definition
             if line.count("typedef struct")>0:
                 # We are entering a struct block
+                self.inParDefs = True
                 self.inStruct = True
             
-            if self.inStruct and line.count("}")>0:
+            if self.inParDefs and line.count("}")>0:
                 # We are exiting a struct block
-                self.inStruct = False
-    
-                # Catch the name of the struct
-                index = line.index("}")
-                #toks = string.split(line[index+1:],";")
-                toks = line[index+1:].split(";")
-                # Catch pointer definition
-                #toks2 = string.split(toks[0],',')
-                toks2 = toks[0].split(',')
-                self.structName = toks2[0].lstrip().rstrip()
-           
-                
+                self.inParDefs = False
+                
+                if self.inStruct:
+                    self.inStruct = False
+                    # Catch the name of the struct
+                    index = line.index("}")
+                    toks = line[index+1:].split(";")
+                    # Catch pointer definition
+                    toks2 = toks[0].split(',')
+                    self.structName = toks2[0].lstrip().rstrip()
            
             # Catch struct content
             key = "[DEFAULT]"
-            if self.inStruct and line.count(key)>0:
+            if self.inParDefs and line.count(key)>0:
                 # Found a new parameter
                 try: