mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-20 11:48:30 -06:00
2001-08-03 Dave Peticolas <dave@krondo.com>
* src/gnome/dialog-sxsincelast.c: same as below * src/gnc-exp-parser.[ch]: seperate->separate git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5066 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
982d2168ec
commit
9b0441eb33
@ -1,5 +1,9 @@
|
||||
2001-08-03 Dave Peticolas <dave@krondo.com>
|
||||
|
||||
* src/gnome/dialog-sxsincelast.c: same as below
|
||||
|
||||
* src/gnc-exp-parser.[ch]: seperate->separate
|
||||
|
||||
* src/engine/gnc-book.c: fix warnings
|
||||
|
||||
* doc/sgml/C/xacc-sxeditor.sgml: fix warning
|
||||
|
@ -410,13 +410,15 @@ gboolean
|
||||
gnc_exp_parser_parse( const char * expression, gnc_numeric *value_p,
|
||||
char **error_loc_p )
|
||||
{
|
||||
return gnc_exp_parser_parse_seperate_vars( expression, value_p,
|
||||
return gnc_exp_parser_parse_separate_vars( expression, value_p,
|
||||
error_loc_p, NULL );
|
||||
}
|
||||
|
||||
gboolean
|
||||
gnc_exp_parser_parse_seperate_vars (const char * expression, gnc_numeric *value_p,
|
||||
char **error_loc_p, GHashTable *varHash )
|
||||
gnc_exp_parser_parse_separate_vars (const char * expression,
|
||||
gnc_numeric *value_p,
|
||||
char **error_loc_p,
|
||||
GHashTable *varHash )
|
||||
{
|
||||
parser_env_ptr pe;
|
||||
var_store_ptr vars;
|
||||
|
@ -72,7 +72,7 @@ gboolean gnc_exp_parser_parse (const char * expression,
|
||||
* dealing with a non-shared variable list and state, local to the expression
|
||||
* being parsed. This is a hashTable of variable names mapping to
|
||||
* gnc_numeric pointers. */
|
||||
gboolean gnc_exp_parser_parse_seperate_vars (const char * expression,
|
||||
gboolean gnc_exp_parser_parse_separate_vars (const char * expression,
|
||||
gnc_numeric *value_p,
|
||||
char **error_loc_p,
|
||||
GHashTable *varHash );
|
||||
|
@ -763,8 +763,8 @@ sxsincelast_entry_changed( GtkEditable *e, gpointer ud )
|
||||
*num = gnc_numeric_create( 0, 1 );
|
||||
dummyVarHash = g_hash_table_new( NULL, NULL );
|
||||
/* FIXME: these debugs probably want to go into a staus bar... */
|
||||
/* FIXME: Should be using xaccParseAmount instead of parser_parse_seperate_vars? */
|
||||
if ( !gnc_exp_parser_parse_seperate_vars( entryText, num, NULL, dummyVarHash ) ) {
|
||||
/* FIXME: Should be using xaccParseAmount instead of parser_parse_separate_vars? */
|
||||
if ( !gnc_exp_parser_parse_separate_vars( entryText, num, NULL, dummyVarHash ) ) {
|
||||
DEBUG( "error parsing entry \"%s\"", entryText );
|
||||
g_free( num );
|
||||
num = NULL;
|
||||
@ -904,7 +904,7 @@ _create_each_transaction_helper( Transaction *t, void *d )
|
||||
credit_num = gnc_numeric_create( 0, 1 );
|
||||
if ( str != NULL
|
||||
&& strlen(str) != 0 ) {
|
||||
if ( ! gnc_exp_parser_parse_seperate_vars( str, &credit_num,
|
||||
if ( ! gnc_exp_parser_parse_separate_vars( str, &credit_num,
|
||||
&parseErrorLoc, tct->varBindings ) ) {
|
||||
PERR( "Error parsing credit formula \"%s\" at \"%s\": %s",
|
||||
str, parseErrorLoc, gnc_exp_parser_error_string() );
|
||||
@ -923,7 +923,7 @@ _create_each_transaction_helper( Transaction *t, void *d )
|
||||
debit_num = gnc_numeric_create( 0, 1 );
|
||||
if ( str != NULL
|
||||
&& strlen(str) != 0 ) {
|
||||
if ( ! gnc_exp_parser_parse_seperate_vars( str, &debit_num,
|
||||
if ( ! gnc_exp_parser_parse_separate_vars( str, &debit_num,
|
||||
&parseErrorLoc, tct->varBindings ) ) {
|
||||
PERR( "Error parsing debit_formula \"%s\" at \"%s\": %s",
|
||||
str, parseErrorLoc, gnc_exp_parser_error_string() );
|
||||
@ -1246,7 +1246,7 @@ parse_vars_from_formula( const char *formula, GHashTable *varHash )
|
||||
gnc_numeric numeric;
|
||||
char *foo;
|
||||
|
||||
if ( ! gnc_exp_parser_parse_seperate_vars( formula, &numeric, &foo, varHash ) ) {
|
||||
if ( ! gnc_exp_parser_parse_separate_vars( formula, &numeric, &foo, varHash ) ) {
|
||||
PERR( "Error parsing at \"%s\": %s",
|
||||
foo, gnc_exp_parser_error_string() );
|
||||
return -1;
|
||||
|
Loading…
Reference in New Issue
Block a user