From 8c8857d21cd9a69d9c24155a7f36d4c74c27ce56 Mon Sep 17 00:00:00 2001 From: Laurent Le Brun Date: Thu, 4 Aug 2016 10:22:16 +0000 Subject: Remove static checks from the parser. -- MOS_MIGRATED_REVID=129313959 --- .../com/google/devtools/build/lib/syntax/Environment.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/syntax/Environment.java') diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java index 4418167d33..9d6ec1c52b 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java @@ -945,10 +945,14 @@ public final class Environment implements Freezable { @VisibleForTesting public List parseFile(String... inputLines) { ParserInputSource input = ParserInputSource.create(Joiner.on("\n").join(inputLines), null); - Parser.ParseResult result = isSkylark - ? Parser.parseFileForSkylark(input, eventHandler, new ValidationEnvironment(this)) - : Parser.parseFile(input, eventHandler, /*parsePython=*/false); - return result.statements; + if (isSkylark) { + Parser.ParseResult result = Parser.parseFileForSkylark(input, eventHandler); + ValidationEnvironment valid = new ValidationEnvironment(this); + valid.validateAst(result.statements, eventHandler); + return result.statements; + } + + return Parser.parseFile(input, eventHandler, /*parsePython=*/ false).statements; } /** -- cgit v1.2.3