Fixed while loop bug

NuruProgramming · Dec 16, 2022 · ee36e9d · ee36e9d
1 parent f08bb63
commit ee36e9d
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 6 deletions.
diff --git a/evaluator/evaluator.go b/evaluator/evaluator.go
@@ -565,7 +565,7 @@ func evalWhileExpression(we *ast.WhileExpression, env *object.Environment) objec
 		if isError(evaluated) {
 			return evaluated
 		}
-		if evaluated.Type() == object.BREAK_OBJ {
+		if evaluated != nil && evaluated.Type() == object.BREAK_OBJ {
 			return evaluated
 		}
 		evalWhileExpression(we, env)

diff --git a/lexer/lexer.go b/lexer/lexer.go
@@ -223,15 +223,33 @@ func (l *Lexer) skipMultiLineComment() {
 }
 
 func (l *Lexer) readString() string {
-	position := l.position + 1
+	var str string
 	for {
 		l.readChar()
 		if l.ch == '"' || l.ch == 0 {
 			break
+		} else if l.ch == '\\' {
+			switch l.peekChar() {
+			case 'n':
+				l.readChar()
+				l.ch = '\n'
+			case 'r':
+				l.readChar()
+				l.ch = '\r'
+			case 't':
+				l.readChar()
+				l.ch = '\t'
+			case '"':
+				l.readChar()
+				l.ch = '"'
+			case '\\':
+				l.readChar()
+				l.ch = '\\'
+			}
 		}
+		str += string(l.ch)
 	}
-
-	return l.input[position:l.position]
+	return str
 }
 
 func (l *Lexer) readSingleQuoteString() string {
@@ -240,8 +258,24 @@ func (l *Lexer) readSingleQuoteString() string {
 		l.readChar()
 		if l.ch == '\'' || l.ch == 0 {
 			break
-		} else if l.ch == '\\' && l.peekChar() == '\'' {
-			l.readChar()
+		} else if l.ch == '\\' {
+			switch l.peekChar() {
+			case 'n':
+				l.readChar()
+				l.ch = '\n'
+			case 'r':
+				l.readChar()
+				l.ch = '\r'
+			case 't':
+				l.readChar()
+				l.ch = '\t'
+			case '"':
+				l.readChar()
+				l.ch = '"'
+			case '\\':
+				l.readChar()
+				l.ch = '\\'
+			}
 		}
 		str += string(l.ch)
 	}