Changeset a1d1b90 in sasview for sansmodels

Timestamp:

Jan 4, 2012 2:55:44 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:

e63a411

Parents:

43ccd258

Message:

updated wrapperGenerator

File:

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

sansmodels/src/python_wrapper/WrapperGenerator.py

@@ -68 +68 @@
         ## Parser in struct section
         self.inStruct = False
+        self.foundCPP = False
         ## Name of struct for the c object
         self.structName = None
@@ -209 +210 @@
                 
             # Catch struct name
+            # C++ class definition
+            if line.count("class")>0:
+                # We are entering a class definition
+                self.inStruct = 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
@@ -352 +367 @@
             basename = os.path.basename(self.file)
             newline = self.replaceToken(newline, 
-                                        "[INCLUDE_FILE]", basename)           
+                                        "[INCLUDE_FILE]", self.file)  
+            if self.foundCPP:
+                newline = self.replaceToken(newline, 
+                                            "[C_INCLUDE_FILE]", "")  
+                newline = self.replaceToken(newline, 
+                                            "[CPP_INCLUDE_FILE]", "#include \"%s\"" % basename)  
+            else:  
+                newline = self.replaceToken(newline, 
+                                            "[C_INCLUDE_FILE]", "#include \"%s\"" % basename)   
+                newline = self.replaceToken(newline, 
+                                            "[CPP_INCLUDE_FILE]", "#include \"models.hh\"")  
                 
             # Numerical calcs dealloc