Allow different c++ standards with castxml

This extends the previous commit, and adds a test. See #33.

Cherry-picked from the develop branch

Author: iMichka

pygccxml/parser/source_reader.py

@@ -161,10 +161,36 @@ def __create_command_line_castxml(self, source_file, xmlfile):
         else:
 
             # On mac or linux, use gcc or clang (the flag is the same)
-            if '-std=c++11' in self.__config.cflags:
-                cmd.append('--castxml-cc-gnu ' + '"(" ' + self.__config.compiler_path + ' -std=c++11 ")"')
+            cmd.append('--castxml-cc-gnu ')
+
+            # Check for -std=xx flags passed to the compiler.
+            # A regex could be used but this is a moving target.
+            # See c++1z for example. It is preferable to have a defined
+            # list of what is allowed. http://clang.llvm.org/cxx_status.html
+            #
+            # Version 98 and 03 are only there in the case somebody is using
+            # these flags; this is the equivalent to not passing these flags.
+            standards = [
+                "-std=c++98",
+                "-std=c++03",
+                "-std=c++11",
+                "-std=c++14",
+                "-std=c++1z"]
+
+            std_flag = ""
+            for standard in standards:
+                if standard in self.__config.cflags:
+                    std_flag = " " + standard + " "
+
+            # A -std= flag was passed, but is not in the list
+            if "-std=" in self.__config.cflags and std_flag == "":
+                raise(RuntimeError("Unknown -std=c++xx flag used !"))
+
+            if std_flag != "":
+                cmd.append(
+                    '"(" ' + self.__config.compiler_path + std_flag + '")"')
             else:
-                cmd.append('--castxml-cc-gnu ' + self.__config.compiler_path)
+                cmd.append(self.__config.compiler_path)
 
         # Tell castxml to output xml compatible files with gccxml
         # so that we can parse them with pygccxml

unittests/data/cpp_standards.hpp

@@ -0,0 +1,8 @@
+// Copyright 2014-2016 Insight Software Consortium.
+// Distributed under the Boost Software License, Version 1.0.
+// See http://www.boost.org/LICENSE_1_0.txt
+
+// A good test for different cpp standards. iostream is one of the first
+// things to fail when the wrong flags are used.
+
+#include <iostream>

unittests/test_all.py

@@ -68,6 +68,7 @@
 import test_utils
 import test_va_list_tag_removal
 import test_copy_constructor
+import test_cpp_standards
 
 testers = [
     # , demangled_tester # failing right now
@@ -128,7 +129,8 @@
     example_tester,
     test_utils,
     test_va_list_tag_removal,
-    test_copy_constructor
+    test_copy_constructor,
+    test_cpp_standards
 ]
 
 if 'posix' in os.name:

unittests/test_cpp_standards.py

@@ -0,0 +1,63 @@
+# Copyright 2014-2016 Insight Software Consortium.
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+
+import unittest
+import parser_test_case
+
+from pygccxml import parser
+from pygccxml import utils
+
+
+class Test(parser_test_case.parser_test_case_t):
+
+    def test(self):
+        """
+        Test different compilation standards by setting cflags.
+
+        """
+
+        # Skip this test for gccxml, this is a CastXML feature.
+        if "gccxml" in self.config.xml_generator:
+            return True
+
+        parser.parse(["cpp_standards.hpp"], self.config)
+
+        self.config.cflags = "-std=c++98"
+        parser.parse(["cpp_standards.hpp"], self.config)
+
+        self.config.cflags = "-std=c++03"
+        parser.parse(["cpp_standards.hpp"], self.config)
+
+        self.config.cflags = "-std=c++11"
+        parser.parse(["cpp_standards.hpp"], self.config)
+
+        # This is broken with llvm 3.6.2 (the one from homebrew)
+        # It should work with never llvms but I keep the test disabled
+        # See https://llvm.org/bugs/show_bug.cgi?id=24872
+        # self.config.cflags = "-std=c++14"
+        # parser.parse(["cpp_standards.hpp"], self.config)
+
+        # Same as above
+        # self.config.cflags = "-std=c++1z"
+        # parser.parse(["cpp_standards.hpp"], self.config)
+
+        # Pass down a flag that does not exist.
+        # This should raise an exception.
+        self.config.cflags = "-std=c++00"
+        self.assertRaises(
+            RuntimeError,
+            lambda: parser.parse(["cpp_standards.hpp"], self.config))
+
+
+def create_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(Test))
+    return suite
+
+
+def run_suite():
+    unittest.TextTestRunner(verbosity=2).run(create_suite())
+
+if __name__ == "__main__":
+    run_suite()