eval infix operations for ints; support modulo

houcine7 · Dec 19, 2023 · 4f4ae9c · 4f4ae9c
1 parent cb776ee
commit 4f4ae9c
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 7 deletions.
diff --git a/internal/lexer/lexer.go b/internal/lexer/lexer.go
@@ -58,6 +58,8 @@ func (l *Lexer) NextToken() token.Token {
 		}
 	case '/':
 		test = token.CreateToken(token.SLASH, string(l.char))
+	case '%':
+		test = token.CreateToken(token.MODULO, string(l.char))
 	case '*':
 		test = token.CreateToken(token.STAR, string(l.char))
 	case '!':

diff --git a/internal/parser/parser.go b/internal/parser/parser.go
@@ -68,6 +68,7 @@ func InitParser(l *lexer.Lexer) *Parser {
 		token.MINUS,
 		token.SLASH,
 		token.STAR,
+		token.MODULO,
 
 		token.EQUAL,
 		token.NOT_EQUAL,
@@ -213,7 +214,6 @@ func (p *Parser) parseForLoopExpression() ast.Expression {
 	exp.InitStm = p.parseDefStmtInForLoop()
 
 	if !p.expectedNextToken(token.CreateToken(token.S_COLON, ";")) {
-		fmt.Println("HEEEERE")
 		return nil
 	}
 	p.Next() // advance to the condition expression
@@ -222,7 +222,6 @@ func (p *Parser) parseForLoopExpression() ast.Expression {
 	if !p.expectedNextToken(token.CreateToken(token.S_COLON, ";")) {
 		return nil
 	}
-
 	p.Next() // advance to post iteration
 	exp.PostIteration = p.parseExpression(LOWEST)
 

diff --git a/internal/parser/parser_cte.go b/internal/parser/parser_cte.go
@@ -30,6 +30,7 @@ var precedences = map[token.TokenType]int{
 	token.MINUS: SUM,
 	token.SLASH: PRODUCT,
 	token.STAR:  PRODUCT,
+	token.MODULO: PRODUCT,
 
 	token.LP: CALL,
 

diff --git a/internal/runtime/eval.go b/internal/runtime/eval.go
@@ -21,12 +21,42 @@ func Eval(node ast.Node) types.ObjectJIPL {
 	case *ast.PostfixExpression:
 		operand := Eval(node.Left)
 		return evalPostfixExpression(node.Operator, operand)
+	case *ast.InfixExpression:
+		leftOperand := Eval(node.Left)
+		rightOperand := Eval(node.Right)
+		return evalInfixExpression(node.Operator,leftOperand,rightOperand)
 	default:
 		return nil
 	}
 }
+
+func evalInfixExpression(operator string, leftOperand, rightOperand types.ObjectJIPL) types.ObjectJIPL {
+	if leftOperand.GetType() != types.T_INTEGER || 
+	rightOperand.GetType() !=types.T_INTEGER {
+		return nil
+	}
+	return evalIntInfixExpression(operator,leftOperand,rightOperand)
+}
 
 
+func evalIntInfixExpression(operator string, left, right types.ObjectJIPL)  types.ObjectJIPL {
+	intObjRight := right.(*types.Integer)
+	intObjLeft := left.(*types.Integer)
+	switch operator {
+	case "+":
+		return &types.Integer{Val: intObjLeft.Val + intObjRight.Val}
+	case "-":
+		return &types.Integer{Val: intObjLeft.Val - intObjRight.Val}
+	case "*":
+		return &types.Integer{Val: intObjLeft.Val * intObjRight.Val}
+	case "/":
+		return &types.Integer{Val: intObjLeft.Val / intObjRight.Val}
+	case "%":
+		return &types.Integer{Val: intObjLeft.Val % intObjRight.Val}
+	default:
+		return nil
+	}
+}
 
 func evalPostfixExpression(operator string, operand types.ObjectJIPL) types.ObjectJIPL{
 	switch operator {
@@ -40,7 +70,7 @@ func evalPostfixExpression(operator string, operand types.ObjectJIPL) types.Obje
 }
 
 func evalIncrementPostfix(operand types.ObjectJIPL) types.ObjectJIPL {
-	if operand.GetType() != types.T_ITNTEGER {
+	if operand.GetType() != types.T_INTEGER {
 		return nil
 	}
 	intObj := operand.(*types.Integer)
@@ -49,7 +79,7 @@ func evalIncrementPostfix(operand types.ObjectJIPL) types.ObjectJIPL {
 }
 
 func evalDecrementPostfix(operand types.ObjectJIPL) types.ObjectJIPL{
-	if operand.GetType() != types.T_ITNTEGER {
+	if operand.GetType() != types.T_INTEGER{
 		return nil
 	}
 	intObj := operand.(*types.Integer)
@@ -78,7 +108,7 @@ func evalPrefixExpression(operator string, operand types.ObjectJIPL) types.Objec
 }
 
 func evalMinusPrefix(operand types.ObjectJIPL) types.ObjectJIPL {
-	if operand.GetType() != types.T_ITNTEGER {
+	if operand.GetType() != types.T_INTEGER {
 		return nil
 	}
 	intObj := operand.(*types.Integer)

diff --git a/internal/token/token_ctes.go b/internal/token/token_ctes.go
@@ -27,6 +27,7 @@ const (
 	NOT_EQUAL = 47 // !=
 	INCREMENT = 50 // ++
 	DECREMENT = 51 // --
+	MODULO    = 56 // %
 
 	/*Comparators operators*/
 	LT       = 52 // <

diff --git a/internal/types/types.go b/internal/types/types.go
@@ -41,12 +41,12 @@ func (intObj *Integer) ToString() string {
 }
 
 func (intObj *Integer) GetType() TypeObj {
-	return T_ITNTEGER
+	return T_INTEGER
 }
 
 // cte of types
 const (
-	T_ITNTEGER  = "INTEGER"
+	T_INTEGER  = "INTEGER"
 	T_BOOLEAN   = "BOOLEAN"
 	T_UNDEFINED = "UNDEFINED"
 )