Commit 85e92e53 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

New peek code generated some spurious errors when concatenating blanks.


2001-05-12  Jody Goldberg <jgoldberg@home.com>

	* src/expr.c (eval_expr_real) : New peek code generated some spurious
	  errors when concatenating blanks.
parent 17d95497
......@@ -9,14 +9,14 @@ Release Critical
----------------
- smarter support for unicode characters that do not convert to the
current encoding during XL import.
current encoding during XL import. (Vlad is looking at this)
Long term breakage
------------------
- outline mode
: finish implementing optionally putting markers above/left
: implement group/ungroup menu items (with undo)
: implement group/ungroup menu items (with undo, Almer is working on this)
: connect the hide/show menu items
- defining file patterns in plugin spec overrides 'has_probe' flag silently.
......
2001-05-12 Jody Goldberg <jgoldberg@home.com>
* src/expr.c (eval_expr_real) : New peek code generated some spurious
errors when concatenating blanks.
2001-05-12 Jody Goldberg <jgoldberg@home.com>
From Juan Pablo Mendoza <pablo_juan@yahoo.com>
......
2001-05-12 Jody Goldberg <jgoldberg@home.com>
* src/expr.c (eval_expr_real) : New peek code generated some spurious
errors when concatenating blanks.
2001-05-12 Jody Goldberg <jgoldberg@home.com>
From Juan Pablo Mendoza <pablo_juan@yahoo.com>
......
2001-05-12 Jody Goldberg <jgoldberg@home.com>
* src/expr.c (eval_expr_real) : New peek code generated some spurious
errors when concatenating blanks.
2001-05-12 Jody Goldberg <jgoldberg@home.com>
From Juan Pablo Mendoza <pablo_juan@yahoo.com>
......
2001-05-12 Jody Goldberg <jgoldberg@home.com>
* src/expr.c (eval_expr_real) : New peek code generated some spurious
errors when concatenating blanks.
2001-05-12 Jody Goldberg <jgoldberg@home.com>
From Juan Pablo Mendoza <pablo_juan@yahoo.com>
......
2001-05-12 Jody Goldberg <jgoldberg@home.com>
* src/expr.c (eval_expr_real) : New peek code generated some spurious
errors when concatenating blanks.
2001-05-12 Jody Goldberg <jgoldberg@home.com>
From Juan Pablo Mendoza <pablo_juan@yahoo.com>
......
......@@ -770,9 +770,7 @@ eval_expr_real (EvalPos const *pos, ExprTree const *tree,
value_release (a);
return res;
case OPER_CONCAT: {
char *tmp;
case OPER_CONCAT:
a = eval_expr_real (pos, tree->binary.value_a, flags);
if (a != NULL && a->type == VALUE_ERROR)
return a;
......@@ -783,17 +781,25 @@ eval_expr_real (EvalPos const *pos, ExprTree const *tree,
return b;
}
tmp = g_strconcat (value_peek_string (a),
value_peek_string (b), NULL);
res = value_new_string (tmp);
g_free (tmp);
if (a != NULL)
if (a == NULL) {
if (b != NULL) {
res = value_new_string (value_peek_string (b));
value_release (b);
} else
res = value_new_string ("");
} else if (b == NULL) {
res = value_new_string (value_peek_string (a));
value_release (a);
} else {
char *tmp = g_strconcat (value_peek_string (a),
value_peek_string (b), NULL);
res = value_new_string (tmp);
g_free (tmp);
value_release (a);
if (b != NULL)
value_release (b);
}
return res;
}
case OPER_FUNCALL:
return eval_funcall (pos, tree, flags);
......
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