Changeset 47e498b in sasmodels

Timestamp:

May 4, 2016 8:24:26 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c, c4c426b

Parents:

3832f27

Message:

properly escape backslashes in windows paths when setting compiler #line directives

File:

• sasmodels/generate.py (modified) (4 diffs)

sasmodels/generate.py

@@ -464 +464 @@
               for f in model_sources(model_info)
               # Add #line directives at the start of each file
-              for p in ('#line 0 "%s"'%f, open(f).read())
+              for p in ('#line 0 "%s"'%f.replace('\\', '\\\\'), open(f).read())
               ]
-    source.append('#line 133 "%s"'%C_KERNEL_TEMPLATE_PATH)
+    source.append('#line 133 "%s"'%C_KERNEL_TEMPLATE_PATH.replace('\\', '\\\\'))
 
     # Prepare defines
@@ -508 +508 @@
 }
 """ % {'body':model_info['form_volume'],
-       'file':model_info['filename'],
+       'file':model_info['filename'].replace('\\', '\\\\'),
        'line':model_info['form_volume_line'],
        }
@@ -541 +541 @@
 }
 """ % {'body':model_info['Iq'],
-       'file':model_info['filename'],
+       'file':model_info['filename'].replace('\\', '\\\\'),
        'line':model_info['Iq_line'],
        }
@@ -574 +574 @@
 }
 """ % {'body':model_info['Iqxy'],
-       'file':model_info['filename'],
+       'file':model_info['filename'].replace('\\', '\\\\'),
        'line':model_info['Iqxy_line'],
        }