From owner-acpi-jp@jp.freebsd.org  Sat Dec 23 19:30:30 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id TAA89477;
	Sat, 23 Dec 2000 19:30:30 +0900 (JST)
	(envelope-from owner-acpi-jp@jp.FreeBSD.org)
Received: from tasogare.imasy.or.jp (root@tasogare.imasy.or.jp [202.227.24.5])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id TAA89468
	for <acpi-jp@jp.freebsd.org>; Sat, 23 Dec 2000 19:30:28 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
Received: from localhost (iwasaki.imasy.or.jp [202.227.24.92])
	by tasogare.imasy.or.jp (8.11.1+3.4W/3.7W-tasogare) with ESMTP id eBNAUAk60390;
	Sat, 23 Dec 2000 19:30:10 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
To: acpi-jp@jp.freebsd.org
Cc: andrew.grover@intel.com
In-Reply-To: <20001221013347R.iwasaki@jp.FreeBSD.org>
References: <20001126010620I.iwasaki@jp.FreeBSD.org>
	<20001221013347R.iwasaki@jp.FreeBSD.org>
X-Mailer: Mew version 1.94.1 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-Id: <20001223193009B.iwasaki@jp.FreeBSD.org>
Date: Sat, 23 Dec 2000 19:30:09 +0900
From: Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
X-Dispatcher: imput version 20000228(IM140)
Lines: 2388
Reply-To: acpi-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: acpi-jp 993
Subject: [acpi-jp 993] Re: ASL compiler development?
Errors-To: owner-acpi-jp@jp.freebsd.org
Sender: owner-acpi-jp@jp.freebsd.org
X-Originator: iwasaki@jp.freebsd.org

> I've just noticed that ACPICA 20001215 includes ASL compiler!
> # This would be a great X'mas present for me :-)
> I'll stop developing my own ASL compiler and import it into CVS repo. in
> Japan as the record, then try to port Intel version of compiler to FreeBSD.
> 
> Thanks a lot, Intel folks!

I've ported Intel ASL compiler to FreeBSD.  Because of trivial
differences between GNU bison and Berkeley YACC, some modifications
were needed.  Most of patches are against aslcompiler.y so that
traditional yacc handle them, and I'm sure that it wouldn't hurt
anything for building iasl using GNU bison.
Another major patches are against files under Subsystem in order to
avoid duplicated definitions with AslCompiler source files.

Andrew, is it possible to merge the patches into the original source?

Thanks

diff -ru ../org/AslCompiler/aslcompiler.y ./AslCompiler/aslcompiler.y
--- ../org/AslCompiler/aslcompiler.y	Fri Dec 22 18:17:17 2000
+++ ./AslCompiler/aslcompiler.y	Sat Dec 23 01:29:48 2000
@@ -734,24 +734,24 @@
 
 ASLCode
     : DefinitionBlockTerm
-    | error                         {YYABORT; $$ = NULL}
+    | error                         {YYABORT; $$ = NULL;}
     ;
 
 DefinitionBlockTerm
-    : DEFINITIONBLOCK '('           {$$ = TrCreateLeafNode (DEFINITIONBLOCK)}
+    : DEFINITIONBLOCK '('           {$$ = TrCreateLeafNode (DEFINITIONBLOCK);}
         String ','
         String ','
         ByteConst ','
         String ','
         String ','
         DWordConst
-        ')'                         {TrSetEndLineNumber ($<n>3)}
-            '{' TermList '}'        {$$ = TrLinkChildren ($<n>3,7,$4,$6,$8,$10,$12,$14,$18)}
+        ')'                         {TrSetEndLineNumber ($<n>3);}
+            '{' TermList '}'        {$$ = TrLinkChildren ($<n>3,7,$4,$6,$8,$10,$12,$14,$18);}
     ;
 
 TermList
-    :                               {$$ = NULL}
-    | Term TermList                 {$$ = TrLinkPeerNode (TrSetNodeFlags ($1, NODE_RESULT_NOT_USED),$2)}
+    :                               {$$ = NULL;}
+    | Term TermList                 {$$ = TrLinkPeerNode (TrSetNodeFlags ($1, NODE_RESULT_NOT_USED),$2);}
     ;
 
 Term
@@ -767,13 +767,13 @@
 
 CompilerDirective
     : IncludeTerm                   {}
-    | IncludeCStyleTerm             {$$ = NULL}
+    | IncludeCStyleTerm             {$$ = NULL;}
     | ExternalTerm                  {}
     ;
 
 ObjectList
-    :                               {$$ = NULL}
-    | Object ObjectList             {$$ = TrLinkPeerNode ($1,$2)}
+    :                               {$$ = NULL;}
+    | Object ObjectList             {$$ = TrLinkPeerNode ($1,$2);}
     ;
 
 Object
@@ -840,19 +840,19 @@
     ;
 
 UserTerm
-    : NameString '('                {TrUpdateNode (METHODCALL, $1)}
-        ArgList ')'                 {$$ = TrLinkChildNode ($1,$4)}
+    : NameString '('                {TrUpdateNode (METHODCALL, $1);}
+        ArgList ')'                 {$$ = TrLinkChildNode ($1,$4);}
     ;
 
 ArgList
-    :                               {$$ = NULL}
-    | TermArg ArgListTail           {$$ = TrLinkPeerNode ($1,$2)}
+    :                               {$$ = NULL;}
+    | TermArg ArgListTail           {$$ = TrLinkPeerNode ($1,$2);}
     ;
 
 ArgListTail
-    :                               {$$ = NULL}
-    | ',' TermArg ArgListTail       {$$ = TrLinkPeerNode ($2,$3)}
-    | ','                           {$$ = NULL}   /* Allows a trailing comma at list end */
+    :                               {$$ = NULL;}
+    | ',' TermArg ArgListTail       {$$ = TrLinkPeerNode ($2,$3);}
+    | ','                           {$$ = NULL;}   /* Allows a trailing comma at list end */
     ;
 
 TermArg
@@ -868,9 +868,9 @@
     ;
 
 Target
-    :                               {$$ = TrCreateLeafNode (ZERO)}       /* Placeholder is a ZeroOp object */
-    | ','                           {$$ = TrCreateLeafNode (ZERO)}       /* Placeholder is a ZeroOp object */
-    | ',' SuperName                 {$$ = TrSetNodeFlags ($2, NODE_IS_TARGET)}
+    :                               {$$ = TrCreateLeafNode (ZERO);}       /* Placeholder is a ZeroOp object */
+    | ','                           {$$ = TrCreateLeafNode (ZERO);}       /* Placeholder is a ZeroOp object */
+    | ',' SuperName                 {$$ = TrSetNodeFlags ($2, NODE_IS_TARGET);}
     ;
 
 
@@ -997,26 +997,26 @@
     ;
 
 IncludeTerm
-    : INCLUDE '('                   {$$ = TrCreateLeafNode (INCLUDE)}
+    : INCLUDE '('                   {$$ = TrCreateLeafNode (INCLUDE);}
         String  ')'                 {$$ = TrLinkChildren ($<n>3,1,$4);FlOpenIncludeFile ($4);}
         TermList
-        IncludeEndTerm              {$$ = TrLinkPeerNodes (3,$<n>3,$7,$8)}
+        IncludeEndTerm              {$$ = TrLinkPeerNodes (3,$<n>3,$7,$8);}
     ;
 
 IncludeEndTerm
-    : INCLUDE_END                   {$$ = TrCreateLeafNode (INCLUDE_END)}
+    : INCLUDE_END                   {$$ = TrCreateLeafNode (INCLUDE_END);}
     ;
 
 IncludeCStyleTerm
     : INCLUDE_CSTYLE
-        String                      {FlOpenIncludeFile ($2)}
+        String                      {FlOpenIncludeFile ($2);}
     ;
 
 ExternalTerm
     : EXTERNAL '('
         NameString
         ',' ObjectTypeKeyword
-        ')'                         {$$ = TrCreateNode (EXTERNAL,2,$3,$5)}
+        ')'                         {$$ = TrCreateNode (EXTERNAL,2,$3,$5);}
     | EXTERNAL '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
@@ -1026,7 +1026,7 @@
 
 
 BankFieldTerm
-    : BANKFIELD '('                 {$$ = TrCreateLeafNode (BANKFIELD)}
+    : BANKFIELD '('                 {$$ = TrCreateLeafNode (BANKFIELD);}
         NameString
         NameStringItem
         TermArgItem
@@ -1034,22 +1034,22 @@
         ',' LockRuleKeyword
         ',' UpdateRuleKeyword
         ')' '{'
-            FieldUnitList '}'       {$$ = TrLinkChildren ($<n>3,7,$4,$5,$6,$8,$10,$12,$15)}
+            FieldUnitList '}'       {$$ = TrLinkChildren ($<n>3,7,$4,$5,$6,$8,$10,$12,$15);}
     | BANKFIELD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 FieldUnitList
-    :                               {$$ = NULL}
+    :                               {$$ = NULL;}
     | FieldUnit
-        FieldUnitListTail           {$$ = TrLinkPeerNode ($1,$2)}
+        FieldUnitListTail           {$$ = TrLinkPeerNode ($1,$2);}
     ;
 
 FieldUnitListTail
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}  /* Allows a trailing comma at list end */
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}  /* Allows a trailing comma at list end */
     | ',' FieldUnit
-            FieldUnitListTail       {$$ = TrLinkPeerNode ($2,$3)}
+            FieldUnitListTail       {$$ = TrLinkPeerNode ($2,$3);}
     ;
 
 FieldUnit
@@ -1059,15 +1059,15 @@
     ;
 
 FieldUnitEntry
-    : ',' AmlPackageLengthTerm      {$$ = TrCreateNode (RESERVED_BYTES,1,$2)}
+    : ',' AmlPackageLengthTerm      {$$ = TrCreateNode (RESERVED_BYTES,1,$2);}
     | NameSeg ','
-        AmlPackageLengthTerm        {$$ = TrLinkChildNode ($1,$3)}
+        AmlPackageLengthTerm        {$$ = TrLinkChildNode ($1,$3);}
     ;
 
 OffsetTerm
     : OFFSET '('
         AmlPackageLengthTerm
-        ')'                         {$$ = TrCreateNode (OFFSET,1,$3)}
+        ')'                         {$$ = TrCreateNode (OFFSET,1,$3);}
     | OFFSET '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
@@ -1076,190 +1076,190 @@
     : ACCESSAS '('
         AccessTypeKeyword
         OptionalAccessAttribTerm
-        ')'                         {$$ = TrCreateNode (ACCESSAS,2,$3,$4)}
+        ')'                         {$$ = TrCreateNode (ACCESSAS,2,$3,$4);}
     | ACCESSAS '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 CreateBitFieldTerm
-    : CREATEBITFIELD '('            {$$ = TrCreateLeafNode (CREATEBITFIELD)}
+    : CREATEBITFIELD '('            {$$ = TrCreateLeafNode (CREATEBITFIELD);}
         TermArg
         TermArgItem
         NameStringItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | CREATEBITFIELD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 CreateByteFieldTerm
-    : CREATEBYTEFIELD '('           {$$ = TrCreateLeafNode (CREATEBYTEFIELD)}
+    : CREATEBYTEFIELD '('           {$$ = TrCreateLeafNode (CREATEBYTEFIELD);}
         TermArg
         TermArgItem
         NameStringItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | CREATEBYTEFIELD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 CreateDWordFieldTerm
-    : CREATEDWORDFIELD '('          {$$ = TrCreateLeafNode (CREATEDWORDFIELD)}
+    : CREATEDWORDFIELD '('          {$$ = TrCreateLeafNode (CREATEDWORDFIELD);}
         TermArg
         TermArgItem
         NameStringItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | CREATEDWORDFIELD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 CreateFieldTerm
-    : CREATEFIELD '('               {$$ = TrCreateLeafNode (CREATEFIELD)}
+    : CREATEFIELD '('               {$$ = TrCreateLeafNode (CREATEFIELD);}
         TermArg
         TermArgItem
         TermArgItem
         NameStringItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$5,$6,$7)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$5,$6,$7);}
     | CREATEFIELD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 CreateQWordFieldTerm
-    : CREATEQWORDFIELD '('          {$$ = TrCreateLeafNode (CREATEQWORDFIELD)}
+    : CREATEQWORDFIELD '('          {$$ = TrCreateLeafNode (CREATEQWORDFIELD);}
         TermArg
         TermArgItem
         NameStringItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | CREATEQWORDFIELD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 CreateWordFieldTerm
-    : CREATEWORDFIELD '('           {$$ = TrCreateLeafNode (CREATEWORDFIELD)}
+    : CREATEWORDFIELD '('           {$$ = TrCreateLeafNode (CREATEWORDFIELD);}
         TermArg
         TermArgItem
         NameStringItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | CREATEWORDFIELD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 DataRegionTerm
-    : DATATABLEREGION '('           {$$ = TrCreateLeafNode (DATATABLEREGION)}
+    : DATATABLEREGION '('           {$$ = TrCreateLeafNode (DATATABLEREGION);}
         NameString
         TermArgItem
         TermArgItem
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$5,$6,$7)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$5,$6,$7);}
     | DATATABLEREGION '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 DeviceTerm
-    : DEVICE '('                    {$$ = TrCreateLeafNode (DEVICE)}
+    : DEVICE '('                    {$$ = TrCreateLeafNode (DEVICE);}
         NameString
         ')' '{'
-            ObjectList '}'          {$$ = TrLinkChildren ($<n>3,2,$4,$7)}
+            ObjectList '}'          {$$ = TrLinkChildren ($<n>3,2,$4,$7);}
     | DEVICE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 EventTerm
-    : EVENT '('                     {$$ = TrCreateLeafNode (EVENT)}
+    : EVENT '('                     {$$ = TrCreateLeafNode (EVENT);}
         NameString
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | EVENT '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 FieldTerm
-    : FIELD '('                     {$$ = TrCreateLeafNode (FIELD)}
+    : FIELD '('                     {$$ = TrCreateLeafNode (FIELD);}
         NameString
         ',' AccessTypeKeyword
         ',' LockRuleKeyword
         ',' UpdateRuleKeyword
         ')' '{'
-            FieldUnitList '}'       {$$ = TrLinkChildren ($<n>3,5,$4,$6,$8,$10,$13)}
+            FieldUnitList '}'       {$$ = TrLinkChildren ($<n>3,5,$4,$6,$8,$10,$13);}
     | FIELD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 IndexFieldTerm
-    : INDEXFIELD '('                {$$ = TrCreateLeafNode (INDEXFIELD)}
+    : INDEXFIELD '('                {$$ = TrCreateLeafNode (INDEXFIELD);}
         NameString
         NameStringItem
         ',' AccessTypeKeyword
         ',' LockRuleKeyword
         ',' UpdateRuleKeyword
         ')' '{'
-            FieldUnitList '}'       {$$ = TrLinkChildren ($<n>3,6,$4,$5,$7,$9,$11,$14)}
+            FieldUnitList '}'       {$$ = TrLinkChildren ($<n>3,6,$4,$5,$7,$9,$11,$14);}
     | INDEXFIELD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 MethodTerm
-    : METHOD  '('                   {$$ = TrCreateLeafNode (METHOD)}
+    : METHOD  '('                   {$$ = TrCreateLeafNode (METHOD);}
         NameString
         OptionalByteConstExpr
         OptionalSerializeRuleKeyword
         OptionalByteConstExpr
         ')' '{'
-            TermList '}'            {$$ = TrLinkChildren ($<n>3,5,$4,$5,$6,$7,$10)}
+            TermList '}'            {$$ = TrLinkChildren ($<n>3,5,$4,$5,$6,$7,$10);}
     | METHOD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 MutexTerm
-    : MUTEX '('                     {$$ = TrCreateLeafNode (MUTEX)}
+    : MUTEX '('                     {$$ = TrCreateLeafNode (MUTEX);}
         NameString
         ',' ByteConstExpr
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$6);}
     | MUTEX '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 OpRegionTerm
-    : OPERATIONREGION '('           {$$ = TrCreateLeafNode (OPERATIONREGION)}
+    : OPERATIONREGION '('           {$$ = TrCreateLeafNode (OPERATIONREGION);}
         NameString
         ',' OpRegionSpaceIdTerm
         TermArgItem
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$6,$7,$8)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$6,$7,$8);}
     | OPERATIONREGION '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 OpRegionSpaceIdTerm
     : RegionSpaceKeyword            {}
-    | ByteConst                     {$$ = UtCheckIntegerRange ($1, 0x80, 0xFF)}
+    | ByteConst                     {$$ = UtCheckIntegerRange ($1, 0x80, 0xFF);}
     ;
 
 PowerResTerm
-    : POWERRESOURCE '('             {$$ = TrCreateLeafNode (POWERRESOURCE)}
+    : POWERRESOURCE '('             {$$ = TrCreateLeafNode (POWERRESOURCE);}
         NameString
         ',' ByteConstExpr
         ',' WordConstExpr
         ')' '{'
-            ObjectList '}'          {$$ = TrLinkChildren ($<n>3,4,$4,$6,$8,$11)}
+            ObjectList '}'          {$$ = TrLinkChildren ($<n>3,4,$4,$6,$8,$11);}
     | POWERRESOURCE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ProcessorTerm
-    : PROCESSOR '('                 {$$ = TrCreateLeafNode (PROCESSOR)}
+    : PROCESSOR '('                 {$$ = TrCreateLeafNode (PROCESSOR);}
         NameString
         ',' ByteConstExpr
         OptionalDWordConstExpr
         OptionalByteConstExpr
         ')' '{'
-            ObjectList '}'          {$$ = TrLinkChildren ($<n>3,5,$4,$6,$7,$8,$11)}
+            ObjectList '}'          {$$ = TrLinkChildren ($<n>3,5,$4,$6,$7,$8,$11);}
     | PROCESSOR '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ThermalZoneTerm
-    : THERMALZONE '('               {$$ = TrCreateLeafNode (THERMALZONE)}
+    : THERMALZONE '('               {$$ = TrCreateLeafNode (THERMALZONE);}
         NameString
         ')' '{'
-            ObjectList '}'          {$$ = TrLinkChildren ($<n>3,2,$4,$7)}
+            ObjectList '}'          {$$ = TrLinkChildren ($<n>3,2,$4,$7);}
     | THERMALZONE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
@@ -1269,28 +1269,28 @@
 
 
 AliasTerm
-    : ALIAS '('                     {$$ = TrCreateLeafNode (ALIAS)}
+    : ALIAS '('                     {$$ = TrCreateLeafNode (ALIAS);}
         NameString
         NameStringItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | ALIAS '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 NameTerm
-    : NAME '('                      {$$ = TrCreateLeafNode (NAME)}
+    : NAME '('                      {$$ = TrCreateLeafNode (NAME);}
         NameString
         ',' DataObject
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$6);}
     | NAME '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ScopeTerm
-    : SCOPE '('                     {$$ = TrCreateLeafNode (SCOPE)}
+    : SCOPE '('                     {$$ = TrCreateLeafNode (SCOPE);}
         NameString
         ')' '{'
-            ObjectList '}'          {$$ = TrLinkChildren ($<n>3,2,$4,$7)}
+            ObjectList '}'          {$$ = TrLinkChildren ($<n>3,2,$4,$7);}
     | SCOPE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
@@ -1300,129 +1300,129 @@
 
 
 BreakTerm
-    : BREAK                         {$$ = TrCreateNode (BREAK, 0)}
+    : BREAK                         {$$ = TrCreateNode (BREAK, 0);}
     ;
 
 BreakPointTerm
-    : BREAKPOINT                    {$$ = TrCreateNode (BREAKPOINT, 0)}
+    : BREAKPOINT                    {$$ = TrCreateNode (BREAKPOINT, 0);}
     ;
 
 ContinueTerm
-    : CONTINUE                      {$$ = TrCreateNode (CONTINUE, 0)}
+    : CONTINUE                      {$$ = TrCreateNode (CONTINUE, 0);}
     ;
 
 FatalTerm
-    : FATAL '('                     {$$ = TrCreateLeafNode (FATAL)}
+    : FATAL '('                     {$$ = TrCreateLeafNode (FATAL);}
         ByteConstExpr
         ',' DWordConstExpr
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$6,$7)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$6,$7);}
     | FATAL '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 IfElseTerm
-    : IfTerm ElseTerm               {$$ = TrLinkPeerNode ($1,$2)}
+    : IfTerm ElseTerm               {$$ = TrLinkPeerNode ($1,$2);}
     ;
 
 IfTerm
-    : IF '('                        {$$ = TrCreateLeafNode (IF)}
+    : IF '('                        {$$ = TrCreateLeafNode (IF);}
         TermArg
         ')' '{'
             TermList '}'
-                                    {$$ = TrLinkChildren ($<n>3,2,$4,$7)}
+                                    {$$ = TrLinkChildren ($<n>3,2,$4,$7);}
     | IF '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ElseTerm
-    :                               {$$ = NULL}
-    | ELSE '{'                      {$$ = TrCreateLeafNode (ELSE)}
+    :                               {$$ = NULL;}
+    | ELSE '{'                      {$$ = TrCreateLeafNode (ELSE);}
         TermList '}'
-                                    {$$ = TrLinkChildren ($<n>3,1,$4)}
+                                    {$$ = TrLinkChildren ($<n>3,1,$4);}
 
-    | ELSEIF '{'                    {$$ = TrCreateLeafNode (ELSEIF)}
+    | ELSEIF '{'                    {$$ = TrCreateLeafNode (ELSEIF);}
         TermList '}'
         ElseTerm
-                                    {$$ = TrLinkChildren ($<n>3,2,$4,$6)}
+                                    {$$ = TrLinkChildren ($<n>3,2,$4,$6);}
     ;
 
 LoadTerm
-    : LOAD '('                      {$$ = TrCreateLeafNode (LOAD)}
+    : LOAD '('                      {$$ = TrCreateLeafNode (LOAD);}
         NameString
         ',' SuperName
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$6);}
     | LOAD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 NoOpTerm
-    : NOOP                          {$$ = TrCreateNode (NOOP, 0)}
+    : NOOP                          {$$ = TrCreateNode (NOOP, 0);}
     ;
 
 NotifyTerm
-    : NOTIFY '('                    {$$ = TrCreateLeafNode (NOTIFY)}
+    : NOTIFY '('                    {$$ = TrCreateLeafNode (NOTIFY);}
         SuperName
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | NOTIFY '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ReleaseTerm
-    : RELEASE '('                   {$$ = TrCreateLeafNode (RELEASE)}
+    : RELEASE '('                   {$$ = TrCreateLeafNode (RELEASE);}
         SuperName
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | RELEASE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ResetTerm
-    : RESET '('                     {$$ = TrCreateLeafNode (RESET)}
+    : RESET '('                     {$$ = TrCreateLeafNode (RESET);}
         SuperName
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | RESET '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ReturnTerm
-    : RETURN '('                    {$$ = TrCreateLeafNode (RETURN)}
+    : RETURN '('                    {$$ = TrCreateLeafNode (RETURN);}
         OptionalTermArg
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | RETURN '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 SignalTerm
-    : SIGNAL '('                    {$$ = TrCreateLeafNode (SIGNAL)}
+    : SIGNAL '('                    {$$ = TrCreateLeafNode (SIGNAL);}
         SuperName
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | SIGNAL '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 SleepTerm
-    : SLEEP '('                     {$$ = TrCreateLeafNode (SLEEP)}
+    : SLEEP '('                     {$$ = TrCreateLeafNode (SLEEP);}
         TermArg
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | SLEEP '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 StallTerm
-    : STALL '('                     {$$ = TrCreateLeafNode (STALL)}
+    : STALL '('                     {$$ = TrCreateLeafNode (STALL);}
         TermArg
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | STALL '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 SwitchTerm
-    : SWITCH '('                    {$$ = TrCreateLeafNode (SWITCH)}
+    : SWITCH '('                    {$$ = TrCreateLeafNode (SWITCH);}
         TermArg
         ')' '{'
             CaseTermList '}'
-                                    {$$ = TrLinkChildren ($<n>3,2,$4,$7)}
+                                    {$$ = TrLinkChildren ($<n>3,2,$4,$7);}
     | SWITCH '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
@@ -1444,34 +1444,34 @@
     ;
 
 CaseTerm
-    : CASE '('                      {$$ = TrCreateLeafNode (CASE)}
+    : CASE '('                      {$$ = TrCreateLeafNode (CASE);}
         DataObject
         ')' '{'
             TermList '}'
-                                    {$$ = TrLinkChildren ($<n>3,2,$4,$7)}
+                                    {$$ = TrLinkChildren ($<n>3,2,$4,$7);}
     | CASE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 DefaultTerm
-    : DEFAULT '{'                   {$$ = TrCreateLeafNode (DEFAULT)}
+    : DEFAULT '{'                   {$$ = TrCreateLeafNode (DEFAULT);}
         TermList '}'
-                                    {$$ = TrLinkChildren ($<n>3,1,$4)}
+                                    {$$ = TrLinkChildren ($<n>3,1,$4);}
     ;
 
 UnloadTerm
-    : UNLOAD '('                    {$$ = TrCreateLeafNode (UNLOAD)}
+    : UNLOAD '('                    {$$ = TrCreateLeafNode (UNLOAD);}
         SuperName
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | UNLOAD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 WhileTerm
-    : WHILE '('                     {$$ = TrCreateLeafNode (WHILE)}
+    : WHILE '('                     {$$ = TrCreateLeafNode (WHILE);}
         TermArg
         ')' '{' TermList '}'
-                                    {$$ = TrLinkChildren ($<n>3,2,$4,$7)}
+                                    {$$ = TrLinkChildren ($<n>3,2,$4,$7);}
     | WHILE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
@@ -1480,68 +1480,68 @@
 /******* Type 2 opcodes *******************************************************/
 
 AcquireTerm
-    : ACQUIRE '('                   {$$ = TrCreateLeafNode (ACQUIRE)}
+    : ACQUIRE '('                   {$$ = TrCreateLeafNode (ACQUIRE);}
         SuperName
         ',' WordConstExpr
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$6);}
     | ACQUIRE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 AddTerm
-    : ADD '('                       {$$ = TrCreateLeafNode (ADD)}
+    : ADD '('                       {$$ = TrCreateLeafNode (ADD);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | ADD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 AndTerm
-    : AND '('                       {$$ = TrCreateLeafNode (AND)}
+    : AND '('                       {$$ = TrCreateLeafNode (AND);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | AND '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ConcatTerm
-    : CONCATENATE '('               {$$ = TrCreateLeafNode (CONCATENATE)}
+    : CONCATENATE '('               {$$ = TrCreateLeafNode (CONCATENATE);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | CONCATENATE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ConcatResTerm
-    : CONCATENATERESTEMPLATE '('        {$$ = TrCreateLeafNode (CONCATENATERESTEMPLATE)}
+    : CONCATENATERESTEMPLATE '('        {$$ = TrCreateLeafNode (CONCATENATERESTEMPLATE);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | CONCATENATERESTEMPLATE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 CondRefOfTerm
-    : CONDREFOF '('                 {$$ = TrCreateLeafNode (CONDREFOF)}
+    : CONDREFOF '('                 {$$ = TrCreateLeafNode (CONDREFOF);}
         SuperName
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | CONDREFOF '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 CopyTerm
-    : COPY '('                      {$$ = TrCreateLeafNode (COPY)}
+    : COPY '('                      {$$ = TrCreateLeafNode (COPY);}
         TermArg
         ',' CopyTarget
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$6);}
     | COPY '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
@@ -1553,257 +1553,257 @@
     ;
 
 DecTerm
-    : DECREMENT '('                 {$$ = TrCreateLeafNode (DECREMENT)}
+    : DECREMENT '('                 {$$ = TrCreateLeafNode (DECREMENT);}
         SuperName
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | DECREMENT '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 DerefOfTerm
-    : DEREFOF '('                   {$$ = TrCreateLeafNode (DEREFOF)}
+    : DEREFOF '('                   {$$ = TrCreateLeafNode (DEREFOF);}
         TermArg
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | DEREFOF '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 DivideTerm
-    : DIVIDE '('                    {$$ = TrCreateLeafNode (DIVIDE)}
+    : DIVIDE '('                    {$$ = TrCreateLeafNode (DIVIDE);}
         TermArg
         TermArgItem
         Target
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$5,$6,$7)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$5,$6,$7);}
     | DIVIDE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 FindSetLeftBitTerm
-    : FINDSETLEFTBIT '('            {$$ = TrCreateLeafNode (FINDSETLEFTBIT)}
+    : FINDSETLEFTBIT '('            {$$ = TrCreateLeafNode (FINDSETLEFTBIT);}
         TermArg
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | FINDSETLEFTBIT '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 FindSetRightBitTerm
-    : FINDSETRIGHTBIT '('           {$$ = TrCreateLeafNode (FINDSETRIGHTBIT)}
+    : FINDSETRIGHTBIT '('           {$$ = TrCreateLeafNode (FINDSETRIGHTBIT);}
         TermArg
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | FINDSETRIGHTBIT '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 FromBCDTerm
-    : FROMBCD '('                   {$$ = TrCreateLeafNode (FROMBCD)}
+    : FROMBCD '('                   {$$ = TrCreateLeafNode (FROMBCD);}
         TermArg
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | FROMBCD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 IncTerm
-    : INCREMENT '('                 {$$ = TrCreateLeafNode (INCREMENT)}
+    : INCREMENT '('                 {$$ = TrCreateLeafNode (INCREMENT);}
         SuperName
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | INCREMENT '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 IndexTerm
-    : INDEX '('                     {$$ = TrCreateLeafNode (INDEX)}
+    : INDEX '('                     {$$ = TrCreateLeafNode (INDEX);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | INDEX '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 LAndTerm
-    : LAND '('                      {$$ = TrCreateLeafNode (LAND)}
+    : LAND '('                      {$$ = TrCreateLeafNode (LAND);}
         TermArg
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | LAND '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 LEqualTerm
-    : LEQUAL '('                    {$$ = TrCreateLeafNode (LEQUAL)}
+    : LEQUAL '('                    {$$ = TrCreateLeafNode (LEQUAL);}
         TermArg
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | LEQUAL '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 LGreaterTerm
-    : LGREATER '('                  {$$ = TrCreateLeafNode (LGREATER)}
+    : LGREATER '('                  {$$ = TrCreateLeafNode (LGREATER);}
         TermArg
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | LGREATER '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 LGreaterEqualTerm
-    : LGREATEREQUAL '('             {$$ = TrCreateLeafNode (LGREATEREQUAL)}
+    : LGREATEREQUAL '('             {$$ = TrCreateLeafNode (LGREATEREQUAL);}
         TermArg
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | LGREATEREQUAL '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 LLessTerm
-    : LLESS '('                     {$$ = TrCreateLeafNode (LLESS)}
+    : LLESS '('                     {$$ = TrCreateLeafNode (LLESS);}
         TermArg
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | LLESS '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 LLessEqualTerm
-    : LLESSEQUAL '('                {$$ = TrCreateLeafNode (LLESSEQUAL)}
+    : LLESSEQUAL '('                {$$ = TrCreateLeafNode (LLESSEQUAL);}
         TermArg
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | LLESSEQUAL '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 LNotTerm
-    : LNOT '('                      {$$ = TrCreateLeafNode (LNOT)}
+    : LNOT '('                      {$$ = TrCreateLeafNode (LNOT);}
         TermArg
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | LNOT '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 LNotEqualTerm
-    : LNOTEQUAL '('                 {$$ = TrCreateLeafNode (LNOTEQUAL)}
+    : LNOTEQUAL '('                 {$$ = TrCreateLeafNode (LNOTEQUAL);}
         TermArg
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | LNOTEQUAL '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 LoadTableTerm
-    : LOADTABLE '('                 {$$ = TrCreateLeafNode (LOADTABLE)}
+    : LOADTABLE '('                 {$$ = TrCreateLeafNode (LOADTABLE);}
         TermArg
         TermArgItem
         TermArgItem
         OptionalListTermArg
         OptionalListTermArg
         OptionalListTermArg
-        ')'                         {$$ = TrLinkChildren ($<n>3,6,$4,$5,$6,$7,$8,$9)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,6,$4,$5,$6,$7,$8,$9);}
     | LOADTABLE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 LOrTerm
-    : LOR '('                       {$$ = TrCreateLeafNode (LOR)}
+    : LOR '('                       {$$ = TrCreateLeafNode (LOR);}
         TermArg
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | LOR '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 MatchTerm
-    : MATCH '('                     {$$ = TrCreateLeafNode (MATCH)}
+    : MATCH '('                     {$$ = TrCreateLeafNode (MATCH);}
         TermArg
         ',' MatchOpKeyword
         TermArgItem
         ',' MatchOpKeyword
         TermArgItem
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,6,$4,$6,$7,$9,$10,$11)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,6,$4,$6,$7,$9,$10,$11);}
     | MATCH '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 MidTerm
-    : MID '('                       {$$ = TrCreateLeafNode (MID)}
+    : MID '('                       {$$ = TrCreateLeafNode (MID);}
         TermArg
         TermArgItem
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$5,$6,$7)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$5,$6,$7);}
     | MID '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ModTerm
-    : MOD '('                       {$$ = TrCreateLeafNode (MOD)}
+    : MOD '('                       {$$ = TrCreateLeafNode (MOD);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | MOD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 MultiplyTerm
-    : MULTIPLY '('                  {$$ = TrCreateLeafNode (MULTIPLY)}
+    : MULTIPLY '('                  {$$ = TrCreateLeafNode (MULTIPLY);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | MULTIPLY '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 NAndTerm
-    : NAND '('                      {$$ = TrCreateLeafNode (NAND)}
+    : NAND '('                      {$$ = TrCreateLeafNode (NAND);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | NAND '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 NOrTerm
-    : NOR '('                       {$$ = TrCreateLeafNode (NOR)}
+    : NOR '('                       {$$ = TrCreateLeafNode (NOR);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | NOR '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 NotTerm
-    : NOT '('                       {$$ = TrCreateLeafNode (NOT)}
+    : NOT '('                       {$$ = TrCreateLeafNode (NOT);}
         TermArg
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | NOT '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ObjectTypeTerm
-    : OBJECTTYPE '('                {$$ = TrCreateLeafNode (OBJECTTYPE)}
+    : OBJECTTYPE '('                {$$ = TrCreateLeafNode (OBJECTTYPE);}
         SuperName
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | OBJECTTYPE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 OrTerm
-    : OR '('                        {$$ = TrCreateLeafNode (OR)}
+    : OR '('                        {$$ = TrCreateLeafNode (OR);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | OR '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
@@ -1813,130 +1813,130 @@
  * we've taken a pointer to it. (hard to tell if a local becomes initialized this way.)
  */
 RefOfTerm
-    : REFOF '('                     {$$ = TrCreateLeafNode (REFOF)}
+    : REFOF '('                     {$$ = TrCreateLeafNode (REFOF);}
         SuperName
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,TrSetNodeFlags ($4, NODE_IS_TARGET))}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,TrSetNodeFlags ($4, NODE_IS_TARGET));}
     | REFOF '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ShiftLeftTerm
-    : SHIFTLEFT '('                 {$$ = TrCreateLeafNode (SHIFTLEFT)}
+    : SHIFTLEFT '('                 {$$ = TrCreateLeafNode (SHIFTLEFT);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | SHIFTLEFT '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ShiftRightTerm
-    : SHIFTRIGHT '('                {$$ = TrCreateLeafNode (SHIFTRIGHT)}
+    : SHIFTRIGHT '('                {$$ = TrCreateLeafNode (SHIFTRIGHT);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | SHIFTRIGHT '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 SizeOfTerm
-    : SIZEOF '('                    {$$ = TrCreateLeafNode (SIZEOF)}
+    : SIZEOF '('                    {$$ = TrCreateLeafNode (SIZEOF);}
         SuperName
-        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,1,$4);}
     | SIZEOF '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 StoreTerm
-    : STORE '('                     {$$ = TrCreateLeafNode (STORE)}
+    : STORE '('                     {$$ = TrCreateLeafNode (STORE);}
         TermArg
         ',' SuperName
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,TrSetNodeFlags ($6, NODE_IS_TARGET))}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,TrSetNodeFlags ($6, NODE_IS_TARGET));}
     | STORE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 SubtractTerm
-    : SUBTRACT '('                  {$$ = TrCreateLeafNode (SUBTRACT)}
+    : SUBTRACT '('                  {$$ = TrCreateLeafNode (SUBTRACT);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | SUBTRACT '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ToBCDTerm
-    : TOBCD '('                     {$$ = TrCreateLeafNode (TOBCD)}
+    : TOBCD '('                     {$$ = TrCreateLeafNode (TOBCD);}
         TermArg
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | TOBCD '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ToBufferTerm
-    : TOBUFFER '('                  {$$ = TrCreateLeafNode (TOBUFFER)}
+    : TOBUFFER '('                  {$$ = TrCreateLeafNode (TOBUFFER);}
         TermArg
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | TOBUFFER '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ToDecimalStringTerm
-    : TODECIMALSTRING '('           {$$ = TrCreateLeafNode (TODECIMALSTRING)}
+    : TODECIMALSTRING '('           {$$ = TrCreateLeafNode (TODECIMALSTRING);}
         TermArg
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | TODECIMALSTRING '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ToHexStringTerm
-    : TOHEXSTRING '('               {$$ = TrCreateLeafNode (TOHEXSTRING)}
+    : TOHEXSTRING '('               {$$ = TrCreateLeafNode (TOHEXSTRING);}
         TermArg
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | TOHEXSTRING '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ToIntegerTerm
-    : TOINTEGER '('                 {$$ = TrCreateLeafNode (TOINTEGER)}
+    : TOINTEGER '('                 {$$ = TrCreateLeafNode (TOINTEGER);}
         TermArg
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | TOINTEGER '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ToStringTerm
-    : TOSTRING '('                  {$$ = TrCreateLeafNode (TOSTRING)}
+    : TOSTRING '('                  {$$ = TrCreateLeafNode (TOSTRING);}
         TermArg
         OptionalListTermArg
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | TOSTRING '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 WaitTerm
-    : WAIT '('                      {$$ = TrCreateLeafNode (WAIT)}
+    : WAIT '('                      {$$ = TrCreateLeafNode (WAIT);}
         SuperName
         TermArgItem
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,$4,$5);}
     | WAIT '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 XOrTerm
-    : XOR '('                       {$$ = TrCreateLeafNode (XOR)}
+    : XOR '('                       {$$ = TrCreateLeafNode (XOR);}
         TermArg
         TermArgItem
         Target
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$5,$6);}
     | XOR '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
@@ -1946,174 +1946,174 @@
 
 
 ObjectTypeKeyword
-    : OBJECTTYPE_UNK                {$$ = TrCreateLeafNode (OBJECTTYPE_UNK)}
-    | OBJECTTYPE_INT                {$$ = TrCreateLeafNode (OBJECTTYPE_INT)}
-    | OBJECTTYPE_STR                {$$ = TrCreateLeafNode (OBJECTTYPE_STR)}
-    | OBJECTTYPE_BUF                {$$ = TrCreateLeafNode (OBJECTTYPE_BUF)}
-    | OBJECTTYPE_PKG                {$$ = TrCreateLeafNode (OBJECTTYPE_PKG)}
-    | OBJECTTYPE_FLD                {$$ = TrCreateLeafNode (OBJECTTYPE_FLD)}
-    | OBJECTTYPE_DEV                {$$ = TrCreateLeafNode (OBJECTTYPE_DEV)}
-    | OBJECTTYPE_EVT                {$$ = TrCreateLeafNode (OBJECTTYPE_EVT)}
-    | OBJECTTYPE_MTH                {$$ = TrCreateLeafNode (OBJECTTYPE_MTH)}
-    | OBJECTTYPE_MTX                {$$ = TrCreateLeafNode (OBJECTTYPE_MTX)}
-    | OBJECTTYPE_OPR                {$$ = TrCreateLeafNode (OBJECTTYPE_OPR)}
-    | OBJECTTYPE_POW                {$$ = TrCreateLeafNode (OBJECTTYPE_POW)}
-    | OBJECTTYPE_THZ                {$$ = TrCreateLeafNode (OBJECTTYPE_THZ)}
-    | OBJECTTYPE_BFF                {$$ = TrCreateLeafNode (OBJECTTYPE_BFF)}
-    | OBJECTTYPE_DDB                {$$ = TrCreateLeafNode (OBJECTTYPE_DDB)}
+    : OBJECTTYPE_UNK                {$$ = TrCreateLeafNode (OBJECTTYPE_UNK);}
+    | OBJECTTYPE_INT                {$$ = TrCreateLeafNode (OBJECTTYPE_INT);}
+    | OBJECTTYPE_STR                {$$ = TrCreateLeafNode (OBJECTTYPE_STR);}
+    | OBJECTTYPE_BUF                {$$ = TrCreateLeafNode (OBJECTTYPE_BUF);}
+    | OBJECTTYPE_PKG                {$$ = TrCreateLeafNode (OBJECTTYPE_PKG);}
+    | OBJECTTYPE_FLD                {$$ = TrCreateLeafNode (OBJECTTYPE_FLD);}
+    | OBJECTTYPE_DEV                {$$ = TrCreateLeafNode (OBJECTTYPE_DEV);}
+    | OBJECTTYPE_EVT                {$$ = TrCreateLeafNode (OBJECTTYPE_EVT);}
+    | OBJECTTYPE_MTH                {$$ = TrCreateLeafNode (OBJECTTYPE_MTH);}
+    | OBJECTTYPE_MTX                {$$ = TrCreateLeafNode (OBJECTTYPE_MTX);}
+    | OBJECTTYPE_OPR                {$$ = TrCreateLeafNode (OBJECTTYPE_OPR);}
+    | OBJECTTYPE_POW                {$$ = TrCreateLeafNode (OBJECTTYPE_POW);}
+    | OBJECTTYPE_THZ                {$$ = TrCreateLeafNode (OBJECTTYPE_THZ);}
+    | OBJECTTYPE_BFF                {$$ = TrCreateLeafNode (OBJECTTYPE_BFF);}
+    | OBJECTTYPE_DDB                {$$ = TrCreateLeafNode (OBJECTTYPE_DDB);}
     ;
 
 AccessTypeKeyword
-    : ACCESSTYPE_ANY                {$$ = TrCreateLeafNode (ACCESSTYPE_ANY)}
-    | ACCESSTYPE_BYTE               {$$ = TrCreateLeafNode (ACCESSTYPE_BYTE)}
-    | ACCESSTYPE_WORD               {$$ = TrCreateLeafNode (ACCESSTYPE_WORD)}
-    | ACCESSTYPE_DWORD              {$$ = TrCreateLeafNode (ACCESSTYPE_DWORD)}
-    | ACCESSTYPE_QWORD              {$$ = TrCreateLeafNode (ACCESSTYPE_QWORD)}
-    | ACCESSTYPE_BUF                {$$ = TrCreateLeafNode (ACCESSTYPE_BUF)}
+    : ACCESSTYPE_ANY                {$$ = TrCreateLeafNode (ACCESSTYPE_ANY);}
+    | ACCESSTYPE_BYTE               {$$ = TrCreateLeafNode (ACCESSTYPE_BYTE);}
+    | ACCESSTYPE_WORD               {$$ = TrCreateLeafNode (ACCESSTYPE_WORD);}
+    | ACCESSTYPE_DWORD              {$$ = TrCreateLeafNode (ACCESSTYPE_DWORD);}
+    | ACCESSTYPE_QWORD              {$$ = TrCreateLeafNode (ACCESSTYPE_QWORD);}
+    | ACCESSTYPE_BUF                {$$ = TrCreateLeafNode (ACCESSTYPE_BUF);}
     ;
 
 AccessAttribKeyword
-    : ACCESSATTRIB_QUICK            {$$ = TrCreateLeafNode (ACCESSATTRIB_QUICK )}
-    | ACCESSATTRIB_SND_RCV          {$$ = TrCreateLeafNode (ACCESSATTRIB_SND_RCV)}
-    | ACCESSATTRIB_BYTE             {$$ = TrCreateLeafNode (ACCESSATTRIB_BYTE)}
-    | ACCESSATTRIB_WORD             {$$ = TrCreateLeafNode (ACCESSATTRIB_WORD)}
-    | ACCESSATTRIB_BLOCK            {$$ = TrCreateLeafNode (ACCESSATTRIB_BLOCK)}
-    | ACCESSATTRIB_CALL             {$$ = TrCreateLeafNode (ACCESSATTRIB_CALL)}
+    : ACCESSATTRIB_QUICK            {$$ = TrCreateLeafNode (ACCESSATTRIB_QUICK );}
+    | ACCESSATTRIB_SND_RCV          {$$ = TrCreateLeafNode (ACCESSATTRIB_SND_RCV);}
+    | ACCESSATTRIB_BYTE             {$$ = TrCreateLeafNode (ACCESSATTRIB_BYTE);}
+    | ACCESSATTRIB_WORD             {$$ = TrCreateLeafNode (ACCESSATTRIB_WORD);}
+    | ACCESSATTRIB_BLOCK            {$$ = TrCreateLeafNode (ACCESSATTRIB_BLOCK);}
+    | ACCESSATTRIB_CALL             {$$ = TrCreateLeafNode (ACCESSATTRIB_CALL);}
     ;
 
 LockRuleKeyword
-    : LOCKRULE_LOCK                 {$$ = TrCreateLeafNode (LOCKRULE_LOCK)}
-    | LOCKRULE_NOLOCK               {$$ = TrCreateLeafNode (LOCKRULE_NOLOCK)}
+    : LOCKRULE_LOCK                 {$$ = TrCreateLeafNode (LOCKRULE_LOCK);}
+    | LOCKRULE_NOLOCK               {$$ = TrCreateLeafNode (LOCKRULE_NOLOCK);}
     ;
 
 UpdateRuleKeyword
-    : UPDATERULE_PRESERVE           {$$ = TrCreateLeafNode (UPDATERULE_PRESERVE)}
-    | UPDATERULE_ONES               {$$ = TrCreateLeafNode (UPDATERULE_ONES)}
-    | UPDATERULE_ZEROS              {$$ = TrCreateLeafNode (UPDATERULE_ZEROS)}
+    : UPDATERULE_PRESERVE           {$$ = TrCreateLeafNode (UPDATERULE_PRESERVE);}
+    | UPDATERULE_ONES               {$$ = TrCreateLeafNode (UPDATERULE_ONES);}
+    | UPDATERULE_ZEROS              {$$ = TrCreateLeafNode (UPDATERULE_ZEROS);}
     ;
 
 
 RegionSpaceKeyword
-    : REGIONSPACE_IO                {$$ = TrCreateLeafNode (REGIONSPACE_IO)}
-    | REGIONSPACE_MEM               {$$ = TrCreateLeafNode (REGIONSPACE_MEM)}
-    | REGIONSPACE_PCI               {$$ = TrCreateLeafNode (REGIONSPACE_PCI)}
-    | REGIONSPACE_EC                {$$ = TrCreateLeafNode (REGIONSPACE_EC)}
-    | REGIONSPACE_SMBUS             {$$ = TrCreateLeafNode (REGIONSPACE_SMBUS)}
-    | REGIONSPACE_CMOS              {$$ = TrCreateLeafNode (REGIONSPACE_CMOS)}
-    | REGIONSPACE_PCIBAR            {$$ = TrCreateLeafNode (REGIONSPACE_PCIBAR)}
+    : REGIONSPACE_IO                {$$ = TrCreateLeafNode (REGIONSPACE_IO);}
+    | REGIONSPACE_MEM               {$$ = TrCreateLeafNode (REGIONSPACE_MEM);}
+    | REGIONSPACE_PCI               {$$ = TrCreateLeafNode (REGIONSPACE_PCI);}
+    | REGIONSPACE_EC                {$$ = TrCreateLeafNode (REGIONSPACE_EC);}
+    | REGIONSPACE_SMBUS             {$$ = TrCreateLeafNode (REGIONSPACE_SMBUS);}
+    | REGIONSPACE_CMOS              {$$ = TrCreateLeafNode (REGIONSPACE_CMOS);}
+    | REGIONSPACE_PCIBAR            {$$ = TrCreateLeafNode (REGIONSPACE_PCIBAR);}
     ;
 
 AddressSpaceKeyword
     : RegionSpaceKeyword            {}
-    | ADDRESSSPACE_FFIXEDHW         {$$ = TrCreateLeafNode (ADDRESSSPACE_FFIXEDHW)}
+    | ADDRESSSPACE_FFIXEDHW         {$$ = TrCreateLeafNode (ADDRESSSPACE_FFIXEDHW);}
     ;
 
 
 SerializeRuleKeyword
-    : SERIALIZERULE_SERIAL          {$$ = TrCreateLeafNode (SERIALIZERULE_SERIAL)}
-    | SERIALIZERULE_NOTSERIAL       {$$ = TrCreateLeafNode (SERIALIZERULE_NOTSERIAL)}
+    : SERIALIZERULE_SERIAL          {$$ = TrCreateLeafNode (SERIALIZERULE_SERIAL);}
+    | SERIALIZERULE_NOTSERIAL       {$$ = TrCreateLeafNode (SERIALIZERULE_NOTSERIAL);}
     ;
 
 MatchOpKeyword
-    : MATCHTYPE_MTR                 {$$ = TrCreateLeafNode (MATCHTYPE_MTR)}
-    | MATCHTYPE_MEQ                 {$$ = TrCreateLeafNode (MATCHTYPE_MEQ)}
-    | MATCHTYPE_MLE                 {$$ = TrCreateLeafNode (MATCHTYPE_MLE)}
-    | MATCHTYPE_MLT                 {$$ = TrCreateLeafNode (MATCHTYPE_MLT)}
-    | MATCHTYPE_MGE                 {$$ = TrCreateLeafNode (MATCHTYPE_MGE)}
-    | MATCHTYPE_MGT                 {$$ = TrCreateLeafNode (MATCHTYPE_MGT)}
+    : MATCHTYPE_MTR                 {$$ = TrCreateLeafNode (MATCHTYPE_MTR);}
+    | MATCHTYPE_MEQ                 {$$ = TrCreateLeafNode (MATCHTYPE_MEQ);}
+    | MATCHTYPE_MLE                 {$$ = TrCreateLeafNode (MATCHTYPE_MLE);}
+    | MATCHTYPE_MLT                 {$$ = TrCreateLeafNode (MATCHTYPE_MLT);}
+    | MATCHTYPE_MGE                 {$$ = TrCreateLeafNode (MATCHTYPE_MGE);}
+    | MATCHTYPE_MGT                 {$$ = TrCreateLeafNode (MATCHTYPE_MGT);}
     ;
 
 DMATypeKeyword
-    : DMATYPE_A                     {$$ = TrCreateLeafNode (DMATYPE_A)}
-    | DMATYPE_COMPATIBILITY         {$$ = TrCreateLeafNode (DMATYPE_COMPATIBILITY)}
-    | DMATYPE_B                     {$$ = TrCreateLeafNode (DMATYPE_B)}
-    | DMATYPE_F                     {$$ = TrCreateLeafNode (DMATYPE_F)}
+    : DMATYPE_A                     {$$ = TrCreateLeafNode (DMATYPE_A);}
+    | DMATYPE_COMPATIBILITY         {$$ = TrCreateLeafNode (DMATYPE_COMPATIBILITY);}
+    | DMATYPE_B                     {$$ = TrCreateLeafNode (DMATYPE_B);}
+    | DMATYPE_F                     {$$ = TrCreateLeafNode (DMATYPE_F);}
     ;
 
 BusMasterKeyword
-    : BUSMASTERTYPE_MASTER          {$$ = TrCreateLeafNode (BUSMASTERTYPE_MASTER)}
-    | BUSMASTERTYPE_NOTMASTER       {$$ = TrCreateLeafNode (BUSMASTERTYPE_NOTMASTER)}
+    : BUSMASTERTYPE_MASTER          {$$ = TrCreateLeafNode (BUSMASTERTYPE_MASTER);}
+    | BUSMASTERTYPE_NOTMASTER       {$$ = TrCreateLeafNode (BUSMASTERTYPE_NOTMASTER);}
     ;
 
 XferTypeKeyword
-    : XFERTYPE_8                    {$$ = TrCreateLeafNode (XFERTYPE_8)}
-    | XFERTYPE_8_16                 {$$ = TrCreateLeafNode (XFERTYPE_8_16)}
-    | XFERTYPE_16                   {$$ = TrCreateLeafNode (XFERTYPE_16)}
+    : XFERTYPE_8                    {$$ = TrCreateLeafNode (XFERTYPE_8);}
+    | XFERTYPE_8_16                 {$$ = TrCreateLeafNode (XFERTYPE_8_16);}
+    | XFERTYPE_16                   {$$ = TrCreateLeafNode (XFERTYPE_16);}
     ;
 
 ResourceTypeKeyword
-    : RESOURCETYPE_CONSUMER         {$$ = TrCreateLeafNode (RESOURCETYPE_CONSUMER)}
-    | RESOURCETYPE_PRODUCER         {$$ = TrCreateLeafNode (RESOURCETYPE_PRODUCER)}
+    : RESOURCETYPE_CONSUMER         {$$ = TrCreateLeafNode (RESOURCETYPE_CONSUMER);}
+    | RESOURCETYPE_PRODUCER         {$$ = TrCreateLeafNode (RESOURCETYPE_PRODUCER);}
     ;
 
 MinKeyword
-    : MINTYPE_FIXED                 {$$ = TrCreateLeafNode (MINTYPE_FIXED)}
-    | MINTYPE_NOTFIXED              {$$ = TrCreateLeafNode (MINTYPE_NOTFIXED)}
+    : MINTYPE_FIXED                 {$$ = TrCreateLeafNode (MINTYPE_FIXED);}
+    | MINTYPE_NOTFIXED              {$$ = TrCreateLeafNode (MINTYPE_NOTFIXED);}
     ;
 
 MaxKeyword
-    : MAXTYPE_FIXED                 {$$ = TrCreateLeafNode (MAXTYPE_FIXED)}
-    | MAXTYPE_NOTFIXED              {$$ = TrCreateLeafNode (MAXTYPE_NOTFIXED)}
+    : MAXTYPE_FIXED                 {$$ = TrCreateLeafNode (MAXTYPE_FIXED);}
+    | MAXTYPE_NOTFIXED              {$$ = TrCreateLeafNode (MAXTYPE_NOTFIXED);}
     ;
 
 DecodeKeyword
-    : DECODETYPE_POS                {$$ = TrCreateLeafNode (DECODETYPE_POS)}
-    | DECODETYPE_SUB                {$$ = TrCreateLeafNode (DECODETYPE_SUB)}
+    : DECODETYPE_POS                {$$ = TrCreateLeafNode (DECODETYPE_POS);}
+    | DECODETYPE_SUB                {$$ = TrCreateLeafNode (DECODETYPE_SUB);}
     ;
 
 RangeTypeKeyword
-    : RANGETYPE_ISAONLY             {$$ = TrCreateLeafNode (RANGETYPE_ISAONLY)}
-    | RANGETYPE_NONISAONLY          {$$ = TrCreateLeafNode (RANGETYPE_NONISAONLY)}
-    | RANGETYPE_ENTIRE              {$$ = TrCreateLeafNode (RANGETYPE_ENTIRE)}
+    : RANGETYPE_ISAONLY             {$$ = TrCreateLeafNode (RANGETYPE_ISAONLY);}
+    | RANGETYPE_NONISAONLY          {$$ = TrCreateLeafNode (RANGETYPE_NONISAONLY);}
+    | RANGETYPE_ENTIRE              {$$ = TrCreateLeafNode (RANGETYPE_ENTIRE);}
     ;
 
 MemTypeKeyword
-    : MEMTYPE_CACHEABLE             {$$ = TrCreateLeafNode (MEMTYPE_CACHEABLE)}
-    | MEMTYPE_WRITECOMBINING        {$$ = TrCreateLeafNode (MEMTYPE_WRITECOMBINING)}
-    | MEMTYPE_PREFETCHABLE          {$$ = TrCreateLeafNode (MEMTYPE_PREFETCHABLE)}
-    | MEMTYPE_NONCACHEABLE          {$$ = TrCreateLeafNode (MEMTYPE_NONCACHEABLE)}
+    : MEMTYPE_CACHEABLE             {$$ = TrCreateLeafNode (MEMTYPE_CACHEABLE);}
+    | MEMTYPE_WRITECOMBINING        {$$ = TrCreateLeafNode (MEMTYPE_WRITECOMBINING);}
+    | MEMTYPE_PREFETCHABLE          {$$ = TrCreateLeafNode (MEMTYPE_PREFETCHABLE);}
+    | MEMTYPE_NONCACHEABLE          {$$ = TrCreateLeafNode (MEMTYPE_NONCACHEABLE);}
     ;
 
 ReadWriteKeyword
-    : READWRITETYPE_BOTH            {$$ = TrCreateLeafNode (READWRITETYPE_BOTH)}
-    | READWRITETYPE_READONLY        {$$ = TrCreateLeafNode (READWRITETYPE_READONLY)}
+    : READWRITETYPE_BOTH            {$$ = TrCreateLeafNode (READWRITETYPE_BOTH);}
+    | READWRITETYPE_READONLY        {$$ = TrCreateLeafNode (READWRITETYPE_READONLY);}
     ;
 
 InterruptTypeKeyword
-    : INTTYPE_EDGE                  {$$ = TrCreateLeafNode (INTTYPE_EDGE)}
-    | INTTYPE_LEVEL                 {$$ = TrCreateLeafNode (INTTYPE_LEVEL)}
+    : INTTYPE_EDGE                  {$$ = TrCreateLeafNode (INTTYPE_EDGE);}
+    | INTTYPE_LEVEL                 {$$ = TrCreateLeafNode (INTTYPE_LEVEL);}
     ;
 
 InterruptLevel
-    : INTLEVEL_ACTIVEHIGH           {$$ = TrCreateLeafNode (INTLEVEL_ACTIVEHIGH)}
-    | INTLEVEL_ACTIVELOW            {$$ = TrCreateLeafNode (INTLEVEL_ACTIVELOW)}
+    : INTLEVEL_ACTIVEHIGH           {$$ = TrCreateLeafNode (INTLEVEL_ACTIVEHIGH);}
+    | INTLEVEL_ACTIVELOW            {$$ = TrCreateLeafNode (INTLEVEL_ACTIVELOW);}
     ;
 
 ShareTypeKeyword
-    : SHARETYPE_SHARED              {$$ = TrCreateLeafNode (SHARETYPE_SHARED)}
-    | SHARETYPE_EXCLUSIVE           {$$ = TrCreateLeafNode (SHARETYPE_EXCLUSIVE)}
+    : SHARETYPE_SHARED              {$$ = TrCreateLeafNode (SHARETYPE_SHARED);}
+    | SHARETYPE_EXCLUSIVE           {$$ = TrCreateLeafNode (SHARETYPE_EXCLUSIVE);}
     ;
 
 IODecodeKeyword
-    : IODECODETYPE_16               {$$ = TrCreateLeafNode (IODECODETYPE_16)}
-    | IODECODETYPE_10               {$$ = TrCreateLeafNode (IODECODETYPE_10)}
+    : IODECODETYPE_16               {$$ = TrCreateLeafNode (IODECODETYPE_16);}
+    | IODECODETYPE_10               {$$ = TrCreateLeafNode (IODECODETYPE_10);}
     ;
 
 TypeKeyword
-    : TYPE_TRANSLATION              {$$ = TrCreateLeafNode (TYPE_TRANSLATION)}
-    | TYPE_STATIC                   {$$ = TrCreateLeafNode (TYPE_STATIC)}
+    : TYPE_TRANSLATION              {$$ = TrCreateLeafNode (TYPE_TRANSLATION);}
+    | TYPE_STATIC                   {$$ = TrCreateLeafNode (TYPE_STATIC);}
     ;
 
 TranslationKeyword
-    : TRANSLATIONTYPE_SPARSE        {$$ = TrCreateLeafNode (TRANSLATIONTYPE_SPARSE)}
-    | TRANSLATIONTYPE_DENSE         {$$ = TrCreateLeafNode (TRANSLATIONTYPE_DENSE)}
+    : TRANSLATIONTYPE_SPARSE        {$$ = TrCreateLeafNode (TRANSLATIONTYPE_SPARSE);}
+    | TRANSLATIONTYPE_DENSE         {$$ = TrCreateLeafNode (TRANSLATIONTYPE_DENSE);}
     ;
 
 AddressKeyword
-    : ADDRESSTYPE_MEMORY            {$$ = TrCreateLeafNode (ADDRESSTYPE_MEMORY)}
-    | ADDRESSTYPE_RESERVED          {$$ = TrCreateLeafNode (ADDRESSTYPE_RESERVED)}
-    | ADDRESSTYPE_NVS               {$$ = TrCreateLeafNode (ADDRESSTYPE_NVS)}
-    | ADDRESSTYPE_ACPI              {$$ = TrCreateLeafNode (ADDRESSTYPE_ACPI)}
+    : ADDRESSTYPE_MEMORY            {$$ = TrCreateLeafNode (ADDRESSTYPE_MEMORY);}
+    | ADDRESSTYPE_RESERVED          {$$ = TrCreateLeafNode (ADDRESSTYPE_RESERVED);}
+    | ADDRESSTYPE_NVS               {$$ = TrCreateLeafNode (ADDRESSTYPE_NVS);}
+    | ADDRESSTYPE_ACPI              {$$ = TrCreateLeafNode (ADDRESSTYPE_ACPI);}
     ;
 
 
@@ -2130,99 +2130,99 @@
     ;
 
 ArgTerm
-    : ARG0                          {$$ = TrCreateLeafNode (ARG0)}
-    | ARG1                          {$$ = TrCreateLeafNode (ARG1)}
-    | ARG2                          {$$ = TrCreateLeafNode (ARG2)}
-    | ARG3                          {$$ = TrCreateLeafNode (ARG3)}
-    | ARG4                          {$$ = TrCreateLeafNode (ARG4)}
-    | ARG5                          {$$ = TrCreateLeafNode (ARG5)}
-    | ARG6                          {$$ = TrCreateLeafNode (ARG6)}
+    : ARG0                          {$$ = TrCreateLeafNode (ARG0);}
+    | ARG1                          {$$ = TrCreateLeafNode (ARG1);}
+    | ARG2                          {$$ = TrCreateLeafNode (ARG2);}
+    | ARG3                          {$$ = TrCreateLeafNode (ARG3);}
+    | ARG4                          {$$ = TrCreateLeafNode (ARG4);}
+    | ARG5                          {$$ = TrCreateLeafNode (ARG5);}
+    | ARG6                          {$$ = TrCreateLeafNode (ARG6);}
     ;
 
 LocalTerm
-    : LOCAL0                        {$$ = TrCreateLeafNode (LOCAL0)}
-    | LOCAL1                        {$$ = TrCreateLeafNode (LOCAL1)}
-    | LOCAL2                        {$$ = TrCreateLeafNode (LOCAL2)}
-    | LOCAL3                        {$$ = TrCreateLeafNode (LOCAL3)}
-    | LOCAL4                        {$$ = TrCreateLeafNode (LOCAL4)}
-    | LOCAL5                        {$$ = TrCreateLeafNode (LOCAL5)}
-    | LOCAL6                        {$$ = TrCreateLeafNode (LOCAL6)}
-    | LOCAL7                        {$$ = TrCreateLeafNode (LOCAL7)}
+    : LOCAL0                        {$$ = TrCreateLeafNode (LOCAL0);}
+    | LOCAL1                        {$$ = TrCreateLeafNode (LOCAL1);}
+    | LOCAL2                        {$$ = TrCreateLeafNode (LOCAL2);}
+    | LOCAL3                        {$$ = TrCreateLeafNode (LOCAL3);}
+    | LOCAL4                        {$$ = TrCreateLeafNode (LOCAL4);}
+    | LOCAL5                        {$$ = TrCreateLeafNode (LOCAL5);}
+    | LOCAL6                        {$$ = TrCreateLeafNode (LOCAL6);}
+    | LOCAL7                        {$$ = TrCreateLeafNode (LOCAL7);}
     ;
 
 DebugTerm
-    : DEBUG                         {$$ = TrCreateLeafNode (DEBUG)}
+    : DEBUG                         {$$ = TrCreateLeafNode (DEBUG);}
     ;
 
 
 ByteConst
-    : Integer                       {$$ = TrUpdateNode (BYTECONST, $1)}
+    : Integer                       {$$ = TrUpdateNode (BYTECONST, $1);}
     ;
 
 WordConst
-    : Integer                       {$$ = TrUpdateNode (WORDCONST, $1)}
+    : Integer                       {$$ = TrUpdateNode (WORDCONST, $1);}
     ;
 
 DWordConst
-    : Integer                       {$$ = TrUpdateNode (DWORDCONST, $1)}
+    : Integer                       {$$ = TrUpdateNode (DWORDCONST, $1);}
     ;
 
 QWordConst
-    : Integer                       {$$ = TrUpdateNode (QWORDCONST, $1)}
+    : Integer                       {$$ = TrUpdateNode (QWORDCONST, $1);}
     ;
 
 Integer
-    : INTEGER                       {$$ = TrCreateValuedLeafNode (INTEGER, AslCompilerlval.i)}
+    : INTEGER                       {$$ = TrCreateValuedLeafNode (INTEGER, AslCompilerlval.i);}
     ;
 
 String
-    : STRING_LITERAL                {$$ = TrCreateValuedLeafNode (STRING_LITERAL, (ACPI_INTEGER) AslCompilerlval.s)}
+    : STRING_LITERAL                {$$ = TrCreateValuedLeafNode (STRING_LITERAL, (ACPI_INTEGER) AslCompilerlval.s);}
     ;
 
 ConstTerm
     : ConstExprTerm                 {}
-    | REVISION                      {$$ = TrCreateLeafNode (REVISION)}
+    | REVISION                      {$$ = TrCreateLeafNode (REVISION);}
     ;
 
 ByteConstExpr
-    : Type3Opcode                   {$$ = TrUpdateNode (BYTECONST, $1)}
-    | Type2IntegerOpcode            {$$ = TrUpdateNode (BYTECONST, $1)}
-    | ConstExprTerm                 {$$ = TrUpdateNode (BYTECONST, $1)}
+    : Type3Opcode                   {$$ = TrUpdateNode (BYTECONST, $1);}
+    | Type2IntegerOpcode            {$$ = TrUpdateNode (BYTECONST, $1);}
+    | ConstExprTerm                 {$$ = TrUpdateNode (BYTECONST, $1);}
     | ByteConst                     {}
     ;
 
 WordConstExpr
-    : Type3Opcode                   {$$ = TrUpdateNode (WORDCONST, $1)}
-    | Type2IntegerOpcode            {$$ = TrUpdateNode (WORDCONST, $1)}
-    | ConstExprTerm                 {$$ = TrUpdateNode (WORDCONST, $1)}
+    : Type3Opcode                   {$$ = TrUpdateNode (WORDCONST, $1);}
+    | Type2IntegerOpcode            {$$ = TrUpdateNode (WORDCONST, $1);}
+    | ConstExprTerm                 {$$ = TrUpdateNode (WORDCONST, $1);}
     | WordConst                     {}
     ;
 
 DWordConstExpr
-    : Type3Opcode                   {$$ = TrUpdateNode (DWORDCONST, $1)}
-    | Type2IntegerOpcode            {$$ = TrUpdateNode (DWORDCONST, $1)}
-    | ConstExprTerm                 {$$ = TrUpdateNode (DWORDCONST, $1)}
+    : Type3Opcode                   {$$ = TrUpdateNode (DWORDCONST, $1);}
+    | Type2IntegerOpcode            {$$ = TrUpdateNode (DWORDCONST, $1);}
+    | ConstExprTerm                 {$$ = TrUpdateNode (DWORDCONST, $1);}
     | DWordConst                    {}
     ;
 
 QWordConstExpr
-    : Type3Opcode                   {$$ = TrUpdateNode (QWORDCONST, $1)}
-    | Type2IntegerOpcode            {$$ = TrUpdateNode (QWORDCONST, $1)}
-    | ConstExprTerm                 {$$ = TrUpdateNode (QWORDCONST, $1)}
+    : Type3Opcode                   {$$ = TrUpdateNode (QWORDCONST, $1);}
+    | Type2IntegerOpcode            {$$ = TrUpdateNode (QWORDCONST, $1);}
+    | ConstExprTerm                 {$$ = TrUpdateNode (QWORDCONST, $1);}
     | QWordConst                    {}
     ;
 
 ConstExprTerm
-    : ZERO                          {$$ = TrCreateLeafNode (ZERO)}
-    | ONE                           {$$ = TrCreateLeafNode (ONE)}
-    | ONES                          {$$ = TrCreateLeafNode (ONES)}
+    : ZERO                          {$$ = TrCreateLeafNode (ZERO);}
+    | ONE                           {$$ = TrCreateLeafNode (ONE);}
+    | ONES                          {$$ = TrCreateLeafNode (ONES);}
     ;
 
 BufferTerm
-    : BUFFER '('                    {$$ = TrCreateLeafNode (BUFFER)}
+    : BUFFER '('                    {$$ = TrCreateLeafNode (BUFFER);}
         OptionalTermArg
         ')' '{'
-            BufferData '}'          {$$ = TrLinkChildren ($<n>3,2,$4,$7)}
+            BufferData '}'          {$$ = TrLinkChildren ($<n>3,2,$4,$7);}
     | BUFFER '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
@@ -2233,57 +2233,57 @@
     ;
 
 ByteList
-    :     {$$ = NULL}
+    :     {$$ = NULL;}
     | ByteConstExpr
-        ByteListTail                {$$ = TrLinkPeerNode ($1,$2)}
+        ByteListTail                {$$ = TrLinkPeerNode ($1,$2);}
     ;
 
 ByteListTail
-    :                               {$$ = NULL}
-    |  ','                          {$$ = NULL}   /* Allows a trailing comma at list end */
+    :                               {$$ = NULL;}
+    |  ','                          {$$ = NULL;}   /* Allows a trailing comma at list end */
     |  ',' ByteConstExpr
-         ByteListTail               {$$ = TrLinkPeerNode ($2,$3)}
+         ByteListTail               {$$ = TrLinkPeerNode ($2,$3);}
     ;
 
 DWordList
-    :                               {$$ = NULL}
+    :                               {$$ = NULL;}
     | DWordConstExpr
-        DWordListTail               {$$ = TrLinkPeerNode ($1,$2)}
+        DWordListTail               {$$ = TrLinkPeerNode ($1,$2);}
     ;
 
 DWordListTail
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}   /* Allows a trailing comma at list end */
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}   /* Allows a trailing comma at list end */
     | ',' DWordConstExpr
-        DWordListTail               {$$ = TrLinkPeerNode ($2,$3)}
+        DWordListTail               {$$ = TrLinkPeerNode ($2,$3);}
     ;
 
 PackageTerm
-    : PACKAGE '('                   {$$ = TrCreateLeafNode (PACKAGE)}
+    : PACKAGE '('                   {$$ = TrCreateLeafNode (PACKAGE);}
         PackageLengthTerm
         ')' '{'
-            PackageList '}'         {$$ = TrLinkChildren ($<n>3,2,$4,$7)}
+            PackageList '}'         {$$ = TrLinkChildren ($<n>3,2,$4,$7);}
     | PACKAGE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 PackageLengthTerm
-    :                               {$$ = NULL}
+    :                               {$$ = NULL;}
     | ByteConstExpr                 {}
     | TermArg                       {}
     ;
 
 PackageList
-    :                               {$$ = NULL}
+    :                               {$$ = NULL;}
     | PackageElement
-        PackageListTail             {$$ = TrLinkPeerNode ($1,$2)}
+        PackageListTail             {$$ = TrLinkPeerNode ($1,$2);}
     ;
 
 PackageListTail
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}   /* Allows a trailing comma at list end */
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}   /* Allows a trailing comma at list end */
     | ',' PackageElement
-        PackageListTail             {$$ = TrLinkPeerNode ($2,$3)}
+        PackageListTail             {$$ = TrLinkPeerNode ($2,$3);}
     ;
 
 PackageElement
@@ -2293,7 +2293,7 @@
 
 EISAIDTerm
     : EISAID '('
-        StringData ')'              {$$ = TrUpdateNode (EISAID, $3)}
+        StringData ')'              {$$ = TrUpdateNode (EISAID, $3);}
     | EISAID '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
@@ -2307,21 +2307,21 @@
         '{'
         ResourceMacroList '}'       {$$ = TrCreateNode (RESOURCETEMPLATE,3,
                                         TrCreateLeafNode (DEFAULT_ARG),
-                                        TrCreateLeafNode (DEFAULT_ARG),$5)}
+                                        TrCreateLeafNode (DEFAULT_ARG),$5);}
     ;
 
 UnicodeTerm
-    : UNICODE '('                   {$$ = TrCreateLeafNode (UNICODE)}
+    : UNICODE '('                   {$$ = TrCreateLeafNode (UNICODE);}
         StringData
-        ')'                         {$$ = TrLinkChildren ($<n>3,2,0,$4)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,2,0,$4);}
     | UNICODE '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 ResourceMacroList
-    :                               {$$ = NULL}
+    :                               {$$ = NULL;}
     | ResourceMacroTerm
-        ResourceMacroList           {$$ = TrLinkPeerNode ($1,$2)}
+        ResourceMacroList           {$$ = TrLinkPeerNode ($1,$2);}
     ;
 
 ResourceMacroTerm
@@ -2349,19 +2349,19 @@
     ;
 
 DMATerm
-    : DMA '('                       {$$ = TrCreateLeafNode (DMA)}
+    : DMA '('                       {$$ = TrCreateLeafNode (DMA);}
         DMATypeKeyword
         ',' BusMasterKeyword
         ',' XferTypeKeyword
         OptionalNameString_Last
         ')' '{'
-            ByteList '}'            {$$ = TrLinkChildren ($<n>3,5,$4,$6,$8,$9,$12)}
+            ByteList '}'            {$$ = TrLinkChildren ($<n>3,5,$4,$6,$8,$9,$12);}
     | DMA '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 DWordIOTerm
-    : DWORDIO '('                   {$$ = TrCreateLeafNode (DWORDIO)}
+    : DWORDIO '('                   {$$ = TrCreateLeafNode (DWORDIO);}
         OptionalResourceType_First
         OptionalMinType
         OptionalMaxType
@@ -2377,13 +2377,13 @@
         OptionalNameString
         OptionalType
         OptionalTranslationType_Last
-        ')'                         {$$ = TrLinkChildren ($<n>3,15,$4,$5,$6,$7,$8,$10,$12,$14,$16,$18,$19,$20,$21,$22,$23)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,15,$4,$5,$6,$7,$8,$10,$12,$14,$16,$18,$19,$20,$21,$22,$23);}
     | DWORDIO '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 DWordMemoryTerm
-    : DWORDMEMORY '('               {$$ = TrCreateLeafNode (DWORDMEMORY)}
+    : DWORDMEMORY '('               {$$ = TrCreateLeafNode (DWORDMEMORY);}
         OptionalResourceType_First
         OptionalDecodeType
         OptionalMinType
@@ -2400,30 +2400,30 @@
         OptionalNameString
         OptionalAddressRange
         OptionalType_Last
-        ')'                         {$$ = TrLinkChildren ($<n>3,16,$4,$5,$6,$7,$8,$10,$12,$14,$16,$18,$20,$21,$22,$23,$24,$25)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,16,$4,$5,$6,$7,$8,$10,$12,$14,$16,$18,$20,$21,$22,$23,$24,$25);}
     | DWORDMEMORY '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 EndDependentFnTerm
     : ENDDEPENDENTFN '('
-        ')'                         {$$ = TrCreateLeafNode (ENDDEPENDENTFN)}
+        ')'                         {$$ = TrCreateLeafNode (ENDDEPENDENTFN);}
     | ENDDEPENDENTFN '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 FixedIOTerm
-    : FIXEDIO '('                   {$$ = TrCreateLeafNode (FIXEDIO)}
+    : FIXEDIO '('                   {$$ = TrCreateLeafNode (FIXEDIO);}
         WordConstExpr
         ',' ByteConstExpr
         OptionalNameString_Last
-        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$6,$7)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,3,$4,$6,$7);}
     | FIXEDIO '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 InterruptTerm
-    : INTERRUPT '('                 {$$ = TrCreateLeafNode (INTERRUPT)}
+    : INTERRUPT '('                 {$$ = TrCreateLeafNode (INTERRUPT);}
         OptionalResourceType_First
         InterruptTypeKeyword
         ',' InterruptLevel
@@ -2432,84 +2432,84 @@
         OptionalStringData
         OptionalNameString_Last
         ')' '{'
-            DWordList '}'           {$$ = TrLinkChildren ($<n>3,8,$4,$5,$7,$8,$9,$10,$11,$14)}
+            DWordList '}'           {$$ = TrLinkChildren ($<n>3,8,$4,$5,$7,$8,$9,$10,$11,$14);}
     | INTERRUPT '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 IOTerm
-    : IO '('                        {$$ = TrCreateLeafNode (IO)}
+    : IO '('                        {$$ = TrCreateLeafNode (IO);}
         IODecodeKeyword
         ',' WordConstExpr
         ',' WordConstExpr
         ',' ByteConstExpr
         ',' ByteConstExpr
         OptionalNameString_Last
-        ')'                         {$$ = TrLinkChildren ($<n>3,6,$4,$6,$8,$10,$12,$13)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,6,$4,$6,$8,$10,$12,$13);}
     | IO '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 IRQNoFlagsTerm
-    : IRQNOFLAGS '('                {$$ = TrCreateLeafNode (IRQNOFLAGS)}
+    : IRQNOFLAGS '('                {$$ = TrCreateLeafNode (IRQNOFLAGS);}
         OptionalNameString_First
         ')' '{'
-            ByteList '}'            {$$ = TrLinkChildren ($<n>3,2,$4,$7)}
+            ByteList '}'            {$$ = TrLinkChildren ($<n>3,2,$4,$7);}
     | IRQNOFLAGS '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 IRQTerm
-    : IRQ '('                       {$$ = TrCreateLeafNode (IRQ)}
+    : IRQ '('                       {$$ = TrCreateLeafNode (IRQ);}
         InterruptTypeKeyword
         ',' InterruptLevel
         OptionalShareType
         OptionalNameString_Last
         ')' '{'
-            ByteList '}'            {$$ = TrLinkChildren ($<n>3,5,$4,$6,$7,$8,$11)}
+            ByteList '}'            {$$ = TrLinkChildren ($<n>3,5,$4,$6,$7,$8,$11);}
     | IRQ '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 Memory24Term
-    : MEMORY24 '('                  {$$ = TrCreateLeafNode (MEMORY24)}
+    : MEMORY24 '('                  {$$ = TrCreateLeafNode (MEMORY24);}
         ReadWriteKeyword
         ',' WordConstExpr
         ',' WordConstExpr
         ',' WordConstExpr
         ',' WordConstExpr
         OptionalNameString_Last
-        ')'                         {$$ = TrLinkChildren ($<n>3,6,$4,$6,$8,$10,$12,$13)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,6,$4,$6,$8,$10,$12,$13);}
     | MEMORY24 '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 Memory32FixedTerm
-    : MEMORY32FIXED '('             {$$ = TrCreateLeafNode (MEMORY32FIXED)}
+    : MEMORY32FIXED '('             {$$ = TrCreateLeafNode (MEMORY32FIXED);}
         ReadWriteKeyword
         ',' DWordConstExpr
         ',' DWordConstExpr
         OptionalNameString_Last
-        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$6,$8,$9)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$6,$8,$9);}
     | MEMORY32FIXED '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 Memory32Term
-    : MEMORY32 '('                  {$$ = TrCreateLeafNode (MEMORY32)}
+    : MEMORY32 '('                  {$$ = TrCreateLeafNode (MEMORY32);}
         ReadWriteKeyword
         ',' DWordConstExpr
         ',' DWordConstExpr
         ',' DWordConstExpr
         ',' DWordConstExpr
         OptionalNameString_Last
-        ')'                         {$$ = TrLinkChildren ($<n>3,6,$4,$6,$8,$10,$12,$13)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,6,$4,$6,$8,$10,$12,$13);}
     | MEMORY32 '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 QWordIOTerm
-    : QWORDIO '('                   {$$ = TrCreateLeafNode (QWORDIO)}
+    : QWORDIO '('                   {$$ = TrCreateLeafNode (QWORDIO);}
         OptionalResourceType_First
         OptionalMinType
         OptionalMaxType
@@ -2525,13 +2525,13 @@
         OptionalNameString
         OptionalType
         OptionalTranslationType_Last
-        ')'                         {$$ = TrLinkChildren ($<n>3,15,$4,$5,$6,$7,$8,$10,$12,$14,$16,$18,$19,$20,$21,$22,$23)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,15,$4,$5,$6,$7,$8,$10,$12,$14,$16,$18,$19,$20,$21,$22,$23);}
     | QWORDIO '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 QWordMemoryTerm
-    : QWORDMEMORY '('               {$$ = TrCreateLeafNode (QWORDMEMORY)}
+    : QWORDMEMORY '('               {$$ = TrCreateLeafNode (QWORDMEMORY);}
         OptionalResourceType_First
         OptionalDecodeType
         OptionalMinType
@@ -2548,60 +2548,60 @@
         OptionalNameString
         OptionalAddressRange
         OptionalType_Last
-        ')'                         {$$ = TrLinkChildren ($<n>3,16,$4,$5,$6,$7,$8,$10,$12,$14,$16,$18,$20,$21,$22,$23,$24,$25)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,16,$4,$5,$6,$7,$8,$10,$12,$14,$16,$18,$20,$21,$22,$23,$24,$25);}
     | QWORDMEMORY '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 RegisterTerm
-    : REGISTER '('                  {$$ = TrCreateLeafNode (REGISTER)}
+    : REGISTER '('                  {$$ = TrCreateLeafNode (REGISTER);}
         AddressSpaceKeyword
         ',' ByteConstExpr
         ',' ByteConstExpr
         ',' QWordConstExpr
-        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$6,$8,$10)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,4,$4,$6,$8,$10);}
     | REGISTER '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 StartDependentFnTerm
-    : STARTDEPENDENTFN '('          {$$ = TrCreateLeafNode (STARTDEPENDENTFN)}
+    : STARTDEPENDENTFN '('          {$$ = TrCreateLeafNode (STARTDEPENDENTFN);}
         ByteConstExpr
         ',' ByteConstExpr
         ')' '{'
-        ResourceMacroList '}'       {$$ = TrLinkChildren ($<n>3,3,$4,$6,$9)}
+        ResourceMacroList '}'       {$$ = TrLinkChildren ($<n>3,3,$4,$6,$9);}
     | STARTDEPENDENTFN '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 StartDependentFnNoPriTerm
-    : STARTDEPENDENTFN_NOPRI '('     {$$ = TrCreateLeafNode (STARTDEPENDENTFN_NOPRI)}
+    : STARTDEPENDENTFN_NOPRI '('     {$$ = TrCreateLeafNode (STARTDEPENDENTFN_NOPRI);}
         ')' '{'
-        ResourceMacroList '}'       {$$ = TrLinkChildren ($<n>3,1,$6)}
+        ResourceMacroList '}'       {$$ = TrLinkChildren ($<n>3,1,$6);}
     | STARTDEPENDENTFN_NOPRI '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 VendorLongTerm
-    : VENDORLONG '('                {$$ = TrCreateLeafNode (VENDORLONG)}
+    : VENDORLONG '('                {$$ = TrCreateLeafNode (VENDORLONG);}
         OptionalNameString_First
         ')' '{'
-            ByteList '}'            {$$ = TrLinkChildren ($<n>3,2,$4,$7)}
+            ByteList '}'            {$$ = TrLinkChildren ($<n>3,2,$4,$7);}
     | VENDORLONG '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 VendorShortTerm
-    : VENDORSHORT '('               {$$ = TrCreateLeafNode (VENDORSHORT)}
+    : VENDORSHORT '('               {$$ = TrCreateLeafNode (VENDORSHORT);}
         OptionalNameString_First
         ')' '{'
-            ByteList '}'            {$$ = TrLinkChildren ($<n>3,2,$4,$7)}
+            ByteList '}'            {$$ = TrLinkChildren ($<n>3,2,$4,$7);}
     | VENDORSHORT '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 WordBusNumberTerm
-    : WORDBUSNUMBER '('             {$$ = TrCreateLeafNode (WORDBUSNUMBER)}
+    : WORDBUSNUMBER '('             {$$ = TrCreateLeafNode (WORDBUSNUMBER);}
         OptionalResourceType_First
         OptionalMinType
         OptionalMaxType
@@ -2614,13 +2614,13 @@
         OptionalByteConstExpr
         OptionalStringData
         OptionalNameString_Last
-        ')'                         {$$ = TrLinkChildren ($<n>3,12,$4,$5,$6,$7,$9,$11,$13,$15,$17,$18,$19,$20)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,12,$4,$5,$6,$7,$9,$11,$13,$15,$17,$18,$19,$20);}
     | WORDBUSNUMBER '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
 
 WordIOTerm
-    : WORDIO '('                    {$$ = TrCreateLeafNode (WORDIO)}
+    : WORDIO '('                    {$$ = TrCreateLeafNode (WORDIO);}
         OptionalResourceType_First
         OptionalMinType
         OptionalMaxType
@@ -2636,7 +2636,7 @@
         OptionalNameString
         OptionalType
         OptionalTranslationType_Last
-        ')'                         {$$ = TrLinkChildren ($<n>3,15,$4,$5,$6,$7,$8,$10,$12,$14,$16,$18,$19,$20,$21,$22,$23)}
+        ')'                         {$$ = TrLinkChildren ($<n>3,15,$4,$5,$6,$7,$8,$10,$12,$14,$16,$18,$19,$20,$21,$22,$23);}
     | WORDIO '('
         error ')'                   {$$ = AslDoError(); yyerrok;}
     ;
@@ -2647,11 +2647,11 @@
 
 NameString
     : NameSeg                       {}
-    | NAMESTRING                    {$$ = TrCreateValuedLeafNode (NAMESTRING, (ACPI_INTEGER) AslCompilerlval.s)}
+    | NAMESTRING                    {$$ = TrCreateValuedLeafNode (NAMESTRING, (ACPI_INTEGER) AslCompilerlval.s);}
     ;
 
 NameSeg
-    : NAMESEG                       {$$ = TrCreateValuedLeafNode (NAMESEG, (ACPI_INTEGER) AslCompilerlval.s)}
+    : NAMESEG                       {$$ = TrCreateValuedLeafNode (NAMESEG, (ACPI_INTEGER) AslCompilerlval.s);}
     ;
 
 
@@ -2659,135 +2659,135 @@
 
 
 AmlPackageLengthTerm
-    : Integer                       {$$ = TrUpdateNode (PACKAGE_LENGTH,(ASL_PARSE_NODE *) $1)}
+    : Integer                       {$$ = TrUpdateNode (PACKAGE_LENGTH,(ASL_PARSE_NODE *) $1);}
     ;
 
 OptionalAccessAttribTerm
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}
-    | ',' ByteConstExpr             {$$ = $2}
-    | ',' AccessAttribKeyword       {$$ = $2}
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}
+    | ',' ByteConstExpr             {$$ = $2;}
+    | ',' AccessAttribKeyword       {$$ = $2;}
     ;
 
 OptionalAddressRange
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}
-    | ',' AddressKeyword            {$$ = $2}
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}
+    | ',' AddressKeyword            {$$ = $2;}
     ;
 
 OptionalByteConstExpr
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}
-    | ',' ByteConstExpr             {$$ = $2}
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}
+    | ',' ByteConstExpr             {$$ = $2;}
     ;
 
 OptionalDecodeType
-    : ','                           {$$ = NULL}
-    | ',' DecodeKeyword             {$$ = $2}
+    : ','                           {$$ = NULL;}
+    | ',' DecodeKeyword             {$$ = $2;}
     ;
 
 OptionalDWordConstExpr
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}
-    | ',' DWordConstExpr            {$$ = $2}
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}
+    | ',' DWordConstExpr            {$$ = $2;}
     ;
 
 OptionalListTermArg
-    :                               {$$ = NULL}
-    | ',' TermArg                   {$$ = $2}
+    :                               {$$ = NULL;}
+    | ',' TermArg                   {$$ = $2;}
     ;
 
 OptionalMaxType
-    : ','                           {$$ = NULL}
-    | ',' MaxKeyword                {$$ = $2}
+    : ','                           {$$ = NULL;}
+    | ',' MaxKeyword                {$$ = $2;}
     ;
 
 OptionalMemType
-    : ','                           {$$ = NULL}
-    | ',' MemTypeKeyword            {$$ = $2}
+    : ','                           {$$ = NULL;}
+    | ',' MemTypeKeyword            {$$ = $2;}
     ;
 
 OptionalMinType
-    : ','                           {$$ = NULL}
-    | ',' MinKeyword                {$$ = $2}
+    : ','                           {$$ = NULL;}
+    | ',' MinKeyword                {$$ = $2;}
     ;
 
 OptionalNameString
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}
-    | ',' NameString                {$$ = $2}
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}
+    | ',' NameString                {$$ = $2;}
     ;
 
 OptionalNameString_Last
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}
-    | ',' NameString                {$$ = $2}
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}
+    | ',' NameString                {$$ = $2;}
     ;
 
 OptionalNameString_First
-    :                               {$$ = NULL}
-    | NameString                    {$$ = $1}
+    :                               {$$ = NULL;}
+    | NameString                    {$$ = $1;}
     ;
 
 OptionalRangeType
-    : ','                           {$$ = NULL}
-    | ',' RangeTypeKeyword          {$$ = $2}
+    : ','                           {$$ = NULL;}
+    | ',' RangeTypeKeyword          {$$ = $2;}
     ;
 
 OptionalResourceType_First
-    :                               {$$ = NULL}
-    | ResourceTypeKeyword           {$$ = $1}
+    :                               {$$ = NULL;}
+    | ResourceTypeKeyword           {$$ = $1;}
     ;
 
 OptionalSerializeRuleKeyword
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}
-    | ',' SerializeRuleKeyword      {$$ = $2}
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}
+    | ',' SerializeRuleKeyword      {$$ = $2;}
     ;
 
 OptionalShareType
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}
-    | ',' ShareTypeKeyword          {$$ = $2}
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}
+    | ',' ShareTypeKeyword          {$$ = $2;}
     ;
 
 OptionalStringData
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}
-    | ',' StringData                {$$ = $2}
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}
+    | ',' StringData                {$$ = $2;}
     ;
 
 OptionalTermArg
-    :                               {$$ = NULL}
-    | TermArg                       {$$ = $1}
+    :                               {$$ = NULL;}
+    | TermArg                       {$$ = $1;}
     ;
 
 OptionalType
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}
-    | ',' TypeKeyword               {$$ = $2}
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}
+    | ',' TypeKeyword               {$$ = $2;}
     ;
 
 OptionalType_Last
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}
-    | ',' TypeKeyword               {$$ = $2}
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}
+    | ',' TypeKeyword               {$$ = $2;}
     ;
 
 OptionalTranslationType_Last
-    :                               {$$ = NULL}
-    | ','                           {$$ = NULL}
-    | ',' TranslationKeyword        {$$ = $2}
+    :                               {$$ = NULL;}
+    | ','                           {$$ = NULL;}
+    | ',' TranslationKeyword        {$$ = $2;}
     ;
 
 
 TermArgItem
-    : ',' TermArg                   {$$ = $2}
+    : ',' TermArg                   {$$ = $2;}
     | ',' error                     {$$ = AslDoError (); yyerrok;}
     ;
 
 NameStringItem
-    : ',' NameString                {$$ = $2}
+    : ',' NameString                {$$ = $2;}
     | ',' error                     {$$ = AslDoError (); yyerrok;}
     ;
 
diff -ru ../org/AslCompiler/aslutils.c ./AslCompiler/aslutils.c
--- ../org/AslCompiler/aslutils.c	Fri Dec 22 18:17:17 2000
+++ ./AslCompiler/aslutils.c	Sat Dec 23 03:32:39 2000
@@ -120,7 +120,12 @@
 #include "acnamesp.h"
 
 
+#ifdef _USE_BERKELEY_YACC
+extern const char * const       AslCompilername[];
+static const char * const       *yytname = &AslCompilername[255];
+#else
 extern const char * const       yytname[];
+#endif
 
 
 /*******************************************************************************
diff -ru ../org/Subsystem/Debugger/dbinput.c ./Subsystem/Debugger/dbinput.c
--- ../org/Subsystem/Debugger/dbinput.c	Sat Dec 23 04:30:20 2000
+++ ./Subsystem/Debugger/dbinput.c	Sat Dec 23 00:56:13 2000
@@ -145,7 +145,9 @@
 
 UINT32                  AcpiGbl_DbDebugLevel = 0x0FFFFFFF;
 UINT32                  AcpiGbl_DbConsoleDebugLevel = NORMAL_DEFAULT | TRACE_TABLES;
+#ifndef _ACPI_ASL_COMPILER
 UINT8                   AcpiGbl_DbOutputFlags = DB_CONSOLE_OUTPUT;
+#endif
 
 
 BOOLEAN                 opt_tables      = FALSE;
diff -ru ../org/Subsystem/Dispatcher/dsutils.c ./Subsystem/Dispatcher/dsutils.c
--- ../org/Subsystem/Dispatcher/dsutils.c	Sat Dec 23 04:30:20 2000
+++ ./Subsystem/Dispatcher/dsutils.c	Sat Dec 23 00:51:49 2000
@@ -711,6 +711,7 @@
  *
  ******************************************************************************/
 
+#ifndef _ACPI_ASL_COMPILER
 OBJECT_TYPE_INTERNAL
 AcpiDsMapOpcodeToDataType (
     UINT16                  Opcode,
@@ -848,6 +849,7 @@
 
     return (DataType);
 }
+#endif
 
 
 /*******************************************************************************
@@ -863,6 +865,7 @@
  *
  ******************************************************************************/
 
+#ifndef _ACPI_ASL_COMPILER
 OBJECT_TYPE_INTERNAL
 AcpiDsMapNamedOpcodeToDataType (
     UINT16                  Opcode)
@@ -944,5 +947,6 @@
 
     return (DataType);
 }
+#endif
 
 
diff -ru ../org/Subsystem/Interpreter/amdump.c ./Subsystem/Interpreter/amdump.c
--- ../org/Subsystem/Interpreter/amdump.c	Sat Dec 23 04:30:20 2000
+++ ./Subsystem/Interpreter/amdump.c	Sat Dec 23 00:50:13 2000
@@ -235,6 +235,7 @@
  *
  ****************************************************************************/
 
+#ifndef _ACPI_ASL_COMPILER
 ACPI_STATUS
 AcpiAmlDumpOperand (
     ACPI_OPERAND_OBJECT     *EntryDesc)
@@ -618,6 +619,7 @@
 
     return (AE_OK);
 }
+#endif
 
 
 /*****************************************************************************
@@ -633,6 +635,7 @@
  *
  ****************************************************************************/
 
+#ifndef _ACPI_ASL_COMPILER
 void
 AcpiAmlDumpOperands (
     ACPI_OPERAND_OBJECT     **Operands,
@@ -681,6 +684,7 @@
 
     return;
 }
+#endif
 
 
 /*****************************************************************************
diff -ru ../org/Subsystem/Interpreter/amutils.c ./Subsystem/Interpreter/amutils.c
--- ../org/Subsystem/Interpreter/amutils.c	Sat Dec 23 04:30:20 2000
+++ ./Subsystem/Interpreter/amutils.c	Sat Dec 23 00:48:05 2000
@@ -210,6 +210,7 @@
  *
  ******************************************************************************/
 
+#ifndef _ACPI_ASL_COMPILER
 BOOLEAN
 AcpiAmlValidateObjectType (
     ACPI_OBJECT_TYPE        Type)
@@ -223,6 +224,7 @@
 
     return (TRUE);
 }
+#endif
 
 
 /*******************************************************************************
diff -ru ../org/Subsystem/Tables/tbinstal.c ./Subsystem/Tables/tbinstal.c
--- ../org/Subsystem/Tables/tbinstal.c	Sat Dec 23 04:30:20 2000
+++ ./Subsystem/Tables/tbinstal.c	Sat Dec 23 00:46:07 2000
@@ -419,6 +419,7 @@
  *
  ******************************************************************************/
 
+#ifndef _ACPI_ASL_COMPILER
 void
 AcpiTbDeleteAcpiTables (void)
 {
@@ -436,6 +437,7 @@
     }
 
 }
+#endif
 
 
 /*******************************************************************************
diff -ru ../org/Subsystem/Tables/tbutils.c ./Subsystem/Tables/tbutils.c
--- ../org/Subsystem/Tables/tbutils.c	Sat Dec 23 04:30:20 2000
+++ ./Subsystem/Tables/tbutils.c	Sat Dec 23 00:41:07 2000
@@ -181,6 +181,7 @@
  *
  ******************************************************************************/
 
+#ifndef _ACPI_ASL_COMPILER
 BOOLEAN
 AcpiTbSystemTablePointer (
     void                    *Where)
@@ -248,6 +249,7 @@
 
     return (FALSE);
 }
+#endif
 
 
 /*******************************************************************************
