Cumulative updates

Author: amoeller

.scalafmt.conf

@@ -1,3 +1,9 @@
 style = IntelliJ 
 maxColumn = 160
-binPack.literalArgumentLists = false
+binPack.literalArgumentLists = false
+align = none
+//align.openParenCallSite = true
+//align.openParenDefnSite = true
+includeCurlyBraceInSelectChains = false
+rewrite.rules = [ redundantbraces, sortimports, SortModifiers ]
+rewrite.redundantBraces.stringInterpolation = true

.travis.yml

@@ -4,13 +4,11 @@ TIP is a tiny imperative programming language aimed at teaching the
 fundamental concepts of static program analysis. This code accompanies the
 lecture notes on [Static Program Analysis](http://cs.au.dk/~amoeller/spa/).
 
-[![Build Status](https://travis-ci.org/cs-au-dk/TIP.svg)](https://travis-ci.org/cs-au-dk/TIP)
-
 ## Getting started
 
 Prerequisites:
 - Java 8
-- [Scala 2.11](http://www.scala-lang.org/download/)
+- [Scala 2.12](http://www.scala-lang.org/download/)
 - [SBT](http://www.scala-sbt.org/)
 
 We suggest you to use IntelliJ for working on TIP, but all the following

README.md

@@ -1,21 +1,12 @@
 name := "tip"
-version := "2.0.0"
 
-scalaVersion := "2.11.8"
+scalaVersion := "2.12.6"
 
 trapExit := false
 
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 
-////// runtime dependencies ////
 libraryDependencies += "org.parboiled" %% "parboiled" % "2.1.4"
-libraryDependencies += "com.regblanc" % "scala-smtlib_2.11" % "0.2.1"
-
-////// test dependencies ///////
-libraryDependencies += "junit" % "junit" % "4.12" % "test"
-libraryDependencies += "org.scalatest" % "scalatest_2.11" % "3.0.0"
+libraryDependencies += "com.regblanc" % "scala-smtlib_2.12" % "0.2.1"
 
 scalaSource in Compile := baseDirectory.value / "src"
-scalaSource in Test := baseDirectory.value / "test"
-
-scalafmtOnCompile in ThisBuild := true // format on compile

build.sbt

@@ -18,7 +18,7 @@ main() {
   n = 42;
   while (n>0) {
     n = n-1;
-    h = alloc;
+    h = alloc null;
     *h = t;
     t = h;
   }

examples/a1.tip

@@ -8,7 +8,7 @@ unnormalized(){
     var d;
 
     d = *x;
-    *d = (*foo)(&x,bar(alloc));
+    *d = (*foo)(&x,bar(alloc null));
 
     return 10;
 }
@@ -26,7 +26,7 @@ normalized(){
     f1 = bar;
     f2 = *foo;
 
-    m = alloc;
+    m = alloc null;
 
     a1 = &x;
     a2 = (f1)(m);

examples/a2.tip

@@ -21,7 +21,7 @@ main() {
     y = &z;
     x = &y;
 
-    **x = (*foo)(&x,bar(alloc));
+    **x = (*foo)(&x,bar(alloc 0));
 
     return **x;
     //return 1;

examples/a3.tip

@@ -1,6 +1,6 @@
 main() {
     var x,y,p,q;
-    q = alloc;
+    q = alloc null;
     y = &q;
     x = *y;
     p = null;

examples/a4.tip

@@ -3,7 +3,7 @@ f() {
     a = &d;
     b = &e;
     a = b;
-    tmp = alloc;
+    tmp = alloc null;
     *a = tmp;
     return 0;
 }

examples/andersen.tip

@@ -37,7 +37,7 @@ main(){
     return test(5);
 /*
     var a,b,c;
-    b = alloc;
+    b = alloc null;
     a=100;
     //c=g(b);
     c=g(&a);