diff options
| author | jkim <jkim@FreeBSD.org> | 2013-01-17 23:56:43 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-01-17 23:56:43 +0000 |
| commit | 2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4 (patch) | |
| tree | a7cdf321edb5a438878660c0df9e9bf8a70038e1 /sys/contrib/dev/acpica/compiler/aslcompiler.y | |
| parent | 39b667a9d0968b8b54185d03b5b8bb2670346424 (diff) | |
| parent | 8f7c8be022add76a280165a4247448f1fcd77631 (diff) | |
| download | FreeBSD-src-2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4.zip FreeBSD-src-2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4.tar.gz | |
Merge ACPICA 20130117.
Diffstat (limited to 'sys/contrib/dev/acpica/compiler/aslcompiler.y')
| -rw-r--r-- | sys/contrib/dev/acpica/compiler/aslcompiler.y | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/sys/contrib/dev/acpica/compiler/aslcompiler.y b/sys/contrib/dev/acpica/compiler/aslcompiler.y index b6453ac..42ff850 100644 --- a/sys/contrib/dev/acpica/compiler/aslcompiler.y +++ b/sys/contrib/dev/acpica/compiler/aslcompiler.y @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2012, Intel Corp. + * Copyright (C) 2000 - 2013, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -661,6 +661,7 @@ void * AslLocalAllocate (unsigned int Size); /* Types */ %type <n> SuperName +%type <n> ObjectTypeName %type <n> ArgTerm %type <n> LocalTerm %type <n> DebugTerm @@ -1991,7 +1992,7 @@ NotTerm ObjectTypeTerm : PARSEOP_OBJECTTYPE '(' {$<n>$ = TrCreateLeafNode (PARSEOP_OBJECTTYPE);} - SuperName + ObjectTypeName ')' {$$ = TrLinkChildren ($<n>3,1,$4);} | PARSEOP_OBJECTTYPE '(' error ')' {$$ = AslDoError(); yyclearin;} @@ -2439,6 +2440,18 @@ SuperName | LocalTerm {} | DebugTerm {} | Type6Opcode {} + +/* For ObjectType: SuperName except for UserTerm (method invocation) */ + +ObjectTypeName + : NameString {} + | ArgTerm {} + | LocalTerm {} + | DebugTerm {} + | RefOfTerm {} + | DerefOfTerm {} + | IndexTerm {} + /* | UserTerm {} */ /* Caused reduce/reduce with Type6Opcode->UserTerm */ ; |
