summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Bendersky <eliben@users.noreply.github.com>2014-09-12 05:34:56 -0700
committerEli Bendersky <eliben@users.noreply.github.com>2014-09-12 05:34:56 -0700
commit0fce7cd1bedc02118e33097d914d9029b4def29e (patch)
tree01b8e5ef3b38ca41c6841c28d5adeed7841b1c6a
parent5153976f02e2cd616b5c6f616e2670059430f530 (diff)
parent044db0c002fdf67ca1d2ef019b309a497f6bc815 (diff)
downloadpycparser-0fce7cd1bedc02118e33097d914d9029b4def29e.tar.gz
Merge pull request #54 from w-vi/master
Fix pragma error when '=' occurs.
-rw-r--r--pycparser/c_lexer.py2
-rw-r--r--tests/test_c_lexer.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/pycparser/c_lexer.py b/pycparser/c_lexer.py
index 393f0a8..e17a2ea 100644
--- a/pycparser/c_lexer.py
+++ b/pycparser/c_lexer.py
@@ -302,7 +302,7 @@ class CLexer(object):
r'pragma'
pass
- t_pppragma_ignore = ' \t<>.-{}();+-*/$%@&^~!?:,0123456789'
+ t_pppragma_ignore = ' \t<>.-{}();=+-*/$%@&^~!?:,0123456789'
@TOKEN(string_literal)
def t_pppragma_STR(self, t): pass
diff --git a/tests/test_c_lexer.py b/tests/test_c_lexer.py
index 2379536..7f69ac1 100644
--- a/tests/test_c_lexer.py
+++ b/tests/test_c_lexer.py
@@ -313,6 +313,7 @@ class TestCLexerNoErrors(unittest.TestCase):
#pragma {pack: 2, smack: 3}
#pragma <includeme.h> "nowit.h"
#pragma "string"
+ #pragma somestring="some_other_string"
#pragma id 124124 and numbers 0235495
59
'''
@@ -325,7 +326,7 @@ class TestCLexerNoErrors(unittest.TestCase):
self.assertEqual(t1.type, 'INT_CONST_DEC')
t2 = self.clex.token()
self.assertEqual(t2.type, 'INT_CONST_DEC')
- self.assertEqual(t2.lineno, 10)
+ self.assertEqual(t2.lineno, 11)