dthelp: Remove always on macro M_NOPAR which was just there to support ancient compilers that don't have 'void'

This commit is contained in:
Peter Howkins
2018-06-23 00:48:36 +01:00
parent 725b02e6bf
commit 757249c65b
173 changed files with 882 additions and 894 deletions

View File

@@ -398,7 +398,7 @@ tagc
postent:start
codetagc:inentc {
startcode(entity->codeindex, &inent, entfile,
"c", nopar, nopar, "") ;
"c", "void", "void", "") ;
}
close:preparam
sschain:inss {
@@ -420,11 +420,11 @@ tagc
}
scchain:insc {
*getaction(scarray) = ++sactions ;
startcode(sactions, &insc, sfile, "s", nopar, nopar, "") ;
startcode(sactions, &insc, sfile, "s", "void", "void", "") ;
}
ecchain:inec {
*getaction(ecarray) = ++eactions ;
startcode(eactions, &inec, efile, "e", nopar, nopar, "") ;
startcode(eactions, &inec, efile, "e", "void", "void", "") ;
}
stcchain:instc {
*getaction(stcarray) = ++stactions ;

View File

@@ -215,7 +215,6 @@ ELTEXTERN int restart ELTINIT(RENTITY) ;
#define stproto "M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END"
#define stformal "m_string, M_START, M_END"
#define stft " M_WCHAR *m_string ;\n LOGICAL M_START ;\n LOGICAL M_END ;\n"
#define nopar "M_NOPAR"
/* Structures for generating defines for parameter values */
ELTEXTERN M_TRIE parval ;

View File

@@ -92,7 +92,7 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto)
/* Called when the C identifier to be #define'd to a parameter value is
scanned */
void cvalue(M_NOPAR)
void cvalue(void)
{
PARVAL *new;
@@ -111,18 +111,18 @@ void cvalue(M_NOPAR)
/* Called after last input character is read to place closing punctuation
at end of output files and close them */
void done(M_NOPAR)
void done(void)
{
M_ENTITY *ent;
ACTION *actp;
LOGICAL first;
int i;
closeiffile(inent, entfile, codeent, "c", nopar);
closeiffile(inent, entfile, codeent, "c", "void");
closeiffile(intext, tfile, tactions, "t", tproto);
closeiffile(inpc, pfile, pactions, "p", pproto);
closeiffile(insc, sfile, sactions, "s", nopar);
closeiffile(inec, efile, eactions, "e", nopar);
closeiffile(insc, sfile, sactions, "s", "void");
closeiffile(inec, efile, eactions, "e", "void");
closeiffile(instc, stfile, stactions, "st", stproto);
endstring();
@@ -190,7 +190,7 @@ void endcode(LOGICAL flag, FILE *file)
}
/* Called at the end of all initial fields in the interface definition */
void endini(M_NOPAR)
void endini(void)
{
if (finitext)
fputs(" putc(m_textchar, m_outfile);\n", tfile);
@@ -209,7 +209,7 @@ void endini(M_NOPAR)
/* End the sign-on message */
#include <time.h>
void endsignon(M_NOPAR)
void endsignon(void)
{
time_t storetime;
char *p;
@@ -255,7 +255,7 @@ void endsignon(M_NOPAR)
}
/* Closes a start-string or end-string */
void endstring(M_NOPAR)
void endstring(void)
{
if (instring) {
if (stringstart) stringstart = FALSE;
@@ -282,7 +282,7 @@ void enttype(type)
}
/* Free storage used for a context-specification chain */
void freechain(M_NOPAR)
void freechain(void)
{
CHAIN *chainp, *dchainp;
@@ -333,7 +333,7 @@ int *getaction(array)
}
/* Allocate new action structure */
ACTION *getactstruct(M_NOPAR)
ACTION *getactstruct(void)
{
ACTION *new;
@@ -347,7 +347,7 @@ ACTION *getactstruct(M_NOPAR)
}
/* Program initialization */
void initialize(M_NOPAR)
void initialize(void)
{
char **mb_delims;
M_WCHAR **wc_delims;
@@ -411,13 +411,13 @@ fputs("#endif\n", ifh);
startcode(pactions, &inpc, pfile, "p", pproto, pformal, pftype);
startcode(tactions, &intext, tfile, "t", tproto, tformal, tftype);
startcode(sactions, &insc, sfile, "s", nopar, nopar, "");
startcode(eactions, &inec, efile, "e", nopar, nopar, "");
startcode(sactions, &insc, sfile, "s", "void", "void", "");
startcode(eactions, &inec, efile, "e", "void", "void", "");
startcode(stactions, &instc, stfile, "st", stproto, stformal, stft);
}
/* Output definitions for strings */
void outstring(M_NOPAR)
void outstring(void)
{
int c;
@@ -480,7 +480,7 @@ for ( ; p ; p = p->next)
}
/* Skip rest of statement after an error */
void skiptoend(M_NOPAR)
void skiptoend(void)
{
int i;
static int errlev = 0;
@@ -580,7 +580,7 @@ fprintf(file, "{\n/* line %d \"%s\" */\n", m_line, iffile); /* balance "}" */
}
/* Begins processing a new element */
void startelement(M_NOPAR)
void startelement(void)
{
CVARSTRUCT *cvarp;
CVARSTRUCT *discard;
@@ -601,7 +601,7 @@ void startelement(M_NOPAR)
}
/* Stores the name of a C variable read from the input file */
void storecvar(M_NOPAR)
void storecvar(void)
{
CVARSTRUCT *new;
@@ -616,7 +616,7 @@ void storecvar(M_NOPAR)
/* Compares the parameter name associated with a C variable in the input
file with the names of all parameters of the current element. Stores
result for later output with code segments */
void storepname(M_NOPAR)
void storepname(void)
{
int i, par;

View File

@@ -35,7 +35,7 @@
#include "entext.h"
/* Add an entity */
void addent(M_NOPAR)
void addent(void)
{
M_ENTITY *new ;

View File

@@ -30,7 +30,7 @@
void actptrout(ACTION **array, char *name);
void addent(M_NOPAR);
void addent(void);
LOGICAL m_allwhite(const M_WCHAR *string);
@@ -38,10 +38,10 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto);
void countdown(M_TRIE *parent, int *count);
void cvalue(M_NOPAR);
void cvalue(void);
void done(M_NOPAR);
void done(void);
void m_dumptrie(FILE *file,
M_TRIE *xtrie,
@@ -51,11 +51,11 @@ void m_dumptrie(FILE *file,
void endcode(LOGICAL flag, FILE *file);
void endini(M_NOPAR);
void endini(void);
void endsignon(M_NOPAR);
void endsignon(void);
void endstring(M_NOPAR);
void endstring(void);
void entout(char *fname);
@@ -78,21 +78,21 @@ void m_exit(int status);
void m_free(void *block, char *msg);
void freechain(M_NOPAR);
void freechain(void);
int getachar(M_NOPAR);
int getachar(void);
int *getaction(ACTION **array);
ACTION *getactstruct(M_NOPAR);
ACTION *getactstruct(void);
void getname(int first);
int gettoken(int *c, int context);
void m_initctype(M_NOPAR);
void m_initctype(void);
void initialize(M_NOPAR);
void initialize(void);
LOGICAL m_letter(M_WCHAR c);
@@ -106,24 +106,24 @@ void m_openchk(FILE **ptr, char *name, char *mode);
void outpval(M_TRIE *p);
void outstring(M_NOPAR);
void outstring(void);
int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name);
const M_WCHAR *m_partype(const int par, const M_WCHAR *string);
int scan(M_NOPAR);
int scan(void);
void skiptoend(M_NOPAR);
void skiptoend(void);
void startcode(int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto,
char *formal, char *formtype);
void startelement(M_NOPAR);
void startelement(void);
void storecvar(M_NOPAR);
void storecvar(void);
void storepname(M_NOPAR);
void storepname(void);
void undodelim(M_WCHAR *delim);

View File

@@ -86,7 +86,7 @@ ungetachar(c);
}
/* Reads the next token and returns it to the main procedure */
int scan(M_NOPAR)
int scan(void)
{
int c;
int n;