diff options
Diffstat (limited to 'giscanner/scannerparser.y')
-rw-r--r-- | giscanner/scannerparser.y | 58 |
1 files changed, 36 insertions, 22 deletions
diff --git a/giscanner/scannerparser.y b/giscanner/scannerparser.y index 26c9eba7..52fc1996 100644 --- a/giscanner/scannerparser.y +++ b/giscanner/scannerparser.y @@ -582,25 +582,24 @@ multiplicative_expression : cast_expression | multiplicative_expression '*' cast_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int * $3->const_int; } | multiplicative_expression '/' cast_expression { + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; if ($3->const_int != 0) { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); $$->const_int = $1->const_int / $3->const_int; - } else { - $$ = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno); } } | multiplicative_expression '%' cast_expression { + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; if ($3->const_int != 0) { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); $$->const_int = $1->const_int % $3->const_int; - } else { - $$ = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno); } } ; @@ -609,12 +608,14 @@ additive_expression : multiplicative_expression | additive_expression '+' multiplicative_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int + $3->const_int; } | additive_expression '-' multiplicative_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int - $3->const_int; } ; @@ -623,7 +624,8 @@ shift_expression : additive_expression | shift_expression SL additive_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int << $3->const_int; /* assume this is a bitfield/flags declaration @@ -634,7 +636,8 @@ shift_expression } | shift_expression SR additive_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int >> $3->const_int; } ; @@ -643,22 +646,26 @@ relational_expression : shift_expression | relational_expression '<' shift_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int < $3->const_int; } | relational_expression '>' shift_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int > $3->const_int; } | relational_expression LTEQ shift_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int <= $3->const_int; } | relational_expression GTEQ shift_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int >= $3->const_int; } ; @@ -667,12 +674,14 @@ equality_expression : relational_expression | equality_expression EQ relational_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int == $3->const_int; } | equality_expression NOTEQ relational_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int != $3->const_int; } ; @@ -681,7 +690,8 @@ and_expression : equality_expression | and_expression '&' equality_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int & $3->const_int; } ; @@ -690,7 +700,8 @@ exclusive_or_expression : and_expression | exclusive_or_expression '^' and_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int ^ $3->const_int; } ; @@ -699,7 +710,8 @@ inclusive_or_expression : exclusive_or_expression | inclusive_or_expression '|' exclusive_or_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = $1->const_int | $3->const_int; } ; @@ -708,7 +720,8 @@ logical_and_expression : inclusive_or_expression | logical_and_expression ANDAND inclusive_or_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = gi_source_symbol_get_const_boolean ($1) && gi_source_symbol_get_const_boolean ($3); @@ -719,7 +732,8 @@ logical_or_expression : logical_and_expression | logical_or_expression OROR logical_and_expression { - $$ = gi_source_symbol_const_binary ($1, $3, scanner->current_file, lineno); + $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno); + $$->const_int_set = TRUE; $$->const_int = gi_source_symbol_get_const_boolean ($1) || gi_source_symbol_get_const_boolean ($3); |