diff options
-rw-r--r-- | demos/expr/expr-impl.h | 53 | ||||
-rw-r--r-- | demos/expr/expr.c | 2 | ||||
-rw-r--r-- | demos/expr/expr.h | 10 | ||||
-rw-r--r-- | demos/expr/exprf.c | 4 | ||||
-rw-r--r-- | demos/expr/exprq.c | 4 | ||||
-rw-r--r-- | demos/expr/exprz.c | 4 |
6 files changed, 38 insertions, 39 deletions
diff --git a/demos/expr/expr-impl.h b/demos/expr/expr-impl.h index aa2732b10..84c5bce88 100644 --- a/demos/expr/expr-impl.h +++ b/demos/expr/expr-impl.h @@ -83,7 +83,7 @@ typedef void (*mpexpr_fun_set_si_t) (mpX_srcptr, long); struct mpexpr_control_t { const struct mpexpr_operator_t *op; - int argcount; + int argcount; }; #define MPEXPR_VARIABLES 26 @@ -91,36 +91,35 @@ struct mpexpr_control_t { struct mpexpr_parse_t { const struct mpexpr_operator_t *table; - mpX_ptr res; - int base; - unsigned long prec; + mpX_ptr res; + int base; + unsigned long prec; const char *e; - size_t elen; - mpX_srcptr *var; - int error_code; + size_t elen; + mpX_srcptr *var; + int error_code; - int token; + int token; const struct mpexpr_operator_t *token_op; - union mpX_t *data_stack; - int data_top; - int data_alloc; - int data_inited; - - struct mpexpr_control_t *control_stack; - int control_top; - int control_alloc; - - - mpexpr_fun_0ary_t mpX_clear; - mpexpr_fun_i_unary_t mpX_ulong_p; - mpexpr_fun_get_ui_t mpX_get_ui; - mpexpr_fun_unary_ui_t mpX_init; - mpexpr_fun_number_t mpX_number; - mpexpr_fun_unary_t mpX_set; - mpexpr_fun_unary_t mpX_set_or_swap; - mpexpr_fun_set_si_t mpX_set_si; - mpexpr_fun_swap_t mpX_swap; + union mpX_t *data_stack; + int data_top; + int data_alloc; + int data_inited; + + struct mpexpr_control_t *control_stack; + int control_top; + int control_alloc; + + mpexpr_fun_0ary_t mpX_clear; + mpexpr_fun_i_unary_t mpX_ulong_p; + mpexpr_fun_get_ui_t mpX_get_ui; + mpexpr_fun_unary_ui_t mpX_init; + mpexpr_fun_number_t mpX_number; + mpexpr_fun_unary_t mpX_set; + mpexpr_fun_unary_t mpX_set_or_swap; + mpexpr_fun_set_si_t mpX_set_si; + mpexpr_fun_swap_t mpX_swap; }; diff --git a/demos/expr/expr.c b/demos/expr/expr.c index 1788d2941..1f4af6cea 100644 --- a/demos/expr/expr.c +++ b/demos/expr/expr.c @@ -278,7 +278,7 @@ lookahead (struct mpexpr_parse_t *p, int prefix) a reference through CP. */ #define CONTROL_PUSH(opptr,args) \ do { \ - const struct mpexpr_operator_t *op = opptr; \ + const struct mpexpr_operator_t *op = opptr; \ struct mpexpr_control_t *cp; \ CONTROL_SPACE (); \ p->control_top++; \ diff --git a/demos/expr/expr.h b/demos/expr/expr.h index eb9fc8f4c..0cfda0a33 100644 --- a/demos/expr/expr.h +++ b/demos/expr/expr.h @@ -101,15 +101,15 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ typedef void (*mpexpr_fun_t) (void); struct mpexpr_operator_t { - const char *name; - mpexpr_fun_t fun; - int type; - int precedence; + const char *name; + mpexpr_fun_t fun; + int type; + int precedence; }; int mpf_expr_a (const struct mpexpr_operator_t *, mpf_ptr, int, - unsigned long,const char *, size_t, mpf_srcptr [26]); + unsigned long, const char *, size_t, mpf_srcptr [26]); int mpf_expr (mpf_ptr, int, const char *, ...); int mpq_expr_a (const struct mpexpr_operator_t *, mpq_ptr, diff --git a/demos/expr/exprf.c b/demos/expr/exprf.c index 777daec37..98ce83479 100644 --- a/demos/expr/exprf.c +++ b/demos/expr/exprf.c @@ -106,8 +106,8 @@ mpf_expr (va_alist) #if HAVE_STDARG va_start (ap, e); #else - mpf_ptr res; - int base; + mpf_ptr res; + int base; const char *e; va_start (ap); res = va_arg (ap, mpf_ptr); diff --git a/demos/expr/exprq.c b/demos/expr/exprq.c index 9b4b8574d..a16b2165c 100644 --- a/demos/expr/exprq.c +++ b/demos/expr/exprq.c @@ -139,8 +139,8 @@ mpq_expr (va_alist) #if HAVE_STDARG va_start (ap, e); #else - mpq_ptr res; - int base; + mpq_ptr res; + int base; const char *e; va_start (ap); res = va_arg (ap, mpq_ptr); diff --git a/demos/expr/exprz.c b/demos/expr/exprz.c index ad5ee7dea..3d4ec6582 100644 --- a/demos/expr/exprz.c +++ b/demos/expr/exprz.c @@ -190,8 +190,8 @@ mpz_expr (va_alist) #if HAVE_STDARG va_start (ap, e); #else - mpz_ptr res; - int base; + mpz_ptr res; + int base; const char *e; va_start (ap); res = va_arg (ap, mpz_ptr); |