Java: Add upgrade script.

Author: aschackmull

java/upgrades/e7706df98aaefcf055f35f50582f2686f41c23bb/annotValue.ql

@@ -0,0 +1,27 @@
+class Annotation extends @annotation {
+  string toString() { result = "annotation" }
+}
+
+class Method extends @method {
+  string toString() { result = "method" }
+}
+
+class Expr extends @expr {
+  string toString() { result = "expr" }
+}
+
+class ParExpr extends Expr, @parexpr {
+  override string toString() { result = "(...)" }
+}
+
+predicate parExprGetExpr(ParExpr pe, Expr e) { exprs(e, _, _, pe, _) }
+
+from Annotation parentid, Method id2, Expr oldvalue, Expr value
+where
+  annotValue(parentid, id2, oldvalue) and
+  if oldvalue instanceof ParExpr
+  then
+    parExprGetExpr+(oldvalue, value) and
+    not value instanceof ParExpr
+  else value = oldvalue
+select parentid, id2, value

java/upgrades/e7706df98aaefcf055f35f50582f2686f41c23bb/callableEnclosingExpr.ql

@@ -0,0 +1,17 @@
+class Expr extends @expr {
+  string toString() { result = "expr" }
+}
+
+class ParExpr extends Expr, @parexpr {
+  override string toString() { result = "(...)" }
+}
+
+class Callable extends @callable {
+  string toString() { result = "callable" }
+}
+
+from Expr id, Callable c
+where
+  callableEnclosingExpr(id, c) and
+  not id instanceof ParExpr
+select id, c

java/upgrades/e7706df98aaefcf055f35f50582f2686f41c23bb/exprs.ql

@@ -0,0 +1,38 @@
+class ExprParent extends @exprparent {
+  string toString() { result = "exprparent" }
+}
+
+class Expr extends ExprParent, @expr {
+  override string toString() { result = "expr" }
+}
+
+class ParExpr extends Expr, @parexpr {
+  override string toString() { result = "(...)" }
+}
+
+class Type extends @type {
+  string toString() { result = "type" }
+}
+
+predicate astlink(ExprParent parent, Expr e, int idx, int parens) {
+  exprs(e, _, _, parent, idx) and
+  parens = 0 and
+  not parent instanceof ParExpr and
+  e instanceof ParExpr
+  or
+  exists(ParExpr pe |
+    exprs(e, _, _, pe, _) and
+    astlink(parent, pe, idx, parens - 1)
+  )
+}
+
+from Expr id, int kind, Type typeid, ExprParent oldparent, ExprParent parent, int oldidx, int idx
+where
+  exprs(id, kind, typeid, oldparent, oldidx) and
+  not id instanceof ParExpr and
+  if oldparent instanceof ParExpr
+  then astlink(parent, id, idx, _)
+  else (
+    parent = oldparent and idx = oldidx
+  )
+select id, kind, typeid, parent, idx

java/upgrades/e7706df98aaefcf055f35f50582f2686f41c23bb/hasLocation.ql

@@ -0,0 +1,17 @@
+class Locatable extends @locatable {
+  string toString() { result = "locatable" }
+}
+
+class Location extends @location {
+  string toString() { result = "location" }
+}
+
+class ParExpr extends Locatable, @parexpr {
+  override string toString() { result = "(...)" }
+}
+
+from Locatable locatable, Location location
+where
+  hasLocation(locatable, location) and
+  not locatable instanceof ParExpr
+select locatable, location

java/upgrades/e7706df98aaefcf055f35f50582f2686f41c23bb/isParenthesized.ql

@@ -0,0 +1,29 @@
+class ExprParent extends @exprparent {
+  string toString() { result = "exprparent" }
+}
+
+class Expr extends ExprParent, @expr {
+  override string toString() { result = "expr" }
+}
+
+class ParExpr extends Expr, @parexpr {
+  override string toString() { result = "(...)" }
+}
+
+predicate astlink(ExprParent parent, Expr e, int idx, int parens) {
+  exprs(e, _, _, parent, idx) and
+  parens = 0 and
+  not parent instanceof ParExpr and
+  e instanceof ParExpr
+  or
+  exists(ParExpr pe |
+    exprs(e, _, _, pe, _) and
+    astlink(parent, pe, idx, parens - 1)
+  )
+}
+
+from Expr e, int parentheses
+where
+  astlink(_, e, _, parentheses) and
+  not e instanceof ParExpr
+select e, parentheses

java/upgrades/e7706df98aaefcf055f35f50582f2686f41c23bb/numlines.ql

@@ -0,0 +1,13 @@
+class Sourceline extends @sourceline {
+  string toString() { result = "sourceline" }
+}
+
+class ParExpr extends Sourceline, @parexpr {
+  override string toString() { result = "(...)" }
+}
+
+from Sourceline id, int l, int code, int comm
+where
+  numlines(id, l, code, comm) and
+  not id instanceof ParExpr
+select id, l, code, comm