Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
use any instead of interface{}
Browse files Browse the repository at this point in the history
cicr99 committed Jan 22, 2024
1 parent 72c77d9 commit 41894c8
Showing 5 changed files with 20 additions and 20 deletions.
20 changes: 10 additions & 10 deletions pkg/hintrunner/hintparser.go
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@ type DerefDeref struct {


// AST Functionality
func (expression IdentifierExp) Evaluate() (interface{}, error) {
func (expression IdentifierExp) Evaluate() (any, error) {
switch {
case expression.DerefCastExp != nil:
return expression.DerefCastExp.Evaluate()
@@ -98,7 +98,7 @@ func (expression IdentifierExp) Evaluate() (interface{}, error) {
}
}

func (expression DerefCastExp) Evaluate() (interface{}, error) {
func (expression DerefCastExp) Evaluate() (any, error) {
value, err := expression.CastExp.ValueExpr.Evaluate()
if err != nil {
return nil, err
@@ -124,7 +124,7 @@ func (expression DerefCastExp) Evaluate() (interface{}, error) {
}
}

func (expression CastExp) Evaluate() (interface{}, error) {
func (expression CastExp) Evaluate() (any, error) {
value, err := expression.ValueExpr.Evaluate()
if err != nil {
return nil, err
@@ -157,7 +157,7 @@ func (expression CastExp) Evaluate() (interface{}, error) {
}
}

func (expression Expression) Evaluate() (interface{}, error) {
func (expression Expression) Evaluate() (any, error) {
switch {
case expression.CellRefExp != nil:
return expression.CellRefExp.Evaluate()
@@ -170,7 +170,7 @@ func (expression Expression) Evaluate() (interface{}, error) {
}
}

func (expression RegisterOffset) Evaluate() (interface{}, error) {
func (expression RegisterOffset) Evaluate() (any, error) {
offsetValue, _ := expression.Offset.Evaluate()
offset := int16(*offsetValue)
if expression.Operator == "-" {
@@ -180,7 +180,7 @@ func (expression RegisterOffset) Evaluate() (interface{}, error) {
return EvaluateRegister(expression.Register, offset)
}

func (expression CellRefExp) Evaluate() (interface{}, error) {
func (expression CellRefExp) Evaluate() (any, error) {
if expression.RegisterOffset != nil {
return expression.RegisterOffset.Evaluate()
}
@@ -211,7 +211,7 @@ func (expression OffsetExp) Evaluate() (*int, error) {
}
}

func (expression DerefExp) Evaluate() (interface{}, error) {
func (expression DerefExp) Evaluate() (any, error) {
cellRefExp, err := expression.CellRefExp.Evaluate()
if err != nil {
return nil, err
@@ -223,7 +223,7 @@ func (expression DerefExp) Evaluate() (interface{}, error) {
return Deref{cellRef}, nil
}

func (expression BinOpExp) Evaluate() (interface{}, error) {
func (expression BinOpExp) Evaluate() (any, error) {
leftExp, err := expression.LeftExp.Evaluate()
if err != nil {
return nil, err
@@ -276,7 +276,7 @@ func (expression BinOpExp) Evaluate() (interface{}, error) {
return nil, fmt.Errorf("invalid binary operation")
}

func (expression LeftExp) Evaluate() (interface{}, error) {
func (expression LeftExp) Evaluate() (any, error) {
switch{
case expression.CellRefExp != nil:
return expression.CellRefExp.Evaluate()
@@ -286,7 +286,7 @@ func (expression LeftExp) Evaluate() (interface{}, error) {
return nil, fmt.Errorf("Unexpected left expression in binary operation")
}

func (expression RightExp) Evaluate() (interface{}, error) {
func (expression RightExp) Evaluate() (any, error) {
switch{
case expression.DerefExp != nil:
return expression.DerefExp.Evaluate()
2 changes: 1 addition & 1 deletion pkg/hintrunner/zerohint.go
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ func GetParameters(zeroProgram *zero.ZeroProgram, hint zero.Hint, hintPC uint64)
return cellRefParams, resOpParams, nil
}

func ParseIdentifier(value string) (interface{}, error) {
func ParseIdentifier(value string) (any, error) {
identifierExp, err := parser.ParseString("", value)
if err != nil {
return nil, err
8 changes: 4 additions & 4 deletions pkg/parsers/starknet/hint.go
Original file line number Diff line number Diff line change
@@ -295,7 +295,7 @@ func (ro *ResOperand) UnmarshalJSON(data []byte) error {
return err
}

var op interface{}
var op any
for k := range resOp {
switch ResOperandName(k) {
case DerefName:
@@ -330,7 +330,7 @@ type InnerDoubleDeref struct {
}

func (i *InnerDoubleDeref) UnmarshalJSON(data []byte) error {
var s []interface{}
var s []any
err := json.Unmarshal(data, &s)
if err != nil {
return err
@@ -413,7 +413,7 @@ func (d *DerefOrImmediate) UnmarshalJSON(data []byte) error {
return err
}

var op interface{}
var op any
for k := range rawDerefOrImmediate {
switch ResOperandName(k) {
case DerefName:
@@ -450,7 +450,7 @@ func (h *Hint) UnmarshalJSON(data []byte) error {

for k, v := range rawHint {
h.Name = HintName(k)
var args interface{}
var args any

switch h.Name {
// Starknet hints
4 changes: 2 additions & 2 deletions pkg/parsers/starknet/starknet.go
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@ type Hints struct {
// Hints are serialized as tuples of (index, []hint)
// https://github.com/starkware-libs/cairo/blob/main/crates/cairo-lang-starknet/src/casm_contract_class.rs#L90
func (hints *Hints) UnmarshalJSON(data []byte) error {
var rawHints []interface{}
var rawHints []any
if err := json.Unmarshal(data, &rawHints); err != nil {
return err
}
@@ -124,7 +124,7 @@ func (hints *Hints) UnmarshalJSON(data []byte) error {
}

func (hints *Hints) MarshalJSON() ([]byte, error) {
var rawHints []interface{}
var rawHints []any
rawHints = append(rawHints, hints.Index)
rawHints = append(rawHints, hints.Hints)

6 changes: 3 additions & 3 deletions pkg/utils/keccak_test.go
Original file line number Diff line number Diff line change
@@ -160,7 +160,7 @@ func TestCairoKeccak(t *testing.T) {

func TestKeccakU256sLEInputs(t *testing.T) {
cases := []struct {
input interface{}
input any
expected string
}{
{
@@ -210,7 +210,7 @@ func TestKeccakU256sLEInputs(t *testing.T) {
}

// Helper Function for converting various input types to uint256
func ConvertToUint256(input interface{}) *uint256.Int {
func ConvertToUint256(input any) *uint256.Int {
switch v := input.(type) {
case string:
return StringToUint256(v)
@@ -252,7 +252,7 @@ func createUint256IntFromBytes(b []byte) *uint256.Int {
// BE (Big Endian) Input Tests
func TestKeccakU256sBEInputs(t *testing.T) {
cases := []struct {
input interface{}
input any
expected string
}{
{

0 comments on commit 41894c8

Please sign in to comment.