openRuyi-Project/gcc
3
0
Fork 0
mirror of https://github.com/openRuyi-Project/gcc.git synced 2026-10-04 16:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

expr.c (num_div_op): Take explicit location.

Browse Source 
2009-06-18  Manuel López-Ibáñez  <manu@gcc.gnu.org>

libcpp/	
	* expr.c (num_div_op): Take explicit location.
testsuite/	
	* gcc.dg/cpp/arith-3.c: Add column info.

From-SVN: r148662
This commit is contained in:
Manuel López-Ibáñez
2009-06-18 15:10:23 +00:00
parent 4c1a901679
commit b506a5a238
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcpp/ChangeLog
+4
View File
@@ -1,3 +1,7 @@
2009-06-18 Manuel López-Ibáñez <manu@gcc.gnu.org>
* expr.c (num_div_op): Take explicit location.
2009-06-17 Ian Lance Taylor <iant@google.com>
* include/cpplib.h (progname): Don't declare.
libcpp/expr.c
+11 -6
View File
@@ -52,7 +52,8 @@ static cpp_num num_inequality_op (cpp_reader *, cpp_num, cpp_num,
static cpp_num num_equality_op (cpp_reader *, cpp_num, cpp_num,
enum cpp_ttype);
static cpp_num num_mul (cpp_reader *, cpp_num, cpp_num);
static cpp_num num_div_op (cpp_reader *, cpp_num, cpp_num, enum cpp_ttype);
static cpp_num num_div_op (cpp_reader *, cpp_num, cpp_num, enum cpp_ttype,
source_location);
static cpp_num num_lshift (cpp_num, size_t, size_t);
static cpp_num num_rshift (cpp_num, size_t, size_t);
@@ -1123,7 +1124,7 @@ reduce (cpp_reader *pfile, struct op *top, enum cpp_ttype op)
case CPP_DIV:
case CPP_MOD:
top[-1].value = num_div_op (pfile, top[-1].value,
top->value, top->op);
top->value, top->op, top->loc);
top[-1].loc = top->loc;
break;
@@ -1668,10 +1669,13 @@ num_mul (cpp_reader *pfile, cpp_num lhs, cpp_num rhs)
return result;
}
/* Divide two preprocessing numbers, returning the answer or the
remainder depending upon OP. */
/* Divide two preprocessing numbers, LHS and RHS, returning the answer
or the remainder depending upon OP. LOCATION is the source location
of this operator (for diagnostics). */
static cpp_num
num_div_op (cpp_reader *pfile, cpp_num lhs, cpp_num rhs, enum cpp_ttype op)
num_div_op (cpp_reader *pfile, cpp_num lhs, cpp_num rhs, enum cpp_ttype op,
source_location location)
{
cpp_num result, sub;
cpp_num_part mask;
@@ -1711,7 +1715,8 @@ num_div_op (cpp_reader *pfile, cpp_num lhs, cpp_num rhs, enum cpp_ttype op)
else
{
if (!pfile->state.skip_eval)
cpp_error (pfile, CPP_DL_ERROR, "division by zero in #if");
cpp_error_with_line (pfile, CPP_DL_ERROR, location, 0,
"division by zero in #if");
return lhs;
}