Allow open c-style comments.

Fixes #1114

2 files changed, 36 insertions, 2 deletions

diff --git a/pygments/lexers/c_cpp.py b/pygments/lexers/c_cpp.py
index a8d75c0a..2a2419d4 100644
--- a/pygments/lexers/c_cpp.py
+++ b/pygments/lexers/c_cpp.py
@@ -46,8 +46,10 @@ class CFamilyLexer(RegexLexer):
             (r'\n', Text),
             (r'\s+', Text),
             (r'\\\n', Text),  # line continuation
-            (r'//(\n|(.|\n)*?[^\\]\n)', Comment.Single),
-            (r'/(\\\n)?[*](.|\n)*?[*](\\\n)?/', Comment.Multiline),
+            (r'//(\n|[\w\W]*?[^\\]\n)', Comment.Single),
+            (r'/(\\\n)?[*][\w\W]*?[*](\\\n)?/', Comment.Multiline),
+            # Open until EOF, so no ending delimeter
+            (r'/(\\\n)?[*][\w\W]*', Comment.Multiline),
         ],
         'statements': [
             (r'(L?)(")', bygroups(String.Affix, String), 'string'),
diff --git a/tests/test_cpp.py b/tests/test_cpp.py
new file mode 100644
index 00000000..e1b94a8e
--- /dev/null
+++ b/tests/test_cpp.py
@@ -0,0 +1,32 @@
+"""
+    CPP Tests
+    ~~~~~~~~~
+
+    :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import unittest
+
+from pygments.lexers import CppLexer
+from pygments.token import Token
+
+
+class CppTest(unittest.TestCase):
+    def setUp(self):
+        self.lexer = CppLexer()
+
+    def testGoodComment(self):
+        fragment = u'/* foo */\n'
+        tokens = [
+            (Token.Comment.Multiline, u'/* foo */'),
+            (Token.Text, u'\n'),
+        ]
+        self.assertEqual(tokens, list(self.lexer.get_tokens(fragment)))
+
+    def testOpenComment(self):
+        fragment = u'/* foo\n'
+        tokens = [
+            (Token.Comment.Multiline, u'/* foo\n'),
+        ]
+        self.assertEqual(tokens, list(self.lexer.get_tokens(fragment)))