aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--authors.txt1
-rw-r--r--mesonbuild/mparser.py1
-rw-r--r--test cases/common/144 empty build file/meson.build2
-rw-r--r--test cases/common/144 empty build file/subdir/meson.build0
4 files changed, 4 insertions, 0 deletions
diff --git a/authors.txt b/authors.txt
index d982dfa..72fe935 100644
--- a/authors.txt
+++ b/authors.txt
@@ -75,3 +75,4 @@ Roger Boerdijk
melak47
Philipp Ittershagen
Dylan Baker
+Aaron Plattner
diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py
index 7a91539..a9f25b1 100644
--- a/mesonbuild/mparser.py
+++ b/mesonbuild/mparser.py
@@ -407,6 +407,7 @@ class Parser:
def __init__(self, code, subdir):
self.lexer = Lexer(code)
self.stream = self.lexer.lex(subdir)
+ self.current = Token('eof', '', 0, 0, 0, (0, 0), None)
self.getsym()
self.in_ternary = False
diff --git a/test cases/common/144 empty build file/meson.build b/test cases/common/144 empty build file/meson.build
new file mode 100644
index 0000000..73d0397
--- /dev/null
+++ b/test cases/common/144 empty build file/meson.build
@@ -0,0 +1,2 @@
+project('subdir with empty meson.build test', 'c')
+subdir('subdir')
diff --git a/test cases/common/144 empty build file/subdir/meson.build b/test cases/common/144 empty build file/subdir/meson.build
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test cases/common/144 empty build file/subdir/meson.build