Skip to content

Implement support for case statements in Ada #171

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

Merged
merged 5 commits into from
Mar 27, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
43 changes: 32 additions & 11 deletions gnat2goto/driver/tree_walk.adb
Original file line number Diff line number Diff line change
Expand Up @@ -1779,16 +1779,37 @@ package body Tree_Walk is
-- Auxiliary function to create a single test case
-- to emplace in a condition from a list of alternative
-- values.
function Make_Single_Test (Alt : Node_Id) return Irep;
function Make_Single_Test (Alt : Node_Id) return Irep is
Ret : constant Irep := New_Irep (I_Op_Eq);
Rhs : constant Irep := Do_Expression (Alt);
function Make_Case_Test (Alts : List_Id) return Irep;
function Make_Case_Test (Alts : List_Id) return Irep is
function Make_Single_Test (Alt : Node_Id) return Irep;
function Make_Single_Test (Alt : Node_Id) return Irep is
Ret : constant Irep := New_Irep (I_Op_Eq);
Rhs : constant Irep := Do_Expression (Alt);
begin
Set_Lhs (Ret, Value);
Set_Rhs (Ret, Rhs);
Set_Type (Ret, New_Irep (I_Bool_Type));
return Ret;
end Make_Single_Test;
First_Alt_Test : constant Irep := Make_Single_Test (First (Alts));
This_Alt : Node_Id := First (Alts);
begin
Set_Lhs (Ret, Value);
Set_Rhs (Ret, Rhs);
Set_Type (Ret, New_Irep (I_Bool_Type));
return Ret;
end Make_Single_Test;
Next (This_Alt);
if not Present (This_Alt) then
return First_Alt_Test;
end if;
declare
Big_Or : constant Irep := New_Irep (I_Op_Or);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cute

begin
Append_Op (Big_Or, First_Alt_Test);
Set_Type (Big_Or, New_Irep (I_Bool_Type));

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make_Bool_Type, although even better we should probably just have a constant Bool_Type := Make_Bool_Type somewhere in this module so we don't keep recreating new ireps for all of these unnecessarily

while Present (This_Alt) loop
Append_Op (Big_Or, Make_Single_Test (This_Alt));
Next (This_Alt);
end loop;
return Big_Or;
end;
end Make_Case_Test;

This_Alt : Node_Id := First (Alternatives (N));
begin
Expand All @@ -1809,8 +1830,8 @@ package body Tree_Walk is
else
This_Test := New_Irep (I_Code_Ifthenelse);
Set_Cond (This_Test,
Make_Single_Test
(First (Discrete_Choices (This_Alt_Copy))));
Make_Case_Test
(Discrete_Choices (This_Alt_Copy)));
Set_Then_Case (This_Test, This_Stmt);
Append_Op (Ret, This_Test);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this line (and 1829) could be moved after the if-then-else block.

end if;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
function Case_Statement_Vals return String is
I : Integer := 3;
begin
case I is
when 0 | 1 | 2 => return "Valid ternary";
when 3 => return "Invalid ternary";
when others => return "";
end case;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why does this test not assert this function returns the right value?

end Case_Statement_Vals;
1 change: 1 addition & 0 deletions testsuite/gnat2goto/tests/case_statement_vals/test.out
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VERIFICATION SUCCESSFUL
3 changes: 3 additions & 0 deletions testsuite/gnat2goto/tests/case_statement_vals/test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from test_support import *

prove()