Fix right side of the Loc of ContractDefinition (#863)

Fix right side of the Loc of ContractDefinition

Signed-off-by: Julian Popescu <hi@julian.dev>

Author: jpopesculian

.gitignore

@@ -2,4 +2,4 @@
 Cargo.lock
 /target
 **/*.rs.bk
-
+bundle.ll

solang-parser/Cargo.toml

@@ -22,3 +22,4 @@ itertools = "0.10"
 [dev-dependencies]
 walkdir = "2.3.2"
 regex = "1.5.5"
+pretty_assertions = "1.2"

solang-parser/src/solidity.lalrpop

@@ -188,8 +188,8 @@ Base: Base = {
 }
 
 ContractDefinition: Box<ContractDefinition> = {
-    <l:@L> <ty:ContractTy> <name:SolIdentifier> <base:Bases> <r:@R>
-    "{" <parts:(<ContractPart>)*> "}" => {
+    <l:@L> <ty:ContractTy> <name:SolIdentifier> <base:Bases>
+    "{" <parts:(<ContractPart>)*> "}" <r:@R> => {
         Box::new(ContractDefinition{loc: Loc::File(file_no, l, r), ty, name, base, parts})
     }
 }

solang-parser/src/test.rs

@@ -1,6 +1,7 @@
 use crate::lexer::Lexer;
 use crate::pt::*;
 use crate::solidity;
+use pretty_assertions::assert_eq;
 use std::sync::mpsc;
 use std::time::Duration;
 use std::{fs, path::Path, thread};
@@ -55,7 +56,7 @@ fn parse_test() {
         SourceUnitPart::DocComment(DocComment{ loc: Loc::File(0,34,51), ty: CommentType::Line, comment: " @description Foo".to_string()}),
         SourceUnitPart::DocComment(DocComment{ loc: Loc::File(0,71,75), ty: CommentType::Line, comment: " Bar".to_string()}),
         SourceUnitPart::ContractDefinition(Box::new(ContractDefinition {
-            loc: Loc::File(0, 92, 105),
+            loc: Loc::File(0, 92, 702),
             ty: ContractTy::Contract(Loc::File(0, 92, 100)),
             name: Identifier {
                 loc: Loc::File(0, 101, 104),
@@ -336,7 +337,7 @@ fn parse_error_test() {
             ],
         })),
         SourceUnitPart::ContractDefinition(Box::new(ContractDefinition {
-            loc: Loc::File(0, 69, 88),
+            loc: Loc::File(0, 69, 438),
             ty: ContractTy::Contract(Loc::File(0, 69, 77)),
             name: Identifier {
                 loc: Loc::File(0, 78, 87),
@@ -879,7 +880,7 @@ fn parse_revert_test() {
 
     let expected_parse_tree = SourceUnit(vec![SourceUnitPart::ContractDefinition(Box::new(
         ContractDefinition {
-            loc: Loc::File(0, 9, 28),
+            loc: Loc::File(0, 9, 150),
             ty: ContractTy::Contract(Loc::File(0, 9, 17)),
             name: Identifier {
                 loc: Loc::File(0, 18, 27),
@@ -968,7 +969,7 @@ fn parse_user_defined_value_type() {
             ty: Expression::Type(Loc::File(0, 25, 32), Type::Uint(256)),
         })),
         SourceUnitPart::ContractDefinition(Box::new(ContractDefinition {
-            loc: Loc::File(0, 42, 61),
+            loc: Loc::File(0, 42, 109),
             ty: ContractTy::Contract(Loc::File(0, 42, 50)),
             name: Identifier {
                 loc: Loc::File(0, 51, 60),

tests/contract_testcases/ewasm/call/call.dot

@@ -1,8 +1,8 @@
 strict digraph "tests/contract_testcases/ewasm/call/call.sol" {
-	contract [label="contract x\ntests/contract_testcases/ewasm/call/call.sol:2:9-20"]
+	contract [label="contract x\ntests/contract_testcases/ewasm/call/call.sol:2:9-6:10"]
 	f [label="function f\ncontract: x\ntests/contract_testcases/ewasm/call/call.sol:3:13-49\nsignature f(address)\nvisibility public\nmutability nonpayable"]
 	parameters [label="parameters\naddress payable a"]
-	diagnostic [label="found contract 'x'\nlevel Debug\ntests/contract_testcases/ewasm/call/call.sol:2:9-20"]
+	diagnostic [label="found contract 'x'\nlevel Debug\ntests/contract_testcases/ewasm/call/call.sol:2:9-6:10"]
 	diagnostic_6 [label="'delegatecall' cannot have value specifed\nlevel Error\ntests/contract_testcases/ewasm/call/call.sol:4:45-73"]
 	contracts -> contract
 	contract -> f [label="function"]

tests/contract_testcases/ewasm/call/call_01.dot

@@ -1,8 +1,8 @@
 strict digraph "tests/contract_testcases/ewasm/call/call_01.sol" {
-	contract [label="contract x\ntests/contract_testcases/ewasm/call/call_01.sol:2:9-20"]
+	contract [label="contract x\ntests/contract_testcases/ewasm/call/call_01.sol:2:9-6:10"]
 	f [label="function f\ncontract: x\ntests/contract_testcases/ewasm/call/call_01.sol:3:13-49\nsignature f(address)\nvisibility public\nmutability nonpayable"]
 	parameters [label="parameters\naddress payable a"]
-	diagnostic [label="found contract 'x'\nlevel Debug\ntests/contract_testcases/ewasm/call/call_01.sol:2:9-20"]
+	diagnostic [label="found contract 'x'\nlevel Debug\ntests/contract_testcases/ewasm/call/call_01.sol:2:9-6:10"]
 	diagnostic_6 [label="'staticcall' cannot have value specifed\nlevel Error\ntests/contract_testcases/ewasm/call/call_01.sol:4:45-71"]
 	contracts -> contract
 	contract -> f [label="function"]

tests/contract_testcases/ewasm/call/call_02.dot

@@ -1,5 +1,5 @@
 strict digraph "tests/contract_testcases/ewasm/call/call_02.sol" {
-	contract [label="contract x\ntests/contract_testcases/ewasm/call/call_02.sol:2:9-20"]
+	contract [label="contract x\ntests/contract_testcases/ewasm/call/call_02.sol:2:9-6:10"]
 	f [label="function f\ncontract: x\ntests/contract_testcases/ewasm/call/call_02.sol:3:13-49\nsignature f(address)\nvisibility public\nmutability nonpayable"]
 	parameters [label="parameters\naddress payable a"]
 	destructure [label="destructure\ntests/contract_testcases/ewasm/call/call_02.sol:4:17-65"]
@@ -10,7 +10,7 @@ strict digraph "tests/contract_testcases/ewasm/call/call_02.sol" {
 	alloc_array [label="alloc array bytes\ninitializer: \ntests/contract_testcases/ewasm/call/call_02.sol:4:62-64"]
 	number_literal [label="uint32 literal: 0\ntests/contract_testcases/ewasm/call/call_02.sol:4:62-64"]
 	number_literal_11 [label="uint128 literal: 2\ntests/contract_testcases/ewasm/call/call_02.sol:4:59-60"]
-	diagnostic [label="found contract 'x'\nlevel Debug\ntests/contract_testcases/ewasm/call/call_02.sol:2:9-20"]
+	diagnostic [label="found contract 'x'\nlevel Debug\ntests/contract_testcases/ewasm/call/call_02.sol:2:9-6:10"]
 	diagnostic_14 [label="function can be declared 'view'\nlevel Warning\ntests/contract_testcases/ewasm/call/call_02.sol:3:13-49"]
 	diagnostic_15 [label="destructure variable 's' has never been used\nlevel Warning\ntests/contract_testcases/ewasm/call/call_02.sol:4:23-24"]
 	diagnostic_16 [label="destructure variable 'bs' has never been used\nlevel Warning\ntests/contract_testcases/ewasm/call/call_02.sol:4:39-41"]

tests/contract_testcases/ewasm/comment_tests.dot

@@ -2,7 +2,7 @@ strict digraph "tests/contract_testcases/ewasm/comment_tests.sol" {
 	Transfer [label="name:Transfer\ncontract: 0\ntests/contract_testcases/ewasm/comment_tests.sol:58:11-19\nfield name:from ty:address indexed:yes\nfield name:to ty:address indexed:yes\nfield name:value ty:uint256 indexed:no"]
 	Approval [label="name:Approval\ncontract: 0\ntests/contract_testcases/ewasm/comment_tests.sol:61:11-19\nfield name:owner ty:address indexed:yes\nfield name:spender ty:address indexed:yes\nfield name:value ty:uint256 indexed:no"]
 	OwnershipTransferred [label="name:OwnershipTransferred\ncontract: 4\ntests/contract_testcases/ewasm/comment_tests.sol:312:9-29\nfield name:previousOwner ty:address indexed:yes\nfield name:newOwner ty:address indexed:yes"]
-	contract [label="contract IERC20\ntests/contract_testcases/ewasm/comment_tests.sol:16:5-17:12"]
+	contract [label="contract IERC20\ntests/contract_testcases/ewasm/comment_tests.sol:16:5-66:2"]
 	tags [label="notice: Submitted for verification at BscScan.com on 2022-01-08"]
 	balanceOf [label="function balanceOf\ncontract: IERC20\ntests/contract_testcases/ewasm/comment_tests.sol:18:5-19:92\nsignature balanceOf(address)\nvisibility external\nmutability view\nvirtual"]
 	parameters [label="parameters\naddress account"]
@@ -21,7 +21,7 @@ strict digraph "tests/contract_testcases/ewasm/comment_tests.sol" {
 	transferFrom [label="function transferFrom\ncontract: IERC20\ntests/contract_testcases/ewasm/comment_tests.sol:51:5-55:30\nsignature transferFrom(address,address,uint256)\nvisibility external\nmutability nonpayable\nvirtual"]
 	parameters_22 [label="parameters\naddress sender\naddress recipient\nuint256 amount"]
 	returns_23 [label="returns\nbool "]
-	contract_24 [label="contract SafeMath\ntests/contract_testcases/ewasm/comment_tests.sol:71:1-72:18"]
+	contract_24 [label="contract SafeMath\ntests/contract_testcases/ewasm/comment_tests.sol:71:1-151:2"]
 	add [label="function add\ncontract: SafeMath\ntests/contract_testcases/ewasm/comment_tests.sol:74:5-71\nsignature add(uint256,uint256)\nvisibility internal\nmutability pure"]
 	parameters_26 [label="parameters\nuint256 a\nuint256 b"]
 	returns_27 [label="returns\nuint256 "]
@@ -136,7 +136,7 @@ strict digraph "tests/contract_testcases/ewasm/comment_tests.sol" {
 	modulo [label="modulo\nuint256\ntests/contract_testcases/ewasm/comment_tests.sol:149:16-21"]
 	variable_137 [label="variable: a\nuint256\ntests/contract_testcases/ewasm/comment_tests.sol:149:16-17"]
 	variable_138 [label="variable: b\nuint256\ntests/contract_testcases/ewasm/comment_tests.sol:149:20-21"]
-	contract_139 [label="contract Context\ntests/contract_testcases/ewasm/comment_tests.sol:152:1-153:27"]
+	contract_139 [label="contract Context\ntests/contract_testcases/ewasm/comment_tests.sol:152:1-166:2"]
 	_msgSender [label="function _msgSender\ncontract: Context\ntests/contract_testcases/ewasm/comment_tests.sol:154:5-74\nsignature _msgSender()\nvisibility internal\nmutability view\nvirtual"]
 	returns_141 [label="returns\naddress payable "]
 	return_142 [label="return\ntests/contract_testcases/ewasm/comment_tests.sol:155:9-26"]
@@ -147,7 +147,7 @@ strict digraph "tests/contract_testcases/ewasm/comment_tests.sol" {
 	builtins_147 [label="builtin GetAddress\ntests/contract_testcases/ewasm/comment_tests.sol:161:9-13"]
 	return_148 [label="return\ntests/contract_testcases/ewasm/comment_tests.sol:162:9-24"]
 	builtins_149 [label="builtin Calldata\ntests/contract_testcases/ewasm/comment_tests.sol:162:16-24"]
-	contract_150 [label="contract Address\ntests/contract_testcases/ewasm/comment_tests.sol:168:1-169:17"]
+	contract_150 [label="contract Address\ntests/contract_testcases/ewasm/comment_tests.sol:168:1-300:2"]
 	isContract [label="function isContract\ncontract: Address\ntests/contract_testcases/ewasm/comment_tests.sol:171:5-70\nsignature isContract(address)\nvisibility internal\nmutability view"]
 	parameters_152 [label="parameters\naddress account"]
 	returns_153 [label="returns\nbool "]
@@ -245,7 +245,7 @@ strict digraph "tests/contract_testcases/ewasm/comment_tests.sol" {
 	_functionCallWithValue [label="function _functionCallWithValue\ncontract: Address\ntests/contract_testcases/ewasm/comment_tests.sol:264:5-270:37\nsignature _functionCallWithValue(address,bytes,uint256,string)\nvisibility private\nmutability nonpayable"]
 	parameters_246 [label="parameters\naddress target\nbytes data\nuint256 weiValue\nstring errorMessage"]
 	returns_247 [label="returns\nbytes "]
-	contract_248 [label="contract Ownable\ntests/contract_testcases/ewasm/comment_tests.sol:302:1-303:28"]
+	contract_248 [label="contract Ownable\ntests/contract_testcases/ewasm/comment_tests.sol:302:1-373:2"]
 	base [label="base Context\ntests/contract_testcases/ewasm/comment_tests.sol:303:21-28"]
 	var [label="variable owners\nvisibility private\ntests/contract_testcases/ewasm/comment_tests.sol:304:5-27"]
 	var_251 [label="variable _owner\nvisibility private\ntests/contract_testcases/ewasm/comment_tests.sol:305:5-27"]
@@ -309,7 +309,7 @@ strict digraph "tests/contract_testcases/ewasm/comment_tests.sol" {
 	storage_var_309 [label="storage variable\nOwnable._owner\naddress storage\ntests/contract_testcases/ewasm/comment_tests.sol:366:10-16"]
 	storage_load_310 [label="storage load address\ntests/contract_testcases/ewasm/comment_tests.sol:366:19-31"]
 	storage_var_311 [label="storage variable\nOwnable._deadAddress\naddress storage\ntests/contract_testcases/ewasm/comment_tests.sol:366:19-31"]
-	contract_312 [label="contract TigerBNB\ntests/contract_testcases/ewasm/comment_tests.sol:374:1-375:46"]
+	contract_312 [label="contract TigerBNB\ntests/contract_testcases/ewasm/comment_tests.sol:374:1-679:2"]
 	base_313 [label="base Context\ntests/contract_testcases/ewasm/comment_tests.sol:375:22-29"]
 	base_314 [label="base IERC20\ntests/contract_testcases/ewasm/comment_tests.sol:375:31-37"]
 	base_315 [label="base Ownable\ntests/contract_testcases/ewasm/comment_tests.sol:375:39-46"]
@@ -773,18 +773,18 @@ strict digraph "tests/contract_testcases/ewasm/comment_tests.sol" {
 	variable_773 [label="variable: spender\naddress\ntests/contract_testcases/ewasm/comment_tests.sol:676:30-37"]
 	variable_774 [label="variable: amount\nuint256\ntests/contract_testcases/ewasm/comment_tests.sol:676:39-45"]
 	diagnostic [label="pragma 'solidity' is ignored\nlevel Debug\ntests/contract_testcases/ewasm/comment_tests.sol:10:3-11:24"]
-	diagnostic_777 [label="found interface 'IERC20'\nlevel Debug\ntests/contract_testcases/ewasm/comment_tests.sol:16:5-17:12"]
-	diagnostic_778 [label="found library 'SafeMath'\nlevel Debug\ntests/contract_testcases/ewasm/comment_tests.sol:71:1-72:18"]
-	diagnostic_779 [label="found abstract contract 'Context'\nlevel Debug\ntests/contract_testcases/ewasm/comment_tests.sol:152:1-153:27"]
-	diagnostic_780 [label="found library 'Address'\nlevel Debug\ntests/contract_testcases/ewasm/comment_tests.sol:168:1-169:17"]
+	diagnostic_777 [label="found interface 'IERC20'\nlevel Debug\ntests/contract_testcases/ewasm/comment_tests.sol:16:5-66:2"]
+	diagnostic_778 [label="found library 'SafeMath'\nlevel Debug\ntests/contract_testcases/ewasm/comment_tests.sol:71:1-151:2"]
+	diagnostic_779 [label="found abstract contract 'Context'\nlevel Debug\ntests/contract_testcases/ewasm/comment_tests.sol:152:1-166:2"]
+	diagnostic_780 [label="found library 'Address'\nlevel Debug\ntests/contract_testcases/ewasm/comment_tests.sol:168:1-300:2"]
 	diagnostic_781 [label="builtin 'extcodehash' is not available for target ewasm. Please, open a GitHub issue at https://github.com/hyperledger-labs/solang/issues if there is need to support this function\nlevel Error\ntests/contract_testcases/ewasm/comment_tests.sol:182:25-45"]
 	diagnostic_782 [label="conversion truncates uint256 to uint128, as value is type uint128 on target ewasm\nlevel Warning\ntests/contract_testcases/ewasm/comment_tests.sol:195:50-56"]
 	diagnostic_783 [label="conversion truncates uint256 to uint128, as value is type uint128 on target ewasm\nlevel Warning\ntests/contract_testcases/ewasm/comment_tests.sol:276:70-78"]
 	diagnostic_784 [label="builtin 'mload' is not available for target ewasm. Please, open a GitHub issue at https://github.com/hyperledger-labs/solang/issues if there is need to support this function\nlevel Error\ntests/contract_testcases/ewasm/comment_tests.sol:288:44-61"]
 	diagnostic_785 [label="missing return statement\nlevel Error\ntests/contract_testcases/ewasm/comment_tests.sol:299:6"]
-	diagnostic_786 [label="found contract 'Ownable'\nlevel Debug\ntests/contract_testcases/ewasm/comment_tests.sol:302:1-303:28"]
+	diagnostic_786 [label="found contract 'Ownable'\nlevel Debug\ntests/contract_testcases/ewasm/comment_tests.sol:302:1-373:2"]
 	diagnostic_787 [label="'internal': visibility for constructors is ignored\nlevel Warning\ntests/contract_testcases/ewasm/comment_tests.sol:321:9-17"]
-	diagnostic_788 [label="found contract 'TigerBNB'\nlevel Debug\ntests/contract_testcases/ewasm/comment_tests.sol:374:1-375:46"]
+	diagnostic_788 [label="found contract 'TigerBNB'\nlevel Debug\ntests/contract_testcases/ewasm/comment_tests.sol:374:1-679:2"]
 	diagnostic_789 [label="'public': visibility for constructors is ignored\nlevel Warning\ntests/contract_testcases/ewasm/comment_tests.sol:417:5-11"]
 	events -> Transfer
 	events -> Approval

tests/contract_testcases/ewasm/dead_storage_different_types.dot

@@ -1,5 +1,5 @@
 strict digraph "tests/contract_testcases/ewasm/dead_storage_different_types.sol" {
-	contract [label="contract C\ntests/contract_testcases/ewasm/dead_storage_different_types.sol:1:1-12"]
+	contract [label="contract C\ntests/contract_testcases/ewasm/dead_storage_different_types.sol:1:1-10:2"]
 	var [label="variable referralsKey\nvisibility private\ntests/contract_testcases/ewasm/dead_storage_different_types.sol:2:5-35"]
 	getReferralsByAddress [label="function getReferralsByAddress\ncontract: C\ntests/contract_testcases/ewasm/dead_storage_different_types.sol:4:5-98\nsignature getReferralsByAddress()\nvisibility public\nmutability view"]
 	returns [label="returns\naddress[] referralsKeyList\nuint256 "]
@@ -11,7 +11,7 @@ strict digraph "tests/contract_testcases/ewasm/dead_storage_different_types.sol"
 	storage_load [label="storage load address[]\ntests/contract_testcases/ewasm/dead_storage_different_types.sol:8:9-37"]
 	storage_var_11 [label="storage variable\nC.referralsKey\naddress[] storage\ntests/contract_testcases/ewasm/dead_storage_different_types.sol:8:17-29"]
 	variable [label="variable: length\nuint256\ntests/contract_testcases/ewasm/dead_storage_different_types.sol:8:30-36"]
-	diagnostic [label="found contract 'C'\nlevel Debug\ntests/contract_testcases/ewasm/dead_storage_different_types.sol:1:1-12"]
+	diagnostic [label="found contract 'C'\nlevel Debug\ntests/contract_testcases/ewasm/dead_storage_different_types.sol:1:1-10:2"]
 	contracts -> contract
 	contract -> var [label="variable"]
 	contract -> getReferralsByAddress [label="function"]