Skip to content

Add support for AssemblyFor #94

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 5 commits into from
Jan 7, 2019
Merged

Add support for AssemblyFor #94

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 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
cc2482b
Add support for AssemblyFor
fvictorio Jan 6, 2019
fa18664
Merge branch 'master' into add-assembly-for
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
13 changes: 11 additions & 2 deletions src/printer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ function genericPrint(path, options, print) {
return concat([
'{',
indent(hardline),
indent(join(line, path.map(print, 'operations'))),
indent(printPreservingEmptyLines(path, 'operations', options, print)),
hardline,
'}'
]);
Expand Down Expand Up @@ -501,7 +501,7 @@ function genericPrint(path, options, print) {
} else {
doc = concat(['case ', path.call(print, 'value')]);
}
return join(' ', [doc, '{}']);
return join(' ', [doc, path.call(print, 'block')]);
case 'AssemblyLocalDefinition':
return join(' ', [
'let',
Expand All @@ -522,6 +522,15 @@ function genericPrint(path, options, print) {
' ',
path.call(print, 'body')
]);
case 'AssemblyFor': {
return join(' ', [
'for',
path.call(print, 'pre'),
path.call(print, 'condition'),
path.call(print, 'post'),
path.call(print, 'body')
]);
}
case 'FunctionTypeName': {
const returns = returnTypes => {
if (returnTypes.length > 0) {
Expand Down
18 changes: 18 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,22 @@ contract Assembly {
}
}
}

function caseAssembly() {
assembly {
switch value
case 0 {
mstore(0, 0x0000000000000000000000000000000000000000000000000000000000000000)
}
case 1 {
mstore(0, 0x1111111111111111111111111111111111111111111111111111111111111111)
}
}
}

function forAssembly() {
assembly {
for { let i := 0 } lt(i, x) { i := add(i, 1) } { y := mul(2, y) }
}
}
}
42 changes: 42 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,24 @@ contract Assembly {
}
}
}

function caseAssembly() {
assembly {
switch value
case 0 {
mstore(0, 0x0000000000000000000000000000000000000000000000000000000000000000)
}
case 1 {
mstore(0, 0x1111111111111111111111111111111111111111111111111111111111111111)
}
}
}

function forAssembly() {
assembly {
for { let i := 0 } lt(i, x) { i := add(i, 1) } { y := mul(2, y) }
}
}
}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
contract Assembly {
Expand All @@ -20,6 +38,30 @@ contract Assembly {
}
}
}

function caseAssembly() {
assembly {
switch value
case 0 {
mstore(0, 0x0000000000000000000000000000000000000000000000000000000000000000)
}
case 1 {
mstore(0, 0x1111111111111111111111111111111111111111111111111111111111111111)
}
}
}

function forAssembly() {
assembly {
for {
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.

I do agree with you, this seems a little bit odd but that's a good starting point; I'll wait for you to address #92 and then we can merge both

let i := 0
} lt(i, x) {
i := add(i, 1)
} {
y := mul(2, y)
}
}
}
}

`;