Release calc version 2.11.2t1

This commit is contained in:
Landon Curt Noll
2000-12-15 07:34:07 -08:00
parent 5e098d2adf
commit 296aa50ac7
52 changed files with 1670 additions and 4777 deletions

13
token.c
View File

@@ -19,8 +19,8 @@
* received a copy with calc; if not, write to Free Software Foundation, Inc.
* 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* @(#) $Revision: 29.4 $
* @(#) $Id: token.c,v 29.4 2000/07/17 15:35:49 chongo Exp $
* @(#) $Revision: 29.3 $
* @(#) $Id: token.c,v 29.3 2000/06/07 14:02:13 chongo Exp $
* @(#) $Source: /usr/local/src/cmd/calc/RCS/token.c,v $
*
* Under source code control: 1990/02/15 01:48:25
@@ -178,8 +178,8 @@ gettoken(void)
type = T_NULL;
while (type == T_NULL) {
ch = nextchar();
if (allsyms && ch!=' ' && ch!=';' && ch!='"' &&
ch!='\'' && ch!='\n' && ch!=EOF) {
if (allsyms && ((ch!=' ') &&
(ch!=';') && (ch!='"') && (ch!='\n'))) {
reread();
type = eatsymbol();
break;
@@ -566,11 +566,10 @@ eatsymbol(void)
if (allsyms) {
for (;;) {
ch = nextchar();
if (ch == ' ' || ch == ';' ||
ch == '\n' || ch == EOF)
if ((ch == ' ') || (ch == ';') || (ch == '\n'))
break;
if (cc-- > 0)
*cp++ = (char) ch;
*cp++ = (char)ch;
}
reread();
*cp = '\0';