lint

Author: turbolent

interpreter/dynamic_casting_test.go

@@ -737,12 +737,11 @@ func returnResourceCasted(fromType, targetType string, operation ast.Operation)
 
 func testResourceCastValid(t *testing.T, types, fromType string, targetType string, operation ast.Operation) {
 	inter := parseCheckAndInterpret(t,
-		types+
-			returnResourceCasted(
-				fromType,
-				targetType,
-				operation,
-			),
+		types+returnResourceCasted(
+			fromType,
+			targetType,
+			operation,
+		),
 	)
 
 	value, err := inter.Invoke("test")
@@ -776,12 +775,10 @@ func testResourceCastValid(t *testing.T, types, fromType string, targetType stri
 
 func testResourceCastInvalid(t *testing.T, types, fromType, targetType string, operation ast.Operation) {
 	inter := parseCheckAndInterpret(t,
-		fmt.Sprintf(
-			types+returnResourceCasted(
-				fromType,
-				targetType,
-				operation,
-			),
+		types+returnResourceCasted(
+			fromType,
+			targetType,
+			operation,
 		),
 	)
 
@@ -886,12 +883,11 @@ func returnStructCasted(fromType, targetType string, operation ast.Operation) st
 
 func testStructCastValid(t *testing.T, types, fromType string, targetType string, operation ast.Operation) {
 	inter := parseCheckAndInterpret(t,
-		types+
-			returnStructCasted(
-				fromType,
-				targetType,
-				operation,
-			),
+		types+returnStructCasted(
+			fromType,
+			targetType,
+			operation,
+		),
 	)
 
 	value, err := inter.Invoke("test")
@@ -925,13 +921,10 @@ func testStructCastValid(t *testing.T, types, fromType string, targetType string
 
 func testStructCastInvalid(t *testing.T, types, fromType, targetType string, operation ast.Operation) {
 	inter := parseCheckAndInterpret(t,
-		fmt.Sprintf(
-			types+
-				returnStructCasted(
-					fromType,
-					targetType,
-					operation,
-				),
+		types+returnStructCasted(
+			fromType,
+			targetType,
+			operation,
 		),
 	)
 
@@ -2256,8 +2249,12 @@ func returnReferenceCasted(fromType, targetType string, operation ast.Operation,
 
 func testReferenceCastValid(t *testing.T, types, fromType, targetType string, operation ast.Operation, isResource bool) {
 	inter := parseCheckAndInterpret(t,
-		types+
-			returnReferenceCasted(fromType, targetType, operation, isResource),
+		types+returnReferenceCasted(
+			fromType,
+			targetType,
+			operation,
+			isResource,
+		),
 	)
 
 	value, err := inter.Invoke("test")
@@ -2309,9 +2306,11 @@ func testReferenceCastValid(t *testing.T, types, fromType, targetType string, op
 
 func testReferenceCastInvalid(t *testing.T, types, fromType, targetType string, operation ast.Operation, isResource bool) {
 	inter := parseCheckAndInterpret(t,
-		fmt.Sprintf(
-			types+
-				returnReferenceCasted(fromType, targetType, operation, isResource),
+		types+returnReferenceCasted(
+			fromType,
+			targetType,
+			operation,
+			isResource,
 		),
 	)
 

old_parser/declaration.go

@@ -747,7 +747,10 @@ func parseHexadecimalLocation(p *parser) common.AddressLocation {
 	address, err := common.BytesToAddress(rawAddress)
 	if err != nil {
 		// Any returned error is a syntax error. e.g: Address too large error.
-		p.reportSyntaxError(err.Error())
+		p.report(&SyntaxError{
+			Pos:     p.current.StartPos,
+			Message: err.Error(),
+		})
 	}
 
 	return common.NewAddressLocation(p.memoryGauge, address, "")

old_parser/parser.go

@@ -243,10 +243,10 @@ func (p *parser) next() {
 			}
 			parseError, ok := err.(ParseError)
 			if !ok {
-				parseError = NewSyntaxError(
-					token.StartPos,
-					err.Error(),
-				)
+				parseError = &SyntaxError{
+					Pos:     token.StartPos,
+					Message: err.Error(),
+				}
 			}
 			p.report(parseError)
 			continue

parser/declaration.go

@@ -910,7 +910,10 @@ func parseHexadecimalLocation(p *parser) common.AddressLocation {
 	address, err := common.BytesToAddress(rawAddress)
 	if err != nil {
 		// Any returned error is a syntax error. e.g: Address too large error.
-		p.reportSyntaxError(err.Error())
+		p.report(&SyntaxError{
+			Pos:     p.current.StartPos,
+			Message: err.Error(),
+		})
 	}
 
 	return common.NewAddressLocation(p.memoryGauge, address, "")

parser/parser.go

@@ -260,10 +260,10 @@ func (p *parser) next() {
 			}
 			parseError, ok := err.(ParseError)
 			if !ok {
-				parseError = NewSyntaxError(
-					token.StartPos,
-					err.Error(),
-				)
+				parseError = &SyntaxError{
+					Pos:     token.StartPos,
+					Message: err.Error(),
+				}
 			}
 			p.report(parseError)
 			continue