Skip to content

Add assembly case blocks #92

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

Merged
mattiaerre merged 4 commits into from
Jan 7, 2019
Merged

Add assembly case blocks #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20c30f3
Add support for AssemblyIf
fvictorio Jan 5, 2019
e1a8b58
Print assembly cases blocks
fvictorio Jan 5, 2019
9711cda
Merge branch 'master' into add-assembly-case-blocks
fvictorio Jan 6, 2019
dc7ab5a
Indent switch cases in assembly code
fvictorio Jan 7, 2019
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
9 changes: 7 additions & 2 deletions src/printer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,14 +494,19 @@ function genericPrint(path, options, print) {
return node.value;
case 'AssemblySwitch':
doc = join(hardline, path.map(print, 'cases'));
return concat(['switch ', path.call(print, 'expression'), hardline, doc]);
return concat([
'switch ',
path.call(print, 'expression'),
indent(hardline),
indent(doc)
]);
case 'AssemblyCase':
if (node.default) {
doc = concat(['default']);
} else {
doc = concat(['case ', path.call(print, 'value')]);
}
return join(' ', [doc, '{}']);
return join(' ', [doc, path.call(print, 'block')]);
case 'AssemblyLocalDefinition':
return join(' ', [
'let',
Expand Down
12 changes: 12 additions & 0 deletions tests/Assembly/Assembly.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,16 @@ contract Assembly {
}
}
}

function caseAssembly() {
assembly {
switch value
case 0 {
mstore(0, 0x0000000000000000000000000000000000000000000000000000000000000000)
}
case 1 {
mstore(0, 0x1111111111111111111111111111111111111111111111111111111111111111)
}
}
}
}
24 changes: 24 additions & 0 deletions tests/Assembly/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@ contract Assembly {
}
}
}

function caseAssembly() {
assembly {
switch value
case 0 {
mstore(0, 0x0000000000000000000000000000000000000000000000000000000000000000)
}
case 1 {
mstore(0, 0x1111111111111111111111111111111111111111111111111111111111111111)
}
}
}
}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
contract Assembly {
Expand All @@ -20,6 +32,18 @@ contract Assembly {
}
}
}

function caseAssembly() {
assembly {
switch value
Copy link
Copy Markdown
Member

@mattiaerre mattiaerre Jan 6, 2019

Choose a reason for hiding this comment

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

uhm, shall we have 2 spaces to indent the "case" inside the switch?

Copy link
Copy Markdown
Member Author

@fvictorio fvictorio Jan 6, 2019

Choose a reason for hiding this comment

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

You mean that the cases should be more indented than the switch? Yeah, I agree with that, and that's what prettier does in javascript.

Copy link
Copy Markdown
Member Author

@fvictorio fvictorio Jan 7, 2019

Choose a reason for hiding this comment

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

Done.

Copy link
Copy Markdown
Member

@mattiaerre mattiaerre Jan 7, 2019

Choose a reason for hiding this comment

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

awesome! thanks so much

case 0 {
mstore(0, 0x0000000000000000000000000000000000000000000000000000000000000000)
}
case 1 {
mstore(0, 0x1111111111111111111111111111111111111111111111111111111111111111)
}
}
}
}

`;