forked from ethereum/solidity
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request ethereum#14723 from ethereum/fixImportAstInlineAss…
…emblyEmptyValueVariable Fix error when using importing ast with a empty `let` variable declaration
- Loading branch information
Showing
5 changed files
with
213 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletions
108
test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| { | ||
| "absolutePath": "a", | ||
| "exportedSymbols": | ||
| { | ||
| "C": | ||
| [ | ||
| 6 | ||
| ] | ||
| }, | ||
| "id": 7, | ||
| "nodeType": "SourceUnit", | ||
| "nodes": | ||
| [ | ||
| { | ||
| "abstract": false, | ||
| "baseContracts": [], | ||
| "canonicalName": "C", | ||
| "contractDependencies": [], | ||
| "contractKind": "contract", | ||
| "fullyImplemented": true, | ||
| "id": 6, | ||
| "linearizedBaseContracts": | ||
| [ | ||
| 6 | ||
| ], | ||
| "name": "C", | ||
| "nameLocation": "9:1:1", | ||
| "nodeType": "ContractDefinition", | ||
| "nodes": | ||
| [ | ||
| { | ||
| "body": | ||
| { | ||
| "id": 4, | ||
| "nodeType": "Block", | ||
| "src": "39:30:1", | ||
| "statements": | ||
| [ | ||
| { | ||
| "AST": | ||
| { | ||
| "nativeSrc": "52:14:1", | ||
| "nodeType": "YulBlock", | ||
| "src": "52:14:1", | ||
| "statements": | ||
| [ | ||
| { | ||
| "nativeSrc": "57:5:1", | ||
| "nodeType": "YulVariableDeclaration", | ||
| "src": "57:5:1", | ||
| "variables": | ||
| [ | ||
| { | ||
| "name": "x", | ||
| "nativeSrc": "61:1:1", | ||
| "nodeType": "YulTypedName", | ||
| "src": "61:1:1", | ||
| "type": "" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "evmVersion": %EVMVERSION%, | ||
| "externalReferences": [], | ||
| "id": 3, | ||
| "nodeType": "InlineAssembly", | ||
| "src": "43:23:1" | ||
| } | ||
| ] | ||
| }, | ||
| "functionSelector": "26121ff0", | ||
| "id": 5, | ||
| "implemented": true, | ||
| "kind": "function", | ||
| "modifiers": [], | ||
| "name": "f", | ||
| "nameLocation": "23:1:1", | ||
| "nodeType": "FunctionDefinition", | ||
| "parameters": | ||
| { | ||
| "id": 1, | ||
| "nodeType": "ParameterList", | ||
| "parameters": [], | ||
| "src": "24:2:1" | ||
| }, | ||
| "returnParameters": | ||
| { | ||
| "id": 2, | ||
| "nodeType": "ParameterList", | ||
| "parameters": [], | ||
| "src": "39:0:1" | ||
| }, | ||
| "scope": 6, | ||
| "src": "14:55:1", | ||
| "stateMutability": "pure", | ||
| "virtual": false, | ||
| "visibility": "public" | ||
| } | ||
| ], | ||
| "scope": 7, | ||
| "src": "0:71:1", | ||
| "usedErrors": [], | ||
| "usedEvents": [] | ||
| } | ||
| ], | ||
| "src": "0:72:1" | ||
| } |
8 changes: 8 additions & 0 deletions
8
test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.sol
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| contract C { | ||
| function f() public pure { | ||
| assembly { | ||
| let x | ||
| } | ||
| } | ||
| } | ||
| // ---- |
92 changes: 92 additions & 0 deletions
92
test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration_parseOnly.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| { | ||
| "absolutePath": "a", | ||
| "id": 7, | ||
| "nodeType": "SourceUnit", | ||
| "nodes": | ||
| [ | ||
| { | ||
| "abstract": false, | ||
| "baseContracts": [], | ||
| "contractDependencies": [], | ||
| "contractKind": "contract", | ||
| "id": 6, | ||
| "name": "C", | ||
| "nameLocation": "9:1:1", | ||
| "nodeType": "ContractDefinition", | ||
| "nodes": | ||
| [ | ||
| { | ||
| "body": | ||
| { | ||
| "id": 4, | ||
| "nodeType": "Block", | ||
| "src": "39:30:1", | ||
| "statements": | ||
| [ | ||
| { | ||
| "AST": | ||
| { | ||
| "nativeSrc": "52:14:1", | ||
| "nodeType": "YulBlock", | ||
| "src": "52:14:1", | ||
| "statements": | ||
| [ | ||
| { | ||
| "nativeSrc": "57:5:1", | ||
| "nodeType": "YulVariableDeclaration", | ||
| "src": "57:5:1", | ||
| "variables": | ||
| [ | ||
| { | ||
| "name": "x", | ||
| "nativeSrc": "61:1:1", | ||
| "nodeType": "YulTypedName", | ||
| "src": "61:1:1", | ||
| "type": "" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "evmVersion": %EVMVERSION%, | ||
| "externalReferences": [], | ||
| "id": 3, | ||
| "nodeType": "InlineAssembly", | ||
| "src": "43:23:1" | ||
| } | ||
| ] | ||
| }, | ||
| "id": 5, | ||
| "implemented": true, | ||
| "kind": "function", | ||
| "modifiers": [], | ||
| "name": "f", | ||
| "nameLocation": "23:1:1", | ||
| "nodeType": "FunctionDefinition", | ||
| "parameters": | ||
| { | ||
| "id": 1, | ||
| "nodeType": "ParameterList", | ||
| "parameters": [], | ||
| "src": "24:2:1" | ||
| }, | ||
| "returnParameters": | ||
| { | ||
| "id": 2, | ||
| "nodeType": "ParameterList", | ||
| "parameters": [], | ||
| "src": "39:0:1" | ||
| }, | ||
| "src": "14:55:1", | ||
| "stateMutability": "pure", | ||
| "virtual": false, | ||
| "visibility": "public" | ||
| } | ||
| ], | ||
| "src": "0:71:1", | ||
| "usedErrors": [], | ||
| "usedEvents": [] | ||
| } | ||
| ], | ||
| "src": "0:72:1" | ||
| } |