From 4063efcf6a63aaf3d057a70993009350402989b9 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 1 Jun 2014 23:39:07 +0300 Subject: Store whole token. --- tools/cmake2meson.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/cmake2meson.py b/tools/cmake2meson.py index c2b7309..ccb2419 100755 --- a/tools/cmake2meson.py +++ b/tools/cmake2meson.py @@ -116,7 +116,7 @@ class Parser(): if self.accept('lparen'): args.append(self.arguments()) self.expect('rparen') - arg = self.current.value + arg = self.current if self.accept('string') or self.accept('varexp') or\ self.accept('id'): args.append(arg) @@ -138,8 +138,8 @@ def convert(cmake_root): p = Parser(cmakecode) for t in p.parse(): if t.name == 'add_subdirectory': - print('\nRecursing to subdir', os.path.join(cmake_root, t.args[0]), '\n') - convert(os.path.join(cmake_root, t.args[0])) + print('\nRecursing to subdir', os.path.join(cmake_root, t.args[0].value), '\n') + convert(os.path.join(cmake_root, t.args[0].value)) print('\nReturning to', cmake_root, '\n') else: print(t.name, t.args) -- cgit v1.1