Merge branch 'develop'

Author: DavePearce

.travis.yml

@@ -7,4 +7,4 @@ jdk:
 
 #
 script:
-    ant build-all test-all
+    ant test-all

CONTRIBUTING.md

@@ -63,3 +63,4 @@ Signed-off-by: Henry J. Wylde <public@hjwylde.com>
 Signed-off-by: Mark Utting <bm.utting@gmail.com>
 Signed-off-by: Drew Stratford <drewstratford@outlook.com>
 Signed-off-by: Rich Dougherty <rich@rd.gen.nz>
+Signed-off-by: Sebastian Schweizer <sebastian@schweizer.tel>

config.xml

@@ -2,7 +2,7 @@
   <!-- Get the root directory of the project by looking at the directory enclosing this file. -->
   <dirname property="rootdir" file="${ant.file.BuildConfig}"/>
   <!-- Set the current Whiley version -->
-  <property name="version" value="0.3.38"/>
+  <property name="version" value="0.3.39"/>
   <!-- Load the Maven Ant tasks so that we can work with Maven repositories. -->
   <typedef uri="urn:maven-ant"
            classpath="${rootdir}/lib/maven-ant-tasks-2.1.3.jar"

modules/wyc/build.xml

@@ -41,12 +41,18 @@
     </javac>
   </target>
 
+  <!-- Set the default value of this property. Since Ant properties are immutable
+       if the value has already been set by the user with -Dtest.name.contains=...
+       this will not override that value. -->
+  <property name="test.name.contains" value=""/>
+
   <target name="test" depends="test-compile-wyc">
     <junit fork="true" dir="${basedir}" failureProperty="tests.failed" printsummary="yes" outputtoformatters="true">
       <classpath>
         <pathelement path="src:../wyil/src:../wybs/src/:../wycs/src:../../${WYRL_JAR}"/>
         <path refid="junit.classpath"/>
       </classpath>
+      <sysproperty key="test.name.contains" value="${test.name.contains}"/>
       <batchtest>
         <fileset dir="src" includes="wyc/testing/*Tests.java"/>
       </batchtest>

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

@@ -390,6 +390,8 @@ private void generate(Stmt stmt, Environment environment,
 				generate((Return) stmt, environment, codes, context);
 			} else if (stmt instanceof Debug) {
 				generate((Debug) stmt, environment, codes, context);
+			} else if (stmt instanceof Fail) {
+				generate((Fail) stmt, environment, codes, context);
 			} else if (stmt instanceof IfElse) {
 				generate((IfElse) stmt, environment, codes, context);
 			} else if (stmt instanceof Switch) {
@@ -809,6 +811,36 @@ private void generate(Stmt.Debug s, Environment environment,
 		codes.add(Codes.Debug(operand), attributes(s));
 	}
 
+	/**
+	 * Translate a fail statement into WyIL bytecodes.
+	 *
+	 * <pre>
+	 * fail
+	 * </pre>
+	 *
+	 * A fail statement is always translated into a WyIL fail bytecode:
+	 *
+	 * <pre>
+	 * fail
+	 * </pre>
+	 *
+	 * @param stmt
+	 *            --- Statement to be translated.
+	 * @param environment
+	 *            --- Mapping from variable names to block registers.
+	 * @param codes
+	 *            --- Code block into which this statement is to be translated.
+	 * @param context
+	 *            --- Enclosing context of this statement (i.e. type, constant,
+	 *            function or method declaration). The context is used to aid
+	 *            with error reporting as it determines the enclosing file.
+	 * @return
+	 */
+	private void generate(Stmt.Fail s, Environment environment,
+			AttributedCodeBlock codes, Context context) {
+		codes.add(Codes.Fail(), attributes(s));
+	}
+
 	/**
 	 * Translate an if statement into WyIL bytecodes. This is done by first
 	 * translating the condition into one or more conditional branches. The true
@@ -2274,8 +2306,8 @@ public void buildVariableDeclarations(Stmt stmt,
 			WhileyFile.Context context) {
 		if (stmt instanceof Assign || stmt instanceof Assert
 				|| stmt instanceof Assume || stmt instanceof Return
-				|| stmt instanceof Debug || stmt instanceof Break
-				|| stmt instanceof Continue
+				|| stmt instanceof Debug || stmt instanceof Fail
+				|| stmt instanceof Break || stmt instanceof Continue
 				|| stmt instanceof Expr.MethodCall
 				|| stmt instanceof Expr.IndirectMethodCall
 				|| stmt instanceof Expr.FunctionCall

modules/wyc/src/wyc/builder/FlowTypeChecker.java

@@ -351,7 +351,10 @@ private Environment propagate(ArrayList<Stmt> block, Environment environment) {
 	 * @return
 	 */
 	private Environment propagate(Stmt stmt, Environment environment) {
-
+		if (environment == BOTTOM) {
+			syntaxError(errorMessage(UNREACHABLE_CODE), filename, stmt);
+			return null; // dead code
+		}
 		try {
 			if (stmt instanceof Stmt.VariableDeclaration) {
 				return propagate((Stmt.VariableDeclaration) stmt, environment);
@@ -375,6 +378,8 @@ private Environment propagate(Stmt stmt, Environment environment) {
 				return propagate((Stmt.Assert) stmt, environment);
 			} else if (stmt instanceof Stmt.Assume) {
 				return propagate((Stmt.Assume) stmt, environment);
+			} else if (stmt instanceof Stmt.Fail) {
+				return propagate((Stmt.Fail) stmt, environment);
 			} else if (stmt instanceof Stmt.Debug) {
 				return propagate((Stmt.Debug) stmt, environment);
 			} else if (stmt instanceof Stmt.Skip) {
@@ -428,6 +433,21 @@ private Environment propagate(Stmt.Assume stmt, Environment environment) {
 		return environment;
 	}
 
+	/**
+	 * Type check a fail statement. The environment after a fail statement is
+	 * "bottom" because that represents an unreachable program point.
+	 *
+	 * @param stmt
+	 *            Statement to type check
+	 * @param environment
+	 *            Determines the type of all variables immediately going into
+	 *            this block
+	 * @return
+	 */
+	private Environment propagate(Stmt.Fail stmt, Environment environment) {
+		return BOTTOM;
+	}
+
 	/**
 	 * Type check a variable declaration statement. This must associate the
 	 * given variable with either its declared and actual type in the
@@ -525,8 +545,8 @@ private Expr.AssignedVariable inferAfterType(Expr.LVal lv, Nominal afterType) {
 		} else if (lv instanceof Expr.Dereference) {
 			Expr.Dereference pa = (Expr.Dereference) lv;
 			// The before and after types are the same since an assignment
-			// through a reference does not change its type.
-			checkIsSubtype(pa.srcType, Nominal.Reference(afterType), lv);
+			// through a reference does not change its type.			
+			checkIsSubtype(pa.srcType.element(), afterType, lv);
 			return inferAfterType((Expr.LVal) pa.src, pa.srcType);
 		} else if (lv instanceof Expr.IndexOf) {
 			Expr.IndexOf la = (Expr.IndexOf) lv;