Skip to content

Commit 24a63fc

Browse files
Refactor: storage base location -> storage layout
1 parent d4f1ae7 commit 24a63fc

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### 0.8.29 (unreleased)
22

33
Language Features:
4-
* Introduce syntax for specifying contract storage base location.
4+
* Introduce syntax for specifying contract storage layout base.
55

66

77
Compiler Features:

libsolidity/parsing/Parser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,8 @@ ASTPointer<ContractDefinition> Parser::parseContractDefinition()
433433
m_errorReporter.parserError(
434434
8714_error,
435435
m_scanner->currentLocation(),
436-
SecondarySourceLocation().append("Another base location was defined here", storageLayoutSpecifier->location()),
437-
"Storage base location was already defined previously."
436+
SecondarySourceLocation().append("Another storage layout was defined here", storageLayoutSpecifier->location()),
437+
"Storage layout was already defined previously."
438438
);
439439

440440
storageLayoutSpecifier = parseStorageLayoutSpecifier();

test/cmdlineTests/storage_layout_specifier_repeated_definition_error/output.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
{
44
"component": "general",
55
"errorCode": "8714",
6-
"formattedMessage": "ParserError: Storage base location was already defined previously.
6+
"formattedMessage": "ParserError: Storage layout was already defined previously.
77
--> fileA:5:34:
88
|
99
5 | contract C layout at 0x1234 is A layout at 0xABCD {
1010
| ^^^^^^
11-
Note: Another base location was defined here
11+
Note: Another storage layout was defined here
1212
--> fileA:5:12:
1313
|
1414
5 | contract C layout at 0x1234 is A layout at 0xABCD {
1515
| ^^^^^^^^^^^^^^^^
1616

1717
",
18-
"message": "Storage base location was already defined previously.",
18+
"message": "Storage layout was already defined previously.",
1919
"secondarySourceLocations": [
2020
{
2121
"end": 100,
2222
"file": "fileA",
23-
"message": "Another base location was defined here",
23+
"message": "Another storage layout was defined here",
2424
"start": 84
2525
}
2626
],
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
contract C layout at 0x1234 is A, B layout at 0xABC { }
22
// ----
3-
// ParserError 8714: (36-42): Storage base location was already defined previously.
3+
// ParserError 8714: (36-42): Storage layout was already defined previously.

0 commit comments

Comments
 (0)