projects/ldc: dmd/expression.c comparison

comparison dmd/expression.c @ 1103:b30fe7e1dbb9

- Updated to DMD frontend 1.041. - Removed dmd/inifile.c , it's not under a free license, replaced with libconfig based config file.

author	Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
date	Thu, 12 Mar 2009 20:37:27 +0100
parents	39cf8fa483fd
children	0d38fa5a0b46

comparison

equal deleted inserted replaced

-:ae950bd712d3
+:b30fe7e1dbb9
 // Compiler implementation of the D programming language
-// Copyright (c) 1999-2008 by Digital Mars
+// Copyright (c) 1999-2009 by Digital Mars
 // All Rights Reserved
 // written by Walter Bright
 // http://www.digitalmars.com
 // License for redistribution is by either the Artistic License
 // in artistic.txt, or the GNU General Public License in gnu.txt.
 // See the included readme.txt for details.
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <math.h>
 #include <assert.h>
 #if _MSC_VER
 #include <complex>
 #else
 #endif
-#include <math.h>
 #if _WIN32 && __DMC__
 extern "C" char * __cdecl __locale_decpoint;
 #endif
 #ifdef __APPLE__
 #define integer_t dmd_integer_t
 #endif
-#if IN_GCC || IN_LLVM
+#include "rmem.h"
-#include "mem.h"
-#elif _WIN32
-#include "..\root\mem.h"
-#elif POSIX
-#include "../root/mem.h"
-#endif
 //#include "port.h"
 #include "mtype.h"
 #include "init.h"
 #include "expression.h"
 assert(arguments);
 size_t nargs = arguments ? arguments->dim : 0;
 size_t nparams = Argument::dim(tf->parameters);
 if (nargs > nparams && tf->varargs == 0)
-error(loc, "expected %"PRIuSIZE" arguments, not %"PRIuSIZE, nparams, nargs);
+	error(loc, "expected %zu arguments, not %zu", nparams, nargs);
 n = (nargs > nparams) ? nargs : nparams;	// n = max(nargs, nparams)
 int done = 0;
 for (size_t i = 0; i < n; i++)
 	    {
 		if (!p->defaultArg)
 		{
 		    if (tf->varargs == 2 && i + 1 == nparams)
 			goto L2;
-error(loc, "expected %"PRIuSIZE" arguments, not %"PRIuSIZE, nparams, nargs);
+		    error(loc, "expected %zu arguments, not %zu", nparams, nargs);
 		    break;
 		}
 		arg = p->defaultArg;
 #if DMDV2
 		if (arg->op == TOKdefault)
 	    {
 		//printf("\t\tvarargs == 2, p->type = '%s'\n", p->type->toChars());
 		if (arg->implicitConvTo(p->type))
 		{
 		    if (nargs != nparams)
-error(loc, "expected %"PRIuSIZE" arguments, not %"PRIuSIZE, nparams, nargs);
+		        error(loc, "expected %zu arguments, not %zu", nparams, nargs);
 		    goto L1;
 		}
 	     L2:
 		Type *tb = p->type->toBasetype();
 		Type *tret = p->isLazyArray();
 va_start(ap, format);
 ::verror(loc, format, ap);
 va_end( ap );
 }
+void Expression::warning(const char *format, ...)
+{
+if (global.params.warnings && !global.gag)
+{
+	fprintf(stdmsg, "warning - ");
+	va_list ap;
+	va_start(ap, format);
+	::warning(loc, format, ap);
+	va_end( ap );
+}
+}
 void Expression::rvalue()
 {
 if (type && type->toBasetype()->ty == Tvoid)
 {	error("expression %s is void and has no value", toChars());
 #if 0
 {
 #if 1
 return Expression::toChars();
 #else
 static char buffer[sizeof(value) * 3 + 1];
-sprintf(buffer, "%lld", value);
+sprintf(buffer, "%jd", value);
 return buffer;
 #endif
 }
 integer_t IntegerExp::toInteger()
 	    L3:
 		buf->printf("%du", (unsigned)v);
 		break;
 	    case Tint64:
-		buf->printf("%lldL", v);
+		buf->printf("%jdL", v);
 		break;
 	    case Tuns64:
-		buf->printf("%lluLU", v);
+		buf->printf("%juLU", v);
 		break;
 	    case Tbit:
 	    case Tbool:
 		buf->writestring((char *)(v ? "true" : "false"));
 		}
 		break;
 	}
 }
 else if (v & 0x8000000000000000LL)
-	buf->printf("0x%llx", v);
+	buf->printf("0x%jx", v);
 else
-	buf->printf("%lld", v);
+	buf->printf("%jd", v);
 }
 void IntegerExp::toMangleBuffer(OutBuffer *buf)
 {
 if ((sinteger_t)value < 0)
-	buf->printf("N%lld", -value);
+	buf->printf("N%jd", -value);
 else
-	buf->printf("%lld", value);
+	buf->printf("%jd", value);
 }
 /******************************** RealExp **************************/
 RealExp::RealExp(Loc loc, real_t value, Type *type)
 * Regard +0 and -0 as different.
 */
 int RealEquals(real_t x1, real_t x2)
 {
+#if __APPLE__
+return (__inline_isnan(x1) && __inline_isnan(x2)) ||
+#else
 return // special case nans
 	   (isnan(x1) && isnan(x2)) ||
+#endif
 	   // and zero, in order to distinguish +0 from -0
 	   (x1 == 0 && x2 == 0 && 1./x1 == 1./x2) ||
 	   // otherwise just compare
 	   (x1 != 0. && x1 == x2);
 }
 * INF			=> INF
 * -0X1.1BC18BA997B95P+79	=> N11BC18BA997B95P79
 * 0X1.9P+2			=> 19P2
 */
+#if __APPLE__
+if (__inline_isnan(value))
+#else
 if (isnan(value))
+#endif
 	buf->writestring("NAN");	// no -NAN bugs
 else
 {
 	char buffer[32];
 	int n = sprintf(buffer, "%LA", value);
 //var->semantic(sc);
 if (!type)
 	type = var->type->pointerTo();
 VarDeclaration *v = var->isVarDeclaration();
 if (v)
-{
+	v->checkNestedReference(sc, loc);
-v->checkNestedReference(sc, loc);
-}
 return this;
 }
 int SymOffExp::isBool(int result)
 {
 	    }
 	    e = e->semantic(sc);
 	}
 	else
 	{
-	    error("string slice [%llu .. %llu] is out of bounds", i1, i2);
+	    error("string slice [%ju .. %ju] is out of bounds", i1, i2);
 	    e = e1;
 	}
 	return e;
 }
-type = t->nextOf()->arrayOf();
+if (t->ty == Tarray)
+	type = e1->type;
+else
+	type = t->nextOf()->arrayOf();
 return e;
 Lerror:
 char *s;
 if (t->ty == Tvoid)
 		else
 		    e = new TypeExp(e1->loc, Argument::getNth(tup->arguments, (size_t)index)->type);
 	    }
 	    else
 	    {
-error("array index [%llu] is outside array bounds [0 .. %"PRIuSIZE"]",
+		error("array index [%ju] is outside array bounds [0 .. %zu]",
-index, length);
+			index, length);
-e = e1;
+		e = e1;
 	    }
 	    break;
 	}
 	default:

Mercurial > projects > ldc

comparison dmd/expression.c @ 1103:b30fe7e1dbb9