Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No flatten for most backends #5528

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
97d81e2
Add patterns/codeSize test
keyboardDrummer May 29, 2024
e77441a
Update codeSize test
keyboardDrummer May 29, 2024
547317f
Split off statement part from SPCG
keyboardDrummer May 29, 2024
55b4cde
Draft of nested match compiler
keyboardDrummer May 30, 2024
b4bc5cf
Save
keyboardDrummer May 30, 2024
f10aa78
Generated code looks good upon visual inspection
keyboardDrummer May 30, 2024
ee9ae6f
Generated code compiles and runs
keyboardDrummer May 30, 2024
069dddb
Move NestedMatch generation to just C#
keyboardDrummer May 30, 2024
da513a0
Attempt at implementation for expressions
keyboardDrummer May 30, 2024
88536c8
Ran formatter
keyboardDrummer May 30, 2024
f13be6e
Fixes
keyboardDrummer May 30, 2024
a61d607
Update C# code generator zo it also uses custom generation for nested…
keyboardDrummer May 30, 2024
846ad62
Regen GeneratedFromDafny code
keyboardDrummer May 30, 2024
85c1b20
Revert "Regen GeneratedFromDafny code"
keyboardDrummer May 30, 2024
3660a37
Fix gen
keyboardDrummer May 30, 2024
26000a5
Fixes for generics
keyboardDrummer May 30, 2024
2805584
Update generated files
keyboardDrummer May 30, 2024
09f39f8
Merge branch 'master' into noFlattenForCSharp
keyboardDrummer May 30, 2024
82a5d71
Fix bug related to disjoint patterns
keyboardDrummer May 31, 2024
c32be6f
Merge branch 'noFlattenForCSharp' of github.com:keyboardDrummer/dafny…
keyboardDrummer May 31, 2024
861cee7
Merge remote-tracking branch 'origin/master' into noFlattenForCSharp
keyboardDrummer May 31, 2024
1e25d7b
Fix literal pattern bug
keyboardDrummer May 31, 2024
6791e43
Remove DatatypeWrapperEraser.IsErasableDatatypeWrapper check
keyboardDrummer May 31, 2024
eedcf47
Ran formatter
keyboardDrummer May 31, 2024
6f981ab
Fix bug in disjunctive assignments
keyboardDrummer May 31, 2024
0bd8c0d
Merge branch 'master' into noFlattenForCSharp
keyboardDrummer May 31, 2024
903f2bf
Trigger CI
keyboardDrummer May 31, 2024
5d9dc07
Merge branch 'noFlattenForCSharp' of github.com:keyboardDrummer/dafny…
keyboardDrummer May 31, 2024
9477c6f
Fixes
keyboardDrummer Jun 1, 2024
b919fa8
Refactoring
keyboardDrummer Jun 1, 2024
c6de95b
Add force integration tests code
keyboardDrummer Jun 3, 2024
0672492
Merge branch 'master' into noFlattenForCSharp
keyboardDrummer Jun 4, 2024
3c86dd7
Convert if else chains to switch
keyboardDrummer Jun 4, 2024
e45420a
Merge commit 'a748799eef1d7~1' into noFlattenForCSharp
keyboardDrummer Jun 5, 2024
b8de307
Merge commit 'a748799eef1d7' into noFlattenForCSharp
keyboardDrummer Jun 5, 2024
f97bf09
Merge remote-tracking branch 'origin/master' into noFlattenForCSharp
keyboardDrummer Jun 5, 2024
75bb47e
Ran formatter
keyboardDrummer Jun 5, 2024
e1bb707
Refactoring
keyboardDrummer Jun 5, 2024
dbcb4a4
Further refactoring
keyboardDrummer Jun 5, 2024
420a13b
Further refactoring
keyboardDrummer Jun 5, 2024
5f860c9
Attempt at using nested matches for all backends
keyboardDrummer Jun 5, 2024
808d090
Use flattened matches for DafnyCodeGenerator
keyboardDrummer Jun 5, 2024
126344a
Reintroduce flattening for Java
keyboardDrummer Jun 5, 2024
a1011f7
Fixes
keyboardDrummer Jun 5, 2024
387b35f
Remove codeSize test
keyboardDrummer Jun 5, 2024
49e0c55
Update expect files
keyboardDrummer Jun 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add patterns/codeSize test
  • Loading branch information
keyboardDrummer committed May 29, 2024
commit 97d81e24d0f50e08cd24a630867676637241f4f5
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
// RUN: %resolve --rprint:%t.rprint "%s" > "%t"
// RUN: %diff "%s.expect" "%t"

datatype Type =
| SelfOwned
| U8 | U16 | U32 | U64 | U128 | I8 | I16 | I32 | I64 | I128
| TIdentifier(name: string)
| TMemberSelect(base: Type, name: string)
| TypeApp(baseName: Type, arguments: seq<Type>)
| Borrowed(underlying: Type)
| BorrowedMut(underlying: Type)
| ImplType(underlying: Type)
| DynType(underlying: Type)
| TupleType(arguments: seq<Type>)
| FnType(arguments: seq<Type>, returnType: Type)
| IntersectionType(left: Type, right: Type)

datatype DeclareType = MUT | CONST

datatype Expr =
RawExpr(content: string)
| Identifier(name: string) // Can be empty for global in MemberSelect
//| Match(matchee: Expr, cases: seq<MatchCase>)
| StmtExpr(stmt: Expr, rhs: Expr)
| Block(underlying: Expr)
//| StructBuild(name: string, assignments: seq<AssignIdentifier>)
| Tuple(arguments: seq<Expr>)
| UnaryOp(op1: string, underlying: Expr, format: UnaryOpFormat)
| BinaryOp(op2: string, left: Expr, right: Expr, format2: BinaryOpFormat)
| LiteralInt(value: string)
| LiteralString(value: string, binary: bool)
| ConversionNum(tpe: Type, underlying: Expr)
| DeclareVar(declareType: DeclareType, name: string, optType: Option<Type>, optRhs: Option<Expr>)
| AssignVar(name: string, rhs: Expr)
| Call(obj: Expr, typeParameters: seq<Type>, arguments: seq<Expr>)
| Select(obj: Expr, name: string)
| MemberSelect(obj: Expr, name: string)
{
function Optimize(): Expr
{
match this {
case UnaryOp("&", Call(Select(underlying, "clone"), typeArgs, args), format) =>
if typeArgs == [] && args == [] then
UnaryOp("&", underlying, format)
else
this

case UnaryOp("!", BinaryOp("==", left, right, format),
CombineFormat()) =>
BinaryOp("!=", left, right, BinaryOpFormat.NoFormat())

case UnaryOp("!", BinaryOp("<", left, right, NoFormat()),
CombineFormat()) =>
BinaryOp(">=", left, right, BinaryOpFormat.NoFormat())

case UnaryOp("!", BinaryOp("<", left, right, ReverseFormat()),
CombineFormat()) =>
BinaryOp("<=", right, left, BinaryOpFormat.NoFormat())

case ConversionNum(tpe, expr) =>
if || tpe.U8? || tpe.U16? || tpe.U32? || tpe.U64? || tpe.U128?
|| tpe.I8? || tpe.I16? || tpe.I32? || tpe.I64? || tpe.I128? then
match expr {
case Call(MemberSelect(
MemberSelect(MemberSelect(
Identifier(""), "dafny_runtime"), "DafnyInt"), "from"), tpe, args) =>
if |tpe| == 0 && |args| == 1 then
match args[0] {
case LiteralInt(number) => LiteralInt("/*optimized*/"+number)
case LiteralString(number, _) => LiteralInt("/*optimized*/"+number)
case _ => this
}
else this
case _ => this
}
else
this
case StmtExpr(DeclareVar(mod, name, Some(tpe), None), StmtExpr(AssignVar(name2, rhs), last)) =>
if name == name2 then
var rewriting := StmtExpr(DeclareVar(mod, name, Some(tpe), Some(rhs)), last);
rewriting
else
this
case _ => this
}
}
}

datatype UnaryOpFormat =
| NoFormat
| CombineFormat
datatype BinaryOpFormat =
| NoFormat
| ImpliesFormat
| EquivalenceFormat
| ReverseFormat

datatype Option<+T> = None | Some(value: T) {

function UnwrapOr(default: T): T {
match this
case Some(v) => v
case None() => default
}

predicate IsFailure() {
None?
}

function PropagateFailure<U>(): Option<U>
requires None?
{
None
}

function Extract(): T
requires Some?
{
value
}
}