Merge pull request #20 from MetaBorgCube/release/0.6.2

Release/0.6.2

.mvn/extensions.xml

@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.metaborg</groupId>
     <artifactId>spoofax-maven-plugin-pomless</artifactId>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
   </extension>
 </extensions>

.mvn/settings.xml

@@ -47,7 +47,7 @@
         </repository>
 		<repository>
 			<id>spoofax-eclipse-repo</id>
-			<url>http://tinyurl.com/spoofax-eclipse-2-1-0</url>
+			<url>http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.2.0/org.metaborg.spoofax.eclipse.updatesite-2.2.0-assembly.zip-unzip/</url>
 			<layout>p2</layout>
 			<releases>
 				<enabled>false</enabled>

Jenkinsfile

@@ -21,16 +21,16 @@ node{
     stage('Build and Test') {
       withMaven(
         //mavenLocalRepo: "${env.JENKINS_HOME}/m2repos/${env.EXECUTOR_NUMBER}", //http://yellowgrass.org/issue/SpoofaxWithCore/173
-        mavenLocalRepo: ".repository",
-        mavenOpts: '-Xmx1G -Xms1G -Xss16m'
+		mavenLocalRepo: ".repository",
+        mavenOpts: '-Xmx2G -Xms2G -Xss16m'
       ){
         sh 'mvn -B -U clean verify -DforceContextQualifier=\$(date +%Y%m%d%H%M)'
       }
     }
 
     stage('Archive') {
       archiveArtifacts(
-        artifacts: 'icedust.eclipse.updatesite/target/site/',
+        artifacts: 'icedust2.eclipse.site/target/site/,icedust.eclipse.updatesite/target/site/',
         excludes: null,
         onlyIfSuccessful: true
       )

change_to_spoofax_nightly.sh

@@ -1,2 +1,2 @@
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "http://download.spoofax.org/update/release/2.0.0/eclipse/site/" search . | xargs sed -i "" "s/http:\/\/download.spoofax.org\/update\/release\/2.0.0\/eclipse\/site\//http:\/\/download.spoofax.org\/update\/nightly\//g"
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "2.0.0" search . | xargs sed -i "" "s/2.0.0/2.1.0-SNAPSHOT/g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "http://tinyurl.com/spoofax-eclipse-2-1-0" search . | xargs sed -i "" "s/http:\/\/tinyurl.com\/spoofax-eclipse-2-1-0/http:\/\/download.spoofax.org\/update\/nightly\//g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "2.1.0" search . | xargs sed -i "" "s/2.1.0/2.2.0-SNAPSHOT/g"

change_to_spoofax_stable.sh

@@ -1,3 +1,2 @@
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "http://download.spoofax.org/update/nightly/" search . | xargs sed -i "" "s/http:\/\/download.spoofax.org\/update\/nightly\//http:\/\/download.spoofax.org\/update\/release\/2.1.0\/eclipse\/site\//g"
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "2.1.0-SNAPSHOT" search . | xargs sed -i "" "s/2.1.0-SNAPSHOT/2.1.0/g"
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "http://download.spoofax.org/update/release/2.1.0/eclipse/site/" search . | xargs sed -i "" "s/http:\/\/download.spoofax.org\/update\/release\/2.1.0\/eclipse\/site\//http:\/\/tinyurl.com\/spoofax-eclipse-2-1-0/g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "http://download.spoofax.org/update/nightly/" search . | xargs sed -i "" "s_http://download.spoofax.org/update/nightly/_http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.2.0/org.metaborg.spoofax.eclipse.updatesite-2.2.0-assembly.zip-unzip/_g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "2.2.0-SNAPSHOT" search . | xargs sed -i "" "s_2.2.0-SNAPSHOT_2.2.0_g"

change_version.sh

@@ -1 +1 @@
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.5.1(.qualifier|-SNAPSHOT)" * | xargs sed -i "" "s/0.5.1/0.6.1/g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.1.0(.qualifier|-SNAPSHOT)" * | xargs sed -i "" "s/0.1.0/0.6.2/g"

change_version_to_stable.sh

@@ -1,2 +1,2 @@
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.6.1.qualifier" * | xargs sed -i "" "s/0.6.1.qualifier/0.6.1/g"
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.6.1-SNAPSHOT" * | xargs sed -i "" "s/0.6.1-SNAPSHOT/0.6.1/g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.6.2.qualifier" * | xargs sed -i "" "s/0.6.2.qualifier/0.6.2/g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.6.2-SNAPSHOT" * | xargs sed -i "" "s/0.6.2-SNAPSHOT/0.6.2/g"

icedust.eclipse.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="icedust.eclipse.feature"
       label="IceDust Language Editor"
-      version="0.6.1">
+      version="0.6.2">
 
    <description url="https://github.com/metaborg/icedust">
       The IceDust Language Editor
@@ -35,6 +35,6 @@ Most Spoofax/IMP code is licensed under the GNU Lesser General Public License (L
          id="icedust.eclipse"
          download-size="0"
          install-size="0"
-         version="0.6.1"/>
+         version="0.6.2"/>
 
 </feature>

icedust.eclipse.feature/pom.xml

@@ -5,13 +5,13 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>icedust.eclipse.feature</artifactId>
-  <version>0.6.1</version>
+  <version>0.6.2</version>
   <packaging>eclipse-feature</packaging>
 
   <parent>
     <groupId>org.metaborg</groupId>
     <artifactId>parent.eclipse.plugin</artifactId>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
     <relativePath />
   </parent>
 
@@ -38,7 +38,7 @@
     </repository>
     <repository>
       <id>spoofax-eclipse-repo</id>
-      <url>http://tinyurl.com/spoofax-eclipse-2-1-0</url>
+      <url>http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.2.0/org.metaborg.spoofax.eclipse.updatesite-2.2.0-assembly.zip-unzip/</url>
       <layout>p2</layout>
       <releases>
         <enabled>false</enabled>

icedust.eclipse.updatesite/pom.xml

@@ -5,13 +5,13 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>icedust.eclipse.updatesite</artifactId>
-  <version>0.6.1</version>
+  <version>0.6.2</version>
   <packaging>eclipse-update-site</packaging>
 
   <parent>
     <groupId>org.metaborg</groupId>
     <artifactId>parent.eclipse.plugin</artifactId>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
     <relativePath />
   </parent>
 
@@ -38,7 +38,7 @@
     </repository>
     <repository>
       <id>spoofax-eclipse-repo</id>
-      <url>http://tinyurl.com/spoofax-eclipse-2-1-0</url>
+      <url>http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.2.0/org.metaborg.spoofax.eclipse.updatesite-2.2.0-assembly.zip-unzip/</url>
       <layout>p2</layout>
       <releases>
         <enabled>false</enabled>

icedust.eclipse.updatesite/site.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/icedust.eclipse.feature_0.6.1.jar" id="icedust.eclipse.feature" version="0.6.1">
+   <feature url="features/icedust.eclipse.feature_0.6.2.jar" id="icedust.eclipse.feature" version="0.6.2">
       <category name="IceDust_Language_Editor"/>
    </feature>
    <category-def name="IceDust_Language_Editor" label="IceDust Language Editor">

icedust.eclipse/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: IceDust language Eclipse plugin
 Bundle-SymbolicName: icedust.eclipse;singleton:=true
-Bundle-Version: 0.6.1
+Bundle-Version: 0.6.2
 Bundle-Vendor: metaborg.org
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.metaborg.spoofax.eclipse

icedust.eclipse/pom.xml

@@ -2,13 +2,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>icedust.eclipse</artifactId>
-  <version>0.6.1</version>
+  <version>0.6.2</version>
   <packaging>eclipse-plugin</packaging>
 
   <parent>
     <groupId>org.metaborg</groupId>
     <artifactId>parent.eclipse.language</artifactId>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
     <relativePath />
   </parent>
 
@@ -62,7 +62,7 @@
     </repository>
     <repository>
       <id>spoofax-eclipse-repo</id>
-      <url>http://tinyurl.com/spoofax-eclipse-2-1-0</url>
+      <url>http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.2.0/org.metaborg.spoofax.eclipse.updatesite-2.2.0-assembly.zip-unzip/</url>
       <layout>p2</layout>
       <releases>
         <enabled>false</enabled>

icedust.examples.webdsl/icedustWebDSL.ice2

@@ -0,0 +1,10 @@
+module icedustWebDSL
+
+model
+
+  entity Foo{
+    bar : String
+    bar2 : String = bar
+  }
+
+  relation Foo.o (ordered) <-> Foo.u

icedust.tests/.gitignore

@@ -11,3 +11,7 @@ target
 /.classpath
 /.project
 /.settings
+**/nativejava
+**/stylesheets
+**/.saved-but-not-built
+**/javascript

icedust.tests/.project

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>icedust.tests</name>
-  <comment></comment>
-  <projects>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.m2e.core.maven2Builder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-    <buildCommand>
-      <name>org.metaborg.spoofax.eclipse.builder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.m2e.core.maven2Nature</nature>
-    <nature>org.metaborg.spoofax.eclipse.nature</nature>
-  </natures>
+	<name>icedust.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.metaborg.spoofax.eclipse.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.metaborg.spoofax.eclipse.nature</nature>
+	</natures>
 </projectDescription>

icedust.tests/dynamic-semantics/generate/auto-shortcut/AutoShortcuts.spt

@@ -0,0 +1,31 @@
+module generate-auto-shortcuts
+
+language IceDust
+
+fixture [[
+  module AutoShortcuts (on-demand)
+
+  model
+  entity Node{
+    value : Int ? = avg( this.child.value ) (default)
+  }
+  relation Tree{
+    Node.tree_as_parent * -> parent
+    Node.tree_as_child  ? -> child
+  }
+
+  data
+    n3 : Node {
+      child = 
+        n1 : Node {value=2},
+        n2 : Node {value=4}
+    }
+
+  execute
+  n3.value
+  [[...]]
+]]
+
+//test Expressions Auto Shortcuts execute-java [[ ]] transform "SPT -> to Java -> Execute" to //FIXME: fix analysis
+//"3
+//"

icedust.tests/generate/expressions-aggregations-recursive/ExpressionsAggregationRecursive.spt → icedust.tests/dynamic-semantics/generate/expressions-aggregations-recursive/ExpressionsAggregationRecursive.spt

@@ -3,7 +3,7 @@ module generate-expressions-aggregation-recursive
 language IceDust
 
 fixture [[
-  module ExpressionsAggregationRecursive
+  module ExpressionsAggregationRecursive (on-demand)
 
   model
 
@@ -28,8 +28,6 @@ fixture [[
     [[...]] 
 ]]
 
-//test Expressions Aggregation Recursive generate-java [[ ]] run generate-java-test
-//
-//test Expressions Aggregation Recursive compile-java [[ ]] run compile-java-test
-
-//test Expressions Aggregation Recursive execute-java [[ ]] run execute-java-test to "3"
+//test Expressions Aggregation Recursive execute-java [[ ]] transform "SPT -> to Java -> Execute" to //FIXME: analysis fails
+//"5
+//"

icedust.tests/generate/expressions-aggregations/ExpressionsAggregation.spt → icedust.tests/dynamic-semantics/generate/expressions-aggregations/ExpressionsAggregation.spt

@@ -3,7 +3,7 @@ module generate-expressions-aggregation
 language IceDust
 
 fixture [[
-  module ExpressionsAggregation
+  module ExpressionsAggregation (on-demand)
 
   model
   entity X {
@@ -22,8 +22,6 @@ fixture [[
   [[...]]
 ]]
 
-//test Expressions Aggregation generate-java [[ ]] run generate-java-test
-//
-//test Expressions Aggregation compile-java [[ ]] run compile-java-test
-
-//test Expressions Aggregation execute-java [[ ]] run execute-java-test to "5"
+//test Expressions Aggregation execute-java [[ ]] transform "SPT -> to Java -> Execute" to //FIXME: code generator fails 
+//"5
+//"

icedust.tests/dynamic-semantics/generate/expressions-cast/ExpressionsCast.spt

@@ -0,0 +1,15 @@
+module generate-expressions-cast
+
+language IceDust
+
+fixture [[
+  module ExpressionsCast (on-demand)
+
+  execute
+    concat(5.0 as String + " " + true as String + " " + 5 as String ++ no value as String)
+    [[...]]
+]]
+
+test Expressions Cast execute-java [[ ]] transform "SPT -> to Java -> Execute" to
+"5.0 true 5
+"

icedust.tests/dynamic-semantics/generate/expressions-datetime/ExpressionsDatetime.spt

@@ -0,0 +1,16 @@
+module generate-expressions-Datetime
+
+language IceDust
+
+fixture [[
+  module ExpressionsDatetime
+
+  execute
+
+    (2015-1-1 0:00:00 - 2014-12-31 0:00:00) /. 3600
+    [[...]] 
+]]
+
+test Expressions Datetime execute-java [[ ]] transform "SPT -> to Java -> Execute" to
+"24
+"

icedust.tests/dynamic-semantics/generate/expressions-logic/ExpressionsLogic.spt

@@ -0,0 +1,23 @@
+module generate-expressions-logic
+
+language IceDust
+
+fixture [[
+  module ExpressionsLogic (on-demand)
+
+  model
+  entity X {
+    val : Int = (42 >= 4 && !false ? "a" : "b") == "a" ? 5 : 88 + 4
+  }
+
+  data
+  x : X {}
+
+  execute
+  x.val
+  [[...]]
+]]
+
+test Expressions Logic execute-java [[ ]] transform "SPT -> to Java -> Execute" to
+"5
+"

icedust.tests/dynamic-semantics/generate/expressions-math/ExpressionsMath.spt

@@ -0,0 +1,23 @@
+module generate-expressions-math
+
+language IceDust
+
+fixture [[
+  module ExpressionsMath (on-demand)
+
+  model
+  entity X {
+    val : Int ? = 42 * 6 % 10 /. (5 - 10) + 4 - 3 * 8 /. -1 + (3 / 2) as Int
+  }
+
+  data
+  x : X {}
+
+  execute
+  x.val
+  [[...]]
+]]
+
+test Expressions Math execute-java [[ ]] transform "SPT -> to Java -> Execute" to
+"29
+"