Commit 76bfc7df authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

Check for names before values.


2000-07-26  Jody Goldberg <jgoldberg@home.com>

	* src/parser.y (parse_string_as_value_or_name) : Check for names
	  before values.

	* configure.in : Update bonobo requirement to reflect release of 0.16
	README : Ditto.
parent 53ef3c90
2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/parser.y (parse_string_as_value_or_name) : Check for names
before values.
* configure.in : Update bonobo requirement to reflect release of 0.16
README : Ditto.
2000-07-26 Jody Goldberg <jgoldberg@home.com> 2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/print-cell.c (print_cell) : resync with cell-draw. * src/print-cell.c (print_cell) : resync with cell-draw.
......
2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/parser.y (parse_string_as_value_or_name) : Check for names
before values.
* configure.in : Update bonobo requirement to reflect release of 0.16
README : Ditto.
2000-07-26 Jody Goldberg <jgoldberg@home.com> 2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/print-cell.c (print_cell) : resync with cell-draw. * src/print-cell.c (print_cell) : resync with cell-draw.
......
2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/parser.y (parse_string_as_value_or_name) : Check for names
before values.
* configure.in : Update bonobo requirement to reflect release of 0.16
README : Ditto.
2000-07-26 Jody Goldberg <jgoldberg@home.com> 2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/print-cell.c (print_cell) : resync with cell-draw. * src/print-cell.c (print_cell) : resync with cell-draw.
......
2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/parser.y (parse_string_as_value_or_name) : Check for names
before values.
* configure.in : Update bonobo requirement to reflect release of 0.16
README : Ditto.
2000-07-26 Jody Goldberg <jgoldberg@home.com> 2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/print-cell.c (print_cell) : resync with cell-draw. * src/print-cell.c (print_cell) : resync with cell-draw.
......
2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/parser.y (parse_string_as_value_or_name) : Check for names
before values.
* configure.in : Update bonobo requirement to reflect release of 0.16
README : Ditto.
2000-07-26 Jody Goldberg <jgoldberg@home.com> 2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/print-cell.c (print_cell) : resync with cell-draw. * src/print-cell.c (print_cell) : resync with cell-draw.
......
2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/parser.y (parse_string_as_value_or_name) : Check for names
before values.
* configure.in : Update bonobo requirement to reflect release of 0.16
README : Ditto.
2000-07-26 Jody Goldberg <jgoldberg@home.com> 2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/print-cell.c (print_cell) : resync with cell-draw. * src/print-cell.c (print_cell) : resync with cell-draw.
......
2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/parser.y (parse_string_as_value_or_name) : Check for names
before values.
* configure.in : Update bonobo requirement to reflect release of 0.16
README : Ditto.
2000-07-26 Jody Goldberg <jgoldberg@home.com> 2000-07-26 Jody Goldberg <jgoldberg@home.com>
* src/print-cell.c (print_cell) : resync with cell-draw. * src/print-cell.c (print_cell) : resync with cell-draw.
......
...@@ -38,7 +38,7 @@ You need: ...@@ -38,7 +38,7 @@ You need:
NOTE : gnome-xml is also known as libxml NOTE : gnome-xml is also known as libxml
Optionally: Optionally:
bonobo == 0.16 (Still in CVS) bonobo == 0.16
Notes regarding plugins Notes regarding plugins
----------------------- -----------------------
......
...@@ -202,10 +202,10 @@ AC_ARG_WITH(bonobo, ...@@ -202,10 +202,10 @@ AC_ARG_WITH(bonobo,
gnumeric_executable=gnumeric gnumeric_executable=gnumeric
AC_SUBST(gnumeric_executable) AC_SUBST(gnumeric_executable)
if $try_bonobo; then if $try_bonobo; then
AC_MSG_CHECKING(for Bonobo >= 0.14) AC_MSG_CHECKING(for Bonobo >= 0.16)
vers=`gnome-config --modversion bonobo | sed -e "s/bonobo-//" | \ vers=`gnome-config --modversion bonobo | sed -e "s/bonobo-//" | \
awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2;}'` awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2;}'`
if test "$vers" -ge 14; then if test "$vers" -ge 16; then
AC_MSG_RESULT(found) AC_MSG_RESULT(found)
AC_DEFINE(ENABLE_BONOBO) AC_DEFINE(ENABLE_BONOBO)
have_bonobo=true have_bonobo=true
......
...@@ -299,20 +299,27 @@ parse_string_as_value (ExprTree *str) ...@@ -299,20 +299,27 @@ parse_string_as_value (ExprTree *str)
return FALSE; return FALSE;
} }
/**
* parse_string_as_value_or_name :
* @str : An expression with oper constant, whose value is a string.
*
* Check to see if a string is a name
* if it is not check to see if it can be parsed as a value
*/
static ExprTree * static ExprTree *
parse_string_as_value_or_name (ExprTree *str) parse_string_as_value_or_name (ExprTree *str)
{ {
NamedExpression *expr_name; NamedExpression *expr_name;
if (parse_string_as_value (str));
return str;
expr_name = expr_name_lookup (parser_pos, str->constant.value->v_str.val->str); expr_name = expr_name_lookup (parser_pos, str->constant.value->v_str.val->str);
if (expr_name == NULL) if (expr_name != NULL) {
return str; unregister_allocation (str); expr_tree_unref (str);
return register_expr_allocation (expr_tree_new_name (expr_name));
}
unregister_allocation (str); expr_tree_unref (str); /* NOTE : parse_string_as_value modifies str in place */
return register_expr_allocation (expr_tree_new_name (expr_name)); parse_string_as_value (str);
return str;
} }
static int static int
......
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