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.

Sign up for GitHub

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

Check command #947

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Check command #947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c415283
Add 'check' commands, a variation of assert command
keyboardDrummer Aug 26, 2024
26d40b5
Merge remote-tracking branch 'origin/master'
keyboardDrummer Aug 26, 2024
49f48cf
Add blank line
keyboardDrummer Aug 26, 2024
86fd5f1
Merge remote-tracking branch 'origin/master' into checkCommand
keyboardDrummer Sep 16, 2024
f9cf807
Move structured commands into separate files
keyboardDrummer Sep 16, 2024
30ba838
Move some code into structured command sublcasses
keyboardDrummer Sep 16, 2024
f690907
Further refactoring
keyboardDrummer Sep 16, 2024
d879869
Renames
keyboardDrummer Sep 16, 2024
b03d169
Allow marking variables so that they're not havocced after a loop
keyboardDrummer Sep 23, 2024
90ac56d
Rename
keyboardDrummer Sep 23, 2024
8664d8a
Format atg
keyboardDrummer Sep 25, 2024
5b8179e
Merge remote-tracking branch 'origin/master' into checkCommand
keyboardDrummer Sep 25, 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
14 changes: 7 additions & 7 deletions Source/Concurrency/LinearTypeChecker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,23 +764,23 @@ private void CheckLinearStoreAccessInGuards()
while (stmtLists.Count > 0)
{
var stmtList = stmtLists.Pop();
stmtList.BigBlocks.Where(bigBlock => bigBlock.ec != null).ForEach(bigBlock => {
switch (bigBlock.ec) {
stmtList.BigBlocks.Where(bigBlock => bigBlock.Ec != null).ForEach(bigBlock => {
switch (bigBlock.Ec) {
case IfCmd ifCmd:
void ProcessIfCmd(IfCmd ifCmd)
{
if (ifCmd.Guard != null && LinearStoreVisitor.HasLinearStoreAccess(ifCmd.Guard))
{
checkingContext.Error(ifCmd.tok, "access to linear store not allowed");
}
stmtLists.Push(ifCmd.thn);
if (ifCmd.elseIf != null)
stmtLists.Push(ifCmd.Thn);
if (ifCmd.ElseIf != null)
{
ProcessIfCmd(ifCmd.elseIf);
ProcessIfCmd(ifCmd.ElseIf);
}
else if (ifCmd.elseBlock != null)
else if (ifCmd.ElseBlock != null)
{
stmtLists.Push(ifCmd.elseBlock);
stmtLists.Push(ifCmd.ElseBlock);
}
}
ProcessIfCmd(ifCmd);
Expand Down
3 changes: 2 additions & 1 deletion Source/Core/AST/Absy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,7 @@ void ObjectInvariant()
Contract.Invariant(this.typedIdent != null);
}

public Variable(IToken tok, TypedIdent typedIdent)
protected Variable(IToken tok, TypedIdent typedIdent)
: base(tok, typedIdent.Name)
{
Contract.Requires(tok != null);
Expand All @@ -1304,6 +1304,7 @@ public Variable(IToken tok, TypedIdent typedIdent, QKeyValue kv)
}

public abstract bool IsMutable { get; }
public bool Monotonic { get; }

public override void Emit(TokenTextWriter stream, int level)
{
Expand Down
Loading
Loading