Attachment #354 for issue #2567

D issues are now tracked on GitHub. This Bugzilla instance remains as a read-only archive.

View | Details | Raw Unified | Return to issue 2567
Collapse All | Expand All

Lines 934-940 Link Here

(-)..\..\..\..\dmd.1.043\dmd\src\dmd/expression.c (-1 / +1 lines)
934	fprintf(stdmsg, "warning - ");	934	fprintf(stdmsg, "warning - ");
935	va_list ap;	935	va_list ap;
936	va_start(ap, format);	936	va_start(ap, format);
937	::verror(loc, format, ap);	937	::verror(loc, format, ap, global.params.warningsAsErrors);
938	va_end( ap );	938	va_end( ap );
939	}	939	}
940	}	940	}




	fprintf(stdmsg, "warning - ");
	va_list ap;
	va_start(ap, format);
	verror(loc, format, ap, global.params.warningsAsErrors);
	va_end( ap );
    }
}

void verror(Loc loc, const char *format, va_list ap, bool incrementErrCount)
{
    if (!global.gag)
    {

	fflush(stdmsg);
//halt();
    }
	if(incrementErrCount)
		global.errors++;
}

/***************************************

  -version=level compile in version code >= level\n\
  -version=ident compile in version code identified by ident\n\
  -w             enable warnings\n\
  -ww            enable warnings, don't treat warnings as errors\n\
",
#if WIN32
"  @cmdfile       read arguments from cmdfile\n"

    global.params.obj = 1;
    global.params.Dversion = 2;
    global.params.quiet = 1;
	global.params.warningsAsErrors = 1;

    global.params.linkswitches = new Array();
    global.params.libfiles = new Array();

            }
	    else if (strcmp(p + 1, "w") == 0)
		global.params.warnings = 1;
	    else if (strcmp(p + 1, "ww") == 0)
		{
		global.params.warnings = 1;
		global.params.warningsAsErrors = 0;
		}
	    else if (strcmp(p + 1, "O") == 0)
		global.params.optimize = 1;
	    else if (p[1] == 'o')

Lines 697-703 Link Here

(-)..\..\..\..\dmd.1.043\dmd\src\dmd/mtype.c (-1 / +1 lines)
697	fprintf(stdmsg, "warning - ");	697	fprintf(stdmsg, "warning - ");
698	va_list ap;	698	va_list ap;
699	va_start(ap, format);	699	va_start(ap, format);
700	::verror(loc, format, ap);	700	::verror(loc, format, ap, global.params.warningsAsErrors);
701	va_end( ap );	701	va_end( ap );
702	}	702	}
703	}	703	}

Lines 104-110 Link Here

(-)..\..\..\..\dmd.1.043\dmd\src\dmd/statement.c (-1 / +1 lines)
104	fprintf(stdmsg, "warning - ");	104	fprintf(stdmsg, "warning - ");
105	va_list ap;	105	va_list ap;
106	va_start(ap, format);	106	va_start(ap, format);
107	::verror(loc, format, ap);	107	::verror(loc, format, ap, global.params.warningsAsErrors);
108	va_end( ap );	108	va_end( ap );
109	}	109	}
110	}	110	}

Return to issue 2567

Lines 129-140 Link Here

(-)..\..\..\..\dmd.1.043\dmd\src\dmd/mars.c (-3 / +11 lines)
129	fprintf(stdmsg, "warning - ");	129	fprintf(stdmsg, "warning - ");
130	va_list ap;	130	va_list ap;
131	va_start(ap, format);	131	va_start(ap, format);
132	verror(loc, format, ap);	132	verror(loc, format, ap, global.params.warningsAsErrors);
133	va_end( ap );	133	va_end( ap );
134	}	134	}
135	}	135	}
136		136
137	void verror(Loc loc, const char *format, va_list ap)	137	void verror(Loc loc, const char *format, va_list ap, bool incrementErrCount)
138	{	138	{
139	if (!global.gag)	139	if (!global.gag)
140	{	140	{
Lines 157-163 Link Here
157	fflush(stdmsg);	157	fflush(stdmsg);
158	//halt();	158	//halt();
159	}	159	}
160	global.errors++;	160	if(incrementErrCount)
		161	global.errors++;
161	}	162	}
162		163
163	/***************************************	164	/***************************************
Lines 237-242 Link Here
237	-version=level compile in version code >= level\n\	238	-version=level compile in version code >= level\n\
238	-version=ident compile in version code identified by ident\n\	239	-version=ident compile in version code identified by ident\n\
239	-w enable warnings\n\	240	-w enable warnings\n\
		241	-ww enable warnings, don't treat warnings as errors\n\
240	",	242	",
241	#if WIN32	243	#if WIN32
242	" @cmdfile read arguments from cmdfile\n"	244	" @cmdfile read arguments from cmdfile\n"
Lines 288-293 Link Here
288	global.params.obj = 1;	290	global.params.obj = 1;
289	global.params.Dversion = 2;	291	global.params.Dversion = 2;
290	global.params.quiet = 1;	292	global.params.quiet = 1;
		293	global.params.warningsAsErrors = 1;
291		294
292	global.params.linkswitches = new Array();	295	global.params.linkswitches = new Array();
293	global.params.libfiles = new Array();	296	global.params.libfiles = new Array();
Lines 388-393 Link Here
388	}	391	}
389	else if (strcmp(p + 1, "w") == 0)	392	else if (strcmp(p + 1, "w") == 0)
390	global.params.warnings = 1;	393	global.params.warnings = 1;
		394	else if (strcmp(p + 1, "ww") == 0)
		395	{
		396	global.params.warnings = 1;
		397	global.params.warningsAsErrors = 0;
		398	}
391	else if (strcmp(p + 1, "O") == 0)	399	else if (strcmp(p + 1, "O") == 0)
392	global.params.optimize = 1;	400	global.params.optimize = 1;
393	else if (p[1] == 'o')	401	else if (p[1] == 'o')

Lines 135-140 Link Here

(-)..\..\..\..\dmd.1.043\dmd\src\dmd/mars.h (-1 / +2 lines)
135	char release; // build release version	135	char release; // build release version
136	char preservePaths; // !=0 means don't strip path from source file	136	char preservePaths; // !=0 means don't strip path from source file
137	char warnings; // enable warnings	137	char warnings; // enable warnings
		138	char warningsAsErrors; // treat warnings as errors
138	char pic; // generate position-independent-code for shared libs	139	char pic; // generate position-independent-code for shared libs
139	char cov; // generate code coverage data	140	char cov; // generate code coverage data
140	char nofloat; // code should not pull in floating point support	141	char nofloat; // code should not pull in floating point support
Lines 348-354 Link Here
348		349
349	void warning(Loc loc, const char *format, ...);	350	void warning(Loc loc, const char *format, ...);
350	void error(Loc loc, const char *format, ...);	351	void error(Loc loc, const char *format, ...);
351	void verror(Loc loc, const char *format, va_list);	352	void verror(Loc loc, const char *format, va_list, bool incrementErrCount=true);
352	void fatal();	353	void fatal();
353	void err_nomem();	354	void err_nomem();
354	int runLINK();	355	int runLINK();