--- freem/src/operator.c 2025/03/09 15:20:18 1.4 +++ freem/src/operator.c 2025/05/05 19:34:46 1.8 @@ -1,23 +1,11 @@ /* - * * - * * * - * * * - * *************** - * * * * * - * * MUMPS * - * * * * * - * *************** - * * * - * * * - * * - * - * operator.c + * $Id: operator.c,v 1.8 2025/05/05 19:34:46 snw Exp $ * operators pattern-match, divide, multiply, add, power * * * Author: Serena Willis * Copyright (C) 1998 MUG Deutschland - * Copyright (C) 2020 Coherent Logic Development LLC + * Copyright (C) 2020, 2025 Coherent Logic Development LLC * * * This file is part of FreeM. @@ -35,6 +23,22 @@ * You should have received a copy of the GNU Affero Public License * along with FreeM. If not, see . * + * $Log: operator.c,v $ + * Revision 1.8 2025/05/05 19:34:46 snw + * Fix E notation code to disallow more than one minus sign after the E + * + * Revision 1.7 2025/04/10 01:24:38 snw + * Remove C++ style comments + * + * Revision 1.6 2025/04/09 19:52:02 snw + * Eliminate as many warnings as possible while building with -Wall + * + * Revision 1.5 2025/03/09 19:50:47 snw + * Second phase of REUSE compliance and header reformat + * + * + * SPDX-FileCopyrightText: (C) 2025 Coherent Logic Development LLC + * SPDX-License-Identifier: AGPL-3.0-or-later **/ #include "mpsdef.h" @@ -801,8 +805,8 @@ void add (char *a, char *b) /* string mi = 1; a[0] = ZERO; } - while (a[mi] == ZERO) { - stcpy (&a[mi], &a[mi + 1]); + while (a[(int) mi] == ZERO) { + stcpy (&a[(int) mi], &a[((int) mi) + 1]); dpa--; } if (dpa < 0) @@ -830,7 +834,7 @@ void add (char *a, char *b) /* string } a[0] = MINUS; } - if (a[mi] == EOL) { + if (a[(int) mi] == EOL) { a[0] = ZERO; a[1] = EOL; } @@ -1128,7 +1132,7 @@ void mdiv (char *uu, char *v, short typ) case '#': snprintf (uu, STRLEN - 1, "%ld\201", (((long) fp_uu) % ((long) fp_v))); - //snprintf (uu, STRLEN - 1, "%ld\201", ((long) fp_uu < 0 ? (((long) fp_uu % (long) fp_v) + (long) fp_v) % (long) fp_v : (long) fp_uu % (long) fp_v)); + /*snprintf (uu, STRLEN - 1, "%ld\201", ((long) fp_uu < 0 ? (((long) fp_uu % (long) fp_v) + (long) fp_v) % (long) fp_v : (long) fp_uu % (long) fp_v)); */ break; } @@ -1974,6 +1978,10 @@ int numlit (char *str) } if (expflg) { if (ch == MINUS) { + if (str[i + 1] == '-') { + merr_raise (ILLOP); + return (0); + } expflg = (-expflg); continue; }