From f64ba790334351c165550403961458b263eabf33 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen <jpakkane@gmail.com> Date: Sat, 31 May 2014 19:31:32 +0300 Subject: [PATCH] Regexp fine tuning, can not parse LLVM yet. --- tools/cmake2meson.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cmake2meson.py b/tools/cmake2meson.py index b2784bf92..790f6aa0d 100755 --- a/tools/cmake2meson.py +++ b/tools/cmake2meson.py @@ -34,12 +34,12 @@ class Lexer: self.token_specification = [ # Need to be sorted longest to shortest. ('ignore', re.compile(r'[ \t]')), - ('id', re.compile('[-+_0-9a-z/A-Z.@]+')), + ('string', re.compile('"[^"]*?"')), + ('id', re.compile('''[-+_0-9a-z/A-Z@.]+''')), ('eol', re.compile(r'\n')), ('comment', re.compile(r'\#.*')), ('lparen', re.compile(r'\(')), ('rparen', re.compile(r'\)')), - ('string', re.compile('"[^"]*?"')), ('varexp', re.compile(r'\${[-_0-9a-z/A-Z.]+}')), ]