From 99d08ce35ede2b5c75266240f20c4554060ddce0 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 25 Mar 2018 10:15:58 +0200 Subject: stringer --- evaluator/builtins.go | 8 ++++---- evaluator/evaluator.go | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'evaluator') diff --git a/evaluator/builtins.go b/evaluator/builtins.go index 711c3c9..38acaea 100644 --- a/evaluator/builtins.go +++ b/evaluator/builtins.go @@ -40,7 +40,7 @@ var builtins = map[string]*object.Builtin{ return newError("wrong number of arguments. got=%d, want=1", len(args)) } - if args[0].Type() != object.ARRAY_OBJ { + if args[0].Type() != object.ARRAY { return newError("argument to `first` must be ARRAY, got %s", args[0].Type()) } @@ -59,7 +59,7 @@ var builtins = map[string]*object.Builtin{ return newError("wrong number of arguments. got=%d, want=1", len(args)) } - if args[0].Type() != object.ARRAY_OBJ { + if args[0].Type() != object.ARRAY { return newError("argument to `last` must be ARRAY, got %s", args[0].Type()) } @@ -79,7 +79,7 @@ var builtins = map[string]*object.Builtin{ return newError("wrong number of arguments. got=%d, want=1", len(args)) } - if args[0].Type() != object.ARRAY_OBJ { + if args[0].Type() != object.ARRAY { return newError("argument to `rest` must be ARRAY, got %s", args[0].Type()) } @@ -101,7 +101,7 @@ var builtins = map[string]*object.Builtin{ return newError("wrong number of arguments. got=%d, want=2", len(args)) } - if args[0].Type() != object.ARRAY_OBJ { + if args[0].Type() != object.ARRAY { return newError("argument to `push` must be ARRAY, got %s", args[0].Type()) } diff --git a/evaluator/evaluator.go b/evaluator/evaluator.go index 6ea4b01..89e6426 100644 --- a/evaluator/evaluator.go +++ b/evaluator/evaluator.go @@ -148,7 +148,7 @@ func evalBlockStatement(block *ast.BlockStatement, env *object.Environment) obje if result != nil { rt := result.Type() - if rt == object.RETURN_VALUE_OBJ || rt == object.ERROR_OBJ { + if rt == object.RETURN_VALUE || rt == object.ERROR { return result } } @@ -177,9 +177,9 @@ func evalPrefixExpression(operator string, right object.Object) object.Object { func evalInfixExpression(operator string, left, right object.Object) object.Object { switch { - case left.Type() == object.INTEGER_OBJ && right.Type() == object.INTEGER_OBJ: + case left.Type() == object.INTEGER && right.Type() == object.INTEGER: return evalIntegerInfixExpression(operator, left, right) - case left.Type() == object.STRING_OBJ && right.Type() == object.STRING_OBJ: + case left.Type() == object.STRING && right.Type() == object.STRING: return evalStringInfixExpression(operator, left, right) case operator == "==": return nativeBoolToBooleanObject(left == right) @@ -208,7 +208,7 @@ func evalBangOperatorExpression(right object.Object) object.Object { } func evalMinusPrefixOperatorExpression(right object.Object) object.Object { - if right.Type() != object.INTEGER_OBJ { + if right.Type() != object.INTEGER { return newError("unknown operator: -%s", right.Type()) } @@ -300,7 +300,7 @@ func newError(format string, a ...interface{}) *object.Error { func isError(obj object.Object) bool { if obj != nil { - return obj.Type() == object.ERROR_OBJ + return obj.Type() == object.ERROR } return false } @@ -355,9 +355,9 @@ func unwrapReturnValue(obj object.Object) object.Object { func evalIndexExpression(left, index object.Object) object.Object { switch { - case left.Type() == object.ARRAY_OBJ && index.Type() == object.INTEGER_OBJ: + case left.Type() == object.ARRAY && index.Type() == object.INTEGER: return evalArrayIndexExpression(left, index) - case left.Type() == object.HASH_OBJ: + case left.Type() == object.HASH: return evalHashIndexExpression(left, index) default: return newError("index operator not supported: %s", left.Type()) -- cgit v1.2.3