Commit bc8e816d authored by Morten Welinder's avatar Morten Welinder Committed by Morten Welinder

Grammar fix.

2002-12-13  Morten Welinder  <terra@diku.dk>

	* src/xml-io.c (gnumeric_xml_read_workbook): Grammar fix.

	* src/parse-util.h (struct _GnmExprConventions): New members
	expr_name_handler, output_sheet_name_sep, and output_argument_sep.
parent 0f79c414
2002-12-13 Morten Welinder <terra@diku.dk>
* src/xml-io.c (gnumeric_xml_read_workbook): Grammar fix.
* src/parse-util.h (struct _GnmExprConventions): New members
expr_name_handler and output_sheet_name_sep.
expr_name_handler, output_sheet_name_sep, and output_argument_sep.
* src/expr.c (do_expr_as_string): Use new expr_name_handler is
conventions.
......
2002-12-13 Morten Welinder <terra@diku.dk>
* src/xml-io.c (gnumeric_xml_read_workbook): Grammar fix.
* src/parse-util.h (struct _GnmExprConventions): New members
expr_name_handler and output_sheet_name_sep.
expr_name_handler, output_sheet_name_sep, and output_argument_sep.
* src/expr.c (do_expr_as_string): Use new expr_name_handler is
conventions.
......
2002-12-13 Morten Welinder <terra@diku.dk>
* src/xml-io.c (gnumeric_xml_read_workbook): Grammar fix.
* src/parse-util.h (struct _GnmExprConventions): New members
expr_name_handler and output_sheet_name_sep.
expr_name_handler, output_sheet_name_sep, and output_argument_sep.
* src/expr.c (do_expr_as_string): Use new expr_name_handler is
conventions.
......
......@@ -2141,15 +2141,23 @@ gnm_expr_list_eq (GnmExprList const *la, GnmExprList const *lb)
static void
gnm_expr_list_as_string (GString *target,
GnmExprList const *list, ParsePos const *pp,
const GnmExprConventions *fmt)
const GnmExprConventions *conv)
{
GnmExprList const *l;
char sep = format_get_arg_sep ();
const char *sep;
char arg_sep[2];
if (conv->output_argument_sep)
sep = conv->output_argument_sep;
else {
arg_sep[0] = format_get_arg_sep ();
arg_sep[1] = 0;
sep = arg_sep;
}
g_string_append_c (target, '(');
for (l = list; l; l = l->next) {
do_expr_as_string (target, l->data, pp, 0, fmt);
if (l->next) g_string_append_c (target, sep);
while (list) {
do_expr_as_string (target, list->data, pp, 0, conv);
if (list->next) g_string_append (target, sep);
list = list->next;
}
g_string_append_c (target, ')');
}
......
......@@ -146,6 +146,9 @@ struct _GnmExprConventions {
/* Used to separate sheet from name when both are needed. */
const char *output_sheet_name_sep;
/* If non-null, used to separate elements in lists. */
const char *output_argument_sep;
};
GnmExprConventions *gnm_expr_conventions_new (void);
......
......@@ -3591,7 +3591,7 @@ gnumeric_xml_read_workbook (GnmFileOpener const *fo,
if (res != NULL)
xmlFreeDoc (res);
gnumeric_error_read (COMMAND_CONTEXT (context),
_("Is not an Gnumeric Workbook file"));
_("The file is not a Gnumeric Workbook file"));
return;
}
......
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