diff options
Diffstat (limited to 'source/compiler/dtparser.y')
| -rw-r--r-- | source/compiler/dtparser.y | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/source/compiler/dtparser.y b/source/compiler/dtparser.y index 43f7f04ebf85..1c44571238ae 100644 --- a/source/compiler/dtparser.y +++ b/source/compiler/dtparser.y @@ -193,26 +193,26 @@ UINT64 DtParserResult; /* Expression return value */ %type <value> Expression -%token <op> EXPOP_EOF -%token <op> EXPOP_NEW_LINE -%token <op> EXPOP_NUMBER -%token <op> EXPOP_HEX_NUMBER -%token <op> EXPOP_DECIMAL_NUMBER -%token <op> EXPOP_LABEL -%token <op> EXPOP_PAREN_OPEN -%token <op> EXPOP_PAREN_CLOSE - -%left <op> EXPOP_LOGICAL_OR -%left <op> EXPOP_LOGICAL_AND -%left <op> EXPOP_OR -%left <op> EXPOP_XOR -%left <op> EXPOP_AND -%left <op> EXPOP_EQUAL EXPOP_NOT_EQUAL -%left <op> EXPOP_GREATER EXPOP_LESS EXPOP_GREATER_EQUAL EXPOP_LESS_EQUAL -%left <op> EXPOP_SHIFT_RIGHT EXPOP_SHIFT_LEFT -%left <op> EXPOP_ADD EXPOP_SUBTRACT -%left <op> EXPOP_MULTIPLY EXPOP_DIVIDE EXPOP_MODULO -%right <op> EXPOP_ONES_COMPLIMENT EXPOP_LOGICAL_NOT +%token <op> OP_EXP_EOF +%token <op> OP_EXP_NEW_LINE +%token <op> OP_EXP_NUMBER +%token <op> OP_EXP_HEX_NUMBER +%token <op> OP_EXP_DECIMAL_NUMBER +%token <op> OP_EXP_LABEL +%token <op> OP_EXP_PAREN_OPEN +%token <op> OP_EXP_PAREN_CLOSE + +%left <op> OP_EXP_LOGICAL_OR +%left <op> OP_EXP_LOGICAL_AND +%left <op> OP_EXP_OR +%left <op> OP_EXP_XOR +%left <op> OP_EXP_AND +%left <op> OP_EXP_EQUAL OP_EXP_NOT_EQUAL +%left <op> OP_EXP_GREATER OP_EXP_LESS OP_EXP_GREATER_EQUAL OP_EXP_LESS_EQUAL +%left <op> OP_EXP_SHIFT_RIGHT OP_EXP_SHIFT_LEFT +%left <op> OP_EXP_ADD OP_EXP_SUBTRACT +%left <op> OP_EXP_MULTIPLY OP_EXP_DIVIDE OP_EXP_MODULO +%right <op> OP_EXP_ONES_COMPLIMENT OP_EXP_LOGICAL_NOT %% @@ -233,46 +233,46 @@ UINT64 DtParserResult; /* Expression return value */ * 12) || */ Value - : Expression EXPOP_NEW_LINE { DtParserResult=$1; return 0; } /* End of line (newline) */ - | Expression EXPOP_EOF { DtParserResult=$1; return 0; } /* End of string (0) */ + : Expression OP_EXP_NEW_LINE { DtParserResult=$1; return 0; } /* End of line (newline) */ + | Expression OP_EXP_EOF { DtParserResult=$1; return 0; } /* End of string (0) */ ; Expression /* Unary operators */ - : EXPOP_LOGICAL_NOT Expression { $$ = DtDoOperator ($2, EXPOP_LOGICAL_NOT, $2);} - | EXPOP_ONES_COMPLIMENT Expression { $$ = DtDoOperator ($2, EXPOP_ONES_COMPLIMENT, $2);} + : OP_EXP_LOGICAL_NOT Expression { $$ = DtDoOperator ($2, OP_EXP_LOGICAL_NOT, $2);} + | OP_EXP_ONES_COMPLIMENT Expression { $$ = DtDoOperator ($2, OP_EXP_ONES_COMPLIMENT, $2);} /* Binary operators */ - | Expression EXPOP_MULTIPLY Expression { $$ = DtDoOperator ($1, EXPOP_MULTIPLY, $3);} - | Expression EXPOP_DIVIDE Expression { $$ = DtDoOperator ($1, EXPOP_DIVIDE, $3);} - | Expression EXPOP_MODULO Expression { $$ = DtDoOperator ($1, EXPOP_MODULO, $3);} - | Expression EXPOP_ADD Expression { $$ = DtDoOperator ($1, EXPOP_ADD, $3);} - | Expression EXPOP_SUBTRACT Expression { $$ = DtDoOperator ($1, EXPOP_SUBTRACT, $3);} - | Expression EXPOP_SHIFT_RIGHT Expression { $$ = DtDoOperator ($1, EXPOP_SHIFT_RIGHT, $3);} - | Expression EXPOP_SHIFT_LEFT Expression { $$ = DtDoOperator ($1, EXPOP_SHIFT_LEFT, $3);} - | Expression EXPOP_GREATER Expression { $$ = DtDoOperator ($1, EXPOP_GREATER, $3);} - | Expression EXPOP_LESS Expression { $$ = DtDoOperator ($1, EXPOP_LESS, $3);} - | Expression EXPOP_GREATER_EQUAL Expression { $$ = DtDoOperator ($1, EXPOP_GREATER_EQUAL, $3);} - | Expression EXPOP_LESS_EQUAL Expression { $$ = DtDoOperator ($1, EXPOP_LESS_EQUAL, $3);} - | Expression EXPOP_EQUAL Expression { $$ = DtDoOperator ($1, EXPOP_EQUAL, $3);} - | Expression EXPOP_NOT_EQUAL Expression { $$ = DtDoOperator ($1, EXPOP_NOT_EQUAL, $3);} - | Expression EXPOP_AND Expression { $$ = DtDoOperator ($1, EXPOP_AND, $3);} - | Expression EXPOP_XOR Expression { $$ = DtDoOperator ($1, EXPOP_XOR, $3);} - | Expression EXPOP_OR Expression { $$ = DtDoOperator ($1, EXPOP_OR, $3);} - | Expression EXPOP_LOGICAL_AND Expression { $$ = DtDoOperator ($1, EXPOP_LOGICAL_AND, $3);} - | Expression EXPOP_LOGICAL_OR Expression { $$ = DtDoOperator ($1, EXPOP_LOGICAL_OR, $3);} + | Expression OP_EXP_MULTIPLY Expression { $$ = DtDoOperator ($1, OP_EXP_MULTIPLY, $3);} + | Expression OP_EXP_DIVIDE Expression { $$ = DtDoOperator ($1, OP_EXP_DIVIDE, $3);} + | Expression OP_EXP_MODULO Expression { $$ = DtDoOperator ($1, OP_EXP_MODULO, $3);} + | Expression OP_EXP_ADD Expression { $$ = DtDoOperator ($1, OP_EXP_ADD, $3);} + | Expression OP_EXP_SUBTRACT Expression { $$ = DtDoOperator ($1, OP_EXP_SUBTRACT, $3);} + | Expression OP_EXP_SHIFT_RIGHT Expression { $$ = DtDoOperator ($1, OP_EXP_SHIFT_RIGHT, $3);} + | Expression OP_EXP_SHIFT_LEFT Expression { $$ = DtDoOperator ($1, OP_EXP_SHIFT_LEFT, $3);} + | Expression OP_EXP_GREATER Expression { $$ = DtDoOperator ($1, OP_EXP_GREATER, $3);} + | Expression OP_EXP_LESS Expression { $$ = DtDoOperator ($1, OP_EXP_LESS, $3);} + | Expression OP_EXP_GREATER_EQUAL Expression { $$ = DtDoOperator ($1, OP_EXP_GREATER_EQUAL, $3);} + | Expression OP_EXP_LESS_EQUAL Expression { $$ = DtDoOperator ($1, OP_EXP_LESS_EQUAL, $3);} + | Expression OP_EXP_EQUAL Expression { $$ = DtDoOperator ($1, OP_EXP_EQUAL, $3);} + | Expression OP_EXP_NOT_EQUAL Expression { $$ = DtDoOperator ($1, OP_EXP_NOT_EQUAL, $3);} + | Expression OP_EXP_AND Expression { $$ = DtDoOperator ($1, OP_EXP_AND, $3);} + | Expression OP_EXP_XOR Expression { $$ = DtDoOperator ($1, OP_EXP_XOR, $3);} + | Expression OP_EXP_OR Expression { $$ = DtDoOperator ($1, OP_EXP_OR, $3);} + | Expression OP_EXP_LOGICAL_AND Expression { $$ = DtDoOperator ($1, OP_EXP_LOGICAL_AND, $3);} + | Expression OP_EXP_LOGICAL_OR Expression { $$ = DtDoOperator ($1, OP_EXP_LOGICAL_OR, $3);} /* Parentheses: '(' Expression ')' */ - | EXPOP_PAREN_OPEN Expression - EXPOP_PAREN_CLOSE { $$ = $2;} + | OP_EXP_PAREN_OPEN Expression + OP_EXP_PAREN_CLOSE { $$ = $2;} /* Label references (prefixed with $) */ - | EXPOP_LABEL { $$ = DtResolveLabel (DtParsertext);} + | OP_EXP_LABEL { $$ = DtResolveLabel (DtParsertext);} /* * All constants for the data table compiler are in hex, whether a (optional) 0x @@ -283,15 +283,15 @@ Expression /* Non-prefixed hex number */ - | EXPOP_NUMBER { $$ = DtDoConstant (DtParsertext);} + | OP_EXP_NUMBER { $$ = DtDoConstant (DtParsertext);} /* Standard hex number (0x1234) */ - | EXPOP_HEX_NUMBER { $$ = DtDoConstant (DtParsertext);} + | OP_EXP_HEX_NUMBER { $$ = DtDoConstant (DtParsertext);} /* Possible TBD: Decimal number with prefix (0d1234) - Not supported this time */ - | EXPOP_DECIMAL_NUMBER { $$ = DtDoConstant (DtParsertext);} + | OP_EXP_DECIMAL_NUMBER { $$ = DtDoConstant (DtParsertext);} ; %% @@ -300,7 +300,7 @@ Expression /* * Local support functions, including parser entry point */ -#define PR_FIRST_PARSE_OPCODE EXPOP_EOF +#define PR_FIRST_PARSE_OPCODE OP_EXP_EOF #define PR_YYTNAME_START 3 @@ -329,7 +329,7 @@ DtParsererror ( * * FUNCTION: DtGetOpName * - * PARAMETERS: ParseOpcode - Parser token (EXPOP_*) + * PARAMETERS: ParseOpcode - Parser token (OP_EXP_*) * * RETURN: Pointer to the opcode name * @@ -344,7 +344,7 @@ DtGetOpName ( #ifdef ASL_YYTNAME_START /* * First entries (PR_YYTNAME_START) in yytname are special reserved names. - * Ignore first 6 characters of name (EXPOP_) + * Ignore first 6 characters of name (OP_EXP_) */ return ((char *) yytname [(ParseOpcode - PR_FIRST_PARSE_OPCODE) + PR_YYTNAME_START] + 6); |