Fixed issue 21

2 files changed, 5 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index 0111acd..0676239 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 Version 3.5
 ---------------------
 05/29/13: beazley
+          Fixed CPP_INTEGER regex in ply/cpp.py (Issue 21).
+	  Reported by @vbraun.
+ 
+05/29/13: beazley
           Fixed yacc validation bugs when from __future__ import unicode_literals
           is being used.  Reported by Kenn Knowles.
 
diff --git a/ply/cpp.py b/ply/cpp.py
index f4ddd27..2f6a030 100644
--- a/ply/cpp.py
+++ b/ply/cpp.py
@@ -34,7 +34,7 @@ t_CPP_ID = r'[A-Za-z_][\w_]*'
 
 # Integer literal
 def CPP_INTEGER(t):
-    r'(((((0x)|(0X))[0-9a-fA-F]+)|(\d+))([uU]|[lL]|[uU][lL]|[lL][uU])?)'
+    r'(((((0x)|(0X))[0-9a-fA-F]+)|(\d+))([uU][lL]|[lL][uU]|[uU]|[lL])?)'
     return t
 
 t_CPP_INTEGER = CPP_INTEGER