aboutsummaryrefslogtreecommitdiff
path: root/source/compiler/aslhelpers.y
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2017-06-29 18:42:13 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2017-06-29 18:42:13 +0000
commit744d47ba98ced2e2a7d3aff2f894136544386e34 (patch)
tree917f6a025e019c7b80e50a45fa783593b4e3c19e /source/compiler/aslhelpers.y
parentc457a42be4fca72c51fdca569271b62213d01a37 (diff)
downloadsrc-744d47ba98ced2e2a7d3aff2f894136544386e34.tar.gz
src-744d47ba98ced2e2a7d3aff2f894136544386e34.zip
Import ACPICA 20170629.vendor/acpica/20170629
Notes
Notes: svn path=/vendor-sys/acpica/dist/; revision=320476 svn path=/vendor-sys/acpica/20170629/; revision=320477; tag=vendor/acpica/20170629
Diffstat (limited to 'source/compiler/aslhelpers.y')
-rw-r--r--source/compiler/aslhelpers.y38
1 files changed, 19 insertions, 19 deletions
diff --git a/source/compiler/aslhelpers.y b/source/compiler/aslhelpers.y
index f200bf2b0e78..cd898b155137 100644
--- a/source/compiler/aslhelpers.y
+++ b/source/compiler/aslhelpers.y
@@ -160,11 +160,11 @@ NoEcho('
******************************************************************************/
OptionalBusMasterKeyword
- : ',' {$$ = TrCreateLeafNode (
+ : ',' {$$ = TrCreateLeafOp (
PARSEOP_BUSMASTERTYPE_MASTER);}
- | ',' PARSEOP_BUSMASTERTYPE_MASTER {$$ = TrCreateLeafNode (
+ | ',' PARSEOP_BUSMASTERTYPE_MASTER {$$ = TrCreateLeafOp (
PARSEOP_BUSMASTERTYPE_MASTER);}
- | ',' PARSEOP_BUSMASTERTYPE_NOTMASTER {$$ = TrCreateLeafNode (
+ | ',' PARSEOP_BUSMASTERTYPE_NOTMASTER {$$ = TrCreateLeafOp (
PARSEOP_BUSMASTERTYPE_NOTMASTER);}
;
@@ -176,9 +176,9 @@ OptionalAccessAttribTerm
;
OptionalAccessSize
- : {$$ = TrCreateValuedLeafNode (
+ : {$$ = TrCreateValuedLeafOp (
PARSEOP_BYTECONST, 0);}
- | ',' {$$ = TrCreateValuedLeafNode (
+ | ',' {$$ = TrCreateValuedLeafOp (
PARSEOP_BYTECONST, 0);}
| ',' ByteConstExpr {$$ = $2;}
;
@@ -243,10 +243,10 @@ OptionalIoRestriction
;
OptionalListString
- : {$$ = TrCreateValuedLeafNode (
+ : {$$ = TrCreateValuedLeafOp (
PARSEOP_STRING_LITERAL,
ACPI_TO_INTEGER (""));} /* Placeholder is a NULL string */
- | ',' {$$ = TrCreateValuedLeafNode (
+ | ',' {$$ = TrCreateValuedLeafOp (
PARSEOP_STRING_LITERAL,
ACPI_TO_INTEGER (""));} /* Placeholder is a NULL string */
| ',' TermArg {$$ = $2;}
@@ -280,13 +280,13 @@ OptionalNameString_Last
;
OptionalNameString_First
- : {$$ = TrCreateLeafNode (
+ : {$$ = TrCreateLeafOp (
PARSEOP_ZERO);}
| NameString {$$ = $1;}
;
OptionalObjectTypeKeyword
- : {$$ = TrCreateLeafNode (
+ : {$$ = TrCreateLeafOp (
PARSEOP_OBJECTTYPE_UNK);}
| ',' ObjectTypeKeyword {$$ = $2;}
;
@@ -308,33 +308,33 @@ OptionalRangeType
;
OptionalReadWriteKeyword
- : {$$ = TrCreateLeafNode (
+ : {$$ = TrCreateLeafOp (
PARSEOP_READWRITETYPE_BOTH);}
- | PARSEOP_READWRITETYPE_BOTH {$$ = TrCreateLeafNode (
+ | PARSEOP_READWRITETYPE_BOTH {$$ = TrCreateLeafOp (
PARSEOP_READWRITETYPE_BOTH);}
- | PARSEOP_READWRITETYPE_READONLY {$$ = TrCreateLeafNode (
+ | PARSEOP_READWRITETYPE_READONLY {$$ = TrCreateLeafOp (
PARSEOP_READWRITETYPE_READONLY);}
;
OptionalResourceType_First
- : {$$ = TrCreateLeafNode (
+ : {$$ = TrCreateLeafOp (
PARSEOP_RESOURCETYPE_CONSUMER);}
| ResourceTypeKeyword {$$ = $1;}
;
OptionalResourceType
- : {$$ = TrCreateLeafNode (
+ : {$$ = TrCreateLeafOp (
PARSEOP_RESOURCETYPE_CONSUMER);}
- | ',' {$$ = TrCreateLeafNode (
+ | ',' {$$ = TrCreateLeafOp (
PARSEOP_RESOURCETYPE_CONSUMER);}
| ',' ResourceTypeKeyword {$$ = $2;}
;
/* Same as above except default is producer */
OptionalProducerResourceType
- : {$$ = TrCreateLeafNode (
+ : {$$ = TrCreateLeafOp (
PARSEOP_RESOURCETYPE_PRODUCER);}
- | ',' {$$ = TrCreateLeafNode (
+ | ',' {$$ = TrCreateLeafOp (
PARSEOP_RESOURCETYPE_PRODUCER);}
| ',' ResourceTypeKeyword {$$ = $2;}
;
@@ -395,9 +395,9 @@ OptionalWordConstExpr
;
OptionalXferSize
- : {$$ = TrCreateValuedLeafNode (
+ : {$$ = TrCreateValuedLeafOp (
PARSEOP_XFERSIZE_32, 2);}
- | ',' {$$ = TrCreateValuedLeafNode (
+ | ',' {$$ = TrCreateValuedLeafOp (
PARSEOP_XFERSIZE_32, 2);}
| ',' XferSizeKeyword {$$ = $2;}
;