summaryrefslogtreecommitdiff
path: root/demos
diff options
context:
space:
mode:
authortege <tege@gmplib.org>2007-09-24 17:19:27 +0200
committertege <tege@gmplib.org>2007-09-24 17:19:27 +0200
commit7f6e0a4930a18e221ea2d45d621bea82c9c9c34e (patch)
tree13f6076dca2ab33d5e59b8847b03226cc30a7be5 /demos
parent4c893cee7bc42b6f874b4729f7afc767512e8f34 (diff)
downloadgmp-7f6e0a4930a18e221ea2d45d621bea82c9c9c34e.tar.gz
Clean up spacing.
Diffstat (limited to 'demos')
-rw-r--r--demos/calc/calcread.c42
-rw-r--r--demos/expr/README2
-rw-r--r--demos/expr/expr.c488
-rw-r--r--demos/expr/expr.h26
-rw-r--r--demos/expr/exprf.c4
-rw-r--r--demos/expr/exprq.c2
-rw-r--r--demos/expr/exprv.c5
-rw-r--r--demos/expr/exprz.c13
-rw-r--r--demos/perl/GMP.xs2
-rw-r--r--demos/perl/test.pl8
-rw-r--r--demos/perl/test2.pl4
11 files changed, 297 insertions, 299 deletions
diff --git a/demos/calc/calcread.c b/demos/calc/calcread.c
index ca8395e10..53291ff73 100644
--- a/demos/calc/calcread.c
+++ b/demos/calc/calcread.c
@@ -30,7 +30,7 @@ this program. If not, see http://www.gnu.org/licenses/. */
/* change this to "#define TRACE(x) x" for a few diagnostics */
-#define TRACE(x)
+#define TRACE(x)
#define MIN(x,y) ((x) < (y) ? (x) : (y))
@@ -47,12 +47,12 @@ calc_completion_entry (const char *text, int state)
len = strlen (text);
}
TRACE (printf ("calc_completion_entry %s %d, index=%d len=%d\n",
- text, state, index, len));
+ text, state, index, len));
while ((name = calc_keywords[index].name) != NULL)
{
index++;
if (memcmp (name, text, len) == 0)
- return (strdup (name));
+ return (strdup (name));
}
return NULL;
}
@@ -95,24 +95,24 @@ calc_input (char *buf, size_t max_size)
size_t copy_size;
if (upto >= line_size)
- {
- if (line != NULL)
- free (line);
-
- line = readline (calc_more_input ? "more> " : "> ");
- calc_more_input = 1;
- if (line == NULL)
- return 0;
- TRACE (printf ("readline: %s\n", line));
-
- if (line[0] != '\0')
- add_history (line);
-
- line_size = strlen (line);
- line[line_size] = '\n';
- line_size++;
- upto = 0;
- }
+ {
+ if (line != NULL)
+ free (line);
+
+ line = readline (calc_more_input ? "more> " : "> ");
+ calc_more_input = 1;
+ if (line == NULL)
+ return 0;
+ TRACE (printf ("readline: %s\n", line));
+
+ if (line[0] != '\0')
+ add_history (line);
+
+ line_size = strlen (line);
+ line[line_size] = '\n';
+ line_size++;
+ upto = 0;
+ }
copy_size = MIN (line_size-upto, max_size);
memcpy (buf, line+upto, copy_size);
diff --git a/demos/expr/README b/demos/expr/README
index a6bdfa0cf..2283cd3ff 100644
--- a/demos/expr/README
+++ b/demos/expr/README
@@ -411,7 +411,7 @@ where.
static const struct mpexpr_operator_t table[] = {
{ "^", (mpexpr_fun_t) mpz_pow_ui,
MPEXPR_TYPE_BINARY_UI | MPEXPR_TYPE_RIGHTASSOC, 9 },
-
+
{ "!", (mpexpr_fun_t) mpz_fac_ui, MPEXPR_TYPE_UNARY_UI, 8 },
{ "-", (mpexpr_fun_t) mpz_neg,
MPEXPR_TYPE_UNARY | MPEXPR_TYPE_PREFIX, 7 },
diff --git a/demos/expr/expr.c b/demos/expr/expr.c
index e87ba6087..f78c32173 100644
--- a/demos/expr/expr.c
+++ b/demos/expr/expr.c
@@ -31,7 +31,7 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
mpz/mpq/mpf being run (if you have the wrong trace function it'll
probably segv). */
-#define TRACE(x)
+#define TRACE(x)
#define MPX_TRACE mpz_trace
@@ -77,17 +77,17 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
do { \
if (p->data_top + 1 >= p->data_alloc) \
{ \
- void *(*reallocate_func) (void *, size_t, size_t); \
- mp_get_memory_functions (NULL, &reallocate_func, NULL); \
- TRACE (printf ("grow stack from %d\n", p->data_alloc)); \
- REALLOC (p->data_stack, p->data_alloc, 20, union mpX_t); \
+ void *(*reallocate_func) (void *, size_t, size_t); \
+ mp_get_memory_functions (NULL, &reallocate_func, NULL); \
+ TRACE (printf ("grow stack from %d\n", p->data_alloc)); \
+ REALLOC (p->data_stack, p->data_alloc, 20, union mpX_t); \
} \
ASSERT (p->data_top + 1 <= p->data_inited); \
if (p->data_top + 1 == p->data_inited) \
{ \
- TRACE (printf ("initialize %d\n", p->data_top + 1)); \
- (*p->mpX_init) (&p->data_stack[p->data_top + 1], p->prec); \
- p->data_inited++; \
+ TRACE (printf ("initialize %d\n", p->data_top + 1)); \
+ (*p->mpX_init) (&p->data_stack[p->data_top + 1], p->prec); \
+ p->data_inited++; \
} \
} while (0)
@@ -159,38 +159,38 @@ lookahead (struct mpexpr_parse_t *p, int prefix)
break;
TRACE (printf ("lookahead at: \"%.*s\" length %u, word %u\n",
- (int) p->elen, p->e, p->elen, wlen));
+ (int) p->elen, p->e, p->elen, wlen));
op_found = NULL;
oplen_found = 0;
for (op = p->table; op->name != NULL; op++)
{
if (op->type == MPEXPR_TYPE_NEW_TABLE)
- {
- printf ("new\n");
- op = (struct mpexpr_operator_t *) op->name - 1;
- continue;
- }
+ {
+ printf ("new\n");
+ op = (struct mpexpr_operator_t *) op->name - 1;
+ continue;
+ }
oplen = strlen (op->name);
if (! ((WHOLEWORD (op) ? wlen == oplen : p->elen >= oplen)
- && memcmp (p->e, op->name, oplen) == 0))
- continue;
+ && memcmp (p->e, op->name, oplen) == 0))
+ continue;
/* Shorter matches don't replace longer previous ones. */
if (op_found && oplen < oplen_found)
- continue;
+ continue;
/* On a match of equal length to a previous one, the old match isn't
- replaced if it has the preferred prefix, and if it doesn't then
- it's not replaced if the new one also doesn't. */
+ replaced if it has the preferred prefix, and if it doesn't then
+ it's not replaced if the new one also doesn't. */
if (op_found && oplen == oplen_found
- && ((op_found->type & MPEXPR_TYPE_PREFIX) == prefix
- || (op->type & MPEXPR_TYPE_PREFIX) != prefix))
- continue;
+ && ((op_found->type & MPEXPR_TYPE_PREFIX) == prefix
+ || (op->type & MPEXPR_TYPE_PREFIX) != prefix))
+ continue;
/* This is now either the first match seen, or a longer than previous
- match, or an equal to previous one but with a preferred prefix. */
+ match, or an equal to previous one but with a preferred prefix. */
op_found = op;
oplen_found = oplen;
}
@@ -200,30 +200,30 @@ lookahead (struct mpexpr_parse_t *p, int prefix)
p->e += oplen_found, p->elen -= oplen_found;
if (op_found->type == MPEXPR_TYPE_VARIABLE)
- {
- if (p->elen == 0)
- ERROR ("end of string expecting a variable",
- MPEXPR_RESULT_PARSE_ERROR);
- i = p->e[0] - 'a';
- if (i < 0 || i >= MPEXPR_VARIABLES)
- ERROR ("bad variable name", MPEXPR_RESULT_BAD_VARIABLE);
- goto variable;
- }
+ {
+ if (p->elen == 0)
+ ERROR ("end of string expecting a variable",
+ MPEXPR_RESULT_PARSE_ERROR);
+ i = p->e[0] - 'a';
+ if (i < 0 || i >= MPEXPR_VARIABLES)
+ ERROR ("bad variable name", MPEXPR_RESULT_BAD_VARIABLE);
+ goto variable;
+ }
if (op_found->precedence == 0)
- {
- TRACE (printf ("lookahead function: %s\n", op_found->name));
- p->token = TOKEN_FUNCTION;
- p->token_op = op_found;
- return 1;
- }
+ {
+ TRACE (printf ("lookahead function: %s\n", op_found->name));
+ p->token = TOKEN_FUNCTION;
+ p->token_op = op_found;
+ return 1;
+ }
else
- {
- TRACE (printf ("lookahead operator: %s\n", op_found->name));
- p->token = TOKEN_OPERATOR;
- p->token_op = op_found;
- return 1;
- }
+ {
+ TRACE (printf ("lookahead operator: %s\n", op_found->name));
+ p->token = TOKEN_OPERATOR;
+ p->token_op = op_found;
+ return 1;
+ }
}
oplen = (*p->mpX_number) (SP+1, p->e, p->elen, p->base);
@@ -243,9 +243,9 @@ lookahead (struct mpexpr_parse_t *p, int prefix)
variable:
p->e++, p->elen--;
if (p->var[i] == NULL)
- ERROR ("NULL variable", MPEXPR_RESULT_BAD_VARIABLE);
+ ERROR ("NULL variable", MPEXPR_RESULT_BAD_VARIABLE);
TRACE (printf ("lookahead variable: var[%d] = ", i);
- MPX_TRACE ("", p->var[i]));
+ MPX_TRACE ("", p->var[i]));
p->token = TOKEN_VALUE;
DATA_PUSH ();
(*p->mpX_set) (SP, p->var[i]);
@@ -267,9 +267,9 @@ lookahead (struct mpexpr_parse_t *p, int prefix)
do { \
if (p->control_top + 1 >= p->control_alloc) \
{ \
- TRACE (printf ("grow control stack from %d\n", p->control_alloc)); \
- REALLOC (p->control_stack, p->control_alloc, 20, \
- struct mpexpr_control_t); \
+ TRACE (printf ("grow control stack from %d\n", p->control_alloc)); \
+ REALLOC (p->control_stack, p->control_alloc, 20, \
+ struct mpexpr_control_t); \
} \
} while (0)
@@ -303,8 +303,8 @@ lookahead (struct mpexpr_parse_t *p, int prefix)
printf ("%s depth %d:", str, p->control_top); \
for (i = 0; i <= p->control_top; i++) \
printf (" \"%s\"(%d)", \
- p->control_stack[i].op->name, \
- p->control_stack[i].argcount); \
+ p->control_stack[i].op->name, \
+ p->control_stack[i].argcount); \
printf ("\n"); \
});
@@ -325,9 +325,9 @@ lookahead (struct mpexpr_parse_t *p, int prefix)
do { \
if (CP->argcount != (n)) \
{ \
- TRACE (printf ("wrong number of arguments for %s, got %d want %d", \
- str, CP->argcount, n)); \
- ERROR ("", MPEXPR_RESULT_PARSE_ERROR); \
+ TRACE (printf ("wrong number of arguments for %s, got %d want %d", \
+ str, CP->argcount, n)); \
+ ERROR ("", MPEXPR_RESULT_PARSE_ERROR); \
} \
} while (0)
@@ -366,7 +366,7 @@ mpexpr_evaluate (struct mpexpr_parse_t *p)
mp_get_memory_functions (&allocate_func, &reallocate_func, &free_func);
TRACE (printf ("mpexpr_evaluate() base %d \"%.*s\"\n",
- p->base, (int) p->elen, p->e));
+ p->base, (int) p->elen, p->e));
/* "done" is a special sentinel at the bottom of the control stack,
precedence -1 is lower than any normal operator. */
@@ -376,7 +376,7 @@ mpexpr_evaluate (struct mpexpr_parse_t *p)
p->control_alloc = 20;
p->control_stack = ALLOCATE_FUNC_TYPE (p->control_alloc,
- struct mpexpr_control_t);
+ struct mpexpr_control_t);
p->control_top = 0;
CP->op = &operator_done;
CP->argcount = 1;
@@ -415,19 +415,19 @@ mpexpr_evaluate (struct mpexpr_parse_t *p)
LOOKAHEAD (MPEXPR_TYPE_PREFIX);
if (! (p->token == TOKEN_OPERATOR
- && p->token_op->type == MPEXPR_TYPE_OPENPAREN))
+ && p->token_op->type == MPEXPR_TYPE_OPENPAREN))
ERROR ("expected open paren for function", MPEXPR_RESULT_PARSE_ERROR);
TRACE (printf ("open paren for function \"%s\"\n", CP->op->name));
if ((CP->op->type & MPEXPR_TYPE_MASK_ARGCOUNT) == MPEXPR_TYPE_NARY(0))
{
- LOOKAHEAD (0);
- if (! (p->token == TOKEN_OPERATOR
- && p->token_op->type == MPEXPR_TYPE_CLOSEPAREN))
- ERROR ("expected close paren for 0ary function",
- MPEXPR_RESULT_PARSE_ERROR);
- goto apply_control_lookahead;
+ LOOKAHEAD (0);
+ if (! (p->token == TOKEN_OPERATOR
+ && p->token_op->type == MPEXPR_TYPE_CLOSEPAREN))
+ ERROR ("expected close paren for 0ary function",
+ MPEXPR_RESULT_PARSE_ERROR);
+ goto apply_control_lookahead;
}
goto another_expr_lookahead;
@@ -455,51 +455,51 @@ mpexpr_evaluate (struct mpexpr_parse_t *p)
|| ((tprec) == (cprec) && ! ((ttype) & MPEXPR_TYPE_RIGHTASSOC)))
if (PRECEDENCE_TEST_REDUCE (p->token_op->precedence, CP->op->precedence,
- p->token_op->type, CP->op->type))
+ p->token_op->type, CP->op->type))
{
- TRACE (printf ("defer operator: %s (prec %d vs %d, type 0x%X)\n",
- p->token_op->name,
- p->token_op->precedence, CP->op->precedence,
- p->token_op->type));
- goto apply_control;
+ TRACE (printf ("defer operator: %s (prec %d vs %d, type 0x%X)\n",
+ p->token_op->name,
+ p->token_op->precedence, CP->op->precedence,
+ p->token_op->type));
+ goto apply_control;
}
/* An argsep is a binary operator, but is never pushed on the control
stack, it just accumulates an extra argument for a function. */
if (p->token_op->type == MPEXPR_TYPE_ARGSEP)
{
- if (CP->op->precedence != 0)
- ERROR ("ARGSEP not in a function call", MPEXPR_RESULT_PARSE_ERROR);
+ if (CP->op->precedence != 0)
+ ERROR ("ARGSEP not in a function call", MPEXPR_RESULT_PARSE_ERROR);
- TRACE (printf ("argsep for function \"%s\"(%d)\n",
- CP->op->name, CP->argcount));
+ TRACE (printf ("argsep for function \"%s\"(%d)\n",
+ CP->op->name, CP->argcount));
#define IS_PAIRWISE(type) \
- (((type) & (MPEXPR_TYPE_MASK_ARGCOUNT | MPEXPR_TYPE_PAIRWISE)) \
- == (MPEXPR_TYPE_BINARY | MPEXPR_TYPE_PAIRWISE))
-
- if (IS_PAIRWISE (CP->op->type) && CP->argcount >= 2)
- {
- TRACE (printf (" will reduce pairwise now\n"));
- CP->argcount--;
- CONTROL_PUSH (CP->op, 2);
- goto apply_control;
- }
-
- CP->argcount++;
- goto another_expr_lookahead;
+ (((type) & (MPEXPR_TYPE_MASK_ARGCOUNT | MPEXPR_TYPE_PAIRWISE)) \
+ == (MPEXPR_TYPE_BINARY | MPEXPR_TYPE_PAIRWISE))
+
+ if (IS_PAIRWISE (CP->op->type) && CP->argcount >= 2)
+ {
+ TRACE (printf (" will reduce pairwise now\n"));
+ CP->argcount--;
+ CONTROL_PUSH (CP->op, 2);
+ goto apply_control;
+ }
+
+ CP->argcount++;
+ goto another_expr_lookahead;
}
switch (p->token_op->type & MPEXPR_TYPE_MASK_ARGCOUNT) {
case MPEXPR_TYPE_NARY(1):
/* Postfix unary operators can always be applied immediately. The
- easiest way to do this is just push it on the control stack and go
- to the normal control stack reduction code. */
+ easiest way to do this is just push it on the control stack and go
+ to the normal control stack reduction code. */
TRACE (printf ("postfix unary operator: %s\n", p->token_op->name));
if (p->token_op->type & MPEXPR_TYPE_PREFIX)
- ERROR ("prefix unary operator used postfix",
- MPEXPR_RESULT_PARSE_ERROR);
+ ERROR ("prefix unary operator used postfix",
+ MPEXPR_RESULT_PARSE_ERROR);
CONTROL_PUSH (p->token_op, 1);
goto apply_control_lookahead;
@@ -513,7 +513,7 @@ mpexpr_evaluate (struct mpexpr_parse_t *p)
}
TRACE (printf ("unrecognised operator \"%s\" type: 0x%X",
- CP->op->name, CP->op->type));
+ CP->op->name, CP->op->type));
ERROR ("", MPEXPR_RESULT_PARSE_ERROR);
break;
@@ -534,10 +534,10 @@ mpexpr_evaluate (struct mpexpr_parse_t *p)
otherwise recognise the various uses of SP as common subexpressions. */
TRACE (printf ("apply control: nested %d, \"%s\" 0x%X, %d args\n",
- p->control_top, CP->op->name, CP->op->type, CP->argcount));
+ p->control_top, CP->op->name, CP->op->type, CP->argcount));
TRACE (printf ("apply 0x%X-ary\n",
- CP->op->type & MPEXPR_TYPE_MASK_ARGCOUNT));
+ CP->op->type & MPEXPR_TYPE_MASK_ARGCOUNT));
switch (CP->op->type & MPEXPR_TYPE_MASK_ARGCOUNT) {
case MPEXPR_TYPE_NARY(0):
{
@@ -547,14 +547,14 @@ mpexpr_evaluate (struct mpexpr_parse_t *p)
sp = SP;
switch (CP->op->type & MPEXPR_TYPE_MASK_ARGSTYLE) {
case 0:
- (* (mpexpr_fun_0ary_t) CP->op->fun) (sp);
- break;
+ (* (mpexpr_fun_0ary_t) CP->op->fun) (sp);
+ break;
case MPEXPR_TYPE_RESULT_INT:
- (*p->mpX_set_si) (sp, (long) (* (mpexpr_fun_i_0ary_t) CP->op->fun) ());
- break;
+ (*p->mpX_set_si) (sp, (long) (* (mpexpr_fun_i_0ary_t) CP->op->fun) ());
+ break;
default:
- ERROR ("unrecognised 0ary argument calling style",
- MPEXPR_RESULT_BAD_TABLE);
+ ERROR ("unrecognised 0ary argument calling style",
+ MPEXPR_RESULT_BAD_TABLE);
}
}
break;
@@ -567,63 +567,63 @@ mpexpr_evaluate (struct mpexpr_parse_t *p)
switch (CP->op->type & MPEXPR_TYPE_MASK_SPECIAL) {
case 0:
- /* not a special */
- break;
+ /* not a special */
+ break;
case MPEXPR_TYPE_DONE & MPEXPR_TYPE_MASK_SPECIAL:
- TRACE (printf ("special done\n"));
- goto done;
+ TRACE (printf ("special done\n"));
+ goto done;
case MPEXPR_TYPE_LOGICAL_NOT & MPEXPR_TYPE_MASK_SPECIAL:
- TRACE (printf ("special logical not\n"));
- (*p->mpX_set_si)
- (sp, (long) ((* (mpexpr_fun_i_unary_t) CP->op->fun) (sp) == 0));
- goto apply_control_done;
+ TRACE (printf ("special logical not\n"));
+ (*p->mpX_set_si)
+ (sp, (long) ((* (mpexpr_fun_i_unary_t) CP->op->fun) (sp) == 0));
+ goto apply_control_done;
case MPEXPR_TYPE_CLOSEPAREN & MPEXPR_TYPE_MASK_SPECIAL:
- CONTROL_POP ();
- if (CP->op->type == MPEXPR_TYPE_OPENPAREN)
- {
- TRACE (printf ("close paren matching open paren\n"));
- CONTROL_POP ();
- goto another_operator;
- }
- if (CP->op->precedence == 0)
- {
- TRACE (printf ("close paren for function\n"));
- goto apply_control;
- }
- ERROR ("unexpected close paren", MPEXPR_RESULT_PARSE_ERROR);
+ CONTROL_POP ();
+ if (CP->op->type == MPEXPR_TYPE_OPENPAREN)
+ {
+ TRACE (printf ("close paren matching open paren\n"));
+ CONTROL_POP ();
+ goto another_operator;
+ }
+ if (CP->op->precedence == 0)
+ {
+ TRACE (printf ("close paren for function\n"));
+ goto apply_control;
+ }
+ ERROR ("unexpected close paren", MPEXPR_RESULT_PARSE_ERROR);
default:
- TRACE (printf ("unrecognised special unary operator 0x%X",
- CP->op->type & MPEXPR_TYPE_MASK_SPECIAL));
- ERROR ("", MPEXPR_RESULT_BAD_TABLE);
+ TRACE (printf ("unrecognised special unary operator 0x%X",
+ CP->op->type & MPEXPR_TYPE_MASK_SPECIAL));
+ ERROR ("", MPEXPR_RESULT_BAD_TABLE);
}
switch (CP->op->type & MPEXPR_TYPE_MASK_ARGSTYLE) {
case 0:
- (* (mpexpr_fun_unary_t) CP->op->fun) (sp, sp);
- break;
+ (* (mpexpr_fun_unary_t) CP->op->fun) (sp, sp);
+ break;
case MPEXPR_TYPE_LAST_UI:
- CHECK_UI (sp);
- (* (mpexpr_fun_unary_ui_t) CP->op->fun)
- (sp, (*p->mpX_get_ui) (sp));
- break;
+ CHECK_UI (sp);
+ (* (mpexpr_fun_unary_ui_t) CP->op->fun)
+ (sp, (*p->mpX_get_ui) (sp));
+ break;
case MPEXPR_TYPE_RESULT_INT:
- (*p->mpX_set_si)
- (sp, (long) (* (mpexpr_fun_i_unary_t) CP->op->fun) (sp));
- break;
+ (*p->mpX_set_si)
+ (sp, (long) (* (mpexpr_fun_i_unary_t) CP->op->fun) (sp));
+ break;
case MPEXPR_TYPE_RESULT_INT | MPEXPR_TYPE_LAST_UI:
- CHECK_UI (sp);
- (*p->mpX_set_si)
- (sp,
- (long) (* (mpexpr_fun_i_unary_ui_t) CP->op->fun)
- ((*p->mpX_get_ui) (sp)));
- break;
+ CHECK_UI (sp);
+ (*p->mpX_set_si)
+ (sp,
+ (long) (* (mpexpr_fun_i_unary_ui_t) CP->op->fun)
+ ((*p->mpX_get_ui) (sp)));
+ break;
default:
- ERROR ("unrecognised unary argument calling style",
- MPEXPR_RESULT_BAD_TABLE);
+ ERROR ("unrecognised unary argument calling style",
+ MPEXPR_RESULT_BAD_TABLE);
}
}
break;
@@ -634,113 +634,113 @@ mpexpr_evaluate (struct mpexpr_parse_t *p)
/* pairwise functions are allowed to have just one argument */
if ((CP->op->type & MPEXPR_TYPE_PAIRWISE)
- && CP->op->precedence == 0
- && CP->argcount == 1)
- goto apply_control_done;
+ && CP->op->precedence == 0
+ && CP->argcount == 1)
+ goto apply_control_done;
CHECK_ARGCOUNT ("binary", 2);
DATA_POP (1);
sp = SP;
TRACE (MPX_TRACE ("lhs", sp);
- MPX_TRACE ("rhs", sp+1));
+ MPX_TRACE ("rhs", sp+1));
if (CP->op->type & MPEXPR_TYPE_MASK_CMP)
- {
- int type = CP->op->type;
- int cmp = (* (mpexpr_fun_i_binary_t) CP->op->fun)
- (sp, sp+1);
- (*p->mpX_set_si)
- (sp,
- (long)
- (( (cmp < 0) & ((type & MPEXPR_TYPE_MASK_CMP_LT) != 0))
- | ((cmp == 0) & ((type & MPEXPR_TYPE_MASK_CMP_EQ) != 0))
- | ((cmp > 0) & ((type & MPEXPR_TYPE_MASK_CMP_GT) != 0))));
- goto apply_control_done;
- }
+ {
+ int type = CP->op->type;
+ int cmp = (* (mpexpr_fun_i_binary_t) CP->op->fun)
+ (sp, sp+1);
+ (*p->mpX_set_si)
+ (sp,
+ (long)
+ (( (cmp < 0) & ((type & MPEXPR_TYPE_MASK_CMP_LT) != 0))
+ | ((cmp == 0) & ((type & MPEXPR_TYPE_MASK_CMP_EQ) != 0))
+ | ((cmp > 0) & ((type & MPEXPR_TYPE_MASK_CMP_GT) != 0))));
+ goto apply_control_done;
+ }
switch (CP->op->type & MPEXPR_TYPE_MASK_SPECIAL) {
case 0:
- /* not a special */
- break;
+ /* not a special */
+ break;
case MPEXPR_TYPE_QUESTION & MPEXPR_TYPE_MASK_SPECIAL:
- ERROR ("'?' without ':'", MPEXPR_RESULT_PARSE_ERROR);
+ ERROR ("'?' without ':'", MPEXPR_RESULT_PARSE_ERROR);
case MPEXPR_TYPE_COLON & MPEXPR_TYPE_MASK_SPECIAL:
- TRACE (printf ("special colon\n"));
- CONTROL_POP ();
- if (CP->op->type != MPEXPR_TYPE_QUESTION)
- ERROR ("':' without '?'", MPEXPR_RESULT_PARSE_ERROR);
-
- CP->argcount--;
- DATA_POP (1);
- sp--;
- TRACE (MPX_TRACE ("query", sp);
- MPX_TRACE ("true", sp+1);
- MPX_TRACE ("false", sp+2));
- (*p->mpX_set)
- (sp, (* (mpexpr_fun_i_unary_t) CP->op->fun) (sp)
- ? sp+1 : sp+2);
- goto apply_control_done;
+ TRACE (printf ("special colon\n"));
+ CONTROL_POP ();
+ if (CP->op->type != MPEXPR_TYPE_QUESTION)
+ ERROR ("':' without '?'", MPEXPR_RESULT_PARSE_ERROR);
+
+ CP->argcount--;
+ DATA_POP (1);
+ sp--;
+ TRACE (MPX_TRACE ("query", sp);
+ MPX_TRACE ("true", sp+1);
+ MPX_TRACE ("false", sp+2));
+ (*p->mpX_set)
+ (sp, (* (mpexpr_fun_i_unary_t) CP->op->fun) (sp)
+ ? sp+1 : sp+2);
+ goto apply_control_done;
case MPEXPR_TYPE_LOGICAL_AND & MPEXPR_TYPE_MASK_SPECIAL:
- TRACE (printf ("special logical and\n"));
- (*p->mpX_set_si)
- (sp,
- (long)
- ((* (mpexpr_fun_i_unary_t) CP->op->fun) (sp)
- && (* (mpexpr_fun_i_unary_t) CP->op->fun) (sp+1)));
- goto apply_control_done;
+ TRACE (printf ("special logical and\n"));
+ (*p->mpX_set_si)
+ (sp,
+ (long)
+ ((* (mpexpr_fun_i_unary_t) CP->op->fun) (sp)
+ && (* (mpexpr_fun_i_unary_t) CP->op->fun) (sp+1)));
+ goto apply_control_done;
case MPEXPR_TYPE_LOGICAL_OR & MPEXPR_TYPE_MASK_SPECIAL:
- TRACE (printf ("special logical and\n"));
- (*p->mpX_set_si)
- (sp,
- (long)
- ((* (mpexpr_fun_i_unary_t) CP->op->fun) (sp)
- || (* (mpexpr_fun_i_unary_t) CP->op->fun) (sp+1)));
- goto apply_control_done;
+ TRACE (printf ("special logical and\n"));
+ (*p->mpX_set_si)
+ (sp,
+ (long)
+ ((* (mpexpr_fun_i_unary_t) CP->op->fun) (sp)
+ || (* (mpexpr_fun_i_unary_t) CP->op->fun) (sp+1)));
+ goto apply_control_done;
case MPEXPR_TYPE_MAX & MPEXPR_TYPE_MASK_SPECIAL:
- TRACE (printf ("special max\n"));
- if ((* (mpexpr_fun_i_binary_t) CP->op->fun) (sp, sp+1) < 0)
- (*p->mpX_swap) (sp, sp+1);
- goto apply_control_done;
+ TRACE (printf ("special max\n"));
+ if ((* (mpexpr_fun_i_binary_t) CP->op->fun) (sp, sp+1) < 0)
+ (*p->mpX_swap) (sp, sp+1);
+ goto apply_control_done;
case MPEXPR_TYPE_MIN & MPEXPR_TYPE_MASK_SPECIAL:
- TRACE (printf ("special min\n"));
- if ((* (mpexpr_fun_i_binary_t) CP->op->fun) (sp, sp+1) > 0)
- (*p->mpX_swap) (sp, sp+1);
- goto apply_control_done;
+ TRACE (printf ("special min\n"));
+ if ((* (mpexpr_fun_i_binary_t) CP->op->fun) (sp, sp+1) > 0)
+ (*p->mpX_swap) (sp, sp+1);
+ goto apply_control_done;
default:
- ERROR ("unrecognised special binary operator",
- MPEXPR_RESULT_BAD_TABLE);
+ ERROR ("unrecognised special binary operator",
+ MPEXPR_RESULT_BAD_TABLE);
}
switch (CP->op->type & MPEXPR_TYPE_MASK_ARGSTYLE) {
case 0:
- (* (mpexpr_fun_binary_t) CP->op->fun) (sp, sp, sp+1);
- break;
+ (* (mpexpr_fun_binary_t) CP->op->fun) (sp, sp, sp+1);
+ break;
case MPEXPR_TYPE_LAST_UI:
- CHECK_UI (sp+1);
- (* (mpexpr_fun_binary_ui_t) CP->op->fun)
- (sp, sp, (*p->mpX_get_ui) (sp+1));
- break;
+ CHECK_UI (sp+1);
+ (* (mpexpr_fun_binary_ui_t) CP->op->fun)
+ (sp, sp, (*p->mpX_get_ui) (sp+1));
+ break;
case MPEXPR_TYPE_RESULT_INT:
- (*p->mpX_set_si)
- (sp,
- (long) (* (mpexpr_fun_i_binary_t) CP->op->fun) (sp, sp+1));
- break;
+ (*p->mpX_set_si)
+ (sp,
+ (long) (* (mpexpr_fun_i_binary_t) CP->op->fun) (sp, sp+1));
+ break;
case MPEXPR_TYPE_LAST_UI | MPEXPR_TYPE_RESULT_INT:
- CHECK_UI (sp+1);
- (*p->mpX_set_si)
- (sp,
- (long) (* (mpexpr_fun_i_binary_ui_t) CP->op->fun)
- (sp, (*p->mpX_get_ui) (sp+1)));
- break;
+ CHECK_UI (sp+1);
+ (*p->mpX_set_si)
+ (sp,
+ (long) (* (mpexpr_fun_i_binary_ui_t) CP->op->fun)
+ (sp, (*p->mpX_get_ui) (sp+1)));
+ break;
default:
- ERROR ("unrecognised binary argument calling style",
- MPEXPR_RESULT_BAD_TABLE);
+ ERROR ("unrecognised binary argument calling style",
+ MPEXPR_RESULT_BAD_TABLE);
}
}
break;
@@ -753,34 +753,34 @@ mpexpr_evaluate (struct mpexpr_parse_t *p)
DATA_POP (2);
sp = SP;
TRACE (MPX_TRACE ("arg1", sp);
- MPX_TRACE ("arg2", sp+1);
- MPX_TRACE ("arg3", sp+1));
+ MPX_TRACE ("arg2", sp+1);
+ MPX_TRACE ("arg3", sp+1));
switch (CP->op->type & MPEXPR_TYPE_MASK_ARGSTYLE) {
case 0:
- (* (mpexpr_fun_ternary_t) CP->op->fun) (sp, sp, sp+1, sp+2);
- break;
+ (* (mpexpr_fun_ternary_t) CP->op->fun) (sp, sp, sp+1, sp+2);
+ break;
case MPEXPR_TYPE_LAST_UI:
- CHECK_UI (sp+2);
- (* (mpexpr_fun_ternary_ui_t) CP->op->fun)
- (sp, sp, sp+1, (*p->mpX_get_ui) (sp+2));
- break;
+ CHECK_UI (sp+2);
+ (* (mpexpr_fun_ternary_ui_t) CP->op->fun)
+ (sp, sp, sp+1, (*p->mpX_get_ui) (sp+2));
+ break;
case MPEXPR_TYPE_RESULT_INT:
- (*p->mpX_set_si)
- (sp,
- (long) (* (mpexpr_fun_i_ternary_t) CP->op->fun)
- (sp, sp+1, sp+2));
- break;
+ (*p->mpX_set_si)
+ (sp,
+ (long) (* (mpexpr_fun_i_ternary_t) CP->op->fun)
+ (sp, sp+1, sp+2));
+ break;
case MPEXPR_TYPE_LAST_UI | MPEXPR_TYPE_RESULT_INT:
- CHECK_UI (sp+2);
- (*p->mpX_set_si)
- (sp,
- (long) (* (mpexpr_fun_i_ternary_ui_t) CP->op->fun)
- (sp, sp+1, (*p->mpX_get_ui) (sp+2)));
- break;
+ CHECK_UI (sp+2);
+ (*p->mpX_set_si)
+ (sp,
+ (long) (* (mpexpr_fun_i_ternary_ui_t) CP->op->fun)
+ (sp, sp+1, (*p->mpX_get_ui) (sp+2)));
+ break;
default:
- ERROR ("unrecognised binary argument calling style",
- MPEXPR_RESULT_BAD_TABLE);
+ ERROR ("unrecognised binary argument calling style",
+ MPEXPR_RESULT_BAD_TABLE);
}
}
break;
@@ -799,20 +799,20 @@ mpexpr_evaluate (struct mpexpr_parse_t *p)
if (p->error_code == MPEXPR_RESULT_OK)
{
if (p->data_top != 0)
- {
- TRACE (printf ("data stack want top at 0, got %d\n", p->data_top));
- p->error_code = MPEXPR_RESULT_PARSE_ERROR;
- }
+ {
+ TRACE (printf ("data stack want top at 0, got %d\n", p->data_top));
+ p->error_code = MPEXPR_RESULT_PARSE_ERROR;
+ }
else
- (*p->mpX_set_or_swap) (p->res, SP);
+ (*p->mpX_set_or_swap) (p->res, SP);
}
{
int i;
for (i = 0; i < p->data_inited; i++)
{
- TRACE (printf ("clear %d\n", i));
- (*p->mpX_clear) (p->data_stack+i);
+ TRACE (printf ("clear %d\n", i));
+ (*p->mpX_clear) (p->data_stack+i);
}
}
diff --git a/demos/expr/expr.h b/demos/expr/expr.h
index a679f179d..c3525b61e 100644
--- a/demos/expr/expr.h
+++ b/demos/expr/expr.h
@@ -28,7 +28,7 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
#define MPEXPR_RESULT_NOT_UI 4
-/* basic types */
+/* basic types */
#define MPEXPR_TYPE_NARY(n) ((n) * 0x0100)
#define MPEXPR_TYPE_MASK_ARGCOUNT MPEXPR_TYPE_NARY(0xF)
#define MPEXPR_TYPE_0ARY MPEXPR_TYPE_NARY(0)
@@ -84,11 +84,11 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
#define MPEXPR_TYPE_MASK_CMP_EQ 0x002
#define MPEXPR_TYPE_MASK_CMP_GT 0x004
#define MPEXPR_TYPE_CMP_LT (MPEXPR_TYPE_BINARY | MPEXPR_TYPE_MASK_CMP \
- | MPEXPR_TYPE_MASK_CMP_LT)
+ | MPEXPR_TYPE_MASK_CMP_LT)
#define MPEXPR_TYPE_CMP_EQ (MPEXPR_TYPE_BINARY | MPEXPR_TYPE_MASK_CMP \
- | MPEXPR_TYPE_MASK_CMP_EQ)
+ | MPEXPR_TYPE_MASK_CMP_EQ)
#define MPEXPR_TYPE_CMP_GT (MPEXPR_TYPE_BINARY | MPEXPR_TYPE_MASK_CMP \
- | MPEXPR_TYPE_MASK_CMP_GT)
+ | MPEXPR_TYPE_MASK_CMP_GT)
#define MPEXPR_TYPE_CMP_LE (MPEXPR_TYPE_CMP_LT | MPEXPR_TYPE_MASK_CMP_EQ)
#define MPEXPR_TYPE_CMP_NE (MPEXPR_TYPE_CMP_LT | MPEXPR_TYPE_MASK_CMP_GT)
#define MPEXPR_TYPE_CMP_GE (MPEXPR_TYPE_CMP_GT | MPEXPR_TYPE_MASK_CMP_EQ)
@@ -109,21 +109,21 @@ struct mpexpr_operator_t {
int mpf_expr_a __GMP_PROTO ((__gmp_const struct mpexpr_operator_t *table,
- mpf_ptr res, int base, unsigned long prec,
- __gmp_const char *e, size_t elen,
- mpf_srcptr var[26]));
+ mpf_ptr res, int base, unsigned long prec,
+ __gmp_const char *e, size_t elen,
+ mpf_srcptr var[26]));
int mpf_expr __GMP_PROTO ((mpf_ptr res, int base, __gmp_const char *e, ...));
int mpq_expr_a __GMP_PROTO ((__gmp_const struct mpexpr_operator_t *table,
- mpq_ptr res, int base,
- __gmp_const char *e, size_t elen,
- mpq_srcptr var[26]));
+ mpq_ptr res, int base,
+ __gmp_const char *e, size_t elen,
+ mpq_srcptr var[26]));
int mpq_expr __GMP_PROTO ((mpq_ptr res, int base, __gmp_const char *e, ...));
int mpz_expr_a __GMP_PROTO ((__gmp_const struct mpexpr_operator_t *table,
- mpz_ptr res, int base,
- __gmp_const char *e, size_t elen,
- mpz_srcptr var[26]));
+ mpz_ptr res, int base,
+ __gmp_const char *e, size_t elen,
+ mpz_srcptr var[26]));
int mpz_expr __GMP_PROTO ((mpz_ptr res, int base, __gmp_const char *e, ...));
#endif
diff --git a/demos/expr/exprf.c b/demos/expr/exprf.c
index 584c19d92..c67ee5178 100644
--- a/demos/expr/exprf.c
+++ b/demos/expr/exprf.c
@@ -38,7 +38,7 @@ static __gmp_const struct mpexpr_operator_t _mpf_expr_standard_table[] = {
{ "**", (mpexpr_fun_t) mpf_pow_ui,
MPEXPR_TYPE_BINARY_UI | MPEXPR_TYPE_RIGHTASSOC, 220 },
-
+
{ "!", (mpexpr_fun_t) e_mpf_sgn,
MPEXPR_TYPE_LOGICAL_NOT | MPEXPR_TYPE_PREFIX, 210 },
{ "-", (mpexpr_fun_t) mpf_neg,
@@ -123,5 +123,5 @@ mpf_expr (va_alist)
return ret;
return mpf_expr_a (mpf_expr_standard_table, res, base,
- mpf_get_prec (res), e, strlen(e), var);
+ mpf_get_prec (res), e, strlen(e), var);
}
diff --git a/demos/expr/exprq.c b/demos/expr/exprq.c
index f648516f2..af91b0016 100644
--- a/demos/expr/exprq.c
+++ b/demos/expr/exprq.c
@@ -76,7 +76,7 @@ static __gmp_const struct mpexpr_operator_t _mpq_expr_standard_table[] = {
{ "**", (mpexpr_fun_t) e_mpq_pow_ui,
MPEXPR_TYPE_BINARY_UI | MPEXPR_TYPE_RIGHTASSOC, 220 },
-
+
{ "!", (mpexpr_fun_t) e_mpq_sgn,
MPEXPR_TYPE_LOGICAL_NOT | MPEXPR_TYPE_PREFIX, 210 },
{ "-", (mpexpr_fun_t) mpq_neg,
diff --git a/demos/expr/exprv.c b/demos/expr/exprv.c
index a01b47bdb..b53682eec 100644
--- a/demos/expr/exprv.c
+++ b/demos/expr/exprv.c
@@ -18,7 +18,6 @@ License for more details.
You should have received a copy of the GNU Lesser General Public License
along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
-
#include <stdio.h>
#include "gmp.h"
#include "expr-impl.h"
@@ -34,9 +33,9 @@ mpexpr_va_to_var (void *var[], va_list ap)
{
v = va_arg (ap, void *);
if (v == NULL)
- break;
+ break;
if (i >= MPEXPR_VARIABLES)
- return MPEXPR_RESULT_BAD_VARIABLE;
+ return MPEXPR_RESULT_BAD_VARIABLE;
var[i++] = v;
}
diff --git a/demos/expr/exprz.c b/demos/expr/exprz.c
index 33196001b..7c01b9dc5 100644
--- a/demos/expr/exprz.c
+++ b/demos/expr/exprz.c
@@ -90,8 +90,8 @@ static __gmp_const struct mpexpr_operator_t _mpz_expr_standard_table[] = {
{ "**", (mpexpr_fun_t) mpz_pow_ui,
MPEXPR_TYPE_BINARY_UI | MPEXPR_TYPE_RIGHTASSOC, 220 },
-
- { "~", (mpexpr_fun_t) mpz_com,
+
+ { "~", (mpexpr_fun_t) mpz_com,
MPEXPR_TYPE_UNARY | MPEXPR_TYPE_PREFIX, 210 },
{ "!", (mpexpr_fun_t) e_mpz_sgn,
MPEXPR_TYPE_LOGICAL_NOT | MPEXPR_TYPE_PREFIX, 210 },
@@ -141,18 +141,18 @@ static __gmp_const struct mpexpr_operator_t _mpz_expr_standard_table[] = {
{ "fib", (mpexpr_fun_t) mpz_fib_ui, MPEXPR_TYPE_UNARY_UI },
{ "fac", (mpexpr_fun_t) mpz_fac_ui, MPEXPR_TYPE_UNARY_UI },
{ "gcd", (mpexpr_fun_t) mpz_gcd, MPEXPR_TYPE_BINARY
- | MPEXPR_TYPE_PAIRWISE },
+ | MPEXPR_TYPE_PAIRWISE },
{ "hamdist", (mpexpr_fun_t) e_mpz_hamdist, MPEXPR_TYPE_BINARY },
{ "invert", (mpexpr_fun_t) mpz_invert, MPEXPR_TYPE_BINARY },
{ "jacobi", (mpexpr_fun_t) mpz_jacobi, MPEXPR_TYPE_I_BINARY },
{ "kronecker", (mpexpr_fun_t) mpz_kronecker, MPEXPR_TYPE_I_BINARY },
{ "lcm", (mpexpr_fun_t) mpz_lcm, MPEXPR_TYPE_BINARY
- | MPEXPR_TYPE_PAIRWISE },
+ | MPEXPR_TYPE_PAIRWISE },
{ "lucnum", (mpexpr_fun_t) mpz_lucnum_ui, MPEXPR_TYPE_UNARY_UI },
{ "max", (mpexpr_fun_t) mpz_cmp, MPEXPR_TYPE_MAX
- | MPEXPR_TYPE_PAIRWISE },
+ | MPEXPR_TYPE_PAIRWISE },
{ "min", (mpexpr_fun_t) mpz_cmp, MPEXPR_TYPE_MIN
- | MPEXPR_TYPE_PAIRWISE },
+ | MPEXPR_TYPE_PAIRWISE },
{ "nextprime", (mpexpr_fun_t) mpz_nextprime, MPEXPR_TYPE_UNARY },
{ "odd_p", (mpexpr_fun_t) e_mpz_odd_p, MPEXPR_TYPE_I_UNARY },
{ "perfect_power_p", (mpexpr_fun_t)mpz_perfect_power_p, MPEXPR_TYPE_I_UNARY},
@@ -208,4 +208,3 @@ mpz_expr (va_alist)
return mpz_expr_a (mpz_expr_standard_table, res, base, e, strlen(e), var);
}
-
diff --git a/demos/perl/GMP.xs b/demos/perl/GMP.xs
index c9e4a79f3..2282c8928 100644
--- a/demos/perl/GMP.xs
+++ b/demos/perl/GMP.xs
@@ -63,7 +63,7 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/.
#define NDEBUG
/* Change this to "#define TRACE(x) x" for some diagnostics. */
-#define TRACE(x)
+#define TRACE(x)
#include <assert.h>
diff --git a/demos/perl/test.pl b/demos/perl/test.pl
index 9edb08f0e..40a903378 100644
--- a/demos/perl/test.pl
+++ b/demos/perl/test.pl
@@ -781,7 +781,7 @@ foreach my $i ([ 1, 19, 1 ],
ok (&$fun (mpz($$i[0]), $$i[1]) == $$i[2]);
ok (&$fun (mpz($$i[0]), mpz($$i[1])) == $$i[2]);
}
-}
+}
#------------------------------------------------------------------------------
# GMP::Mpz::lcm
@@ -1677,7 +1677,7 @@ ok (floor(mpf(7.5)) == 7.0);
{ my $old_prec = get_default_prec();
set_default_prec(128);
-
+
ok ( mpf_eq (mpz("0x10000000000000001"), mpz("0x10000000000000002"), 1));
ok (! mpf_eq (mpz("0x11"), mpz("0x12"), 128));
@@ -1789,7 +1789,7 @@ ok (trunc(mpf(7.5)) == 7.0);
{ my $r = randstate();
my $z = mpz_urandomm($r, mpz(3)**100);
ok (UNIVERSAL::isa($z,"GMP::Mpz")); }
-
+
#------------------------------------------------------------------------------
# GMP::Rand::mpz_urandomb_ui
@@ -2100,7 +2100,7 @@ ok (via_printf ("%#X", mpq(15,16)) eq '0XF/0X10');
ok (via_printf ("%*.*f", 10, 3, 1.25) eq ' 1.250');
ok (via_printf ("%*.*f", 10, 3, mpf(1.5)) eq ' 1.500');
-
+
#------------------------------------------------------------------------------
# GMP::sgn
diff --git a/demos/perl/test2.pl b/demos/perl/test2.pl
index 0f30326ca..645d3cfbb 100644
--- a/demos/perl/test2.pl
+++ b/demos/perl/test2.pl
@@ -28,14 +28,14 @@ use GMP::Mpz qw(:constants);
ok (UNIVERSAL::isa ($a, "GMP::Mpz"));
}
use GMP::Mpz qw(:noconstants);
-
+
use GMP::Mpq qw(:constants);
{
my $a = 123;
ok (UNIVERSAL::isa ($a, "GMP::Mpq"));
}
use GMP::Mpq qw(:noconstants);
-
+
use GMP::Mpf qw(:constants);
{
my $a = 123;