diff options
| author | jkim <jkim@FreeBSD.org> | 2015-02-18 20:33:00 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-02-18 20:33:00 +0000 |
| commit | a1a0103e5c0491f9378743fd890ce7c1b5731996 (patch) | |
| tree | fb0545399f40531160cc35b45423b4a49e6dbb79 /sys/contrib/dev/acpica/compiler/aslcompile.c | |
| parent | e88977434bd97898228c4330df94ca93ffd4b3bf (diff) | |
| parent | c289b811b42daf9e7ef5c37a35e951d01c23715a (diff) | |
| download | FreeBSD-src-a1a0103e5c0491f9378743fd890ce7c1b5731996.zip FreeBSD-src-a1a0103e5c0491f9378743fd890ce7c1b5731996.tar.gz | |
Merge ACPICA 20141107 and 20150204.
Diffstat (limited to 'sys/contrib/dev/acpica/compiler/aslcompile.c')
| -rw-r--r-- | sys/contrib/dev/acpica/compiler/aslcompile.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/contrib/dev/acpica/compiler/aslcompile.c b/sys/contrib/dev/acpica/compiler/aslcompile.c index b26c9e8..cf37c6a 100644 --- a/sys/contrib/dev/acpica/compiler/aslcompile.c +++ b/sys/contrib/dev/acpica/compiler/aslcompile.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2014, Intel Corp. + * Copyright (C) 2000 - 2015, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -118,10 +118,9 @@ CmDoCompile ( AslCompilerparse(); UtEndEvent (Event); - /* Check for parse errors */ + /* Check for parser-detected syntax errors */ - Status = AslCheckForErrorExit (); - if (ACPI_FAILURE (Status)) + if (Gbl_SyntaxError) { fprintf (stderr, "Compiler aborting due to parser-detected syntax error(s)\n"); LsDumpParseTree (); @@ -147,6 +146,13 @@ CmDoCompile ( Event = UtBeginEvent ("Flush source input"); CmFlushSourceCode (); + /* Prune the parse tree if requested (debug purposes only) */ + + if (Gbl_PruneParseTree) + { + AslPruneParseTree (Gbl_PruneDepth, Gbl_PruneType); + } + /* Optional parse tree dump, compiler debug output only */ LsDumpParseTree (); |
