Skip to content

Commit 0cccbbd

Browse files
DavePearceDavePearce
committed
Add support for old() expression
In the end, we cannot compile old() expressions to JavaScript. That means we also cannot compile variant expressions.
1 parent c3162da commit 0cccbbd

File tree

129 files changed

+1690
-238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+1690
-238
lines changed

‎src/main/java/wyjs/tasks/JavaScriptCompiler.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@
4545
import wycc.util.AbstractCompilationUnit.Value;
4646
import wyil.lang.WyilFile;
4747
import wyil.lang.WyilFile.Decl;
48+
import wyil.lang.WyilFile.Decl.Variant;
4849
import wyil.lang.WyilFile.Expr;
50+
import wyil.lang.WyilFile.Expr.Old;
4951
import wyil.lang.WyilFile.LVal;
5052
import wyil.lang.WyilFile.Modifier;
5153
import wyil.lang.WyilFile.Stmt;
@@ -157,6 +159,19 @@ public Term constructProperty(Decl.Property decl, List<Term> clauses) {
157159
return new JavaScriptFile.Method(name, parameters, new Block(body));
158160
}
159161

162+
163+
@Override
164+
public Term constructVariant(Variant decl, List<Term> clauses) {
165+
// Determine qualified name
166+
String name = toMangledName(decl);
167+
// Translate parameters
168+
List<String> parameters = toParameterNames(decl.getParameters());
169+
// Construct body from translated clauses
170+
Term body = new Return(and(clauses));
171+
// Done
172+
return new JavaScriptFile.Method(name, parameters, new Block(body));
173+
}
174+
160175
@Override
161176
public Term constructFunction(Decl.Function decl, List<Term> precondition, List<Term> postcondition, Term _body) {
162177
if (decl.getModifiers().match(Modifier.Native.class) == null) {
@@ -751,6 +766,11 @@ public Term constructNew(Expr.New expr, Term operand) {
751766
}
752767
}
753768

769+
@Override
770+
public Term constructOld(Old expr, Term operand) {
771+
throw new UnsupportedOperationException();
772+
}
773+
754774
@Override
755775
public Term constructNotEqual(Expr.NotEqual expr, Term lhs, Term rhs) {
756776
Type lhsT = expr.getFirstOperand().getType();

‎tests/valid/Access_Valid_1.whiley‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ public export method test() :
99
int[] l = [1, 2, 3]
1010
assume index(l,0) == 1
1111
assume index(l,1) == 2
12-
assume index(l,2) == 3
12+
assume index(l,2) == 3

‎tests/valid/Array_Valid_11.whiley‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
function copy(int[] a) -> (int[][] b)
2+
ensures |b| == |a|
3+
ensures all {i in 0..|a| | b[i] == a}:
4+
int n = |a|
5+
return [a; n]
6+
7+
public export method test():
8+
assert copy([]) == []
9+
assert copy([1]) == [[1]]
10+
assert copy([1,2]) == [[1,2],[1,2]]
11+
assert copy([1,2,3]) == [[1,2,3], [1,2,3], [1,2,3]]

‎tests/valid/Array_Valid_12.whiley‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
function f(int[] xs) -> (int r)
2+
requires |xs| > 0
3+
ensures r >= 0 && r < |xs|:
4+
//
5+
return 0
6+
7+
public export method test():
8+
//
9+
int[] xs = [0]
10+
xs[f([0])] = 1
11+
assert xs == [1]
12+
int[] ys = [1,2]
13+
ys[f(ys)] = 3
14+
assert (ys[0] == 3) || (ys[1] == 3)
15+

‎tests/valid/Array_Valid_7.whiley‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
function f(int[] xs) -> (int r)
2-
requires |xs| > 0
3-
ensures r >= 0 && r < |xs|:
2+
ensures r == 0:
43
//
54
return 0
65

‎tests/valid/Assert_Valid_3.whiley‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
function f(int[] xs) -> (int r)
2+
requires xs[0] >= 0
3+
ensures r >= 0:
4+
return xs[0]
5+
6+
//
7+
public export method test():
8+
int[] xs = [1,2,3]
9+
int x = f(xs)
10+
assert x >= 0

‎tests/valid/Assert_Valid_4.whiley‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
function f(int[] xs) -> (int r)
2+
ensures r >= 0:
3+
assume |xs| > 0 && xs[0] >= 0
4+
return xs[0]
5+
6+
//
7+
public export method test():
8+
int[] xs = [1,2,3]
9+
int x = f(xs)
10+
assert x >= 0

‎tests/valid/Assert_Valid_5.whiley‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
function f(int[] xs) -> (int r)
2+
requires xs[0] == 0:
3+
//
4+
int n = 0
5+
while n < 10 where n >= 0 && xs[0] == 0:
6+
assert |xs| > 0
7+
xs[0] = 0
8+
n = n + 1
9+
//
10+
return n
11+
12+
13+
public export method test():
14+
int[] xs = [0,0,0]
15+
assume f(xs) == 10

‎tests/valid/Assert_Valid_6.whiley‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
method m(int[] xs) -> (int r)
2+
requires xs[0] >= 0:
3+
return xs[0]
4+
5+
//
6+
public export method test():
7+
int[] xs = [1,2,3]
8+
m(xs)

‎tests/valid/Assert_Valid_7.whiley‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
function f(int[] xs) -> (int r)
2+
requires xs[0] == 0:
3+
//
4+
int n = 0
5+
do:
6+
assert (n == 0) || (|xs| > 0)
7+
xs[0] = 0
8+
n = n + 1
9+
while n < 10 where n >= 0 && xs[0] == 0
10+
//
11+
return n
12+
13+
14+
public export method test():
15+
int[] xs = [0,0,0]
16+
assume f(xs) == 10

0 commit comments

Comments
 (0)