Merge branch 'release' for version 2.1.0

.travis.yml

@@ -8,10 +8,6 @@ jdk:
 branches:
   except:
     - docs
-env:
-  global:
-    - SONATYPE_USERNAME=joeycoleman
-    - secure: "LV3gkLdIXN/W10xeoIZ5lxFbVGeOPjwEvWjYzoCeX/MQrSWiY+oK22mhL1H84RczHHk9jvwlRK9ZEElKOj0vl/ywL/mF7WJgoUIDMUIAQ/jeZsJ7tF4S5o1Drjgwa6dZYLgEkNXWE4cb63vDGUQhRJz3Qq3/fntmvbKL2qCmJcE="
 before_install:
   - mvn -version
   - if [ $TRAVIS_BRANCH == "development" ] ; then { sudo apt-get update -qq; sudo apt-get install -qq nsis nsis-common nsis-pluginapi; } ; fi
@@ -27,5 +23,3 @@ script:
   - echo travis_fold:start:compile_ide
   - mvn -B install -f ide/pom.xml -Dgit-commit-id.skip=true -Pall-platforms
   - echo travis_fold:end:compile_ide
-after_success:
-  - if [ $TRAVIS_BRANCH == "development" ] ; then { echo \"-*- Deploying snapshots to Sonatype -*-\"; python tools/scripts/addServer.py; mvn -Dmaven.test.skip=true -Dmaven.javadoc.skip=true deploy --settings ~/.m2/mySettings.xml; } ; fi

README.md

@@ -16,5 +16,8 @@ This directory contains several subdirectories:
 * Documentation for VDM and Overture is in `documentation`
 * Auxiliary code that supports the build process are found in `tools`
 
+## Tests
+If running on a terminal with no gfx enabled then disable the UI test profile `ui-tests` profile. The maven argument for this is `-P ui-tests` and is used like: `mvn install -P !ui-tests` .
+
 
 

core/ast/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.overturetool</groupId>
     <artifactId>core</artifactId>
-    <version>2.0.8</version>
+    <version>2.1.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -13,7 +13,7 @@
   <name>The Overture Abstract Syntax Tree </name>
 
   <properties>
-    <astcreator.version>1.6.4</astcreator.version>
+    <astcreator.version>1.6.6</astcreator.version>
   </properties>
 
   <build>

core/ast/src/main/java/org/overture/ast/lex/LexLocation.java

@@ -48,9 +48,9 @@ public class LexLocation implements Serializable, ExternalNode, ILexLocation
 	@Override
 	public LexLocation clone()
 	{
-		LexLocation location= new LexLocation(file, module, startLine, startPos, endLine, endPos, startOffset, endOffset);
+		LexLocation location = new LexLocation(file, module, startLine, startPos, endLine, endPos, startOffset, endOffset);
 		location.hits = hits;
-		location.executable=executable;
+		location.executable = executable;
 		return location;
 	}
 
@@ -319,10 +319,10 @@ public static void resetLocations()
 			uniqueLocations = new HashMap<LexLocation, LexLocation>();
 		}
 
-//		synchronized (locationToAstNode)
-//		{
-//			locationToAstNode = new Hashtable<LexLocation, INode>();
-//		}
+		// synchronized (locationToAstNode)
+		// {
+		// locationToAstNode = new Hashtable<LexLocation, INode>();
+		// }
 		//
 		// synchronized (nameSpans)
 		// {
@@ -627,28 +627,30 @@ public static void mergeHits(File source, File coverage) throws IOException
 
 		br.close();
 	}
-	
+
 	/**
-	 * This method handles the case where a location exist both with hits>0 and hits==0. It will remove the location with hits==0 when another location hits>0 exists
+	 * This method handles the case where a location exist both with hits>0 and hits==0. It will remove the location
+	 * with hits==0 when another location hits>0 exists
+	 * 
 	 * @param locations
-	 * @return
+	 * @return the list of locations where the unwanted locations have been removed
 	 */
 	public static List<LexLocation> removeDuplicates(List<LexLocation> locations)
 	{
 		List<LexLocation> tmp = new Vector<LexLocation>();
-	c:	for (LexLocation l1 : locations)
+		c: for (LexLocation l1 : locations)
 		{
-			if(l1.hits==0)
+			if (l1.hits == 0)
 			{
 				for (LexLocation l2 : locations)
 				{
-					if(l1.equals(l2)&& l2.hits>0)
+					if (l1.equals(l2) && l2.hits > 0)
 					{
 						continue c;
 					}
 				}
 				tmp.add(l1);
-			}else
+			} else
 			{
 				tmp.add(l1);
 			}

core/ast/src/main/resources/overtureII.astv2.tostring

@@ -267,3 +267,9 @@ import org.overture.ast.util.ToStringUtil;
 
 //object designator
 %objectDesignator->identifier = [name];
+%objectDesignator->apply = [object] "(" + $Utils.listToString($[args]$)$ + ")"
+%objectDesignator->field = [object]+"."+[fieldName]
+%objectDesignator->new = "new "+[expression]
+%objectDesignator->self = [self]
+
+

core/codegen-runtime/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.overturetool</groupId>
     <artifactId>core</artifactId>
-    <version>2.0.8<!--Replaceable: Main Version--></version>
+    <version>2.1.0<!--Replaceable: Main Version--></version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

core/codegen-runtime/src/main/java/org/overture/codegen/runtime/IO.java

@@ -64,4 +64,10 @@ public static void printf(String format, List<Object> args) {
 		System.out.printf(format, args.toArray());
 		System.out.flush();
     }
+
+    public static void printf(VDMSeq seq, List<Object> args) {
+
+    	System.out.printf(seq.toString(), args.toArray());
+		System.out.flush();
+    }
 }