Introduce Lifetimes

modules/wyc/src/wyc/builder/CodeGenerator.java

@@ -312,6 +312,8 @@ private void generate(Stmt stmt, EnclosingScope scope) {
 				generate((Break) stmt, scope);
 			} else if (stmt instanceof Continue) {
 				generate((Continue) stmt, scope);
+			} else if (stmt instanceof NamedBlock) {
+				generate((NamedBlock) stmt, scope);
 			} else if (stmt instanceof While) {
 				generate((While) stmt, scope);
 			} else if (stmt instanceof DoWhile) {
@@ -974,6 +976,15 @@ private void checkNoDuplicateLabels(List<Stmt.Case> cases, EnclosingScope scope)
 	}
 
 
+	/**
+	 * Translate a named block into WyIL bytecodes.
+	 */
+	private void generate(Stmt.NamedBlock s, EnclosingScope scope) {
+		for (Stmt st : s.body) {
+			generate(st, scope);
+		}
+	}
+
 	/**
 	 * Translate a while loop into WyIL bytecodes. Consider the following use of
 	 * a while statement:
@@ -1675,7 +1686,8 @@ private Type.FunctionOrMethod determineLambdaParametersAndOperands(Expr.Lambda e
 		if(lambdaType instanceof Nominal.Function) {
 			return Type.Function(rawLambdaType.returns(),rawParamTypes);
 		} else {
-			return Type.Method(rawLambdaType.returns(),rawParamTypes);
+			return Type.Method(rawLambdaType.returns(),rawLambdaType.contextLifetimes(),
+					rawLambdaType.lifetimeParams(),rawParamTypes);
 		}
 	}
 

modules/wyc/src/wyc/io/WhileyFileLexer.java

@@ -563,6 +563,8 @@ private void syntaxError(String msg, int index) {
 			put("export", Token.Kind.Export);
 			put("method", Token.Kind.Method);
 			put("package", Token.Kind.Package);
+			// lifetimes
+			put("this", Token.Kind.This);
 		}
 	};
 
@@ -627,6 +629,8 @@ public enum Kind {
 			Export("export"),
 			Function("function"),
 			Method("method"),
+			// Lifetimes
+			This("this"),
 			// Expressions
 			All("all"),
 			No("no"),