diff options
| -rw-r--r-- | source/compiler/aslcompiler.l | 1 | ||||
| -rw-r--r-- | source/compiler/aslcompiler.y | 9 | ||||
| -rw-r--r-- | source/compiler/aslmap.c | 2 |
3 files changed, 0 insertions, 12 deletions
diff --git a/source/compiler/aslcompiler.l b/source/compiler/aslcompiler.l index 824edf42d..1b8676b29 100644 --- a/source/compiler/aslcompiler.l +++ b/source/compiler/aslcompiler.l @@ -190,7 +190,6 @@ NamePathTail [.]{NameSeg} count (1); return (PARSEOP_INTEGER); } "Include" { count (1); return (PARSEOP_INCLUDE); } -"#include" { count (1); return (PARSEOP_INCLUDE_CSTYLE); } "#line" { count (1); AslDoLineDirective ((char *) AslCompilertext);} "External" { count (1); return (PARSEOP_EXTERNAL); } diff --git a/source/compiler/aslcompiler.y b/source/compiler/aslcompiler.y index 8bc42141b..d25b6b028 100644 --- a/source/compiler/aslcompiler.y +++ b/source/compiler/aslcompiler.y @@ -308,7 +308,6 @@ void * AslLocalAllocate (unsigned int Size); %token <i> PARSEOP_I2C_SERIALBUS %token <i> PARSEOP_IF %token <i> PARSEOP_INCLUDE -%token <i> PARSEOP_INCLUDE_CSTYLE %token <i> PARSEOP_INCLUDE_END %token <i> PARSEOP_INCREMENT %token <i> PARSEOP_INDEX @@ -333,7 +332,6 @@ void * AslLocalAllocate (unsigned int Size); %token <i> PARSEOP_LEQUAL %token <i> PARSEOP_LGREATER %token <i> PARSEOP_LGREATEREQUAL -%token <i> PARSEOP_LINE_CSTYLE %token <i> PARSEOP_LLESS %token <i> PARSEOP_LLESSEQUAL %token <i> PARSEOP_LNOT @@ -576,7 +574,6 @@ void * AslLocalAllocate (unsigned int Size); %type <n> FieldUnit %type <n> FieldUnitEntry %type <n> FieldUnitList -%type <n> IncludeCStyleTerm %type <n> IncludeTerm %type <n> OffsetTerm %type <n> OptionalAccessAttribTerm @@ -938,7 +935,6 @@ Term CompilerDirective : IncludeTerm {} - | IncludeCStyleTerm {$$ = NULL;} | ExternalTerm {} ; @@ -1232,11 +1228,6 @@ IncludeEndTerm : PARSEOP_INCLUDE_END {$$ = TrCreateLeafNode (PARSEOP_INCLUDE_END);} ; -IncludeCStyleTerm - : PARSEOP_INCLUDE_CSTYLE - String {FlOpenIncludeFile ($2);} - ; - ExternalTerm : PARSEOP_EXTERNAL '(' NameString diff --git a/source/compiler/aslmap.c b/source/compiler/aslmap.c index c2f0b947a..498ca42cc 100644 --- a/source/compiler/aslmap.c +++ b/source/compiler/aslmap.c @@ -312,7 +312,6 @@ const ASL_MAPPING_ENTRY AslKeywordMapping [] = /* I2CSERIALBUS */ OP_TABLE_ENTRY (AML_DEFAULT_ARG_OP, 0, 0, 0), /* IF */ OP_TABLE_ENTRY (AML_IF_OP, 0, NODE_AML_PACKAGE, 0), /* INCLUDE */ OP_TABLE_ENTRY (AML_DEFAULT_ARG_OP, 0, 0, 0), -/* INCLUDE_CSTYLE */ OP_TABLE_ENTRY (AML_DEFAULT_ARG_OP, 0, 0, 0), /* INCLUDE_END */ OP_TABLE_ENTRY (AML_DEFAULT_ARG_OP, 0, 0, 0), /* INCREMENT */ OP_TABLE_ENTRY (AML_INCREMENT_OP, 0, 0, ACPI_BTYPE_INTEGER), /* INDEX */ OP_TABLE_ENTRY (AML_INDEX_OP, 0, 0, ACPI_BTYPE_REFERENCE), @@ -337,7 +336,6 @@ const ASL_MAPPING_ENTRY AslKeywordMapping [] = /* LEQUAL */ OP_TABLE_ENTRY (AML_LEQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), /* LGREATER */ OP_TABLE_ENTRY (AML_LGREATER_OP, 0, 0, ACPI_BTYPE_INTEGER), /* LGREATEREQUAL */ OP_TABLE_ENTRY (AML_LGREATEREQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), -/* LINE */ OP_TABLE_ENTRY (AML_DEFAULT_ARG_OP, 0, 0, 0), /* LLESS */ OP_TABLE_ENTRY (AML_LLESS_OP, 0, 0, ACPI_BTYPE_INTEGER), /* LLESSEQUAL */ OP_TABLE_ENTRY (AML_LLESSEQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), /* LNOT */ OP_TABLE_ENTRY (AML_LNOT_OP, 0, 0, ACPI_BTYPE_INTEGER), |