d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #66 from davidgiven/dtrg-warnings

Browse source 
lang/basic/lib: fewer warnings
This commit is contained in:
David Given 2017-11-19 11:39:45 +01:00 committed by GitHub
parent caa9df5449 0e020132f8
commit fb90b7b8d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 605 additions and 577 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lang/basic/lib/abs.c
View file

@ -5,11 +5,11 @@
* See the copyright notice in the ACK home directory, in the file "Copyright".
*/
long _abl(i) long i;
long _abl(long i)
{
return( i>=0?i:-i);
return (i >= 0 ? i : -i);
}
double _abr(f) double f;
double _abr(double f)
{
return( f>=0.0?f: -f);
return (f >= 0.0 ? f : -f);
}

7
lang/basic/lib/asc.c
View file

@ -2,10 +2,9 @@
/* $Id$ */
int _asc(str)
String *str;
int _asc(String* str)
{
if(str==0 || str->strval==0)
if (str == 0 || str->strval == 0)
error(3);
return( *str->strval);
return (*str->strval);
}

8
lang/basic/lib/asrt.c
View file

@ -1,8 +1,10 @@
/* $Id$ */
#include <stdio.h>
#include <stdlib.h>
asrt(b)
void asrt(int b)
{
if(!b){
if (!b)
{
printf("ASSERTION ERROR\n");
abort();
}

1
lang/basic/lib/atn.c
View file

@ -10,4 +10,3 @@
#include <math.h>
double _atn(double x) { return atan(x); }

17
lang/basic/lib/chr.c
View file

@ -2,16 +2,15 @@
/* $Id$ */
String *_chr(i)
int i;
String* _chr(int i)
{
String *s;
char buf[2];
String* s;
char buf[2];
if( i<0 || i>127)
if (i < 0 || i > 127)
error(3);
buf[0]=i;
buf[1]=0;
s= _newstr(buf);
return(s);
buf[0] = i;
buf[1] = 0;
s = _newstr(buf);
return (s);
}

50
lang/basic/lib/conversion.c
View file

@ -1,40 +1,44 @@
/* $Id$ */
int _cint(f) double f;
int _cint(double f)
{
int r;
if( f<-32768 || f>32767) error(4);
if(f<0)
r= f-0.5;
else r= f+0.5;
return(r);
if (f < -32768 || f > 32767)
error(4);
if (f < 0)
r = f - 0.5;
else
r = f + 0.5;
return (r);
}
double _trunc(f)
double f;
double _trunc(double f)
{
long d;
d=f;
f=d;
return( f );
d = f;
f = d;
return (f);
}
double _fcint(f) double f;
double _fcint(double f)
{
long r;
if(f<0){
r= -f;
r= -r -1;
}else r= f;
f=r;
return(f);
if (f < 0)
{
r = -f;
r = -r - 1;
}
else
r = f;
f = r;
return (f);
}
int _fix(f)
double f;
int _fix(double f)
{
int r;
if( f<-32768.0 || f>32767.0) error(4);
r= _sgn(f) * _fcint((f>0.0? f : -f));
return(r);
if (f < -32768.0 || f > 32767.0)
error(4);
r = _sgn(f) * _fcint((f > 0.0 ? f : -f));
return (r);
}

98
lang/basic/lib/error.c
View file

@ -7,58 +7,58 @@ int _erlsym;
/* error takes an error value in the range of 0-255 */
/* and generates a trap */
char *errortable[255]={
/* 0 */ "",
/* 1 */ "RETURN without GOSUB",
/* 2 */ "Out of data",
/* 3 */ "Illegal function call",
/* 4 */ "Overflow",
/* 5 */ "Out of memory",
/* 6 */ "Undefined line ",
/* 7 */ "Subscript out of range",
/* 8 */ "Redimensioned array",
/* 9 */ "Division by zero",
/* 10 */ "Illegal indirect",
/* 11 */ "Type mismatch",
/* 12 */ "Out of string space",
/* 13 */ "String too long",
/* 14 */ "String formula too complex",
/* 15 */ "Can't continue",
/* 16 */ "Undefined user function",
/* 17 */ "No resume",
/* 18 */ "Resume without error",
/* 19 */ "Unprintable error",
/* 20 */ "Missing operand",
/* 21 */ "Line buffer overflow",
/* 22 */ "FOR without NEXT",
/* 23 */ "WHILE without WEND",
/* 24 */ "WEND without WHILE",
/* 25 */ "Field overflow",
/* 26 */ "Internal error",
/* 27 */ "Bad file number",
/* 28 */ "File not found",
/* 29 */ "Bad file mode",
/* 30 */ "File already open",
/* 31 */ "Disk IO error",
/* 32 */ "File already exists",
/* 33 */ "Disk full",
/* 34 */ "Input past end",
/* 35 */ "Bad record number",
/* 36 */ "Bad file name",
/* 37 */ "Direct statement in file",
/* 38 */ "Too many files",
/* 39 */ "File not open",
/* 40 */ "Syntax error in data",
0
char* errortable[255] = {
/* 0 */ "",
/* 1 */ "RETURN without GOSUB",
/* 2 */ "Out of data",
/* 3 */ "Illegal function call",
/* 4 */ "Overflow",
/* 5 */ "Out of memory",
/* 6 */ "Undefined line ",
/* 7 */ "Subscript out of range",
/* 8 */ "Redimensioned array",
/* 9 */ "Division by zero",
/* 10 */ "Illegal indirect",
/* 11 */ "Type mismatch",
/* 12 */ "Out of string space",
/* 13 */ "String too long",
/* 14 */ "String formula too complex",
/* 15 */ "Can't continue",
/* 16 */ "Undefined user function",
/* 17 */ "No resume",
/* 18 */ "Resume without error",
/* 19 */ "Unprintable error",
/* 20 */ "Missing operand",
/* 21 */ "Line buffer overflow",
/* 22 */ "FOR without NEXT",
/* 23 */ "WHILE without WEND",
/* 24 */ "WEND without WHILE",
/* 25 */ "Field overflow",
/* 26 */ "Internal error",
/* 27 */ "Bad file number",
/* 28 */ "File not found",
/* 29 */ "Bad file mode",
/* 30 */ "File already open",
/* 31 */ "Disk IO error",
/* 32 */ "File already exists",
/* 33 */ "Disk full",
/* 34 */ "Input past end",
/* 35 */ "Bad record number",
/* 36 */ "Bad file name",
/* 37 */ "Direct statement in file",
/* 38 */ "Too many files",
/* 39 */ "File not open",
/* 40 */ "Syntax error in data",
0
};
error(index)
int index;
void error(int index)
{
_setline();
if( index<0 || index >40 )
printf("LINE %d:ERROR %d: Unprintable error\n",_erlsym,index);
else printf("LINE %d:ERROR %d: %s\n",_erlsym,index,errortable[index]);
_errsym= index;
if (index < 0 || index > 40)
printf("LINE %d:ERROR %d: Unprintable error\n", _erlsym, index);
else
printf("LINE %d:ERROR %d: %s\n", _erlsym, index, errortable[index]);
_errsym = index;
_trap();
}

116
lang/basic/lib/file.c
View file

@ -4,7 +4,7 @@
/* $Id$ */
Filedesc _fdtable[16];
Filedesc _fdtable[16];
/* BASIC file descriptor table */
/* Channel assignment:
-1 terminal IO
@ -12,124 +12,122 @@ Filedesc _fdtable[16];
1-15 user files
*/
int _chann = -1;
FILE* _chanrd = stdin;
FILE* _chanwr = stdout;
int _chann = -1;
FILE *_chanrd = stdin;
FILE *_chanwr = stdout;
_setchan(index)
int index;
void _setchan(int index)
{
#ifdef DEBUG
printf("setchannel %d\n",index);
printf("setchannel %d\n", index);
#endif
fflush(_chanwr);
if( index == -1)
if (index == -1)
{
_chann= -1;
_chanrd= stdin;
_chanwr= stdout;
_chann = -1;
_chanrd = stdin;
_chanwr = stdout;
return;
}
if( index<0 || index>15)
if (index < 0 || index > 15)
error(27);
_chann=index;
_chanrd= _chanwr= _fdtable[index].fd;
_chann = index;
_chanrd = _chanwr = _fdtable[index].fd;
}
_asschn()
void _asschn(void)
{
#ifdef DEBUG
printf("_asschn %d\n",_chann);
printf("_asschn %d\n", _chann);
#endif
if( _chann == -1) return;
if (_chann == -1)
return;
#ifdef DEBUG
printf(" file %d\n", _fdtable[_chann].fd);
#endif
if( _chann<0 || _chann>15)
if (_chann < 0 || _chann > 15)
error(27);
if( _fdtable[_chann].fd== 0)
if (_fdtable[_chann].fd == 0)
error(39);
if( feof( _fdtable[_chann].fd))
if (feof(_fdtable[_chann].fd))
error(2);
}
_clochn(nr)
int nr;
void _clochn(int nr)
{
if( nr<1 || nr >15 || _fdtable[nr].fd==0) error(3);
if (nr < 1 || nr > 15 || _fdtable[nr].fd == 0)
error(3);
fclose(_fdtable[nr].fd);
_fdtable[nr].fd=0; _fdtable[nr].fname=0;
_fdtable[nr].fd = 0;
_fdtable[nr].fname = 0;
}
_opnchn(reclen,fname,mode)
String *mode,*fname;
int reclen;
void _opnchn(int reclen, String* fname, String* mode)
{
/* channel has been set */
FILE *f;
FILE* f;
int m;
#ifdef DEBUG
printf("open %d %s %s \n",reclen,mode->strval,fname->strval);
printf("open %d %s %s \n", reclen, mode->strval, fname->strval);
#endif
/* check for opened/closed file */
if(_fdtable[_chann].fd)
if (_fdtable[_chann].fd)
error(30);
switch(*mode->strval)
switch (*mode->strval)
{
case 'O':
case 'o':
if( (f=fopen(fname->strval,"w")) == NULL)
if ((f = fopen(fname->strval, "w")) == NULL)
error(28);
m= OMODE;
m = OMODE;
break;
case 'I':
case 'i':
if( (f=fopen(fname->strval,"r")) == NULL)
if ((f = fopen(fname->strval, "r")) == NULL)
error(28);
m= IMODE;
m = IMODE;
break;
case 'r':
case 'R':
if( (f=fopen(fname->strval,"a")) == NULL)
if ((f = fopen(fname->strval, "a")) == NULL)
error(28);
m= RMODE;
m = RMODE;
break;
default:
printf("file mode %s\n",mode->strval);
printf("file mode %s\n", mode->strval);
error(29);
}
_chanwr= _chanrd= _fdtable[_chann].fd= f;
_fdtable[_chann].fname= fname->strval;
_fdtable[_chann].reclength= reclen;
_fdtable[_chann].mode= m;
_chanwr = _chanrd = _fdtable[_chann].fd = f;
_fdtable[_chann].fname = fname->strval;
_fdtable[_chann].reclength = reclen;
_fdtable[_chann].mode = m;
#ifdef DEBUG
printf("file descr %d\n",f);
printf("file descr %d\n", f);
#endif
}
_ioeof(channel)
int channel;
int _ioeof(int channel)
{
FILE *fd;
FILE* fd;
char c;
if( channel<0 || channel >15) error(3);
fd= _fdtable[channel].fd;
if( fd==0)
if (channel < 0 || channel > 15)
error(3);
c=fgetc(fd);
if( feof(_fdtable[channel].fd) ) return(-1);
ungetc(c,fd);
return(0);
fd = _fdtable[channel].fd;
if (fd == 0)
error(3);
c = fgetc(fd);
if (feof(_fdtable[channel].fd))
return (-1);
ungetc(c, fd);
return (0);
}
_close()
void _close(void)
{
/* close all open files */
int i;
for(i=1;i<16;i++)
if( _fdtable[i].fd)
_clochn(i);
for (i = 1; i < 16; i++)
if (_fdtable[i].fd)
_clochn(i);
}

5
lang/basic/lib/hlt.c
View file

@ -1,12 +1,11 @@
#include <stdlib.h>
_hlt(nr)
int nr;
void _hlt(int nr)
{
exit(nr);
}
_goto_err()
void _goto_err(void)
{
error(3);
}

116
lang/basic/lib/io.c
View file

@ -8,84 +8,102 @@
#define MAXWIDTH 255
int _width = 75, _pos=0, _zonewidth=15;
int _width = 75, _pos = 0, _zonewidth = 15;
_out(str)
char *str;
void _out(char* str)
{
int pos;
if( _chann== -1) pos= _pos;
else pos= _fdtable[_chann].pos;
while( *str)
if (_chann == -1)
pos = _pos;
else
pos = _fdtable[_chann].pos;
while (*str)
{
if( pos>= _width){ _outnl(); pos=0;}
if (pos >= _width)
{
_outnl();
pos = 0;
}
fputc(*str++, _chanwr);
pos++;
}
if( _chann== -1) _pos=pos;
else _fdtable[_chann].pos= pos;
if (_chann == -1)
_pos = pos;
else
_fdtable[_chann].pos = pos;
}
_outnl()
void _outnl(void)
{
fputc('\n',_chanwr);
if( _chann == -1)
_pos=0;
fputc('\n', _chanwr);
if (_chann == -1)
_pos = 0;
else
_fdtable[_chann].pos=0;
_fdtable[_chann].pos = 0;
}
_zone()
void _zone(void)
{
/* go to next zone */
int pos;
if( _chann == -1)
pos= _pos;
else pos= _fdtable[_chann].pos;
do{
fputc(' ',_chanwr);
if (_chann == -1)
pos = _pos;
else
pos = _fdtable[_chann].pos;
do
{
fputc(' ', _chanwr);
pos++;
if( pos==_width)
if (pos == _width)
{
_outnl();
pos=0;
pos = 0;
break;
}
} while( pos % _zonewidth != 0);
if( _chann== -1) _pos=pos;
else _fdtable[_chann].pos= pos;
} while (pos % _zonewidth != 0);
if (_chann == -1)
_pos = pos;
else
_fdtable[_chann].pos = pos;
}
_in(buf)
char *buf;
void _in(char* buf)
{
register int holder ;
char *c;
register int holder;
char* c;
int pos;
if( _chann == -1)
if (_chann == -1)
{
pos= _pos;
}else pos= _fdtable[_chann].pos;
c= buf;
while( (holder = fgetc(_chanrd)) != EOF && holder != '\n'){
*c= holder ;
if( _chann == -1) putchar(holder);
c++; pos++;
pos = _pos;
}
*c= 0;
if( _chann== -1)
else
pos = _fdtable[_chann].pos;
c = buf;
while ((holder = fgetc(_chanrd)) != EOF && holder != '\n')
{
_pos=pos;
} else _fdtable[_chann].pos= pos;
*c = holder;
if (_chann == -1)
putchar(holder);
c++;
pos++;
}
*c = 0;
if (_chann == -1)
{
_pos = pos;
}
else
_fdtable[_chann].pos = pos;
}
_tab(x)
int x;
void _tab(int x)
{
if( x> _width) error(3);
if( x< _pos) _outnl();
_spc(x-_pos);
if (x > _width)
error(3);
if (x < _pos)
_outnl();
_spc(x - _pos);
}
_spc(x)
int x;
void _spc(int x)
{
while(x-->0) _out(" ");
while (x-- > 0)
_out(" ");
}

36
lang/basic/lib/mki.c
View file

@ -2,33 +2,29 @@
/* $Id$ */
String *_mki(i)
long i;
String* _mki(long i)
{
char *buffer =" ";
String *s;
char* buffer = " ";
String* s;
s= _newstr(buffer);
* ( (long *)s->strval ) = i ;
return(s);
s = _newstr(buffer);
*((long*)s->strval) = i;
return (s);
}
String *_mkd(d)
double d;
String* _mkd(double d)
{
char *buffer =" ";
String *s;
char* buffer = " ";
String* s;
s= _newstr(buffer);
* ( (double *)s->strval ) = d ;
return(s);
s = _newstr(buffer);
*((double*)s->strval) = d;
return (s);
}
long _cvi(s)
String *s;
long _cvi(String* s)
{
return *( (long *) s->strval) ;
return *((long*)s->strval);
}
double _cvd(s)
String *s;
double _cvd(String* s)
{
return *( (double *) s->strval) ;
return *((double*)s->strval);
}

19
lang/basic/lib/oct.c
View file

@ -4,28 +4,25 @@
/* $Id$ */
String *_oct(i)
int i;
String* _oct(int i)
{
char buffer[30];
sprintf(buffer,"%o",i);
return( (String *)_newstr(buffer));
sprintf(buffer, "%o", i);
return ((String*)_newstr(buffer));
}
String *_hex(i)
int i;
String* _hex(int i)
{
char buffer[30];
sprintf(buffer,"%x",i);
return( (String *)_newstr(buffer));
sprintf(buffer, "%x", i);
return ((String*)_newstr(buffer));
}
String *_nstr(f)
double f;
String* _nstr(double f)
{
char buffer[80];
_str(f, buffer);
return (String *) _newstr(buffer);
return (String*)_newstr(buffer);
}

22
lang/basic/lib/peek.c
View file

@ -1,26 +1,24 @@
/* $Id$ */
int peek(addr)
int addr;
int peek(int addr)
{
/* this can not work properly for machines in which the
POINTERSIZE differs from the integer size
*/
char *p;
char* p;
int i;
p= (char *)addr;
i= *p;
p = (char*)addr;
i = *p;
#ifdef DEBUG
printf("peek %d = %d\n",addr,i);
printf("peek %d = %d\n", addr, i);
#endif
return(i);
return (i);
}
_poke(i,j)
int i,j;
void _poke(int i, int j)
{
char *p;
p= (char *) i;
*p=j;
char* p;
p = (char*)i;
*p = j;
}

1
lang/basic/lib/power.c
View file

@ -1,4 +1,3 @@
#include <math.h>
double _power(double x, double y) { return pow(x, y); }

95
lang/basic/lib/print.c
View file

@ -7,75 +7,84 @@
/* Here all routine to generate terminal oriented output is located */
_qstmark()
void _qstmark(void)
{
/* prompt for terminal input */
putchar('?');
}
_nl()
void _nl(void)
{
_asschn();
_outnl();
}
_prinum(i)
int i;
void _prinum(int i)
{
char buffer[40];
char buffer[40];
_asschn();
if(i>=0)
sprintf(buffer," %d ",i);
else sprintf(buffer,"-%d ",-i);
if (i >= 0)
sprintf(buffer, " %d ", i);
else
sprintf(buffer, "-%d ", -i);
_out(buffer);
}
_str(f,buffer)
double f;
char *buffer;
void _str(double f, char* buffer)
{
register char *c = buffer;
register char* c = buffer;
int eformat = 0;
if( f>=0){
if( f> 1.0e8) {
eformat = 1;
sprintf(buffer," %e",f);
}
else sprintf(buffer," %f",f);
c++;
}else {
if(-f> 1.0e8) {
eformat = 1;
sprintf(buffer,"-%e",-f);
}
else sprintf(buffer,"-%f",-f);
}
if (! eformat) {
for( ; *c && *c!= ' ';c++) ;
c--;
while( c>buffer && *c== '0')
if (f >= 0)
{
if (f > 1.0e8)
{
*c= 0;c--;
eformat = 1;
sprintf(buffer, " %e", f);
}
if( *c=='.') *c=0;
else
sprintf(buffer, " %f", f);
c++;
}
else
{
if (-f > 1.0e8)
{
eformat = 1;
sprintf(buffer, "-%e", -f);
}
else
sprintf(buffer, "-%f", -f);
}
if (!eformat)
{
for (; *c && *c != ' '; c++)
;
c--;
while (c > buffer && *c == '0')
{
*c = 0;
c--;
}
if (*c == '.')
*c = 0;
}
}
_prfnum(f)
double f;
void _prfnum(double f)
{
/* BASIC strings trailing zeroes */
char buffer[100];
char *c;
char buffer[100];
char* c;
_asschn();
c= buffer;
_str(f,c);
strcat(buffer," ");
c = buffer;
_str(f, c);
strcat(buffer, " ");
_out(buffer);
}
_prstr(str)
String *str;
void _prstr(String* str)
{
_asschn();
if( str==0) _out("<null>");
else _out(str->strval);
if (str == 0)
_out("<null>");
else
_out(str->strval);
}

18
lang/basic/lib/random.c
View file

@ -5,7 +5,7 @@
#define EM_WSIZE _EM_WSIZE
#endif
_randomi()
void _randomi(void)
{
int i;
_setchan(-1);
@ -14,19 +14,19 @@ _randomi()
_setrand(i);
}
_setrand(i)
int i;
void _setrand(int i)
{
srand(i);
}
double _rnd(d) double d;
double _rnd(double d)
{
double f; f= (int) rand();
return(f/
double f;
f = (int)rand();
return (f /
#if EM_WSIZE == 4
2147483647.0
2147483647.0
#else
32767.0
32767.0
#endif
);
);
}

148
lang/basic/lib/read.c
View file

@ -4,115 +4,130 @@
/* $Id$ */
_readln()
void _readln(void)
{
register int c;
while( (c=fgetc(_chanrd)) != EOF && c!= '\n')
while ((c = fgetc(_chanrd)) != EOF && c != '\n')
;
}
readskip()
void readskip(void)
{
register int c;
#ifdef DEBUG
printf("readskip\n");
#endif
while( (c=fgetc(_chanrd)) != EOF && c!= ',' && c!= '\n')
while ((c = fgetc(_chanrd)) != EOF && c != ',' && c != '\n')
;
}
_readint(addr)
int *addr;
void _readint(int* addr)
{
int i;
char buf[1024];
char buf[1024];
#ifdef DEBUG
printf("read int from %d\n",_chann);
printf("read int from %d\n", _chann);
#endif
_asschn();
if( fscanf(_chanrd,"%d",&i) != 1)
if (fscanf(_chanrd, "%d", &i) != 1)
{
if( ferror(_chanrd)) error(29);
if( feof(_chanrd)) error(2);
if( _chann == -1)
if (ferror(_chanrd))
error(29);
if (feof(_chanrd))
error(2);
if (_chann == -1)
{
_asschn(); /* may be closed by now */
fgets(buf,1024,_chanrd);
_asschn(); /* may be closed by now */
fgets(buf, 1024, _chanrd);
printf("?Redo ");
_readint(addr);
return;
}
error(40);
}else { readskip(); *addr=i;}
}
else
{
readskip();
*addr = i;
}
}
_readflt(addr)
double *addr;
void _readflt(double* addr)
{
double f;
char buf[1024];
#ifdef DEBUG
printf("read flt from %d\n",_chann);
printf("read flt from %d\n", _chann);
#endif
_asschn();
if( fscanf(_chanrd,"%lf",&f) != 1)
if (fscanf(_chanrd, "%lf", &f) != 1)
{
if( ferror(_chanrd)) error(29);
if( feof(_chanrd)) error(2);
if( _chann == -1)
if (ferror(_chanrd))
error(29);
if (feof(_chanrd))
error(2);
if (_chann == -1)
{
fgets(buf,1024,_chanrd);
fgets(buf, 1024, _chanrd);
printf("?Redo ");
_readflt(addr);
return;
}
error(40);
}else { readskip(); *addr=f;}
}
else
{
readskip();
*addr = f;
}
}
_readstr(s)
String **s;
void _readstr(String** s)
{
char buffer[1024];
register int kar ;
char *c;
register int kar;
char* c;
#ifdef DEBUG
printf("read str from %d\n",_chann);
printf("read str from %d\n", _chann);
#endif
_asschn();
c= buffer;
kar= fgetc(_chanrd);
while(isspace(kar) && kar!= EOF)
kar= fgetc(_chanrd);
*c=kar ;
if( kar== '"')
c = buffer;
kar = fgetc(_chanrd);
while (isspace(kar) && kar != EOF)
kar = fgetc(_chanrd);
*c = kar;
if (kar == '"')
{
/* read quoted string */
/* read quoted string */
#ifdef DEBUG
printf("qouted string\n");
#endif
while ( (kar= fgetc(_chanrd)) != EOF && kar!='"' ) *c++ = kar ;
ungetc(kar,_chanrd);
*c=0;
}else
if( isalpha(*c))
while ((kar = fgetc(_chanrd)) != EOF && kar != '"')
*c++ = kar;
ungetc(kar, _chanrd);
*c = 0;
}
else if (isalpha(*c))
{
/* read normal string */
c++;
#ifdef DEBUG
printf("non-qouted string\n");
#endif
while( (kar= fgetc(_chanrd)) != ',' && kar!= EOF &&
!isspace(kar) && kar!='\n')
*c++= kar ;
ungetc(kar,_chanrd);
*c=0;
}else{
if( ferror(_chanrd)) error(29);
if( feof(_chanrd)) error(2);
if( _chann == -1)
while ((kar = fgetc(_chanrd)) != ',' && kar != EOF && !isspace(kar) && kar != '\n')
*c++ = kar;
ungetc(kar, _chanrd);
*c = 0;
}
else
{
if (ferror(_chanrd))
error(29);
if (feof(_chanrd))
error(2);
if (_chann == -1)
{
fgets(buffer,1024,_chanrd);
fgets(buffer, 1024, _chanrd);
printf("?Redo ");
_rdline(s);
return;
@ -120,48 +135,47 @@ String **s;
error(40);
}
#ifdef DEBUG
printf("string read: %s\n",buffer);
printf("string read: %s\n", buffer);
#endif
readskip();
/* save value read */
_decstr(*s);
*s= (String *) _newstr(buffer);
*s = (String*)_newstr(buffer);
}
extern int _seektab[];
_restore(line)
int line;
void _restore(int line)
{
int nr;
char buffer[1024];
#ifdef DEBUG
printf("seek to %d",line);
printf("seek to %d", line);
#endif
fseek(_chanrd,0l,0);
if( line)
fseek(_chanrd, 0l, 0);
if (line)
{
/* search number of lines to skip */
for(nr=0; _seektab[nr] && _seektab[nr]< line; nr+=2)
for (nr = 0; _seektab[nr] && _seektab[nr] < line; nr += 2)
#ifdef DEBUG
printf("test %d %d\n",_seektab[nr], _seektab[nr+1]);
printf("test %d %d\n", _seektab[nr], _seektab[nr + 1]);
#endif
;
nr /= 2;
#ifdef DEBUG
printf(" %d lines to skip\n",nr);
printf(" %d lines to skip\n", nr);
#endif
while(nr-- >0 ) fgets(buffer,1024,_chanrd);
while (nr-- > 0)
fgets(buffer, 1024, _chanrd);
}
}
_rdline(s)
String **s;
void _rdline(String** s)
{
char buffer[1024];
if( fgets(buffer,1024,_chanrd) == 0)
if (fgets(buffer, 1024, _chanrd) == 0)
{
if( _chann == -1)
if (_chann == -1)
{
printf("?Redo ");
_rdline(s);
@ -170,5 +184,5 @@ String **s;
error(40);
}
_decstr(*s);
*s= (String *) _newstr(buffer);
*s = (String*)_newstr(buffer);
}

26
lang/basic/lib/return.c
View file

@ -1,29 +1,29 @@
/* $Id$ */
#define MAXNESTING 1000
#define MAXNESTING 1000
int _gotable[MAXNESTING];
int topstk=0;
int topstk = 0;
_gosub(x)
int x;
void _gosub(int x)
{
/* administer gosub */
/* administer gosub */
#ifdef DEBUG
printf("store %d in %d\n",x,topstk);
printf("store %d in %d\n", x, topstk);
#endif
if( topstk== MAXNESTING) error(26);
_gotable[topstk]= x;
if (topstk == MAXNESTING)
error(26);
_gotable[topstk] = x;
topstk++;
}
_retstmt()
int _retstmt(void)
{
/* make sure that a return label index is on top
/* make sure that a return label index is on top
of the stack */
#ifdef DEBUG
printf("return to %d %d\n",_gotable[topstk-1],topstk-1);
printf("return to %d %d\n", _gotable[topstk - 1], topstk - 1);
#endif
if( topstk==0 || topstk==MAXNESTING)
if (topstk == 0 || topstk == MAXNESTING)
error(1);
return( _gotable[--topstk]);
return (_gotable[--topstk]);
}

21
lang/basic/lib/salloc.c
View file

@ -1,18 +1,19 @@
#include <stdlib.h>
char * salloc(length)
unsigned length;
char* salloc(unsigned length)
{
char *c, *s;
c= malloc(length);
if( !c ) error(5);
for(s=c;s<c+length;s++) *s = 0;
return(c);
char* c, *s;
c = malloc(length);
if (!c)
error(5);
for (s = c; s < c + length; s++)
*s = 0;
return (c);
}
sfree(c)
char *c;
void sfree(char* c)
{
if( !c ) return;
if (!c)
return;
free(c);
}

17
lang/basic/lib/sgn.c
View file

@ -1,16 +1,17 @@
/* $Id$ */
_sgn(v)
double v;
int _sgn(double v)
{
if( v>0) return(1);
if( v<0) return(-1);
return(0);
if (v > 0)
return (1);
if (v < 0)
return (-1);
return (0);
}
_forsgn(v)
double v;
int _forsgn(double v)
{
if (v >= 0) return 1;
if (v >= 0)
return 1;
return -1;
}

1
lang/basic/lib/sin.c
View file

@ -13,4 +13,3 @@
double _sin(double x) { return sin(x); }
double _cos(double x) { return cos(x); }
double _tan(double x) { return tan(x); }

1
lang/basic/lib/sqt.c
View file

@ -11,4 +11,3 @@
#include <math.h>
double _sqt(double x) { return sqrt(x); }

228
lang/basic/lib/string.c
View file

@ -4,47 +4,48 @@
/* $Id$ */
#define ok(X) if( X ==0) return;
#define okr(X) if( X ==0) return(0);
#define ok(X) \
if (X == 0) \
return;
#define okr(X) \
if (X == 0) \
return (0);
extern char *salloc() ;
extern char* salloc();
_length(str)
String *str;
int _length(String* str)
{
okr(str);
return(str->strlength);
return (str->strlength);
}
String *_newstr(str)
char *str;
String* _newstr(char* str)
{
String *s;
String* s;
okr(str);
s= (String *) salloc(sizeof(String));
s->strcount=1;
s->strlength= strlen(str);
s->strval= salloc(s->strlength+1);
strcpy(s->strval,str);
return(s);
s = (String*)salloc(sizeof(String));
s->strcount = 1;
s->strlength = strlen(str);
s->strval = salloc(s->strlength + 1);
strcpy(s->strval, str);
return (s);
}
_incstr(src)
String *src;
void _incstr(String* src)
{
/* one more variable uses the string */
ok(src);
src->strcount++;
}
_decstr(str)
String *str;
void _decstr(String* str)
{
ok(str);
/* Strings in ROM are initialized with this count */
if ( str->strcount==9999 ) return ;
if (str->strcount == 9999)
return;
str->strcount--;
if(str->strcount<=0) _delstr(str);
if (str->strcount <= 0)
_delstr(str);
}
_strcpy(dst,src)
String *src,*dst;
void _strcpy(String* dst, String* src)
{
ok(src);
ok(dst);
@ -52,133 +53,134 @@ String *src,*dst;
*dst = *src;
_incstr(src);
}
_delstr(src)
String *src;
void _delstr(String* src)
{
ok(src);
sfree(src->strval);
sfree((char *)src);
sfree((char*)src);
}
String *_concat(s1,s2)
String *s1,*s2;
String* _concat(String* s1, String* s2)
{
String *s;
String* s;
int length;
okr(s1); okr(s2);
s= (String *) salloc(sizeof(String));
s->strlength= _length(s1)+_length(s2);
s->strval= salloc(s->strlength+1);
okr(s1);
okr(s2);
s = (String*)salloc(sizeof(String));
s->strlength = _length(s1) + _length(s2);
s->strval = salloc(s->strlength + 1);
s->strcount = 1;
strcpy(s->strval,s2->strval);
strcat(s->strval,s1->strval);
return(s);
strcpy(s->strval, s2->strval);
strcat(s->strval, s1->strval);
return (s);
}
_strcomp(s1,s2)
String *s1,*s2;
int _strcomp(String* s1, String* s2)
{
okr(s1);okr(s2);
return(strcmp(s2->strval,s1->strval));
okr(s1);
okr(s2);
return (strcmp(s2->strval, s1->strval));
}
String *_left(size,s)
String *s;
int size;
String* _left(int size, String* s)
{
String *ns;
String* ns;
int i;
okr(s);
if( size <0 || size >s->strlength) error(3);
ns= (String *) salloc(sizeof(String));
ns->strval= salloc(size+1);
ns->strcount=1;
for(i=0; i<size && s->strval[i];i++)
ns->strval[i]= s->strval[i];
ns->strval[i]=0;
ns->strlength= i;
return(ns);
if (size < 0 || size > s->strlength)
error(3);
ns = (String*)salloc(sizeof(String));
ns->strval = salloc(size + 1);
ns->strcount = 1;
for (i = 0; i < size && s->strval[i]; i++)
ns->strval[i] = s->strval[i];
ns->strval[i] = 0;
ns->strlength = i;
return (ns);
}
String *_space(d)
int d;
String* _space(int d)
{
String *s;
int i,len;
String* s;
int i, len;
len= d;
s= (String *) salloc(sizeof(String));
s->strlength= len;
s->strcount=1;
s->strval= salloc(len+1);
for(i=0;i<len;i++)
s->strval[i]= ' ';
s->strval[i]=0;
return(s);
len = d;
s = (String*)salloc(sizeof(String));
s->strlength = len;
s->strcount = 1;
s->strval = salloc(len + 1);
for (i = 0; i < len; i++)
s->strval[i] = ' ';
s->strval[i] = 0;
return (s);
}
String *_strascii()
String* _strascii(void)
{
}
String *_string(f, d)
double d,f;
String* _string(double f, double d)
{
int i,j;
String *s;
int i, j;
String* s;
i=d;j=f;
if( i<0 || i>MAXSTRING) error(3);
s= (String *) salloc(sizeof(String));
s->strlength= i;
s->strcount=1;
s->strval= salloc(i+1);
s->strval[i--]=0;
for(; i>=0;i--)
s->strval[i]= j;
return(s);
i = d;
j = f;
if (i < 0 || i > MAXSTRING)
error(3);
s = (String*)salloc(sizeof(String));
s->strlength = i;
s->strcount = 1;
s->strval = salloc(i + 1);
s->strval[i--] = 0;
for (; i >= 0; i--)
s->strval[i] = j;
return (s);
}
_midstmt(s2,i1,i2,s)
int i1,i2;
String *s, *s2;
void _midstmt(String* s2, int i1, int i2, String* s)
{
int l;
/*printf("mid called %d %d %s %s\n",i1,i2,s->strval, s2->strval);*/
if (i2 < 0 || i1 < -1) error(3);
if( s->strlength<i2 || s2->strlength < i1) error(3); /* source string too short */
if( i1== -1) i1= s2->strlength;
l= s->strlength - i2+1;
if( i1>l ) i1=l;
strncpy(s->strval+i2-1,s2->strval,i1);
if (i2 < 0 || i1 < -1)
error(3);
if (s->strlength < i2 || s2->strlength < i1)
error(3); /* source string too short */
if (i1 == -1)
i1 = s2->strlength;
l = s->strlength - i2 + 1;
if (i1 > l)
i1 = l;
strncpy(s->strval + i2 - 1, s2->strval, i1);
}
String *_mid(i1,i2,s)
int i1,i2;
String *s;
String* _mid(int i1, int i2, String* s)
{
int l;
String *s2;
String* s2;
/* printf("mid fcn called %d %d %s\n",i1,i2,s->strval);*/
if (i2 < 0 || i1 < -1) return(s2); /* or error? */
if( i1 == -1) i1= s->strlength;
s2= _newstr(s->strval);
s2->strval[0]=0;
if( s->strlength<i2) return(s2); /* source string too short */
l= s->strlength - i2+1;
if( i1>l ) i1=l;
strncpy(s2->strval,s->strval+i2-1,i1);
s2->strval[i1]=0;
return(s2);
/* printf("mid fcn called %d %d %s\n",i1,i2,s->strval);*/
if (i2 < 0 || i1 < -1)
return (s2); /* or error? */
if (i1 == -1)
i1 = s->strlength;
s2 = _newstr(s->strval);
s2->strval[0] = 0;
if (s->strlength < i2)
return (s2); /* source string too short */
l = s->strlength - i2 + 1;
if (i1 > l)
i1 = l;
strncpy(s2->strval, s->strval + i2 - 1, i1);
s2->strval[i1] = 0;
return (s2);
}
String *_right(length,str)
String *str;
int length;
String* _right(int length, String* str)
{
String *s;
String* s;
int i;
i= _length(str)-length;
if(i<0) i=0;
s= _newstr(str->strval+i);
return(s);
i = _length(str) - length;
if (i < 0)
i = 0;
s = _newstr(str->strval + i);
return (s);
}

27
lang/basic/lib/swap.c
View file

@ -2,29 +2,26 @@
/* $Id$ */
_intswap(i1,i2)
int *i1,*i2;
void _intswap(int* i1, int* i2)
{
int i3;
i3= *i1;
*i1= *i2;
*i2=i3;
i3 = *i1;
*i1 = *i2;
*i2 = i3;
}
_fltswap(i1,i2)
double *i1,*i2;
void _fltswap(double* i1, double* i2)
{
double i3;
i3= *i1;
*i1= *i2;
*i2=i3;
i3 = *i1;
*i1 = *i2;
*i2 = i3;
}
_strswap(s1,s2)
String **s1,**s2;
void _strswap(String** s1, String** s2)
{
String *s;
s= *s1;
*s1= *s2;
String* s;
s = *s1;
*s1 = *s2;
*s2 = s;
}

5
lang/basic/lib/trace.c
View file

@ -1,7 +1,6 @@
/* $Id$ */
_trace(i)
int i;
void _trace(int i)
{
printf("[%d]",i);
printf("[%d]", i);
}

46
lang/basic/lib/trap.c
View file

@ -10,53 +10,49 @@
/* $Id$ */
/* Trap handling */
int _trpline; /* BASIC return label */
jmp_buf trpbuf;
int _trpline; /* BASIC return label */
jmp_buf trpbuf;
_trpset(nr)
int nr;
void _trpset(int nr)
{
/*debug printf("trap set to %d\n",nr);*/
_trpline=nr;
_trpline = nr;
}
void
_trpfatal(i)
int i;
void _trpfatal(int i)
{
extern int _errsym,_erlsym;
extern int _errsym, _erlsym;
_errsym= i;
_errsym = i;
_setline();
if( _trpline == 0)
printf("LINE %d: FATAL ERROR: trap %d\n",_erlsym,i);
if (_trpline == 0)
printf("LINE %d: FATAL ERROR: trap %d\n", _erlsym, i);
#ifdef DEBUG
printf("trap occurred %d return %d\n",i,_trpline);
printf("trap occurred %d return %d\n", i, _trpline);
#endif
_trap();
}
_ini_trp()
void _ini_trp(void)
{
/* initialize trap routines */
int i;
for(i=0;i<NSIG;i++)
signal(i,_trpfatal);
for (i = 0; i < NSIG; i++)
signal(i, _trpfatal);
}
_settrap(nr)
int nr;
void _settrap(int nr)
{
_trpline=nr;
_trpline = nr;
}
_trap()
void _trap(void)
{
int line;
if( _trpline==0) exit(-1);
line=_trpline;
_trpline=0; /* should be reset by user */
if (_trpline == 0)
exit(-1);
line = _trpline;
_trpline = 0; /* should be reset by user */
_ini_trp();
longjmp(trpbuf,line);
longjmp(trpbuf, line);
}

39
lang/basic/lib/write.c
View file

@ -5,31 +5,34 @@
/* assume that the channel has been set */
_wrnl()
void _wrnl(void)
{
if( fputc('\n',_chanwr) == EOF) error(29);
if (fputc('\n', _chanwr) == EOF)
error(29);
}
_wrcomma()
void _wrcomma(void)
{
if( fputc(',',_chanwr) == EOF) error(29);
if (fputc(',', _chanwr) == EOF)
error(29);
}
_wrint(i)
int i;
void _wrint(int i)
{
if(i>0)
if( fputc(' ',_chanwr)==EOF) error(29);
fprintf(_chanwr,"%d",i);
if( ferror(_chanwr) ) error(29);
if (i > 0)
if (fputc(' ', _chanwr) == EOF)
error(29);
fprintf(_chanwr, "%d", i);
if (ferror(_chanwr))
error(29);
}
_wrflt(f)
double f;
void _wrflt(double f)
{
fprintf(_chanwr,"%f",f);
if( ferror(_chanwr) ) error(29);
fprintf(_chanwr, "%f", f);
if (ferror(_chanwr))
error(29);
}
_wrstr(s)
String *s;
void _wrstr(String* s)
{
fprintf(_chanwr,"\"%s\"",s->strval);
if( ferror(_chanwr) ) error(29);
fprintf(_chanwr, "\"%s\"", s->strval);
if (ferror(_chanwr))
error(29);
}

2
modules/src/idf/idf_pkg.body
View file

@ -123,7 +123,7 @@ struct idf* str2idf(char tg[], int cpy)
int size;
IDF_STARTHASH(hash);
while (c = *cp++)
while ((c = *cp++))
{
IDF_ENHASH(hash, c);
}