Commit 46fef5b2 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

shrink the stack a bit. 2001-09-24 Jody Goldberg <jgoldberg@home.com>

2001-09-25  Jody Goldberg <jgoldberg@home.com>

	* src/expr.c (eval_expr_real) : shrink the stack a bit.
2001-09-24  Jody Goldberg <jgoldberg@home.com>

	* src/formats.c (cell_format_classify) : parse first, search list later.
	  This ensures that we find the right precision and such.
parent 4dba03a0
2001-09-25 Jody Goldberg <jgoldberg@home.com>
* src/expr.c (eval_expr_real) : shrink the stack a bit.
2001-09-25 Jon K Hellan <hellan@acm.org>
* idl/.cvsignore: Adapt to present reality.
......
2001-09-25 Jody Goldberg <jgoldberg@home.com>
* src/expr.c (eval_expr_real) : shrink the stack a bit.
2001-09-25 Jon K Hellan <hellan@acm.org>
* idl/.cvsignore: Adapt to present reality.
......
2001-09-25 Jody Goldberg <jgoldberg@home.com>
* src/expr.c (eval_expr_real) : shrink the stack a bit.
2001-09-25 Jon K Hellan <hellan@acm.org>
* idl/.cvsignore: Adapt to present reality.
......
2001-09-25 Jody Goldberg <jgoldberg@home.com>
* src/expr.c (eval_expr_real) : shrink the stack a bit.
2001-09-25 Jon K Hellan <hellan@acm.org>
* idl/.cvsignore: Adapt to present reality.
......
......@@ -829,16 +829,14 @@ eval_expr_real (EvalPos const *pos, ExprTree const *expr,
return eval_expr_name (pos, expr->name.name, flags);
case OPER_VAR: {
Sheet *cell_sheet;
CellRef const *ref;
CellRef const * const ref = &expr->var.ref;
Cell *cell;
CellPos dest;
ref = &expr->var.ref;
cellref_get_abs_pos (ref, &pos->eval, &dest);
cell_sheet = eval_sheet (ref->sheet, pos->sheet);
cell = sheet_cell_get (cell_sheet, dest.col, dest.row);
cell = sheet_cell_get (eval_sheet (ref->sheet, pos->sheet),
dest.col, dest.row);
if (cell == NULL)
return NULL;
......
......@@ -595,6 +595,10 @@ cell_format_classify (char const * const fmt, FormatCharacteristics *info)
info->negative_fmt = 0;
info->currency_symbol_index = 1; /* '$' */
/* Can we parse it ? */
if ((res = cell_format_is_number (fmt, info)) != FMT_UNKNOWN)
return res;
/* Is it in the lists */
for (i = 0; cell_formats[i] != NULL ; ++i) {
int j = 0;
......@@ -605,10 +609,5 @@ cell_format_classify (char const * const fmt, FormatCharacteristics *info)
return i;
}
}
/* Can we parse it ? */
if ((res = cell_format_is_number (fmt, info)) != FMT_UNKNOWN)
return res;
return FMT_UNKNOWN;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment