Merge pull request #13 from JunNishimura/change_symbol_for_equation

change equation symbol
JunNishimura · Sep 26, 2024 · 14db100 · 14db100
2 parents 9f0f292 + 6bec5ab
commit 14db100
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/evaluator/builtins.go b/evaluator/builtins.go
@@ -81,7 +81,7 @@ var builtins = map[string]*object.Builtin{
 			return &object.Integer{Value: result}
 		},
 	},
-	"=": {
+	"==": {
 		Fn: func(args ...object.Object) object.Object {
 			if len(args) <= 1 {
 				return newError("number of arguments to '=' must be more than 1, got %d", len(args))

diff --git a/evaluator/evaluator_test.go b/evaluator/evaluator_test.go
@@ -151,7 +151,7 @@ func TestEvalBooleanExpression(t *testing.T) {
 			input: `
 				{
 					"command": {
-						"symbol": "=",
+						"symbol": "==",
 						"args": [true, true]
 					}
 				}`,
@@ -162,7 +162,7 @@ func TestEvalBooleanExpression(t *testing.T) {
 			input: `
 				{
 					"command": {
-						"symbol": "=",
+						"symbol": "==",
 						"args": [true, false]
 					}
 				}`,

diff --git a/lexer/lexer.go b/lexer/lexer.go
@@ -58,7 +58,14 @@ func (l *Lexer) NextToken() token.Token {
 	case '/':
 		tok = newToken(token.SYMBOL, l.curChar)
 	case '=':
-		tok = newToken(token.SYMBOL, l.curChar)
+		if l.peekChar() == '=' {
+			ch := l.curChar
+			l.readChar()
+			literal := string(ch) + string(l.curChar)
+			tok = token.Token{Type: token.SYMBOL, Literal: literal}
+		} else {
+			tok = newToken(token.SYMBOL, l.curChar)
+		}
 	case '!':
 		if l.peekChar() == '=' {
 			ch := l.curChar

diff --git a/lexer/lexer_test.go b/lexer/lexer_test.go
@@ -219,7 +219,7 @@ func TestSingleProgram(t *testing.T) {
 			input: `
 				{
 					"command": {
-						"symbol": "=",
+						"symbol": "==",
 						"args": [1, 2]
 					}
 				}`,
@@ -235,7 +235,7 @@ func TestSingleProgram(t *testing.T) {
 				{Type: token.DOUBLE_QUOTE, Literal: "\""},
 				{Type: token.COLON, Literal: ":"},
 				{Type: token.DOUBLE_QUOTE, Literal: "\""},
-				{Type: token.SYMBOL, Literal: "="},
+				{Type: token.SYMBOL, Literal: "=="},
 				{Type: token.DOUBLE_QUOTE, Literal: "\""},
 				{Type: token.COMMA, Literal: ","},
 				{Type: token.DOUBLE_QUOTE, Literal: "\""},

diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -298,15 +298,15 @@ func TestCommand(t *testing.T) {
 			input: `
 				{
 					"command": {
-						"symbol": "=",
+						"symbol": "==",
 						"args": [1, 2]
 					}
 				}`,
 			expected: &ast.CommandObject{
 				Token: token.Token{Type: token.COMMAND, Literal: "command"},
 				Symbol: &ast.Symbol{
-					Token: token.Token{Type: token.SYMBOL, Literal: "="},
-					Value: "=",
+					Token: token.Token{Type: token.SYMBOL, Literal: "=="},
+					Value: "==",
 				},
 				Args: []ast.Expression{
 					&ast.IntegerLiteral{
@@ -434,7 +434,7 @@ func TestIfExpression(t *testing.T) {
 					"if": {
 						"cond": {
 							"command": {
-								"symbol": "=",
+								"symbol": "==",
 								"args": [1, 2]
 							}
 						},
@@ -457,8 +457,8 @@ func TestIfExpression(t *testing.T) {
 				Condition: &ast.CommandObject{
 					Token: token.Token{Type: token.COMMAND, Literal: "command"},
 					Symbol: &ast.Symbol{
-						Token: token.Token{Type: token.SYMBOL, Literal: "="},
-						Value: "=",
+						Token: token.Token{Type: token.SYMBOL, Literal: "=="},
+						Value: "==",
 					},
 					Args: []ast.Expression{
 						&ast.IntegerLiteral{