Skip to content

Commit

Permalink
merge with D2
Browse files Browse the repository at this point in the history
  • Loading branch information
@WalterBright
WalterBright committed Mar 1, 2011
1 parent 8d22c9d commit e199b48
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 21 deletions.
2 changes: 2 additions & 0 deletions src/attrib.c
View file
Expand Up @@ -955,6 +955,8 @@ void PragmaDeclaration::semantic(Scope *sc)
e = e->semantic(sc);
e = e->optimize(WANTvalue | WANTinterpret);
args->data[0] = (void *)e;
if (e->op == TOKerror)
goto Lnodecl;
if (e->op != TOKstring)
error("string expected for library name, not '%s'", e->toChars());
else if (global.params.verbose)
Expand Down
2 changes: 2 additions & 0 deletions src/cast.c
View file
Expand Up @@ -622,6 +622,8 @@ Expression *Expression::castTo(Scope *sc, Type *t)
#endif
if (type == t)
return this;
if (op == TOKerror)
return this;
Expression *e = this;
Type *tb = t->toBasetype();
Type *typeb = type->toBasetype();
Expand Down
36 changes: 24 additions & 12 deletions src/expression.c
View file
@@ -1,6 +1,6 @@

// Compiler implementation of the D programming language
// Copyright (c) 1999-2010 by Digital Mars
// Copyright (c) 1999-2011 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
Expand Down Expand Up @@ -3152,17 +3152,21 @@ Expression *StructLiteralExp::semantic(Scope *sc)
else
{
if (v->init)
{ e = v->init->toExpression();
if (!e)
{ error("cannot make expression out of initializer for %s", v->toChars());
e = new ErrorExp();
}
else if (v->scope)
{ // Do deferred semantic anaylsis
Initializer *i2 = v->init->syntaxCopy();
i2 = i2->semantic(v->scope, v->type);
e = i2->toExpression();
v->scope = NULL;
{ if (v->init->isVoidInitializer())
e = NULL;
else
{ e = v->init->toExpression();
if (!e)
{ error("cannot make expression out of initializer for %s", v->toChars());
e = new ErrorExp();
}
else if (v->scope)
{ // Do deferred semantic anaylsis
Initializer *i2 = v->init->syntaxCopy();
i2 = i2->semantic(v->scope, v->type);
e = i2->toExpression();
v->scope = NULL;
}
}
}
else
Expand Down Expand Up @@ -3410,6 +3414,8 @@ Expression *ScopeExp::semantic(Scope *sc)
}
//printf("sds = %s, '%s'\n", sds->kind(), sds->toChars());
}
if (global.errors)
return new ErrorExp();
}
else
{
Expand Down Expand Up @@ -5176,6 +5182,8 @@ Expression *CompileExp::semantic(Scope *sc)
#endif
UnaExp::semantic(sc);
e1 = resolveProperties(sc, e1);
if (e1->op == TOKerror)
return e1;
if (!e1->type->isString())
{
error("argument to mixin must be a string type, not %s\n", e1->type->toChars());
Expand Down Expand Up @@ -5908,6 +5916,8 @@ Expression *DotTemplateInstanceExp::semantic(Scope *sc)
Expression *e = new DotIdExp(loc, e1, ti->name);
L1:
e = e->semantic(sc);
if (e->op == TOKerror)
return e;
if (e->op == TOKdottd)
{
if (global.errors)
Expand Down Expand Up @@ -7201,6 +7211,8 @@ Expression *DeleteExp::semantic(Scope *sc)
UnaExp::semantic(sc);
e1 = resolveProperties(sc, e1);
e1 = e1->toLvalue(sc, NULL);
if (e1->op == TOKerror)
return e1;
type = Type::tvoid;

tb = e1->type->toBasetype();
Expand Down
5 changes: 4 additions & 1 deletion src/init.c
View file
@@ -1,6 +1,6 @@

// Compiler implementation of the D programming language
// Copyright (c) 1999-2009 by Digital Mars
// Copyright (c) 1999-2011 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
Expand Down Expand Up @@ -166,6 +166,7 @@ Initializer *StructInitializer::semantic(Scope *sc, Type *t)
{
if (fieldi >= ad->fields.dim)
{ error(loc, "too many initializers for %s", ad->toChars());
errors = 1;
field.remove(i);
i--;
continue;
Expand All @@ -182,6 +183,7 @@ Initializer *StructInitializer::semantic(Scope *sc, Type *t)
if (!s)
{
error(loc, "'%s' is not a member of '%s'", id->toChars(), t->toChars());
errors = 1;
continue;
}

Expand All @@ -191,6 +193,7 @@ Initializer *StructInitializer::semantic(Scope *sc, Type *t)
if (fieldi >= ad->fields.dim)
{
s->error("is not a per-instance initializable field");
errors = 1;
break;
}
if (s == (Dsymbol *)ad->fields.data[fieldi])
Expand Down
6 changes: 5 additions & 1 deletion src/interpret.c
View file
Expand Up @@ -1266,7 +1266,7 @@ Expression *getVarExp(Loc loc, InterState *istate, Declaration *d)
}
else if ((v->isCTFE() || (!v->isDataseg() && istate)) && !v->value)
{
if (v->init)
if (v->init && v->type->size() != 0)
{
if (v->init->isVoidInitializer())
{
Expand Down Expand Up @@ -1339,6 +1339,10 @@ Expression *DeclarationExp::interpret(InterState *istate)
e = EXP_CANT_INTERPRET;
}
}
else if (s == v && !v->init && v->type->size()==0)
{ // Zero-length arrays don't need an initializer
e = v->type->defaultInitLiteral(loc);
}
#if DMDV2
else if (s == v && (v->isConst() || v->isImmutable()) && v->init)
#else
Expand Down
12 changes: 10 additions & 2 deletions src/mtype.c
View file
@@ -1,6 +1,6 @@

// Compiler implementation of the D programming language
// Copyright (c) 1999-2010 by Digital Mars
// Copyright (c) 1999-2011 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
Expand Down Expand Up @@ -3377,8 +3377,11 @@ void TypeQualified::resolveHelper(Loc loc, Scope *sc,
*pe = e;
}
else
{
Lerror:
error(loc, "identifier '%s' of '%s' is not defined", id->toChars(), toChars());
*pe = new ErrorExp();
}
return;
}
L2:
Expand Down Expand Up @@ -3494,6 +3497,7 @@ void TypeQualified::resolveHelper(Loc loc, Scope *sc,
else
error(loc, "undefined identifier %s", p);
}
*pt = Type::terror;
}
}

Expand Down Expand Up @@ -4682,7 +4686,11 @@ Expression *TypeStruct::defaultInitLiteral(Loc loc)
VarDeclaration *vd = (VarDeclaration *)(sym->fields.data[j]);
Expression *e;
if (vd->init)
e = vd->init->toExpression();
{ if (vd->init->isVoidInitializer())
e = NULL;
else
e = vd->init->toExpression();
}
else
e = vd->type->defaultInitLiteral();
structelems->data[j] = e;
Expand Down
24 changes: 19 additions & 5 deletions src/statement.c
View file
Expand Up @@ -305,6 +305,8 @@ Statements *CompileStatement::flatten(Scope *sc)
exp = exp->semantic(sc);
exp = resolveProperties(sc, exp);
exp = exp->optimize(WANTvalue | WANTinterpret);
if (exp->op == TOKerror)
return NULL;
if (exp->op != TOKstring)
{ error("argument to mixin must be a string, not (%s)", exp->toChars());
return NULL;
Expand Down Expand Up @@ -1887,6 +1889,9 @@ Statement *ForeachStatement::semantic(Scope *sc)
}
break;
}
case Terror:
s = NULL;
break;

default:
error("foreach: %s is not an aggregate type", aggr->type->toChars());
Expand Down Expand Up @@ -2814,7 +2819,7 @@ Statement *CaseStatement::semantic(Scope *sc)
{
exp = exp->implicitCastTo(sc, sw->condition->type);
exp = exp->optimize(WANTvalue | WANTinterpret);
if (exp->op != TOKstring && exp->op != TOKint64)
if (exp->op != TOKstring && exp->op != TOKint64 && exp->op != TOKerror)
{
error("case must be a string or an integral constant, not %s", exp->toChars());
exp = new IntegerExp(0);
Expand Down Expand Up @@ -2914,11 +2919,15 @@ Statement *CaseRangeStatement::semantic(Scope *sc)
first = first->semantic(sc);
first = first->implicitCastTo(sc, sw->condition->type);
first = first->optimize(WANTvalue | WANTinterpret);
dinteger_t fval = first->toInteger();

last = last->semantic(sc);
last = last->implicitCastTo(sc, sw->condition->type);
last = last->optimize(WANTvalue | WANTinterpret);

if (first->op == TOKerror || last->op == TOKerror)
return statement ? statement->semantic(sc) : NULL;

dinteger_t fval = first->toInteger();
dinteger_t lval = last->toInteger();

if (lval - fval > 256)
Expand Down Expand Up @@ -3227,11 +3236,12 @@ Statement *ReturnStatement::semantic(Scope *sc)
}
else if (fd->inferRetType)
{
if (fd->type->nextOf())
Type *tfret = fd->type->nextOf();
if (tfret)
{
if (!exp->type->equals(fd->type->nextOf()))
if (tfret != Type::terror && !exp->type->equals(tfret))
error("mismatched function return type inference of %s and %s",
exp->type->toChars(), fd->type->nextOf()->toChars());
exp->type->toChars(), tfret->toChars());
}
else
{
Expand Down Expand Up @@ -3768,6 +3778,8 @@ Statement *WithStatement::semantic(Scope *sc)
//printf("WithStatement::semantic()\n");
exp = exp->semantic(sc);
exp = resolveProperties(sc, exp);
if (exp->op == TOKerror)
return NULL;
if (exp->op == TOKimport)
{ ScopeExp *es = (ScopeExp *)exp;

Expand Down Expand Up @@ -4196,6 +4208,8 @@ Statement *ThrowStatement::semantic(Scope *sc)
error("Throw statements cannot be in contracts");
exp = exp->semantic(sc);
exp = resolveProperties(sc, exp);
if (exp->op == TOKerror)
return this;
if (!exp->type->toBasetype()->isClassHandle())
error("can only throw class objects, not type %s", exp->type->toChars());
return this;
Expand Down

0 comments on commit e199b48

Please sign in to comment.