Merge branch 'develop'

.gitignore

@@ -11,5 +11,6 @@
 *.smt2
 /report/
 /build/
+/dist/
 /modules/wycs/src/wycs/core/Types.java
-/modules/wycs/src/wycs/solver/Solver.java
+/modules/wycs/src/wycs/solver/Solver.java

.travis.yml

@@ -7,4 +7,5 @@ jdk:
 
 #
 script:
-    ant test-all
+    - touch running_on_travis
+    - ant test-all

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.39"/>
+  <property name="version" value="0.3.40"/>
   <!-- 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/wybs/src/wyfs/util/VirtualRoot.java

@@ -72,6 +72,11 @@ public static final class Entry<T> extends AbstractEntry<T> implements Path.Entr
 		 */
 		private byte[] data;
 
+		/**
+		 * Number of bytes in data actually used.
+		 */
+		private int length;
+
 		/**
 		 * The last modified date. This is a time stamp used to determine when
 		 * the file was last modified in order to calculate which dependents
@@ -98,22 +103,31 @@ public long lastModified() {
 		}
 
 		public InputStream inputStream() {
-			return new ByteArrayInputStream(data);
+			return new ByteArrayInputStream(data,0,length);
 		}
 
 		public OutputStream outputStream() {
 			lastModified = System.currentTimeMillis();
 			data = new byte[0];
+			length = 0;
 			// create an output stream which will automatically resize the given
 			// array.
-			return new OutputStream() {
-				private int pos = 0;
-
+			return new OutputStream() {		
+				public void write(byte[] bytes) {
+					data = new byte[bytes.length];
+					System.arraycopy(bytes, 0, data, 0, bytes.length);
+					length = data.length;
+				}
+				public void write(byte[] bytes, int off, int len) {
+					data = new byte[len];
+					System.arraycopy(bytes, off, data, 0, len);
+					length = data.length;
+				}
 				public void write(int b) {
-					if (pos >= data.length) {
+					if (length >= data.length) {
 						data = Arrays.copyOf(data, (data.length + 1) * 2);
 					}
-					data[pos++] = (byte) b;
+					data[length++] = (byte) b;
 				}
 			};
 		}

modules/wyc/build.xml

@@ -47,7 +47,7 @@
   <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">
+    <junit fork="true" dir="${basedir}" failureProperty="tests.failed" printsummary="yes" showoutput="yes" outputtoformatters="no">
       <classpath>
         <pathelement path="src:../wyil/src:../wybs/src/:../wycs/src:../../${WYRL_JAR}"/>
         <path refid="junit.classpath"/>