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

Support switch label clauses. Fixes #693 #694

Merged
merged 8 commits into from
Jun 12, 2018
Merged

Support switch label clauses. Fixes #693 #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0124633
Test cases for #693
kamphaus Apr 27, 2018
5a4977b
Transpile switch label clause. Fixes #693
kamphaus Apr 27, 2018
979839e
Improve handling of label clause
kamphaus Apr 28, 2018
fd72d77
Fix panic if Switch body contains NullStmt after LabelStmt
kamphaus Apr 28, 2018
10adffd
Fix goto SW_GENERATED_LABEL_x jumps over declaration of variable
kamphaus Apr 30, 2018
9fec47f
Add test for nested for loop with break
christophe-kamphaus-jemmic May 25, 2018
76f7566
Fix failing test: do not replace nested breaks
christophe-kamphaus-jemmic May 25, 2018
0f6a60b
Remove vendor/ folder
christophe-kamphaus-jemmic Jun 4, 2018
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
2 changes: 1 addition & 1 deletion tests/code_quality/for.expected.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Package main - transpiled by c2go version: v0.22.4 Aluminium 2018-04-24
Package main - transpiled by c2go version: v0.23.0 Berkelium 2018-04-27

If you have found any issues, please raise an issue at:
https://github.com/elliotchance/c2go/
Expand Down
2 changes: 1 addition & 1 deletion tests/code_quality/if.expected.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Package main - transpiled by c2go version: v0.22.4 Aluminium 2018-04-24
Package main - transpiled by c2go version: v0.23.0 Berkelium 2018-04-27

If you have found any issues, please raise an issue at:
https://github.com/elliotchance/c2go/
Expand Down
2 changes: 1 addition & 1 deletion tests/code_quality/operators.expected.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Package main - transpiled by c2go version: v0.22.4 Aluminium 2018-04-24
Package main - transpiled by c2go version: v0.23.0 Berkelium 2018-04-27

If you have found any issues, please raise an issue at:
https://github.com/elliotchance/c2go/
Expand Down
6 changes: 5 additions & 1 deletion tests/code_quality/switch.expected.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Package main - transpiled by c2go version: v0.22.4 Aluminium 2018-04-24
Package main - transpiled by c2go version: v0.23.0 Berkelium 2018-04-27

If you have found any issues, please raise an issue at:
https://github.com/elliotchance/c2go/
Expand Down Expand Up @@ -28,7 +28,11 @@ func switch_function() {
return
}
case int32(4):
{
}
case int32(5):
{
}
case int32(6):
fallthrough
case int32(7):
Expand Down
100 changes: 99 additions & 1 deletion tests/switch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// CompoundStmt with 12 children.

#include <stdio.h>
#include <stdbool.h>
#include "tests.h"

void match_a_single_case()
Expand Down Expand Up @@ -125,6 +126,45 @@ void fallthrough_several_midway_default()
}
}

void goto_label(bool use_goto)
{
for (;;) {
switch (0)
{
case 3:
continue;
case 0:
if (use_goto) {
for (;;)
break;
goto LABEL;
fail("code should not reach here");
} else if (false) {
goto LABELX;
goto LABELY;
fail("code should not reach here");
}
/* other comment */
// some comment
/* fallthrough */
LABELY:
case 4:
LABEL:
printf("x");
case 1:
pass(__func__);
break;
case 2:
;
LABELX:
default:
fail("code should not reach here");
break;
}
break;
}
}

void scoped_match_a_single_case()
{
switch (1)
Expand Down Expand Up @@ -278,6 +318,60 @@ void scoped_fallthrough_several_midway_default()
}
}

void scoped_goto_label(bool use_goto)
{
for (;;) {
switch (0)
{
case 3:
{
continue;
}
case 0:
{
if (use_goto) {
for (;;) {
break;
}
goto LABEL;
fail("code should not reach here");
} else if (false) {
goto LABELX;
goto LABELY;
fail("code should not reach here");
}
/* other comment */
// some comment
/* fallthrough */
}
LABELY: {}
case 4: {}
LABEL:
{
printf("x");
}
case 1:
{
pass(__func__);
break;
}
case 2:
{
int x = 0;
printf("%d", x);
break;
}
LABELX: {}
default:
{
fail("code should not reach here");
break;
}
}
break;
}
}

typedef struct I67 I67;
struct I67{
int x,y;
Expand Down Expand Up @@ -376,14 +470,16 @@ void switch_without_input()

int main()
{
plan(33);
plan(37);

match_a_single_case();
fallthrough_to_next_case();
match_no_cases();
match_default();
fallthrough_several_cases_including_default();
fallthrough_several_midway_default();
goto_label(false);
goto_label(true);

// For each of the tests above there will be identical cases that use scopes
// for the case statements.
Expand All @@ -393,6 +489,8 @@ int main()
scoped_match_default();
scoped_fallthrough_several_cases_including_default();
scoped_fallthrough_several_midway_default();
scoped_goto_label(false);
scoped_goto_label(true);

switch_issue67();
empty_switch();
Expand Down
Loading