[patch] gcc7 patch for pplexer.py

grass-7.2.0-001-gcc7-pplexer.py.patch (text/plain), 1.10 KB, created by CaptainBlood on 2017-10-29 05:21:16 UTC

--- grass-7.2.0/lib/python/ctypes/ctypesgencore/parser/pplexer.py	2017-10-29 06:58:54.150304350 +0300
+++ grass-7.2.0/lib/python/ctypes/ctypesgencore/parser/pplexer.py.new	2017-10-29 07:07:42.500310213 +0300
@@ -52,7 +52,7 @@
     'L': '[a-zA-Z_]',
     'H': '[a-fA-F0-9]',
     'E': '[Ee][+-]?\s*{D}+',
-    'FS': '[FflL]',
+    'FS': '([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)',
     'IS': '[uUlL]*',
 }
 # Helper: substitute {foo} with subs[foo] in string (makes regexes more lexy)
@@ -226,10 +226,10 @@
     exp = m.group("exp")
     suf = m.group("suf")
 
-    if dp or exp or (suf and suf in ("Ff")):
+    if dp or exp or (suf and suf not in ("Ll")):
         s = m.group(0)
         if suf:
-            s = s[:-1]
+            s = s[:-len(suf)]            
         # Attach a prefix so the parser can figure out if should become an
         # integer, float, or long
         t.value = "f" + s
@@ -240,8 +240,7 @@
 
     return t
 
-INT_LITERAL = sub(r"(?P<p1>(?:0x{H}+)|(?:{D}+))(?P<suf>{IS})")
-
+INT_LITERAL = sub(r"(?P<p1>(?:0x{H}+)|(?:0[0-7]+)|(?:[1-9]{D}+))(?P<suf>{IS})")
 
 @TOKEN(INT_LITERAL)
 def t_ANY_int(t):