From: Jordan Justen <jordan.l.justen@intel.com>
Date: Thu, 17 Aug 2017 22:44:53 +0000 (-0700)
Subject: genxml/gen_bits_header.py: Use regex to strip no alphanum chars
X-Git-Tag: android-x86-9.0-r1~8907
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a9b0b72a786d270e1fa09e5d4741c498c4c66247;p=android-x86%2Fexternal-mesa.git

genxml/gen_bits_header.py: Use regex to strip no alphanum chars

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Sagar Ghuge <sagar.ghuge@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/intel/genxml/gen_bits_header.py b/src/intel/genxml/gen_bits_header.py
index ded2d2dcfcf..aac49fb49e2 100644
--- a/src/intel/genxml/gen_bits_header.py
+++ b/src/intel/genxml/gen_bits_header.py
@@ -25,6 +25,7 @@ from __future__ import (
 
 import argparse
 import os
+import re
 import xml.parsers.expat
 
 from mako.template import Template
@@ -130,33 +131,10 @@ ${emit_per_gen_prop_func(field, 'start')}
 
 #endif /* ${guard} */""", output_encoding='utf-8')
 
+alphanum_nono = re.compile(r'[ /\[\]()\-:.,=>#&*"+\\]+')
 def to_alphanum(name):
-    substitutions = {
-        ' ': '',
-        '/': '',
-        '[': '',
-        ']': '',
-        '(': '',
-        ')': '',
-        '-': '',
-        ':': '',
-        '.': '',
-        ',': '',
-        '=': '',
-        '>': '',
-        '#': '',
-        'α': 'alpha',
-        '&': '',
-        '*': '',
-        '"': '',
-        '+': '',
-        '\'': '',
-    }
-
-    for i, j in substitutions.items():
-        name = name.replace(i, j)
-
-    return name
+    global alphanum_nono
+    return alphanum_nono.sub('', name).replace('α', 'alpha')
 
 def safe_name(name):
     name = to_alphanum(name)