merge D1 pull #529

dlang · May 3, 2012 · b75d921 · b75d921
2 parents 37aab20 + 86b225a
commit b75d921
Show file tree

Hide file tree

Showing 4 changed files with 236 additions and 182 deletions.
diff --git a/src/declaration.h b/src/declaration.h
@@ -541,6 +541,7 @@ struct FuncDeclaration : Declaration
     Identifier *outId;                  // identifier for out statement
     VarDeclaration *vresult;            // variable corresponding to outId
     LabelDsymbol *returnLabel;          // where the return goes
+    Scope *scout;                       // out contract scope for vresult->semantic
 
     DsymbolTable *localsymtab;          // used to prevent symbols in different
                                         // scopes from having the same name
@@ -658,6 +659,7 @@ struct FuncDeclaration : Declaration
     FuncDeclaration *isUnique();
     int needsClosure();
     int hasNestedFrameRefs();
+    void buildResultVar();
     Statement *mergeFrequire(Statement *);
     Statement *mergeFensure(Statement *);
     Parameters *getParameters(int *pvarargs);