From 14a19b3e6b32dc32f8e176589950b2c2be92292a Mon Sep 17 00:00:00 2001
From: pagran <67878280+pagran@users.noreply.github.com>
Date: Tue, 28 Jul 2020 23:21:30 +0300
Subject: [PATCH] intLiteral helper now accepts int (#76)

---
 internal/literals/asthelpers.go |  8 ++++----
 internal/literals/literals.go   |  4 ++--
 internal/literals/numbers.go    |  8 +++-----
 internal/literals/swap.go       | 17 ++++++++---------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/internal/literals/asthelpers.go b/internal/literals/asthelpers.go
index e5b3a7b..466e859 100644
--- a/internal/literals/asthelpers.go
+++ b/internal/literals/asthelpers.go
@@ -9,10 +9,11 @@ import (
 func ident(name string) *ast.Ident {
 	return &ast.Ident{Name: name}
 }
-func intLiteral(value string) *ast.BasicLit {
+
+func intLiteral(value int) *ast.BasicLit {
 	return &ast.BasicLit{
 		Kind:  token.INT,
-		Value: value,
+		Value: strconv.Itoa(value),
 	}
 }
 
@@ -62,10 +63,9 @@ func returnStmt(results ...ast.Expr) *ast.ReturnStmt {
 
 // _ = data[pos]
 func boundsCheckData(pos int) *ast.AssignStmt {
-	posStr := strconv.Itoa(pos)
 	return &ast.AssignStmt{
 		Lhs: []ast.Expr{ident("_")},
 		Tok: token.ASSIGN,
-		Rhs: []ast.Expr{indexExpr("data", intLiteral(posStr))},
+		Rhs: []ast.Expr{indexExpr("data", intLiteral(pos))},
 	}
 }
diff --git a/internal/literals/literals.go b/internal/literals/literals.go
index 3c481e2..10d5c2d 100644
--- a/internal/literals/literals.go
+++ b/internal/literals/literals.go
@@ -200,7 +200,7 @@ func obfuscateByteArray(data []byte, length int64) *ast.CallExpr {
 	block := obfuscator.obfuscate(data)
 
 	arrayType := &ast.ArrayType{
-		Len: intLiteral(strconv.Itoa(int(length))),
+		Len: intLiteral(int(length)),
 		Elt: ident("byte"),
 	}
 
@@ -245,7 +245,7 @@ func obfuscateBool(data bool) *ast.BinaryExpr {
 	return &ast.BinaryExpr{
 		X:  genObfuscateInt(dataUint64, intType),
 		Op: token.EQL,
-		Y:  intLiteral("1"),
+		Y:  intLiteral(1),
 	}
 }
 
diff --git a/internal/literals/numbers.go b/internal/literals/numbers.go
index ca30b3c..6f84697 100644
--- a/internal/literals/numbers.go
+++ b/internal/literals/numbers.go
@@ -122,19 +122,17 @@ func bytesToUint(bits int) ast.Expr {
 
 	var expr ast.Expr
 	for i := 0; i < bytes; i++ {
-		posStr := strconv.Itoa(i)
-
 		if i == 0 {
-			expr = callExpr(ident("uint"+bitsStr), indexExpr("data", intLiteral(posStr)))
+			expr = callExpr(ident("uint"+bitsStr), indexExpr("data", intLiteral(i)))
 			continue
 		}
 
-		shiftValue := strconv.Itoa(i * 8)
+		shiftValue := i * 8
 		expr = &ast.BinaryExpr{
 			X:  expr,
 			Op: token.OR,
 			Y: &ast.BinaryExpr{
-				X:  callExpr(ident("uint"+bitsStr), indexExpr("data", intLiteral(posStr))),
+				X:  callExpr(ident("uint"+bitsStr), indexExpr("data", intLiteral(i))),
 				Op: token.SHL,
 				Y:  intLiteral(shiftValue),
 			},
diff --git a/internal/literals/swap.go b/internal/literals/swap.go
index 2e24070..44db41e 100644
--- a/internal/literals/swap.go
+++ b/internal/literals/swap.go
@@ -4,7 +4,6 @@ import (
 	"go/ast"
 	"go/token"
 	"math"
-	"strconv"
 )
 
 type swap struct{}
@@ -34,7 +33,7 @@ func positionsToSlice(data []int) *ast.CompositeLit {
 		Elts: []ast.Expr{},
 	}
 	for _, data := range data {
-		arr.Elts = append(arr.Elts, intLiteral(strconv.Itoa(data)))
+		arr.Elts = append(arr.Elts, intLiteral(data))
 	}
 	return arr
 }
@@ -78,17 +77,17 @@ func (x swap) obfuscate(data []byte) *ast.BlockStmt {
 			Init: &ast.AssignStmt{
 				Lhs: []ast.Expr{ident("i")},
 				Tok: token.DEFINE,
-				Rhs: []ast.Expr{intLiteral("0")},
+				Rhs: []ast.Expr{intLiteral(0)},
 			},
 			Cond: &ast.BinaryExpr{
 				X:  ident("i"),
 				Op: token.LSS,
-				Y:  intLiteral(strconv.Itoa(len(positions))),
+				Y:  intLiteral(len(positions)),
 			},
 			Post: &ast.AssignStmt{
 				Lhs: []ast.Expr{ident("i")},
 				Tok: token.ADD_ASSIGN,
-				Rhs: []ast.Expr{intLiteral("2")},
+				Rhs: []ast.Expr{intLiteral(2)},
 			},
 			Body: &ast.BlockStmt{
 				List: []ast.Stmt{
@@ -106,12 +105,12 @@ func (x swap) obfuscate(data []byte) *ast.BlockStmt {
 										Y: indexExpr("positions", &ast.BinaryExpr{
 											X:  ident("i"),
 											Op: token.ADD,
-											Y:  intLiteral("1"),
+											Y:  intLiteral(1),
 										}),
 									}),
 								},
 								Op: token.ADD,
-								Y:  intLiteral(strconv.Itoa(int(shiftKey))),
+								Y:  intLiteral(int(shiftKey)),
 							},
 						},
 					},
@@ -121,7 +120,7 @@ func (x swap) obfuscate(data []byte) *ast.BlockStmt {
 							indexExpr("data", indexExpr("positions", &ast.BinaryExpr{
 								X:  ident("i"),
 								Op: token.ADD,
-								Y:  intLiteral("1"),
+								Y:  intLiteral(1),
 							})),
 						},
 						Tok: token.ASSIGN,
@@ -130,7 +129,7 @@ func (x swap) obfuscate(data []byte) *ast.BlockStmt {
 								X: indexExpr("data", indexExpr("positions", &ast.BinaryExpr{
 									X:  ident("i"),
 									Op: token.ADD,
-									Y:  intLiteral("1"),
+									Y:  intLiteral(1),
 								})),
 								Op: token.XOR,
 								Y:  ident("localKey"),