wip: trying bufio reader for extracting tokens

internal/tokenizer/tokenizer.go

@@ -1,8 +1,9 @@
 package tokenizer
 
 import (
-	"fmt"
+	"bufio"
 	"regexp"
+	"slices"
 )
 
 type TokenType int
@@ -15,7 +16,7 @@ const (
 	IDENTIFIER
 )
 
-var KEYWORDS = [...]string{
+var KEYWORDS = []string{
 	"class",
 	"constructor",
 	"function",
@@ -24,7 +25,7 @@ var KEYWORDS = [...]string{
 	"static",
 	"var",
 	"int",
-	"char",
+	"read",
 	"boolean",
 	"void",
 	"true",
@@ -39,7 +40,7 @@ var KEYWORDS = [...]string{
 	"return",
 }
 
-var SYMBOLS = [...]string{
+var SYMBOLS = []string{
 	"{",
 	"}",
 	"(",
@@ -66,17 +67,61 @@ type Token struct {
 	Type  TokenType
 }
 
-func ExtractTokens(tokens *[]Token, source []byte) error {
+func ExtractTokens(tokens *[]Token, reader *bufio.Reader) error {
-	i := 0
+	read := ""
+	buf := []byte{}
 
-	for i < len(source) {
+	for {
-		t := string(source[i])
+		_, err := reader.Read(buf)
+		read += string(buf)
 
-		if match, _ := regexp.MatchString("^[[:space:]]$", t); match {
+		if err != nil {
-			i++
+			return err
+		}
+
+		if match, _ := regexp.MatchString("^[[:space:]]$", read); match {
+			continue
+		}
+
+		if read == "/" {
+			next, err := reader.ReadByte()
+
+			if err != nil {
+				return err
+			}
+
+			if string(next) == "/" || string(next) == "*" {
+				_, err := reader.ReadBytes('/')
+
+				if err != nil {
+					return err
+				}
 			} else {
-			fmt.Println(t)
+				*tokens = append(*tokens, Token{Value: read, Type: SYMBOL})
-			i++
+				read = ""
+
+				err := reader.UnreadByte()
+
+				if err != nil {
+					return err
+				}
+
+				continue
+			}
+		}
+
+		if slices.Contains(SYMBOLS, read) {
+			*tokens = append(*tokens, Token{Value: read, Type: SYMBOL})
+			read = ""
+
+			continue
+		}
+
+		if slices.Contains(KEYWORDS, read) {
+			*tokens = append(*tokens, Token{Value: read, Type: KEYWORD})
+			read = ""
+
+			continue
 		}
 	}
 

main.go

@@ -1,17 +1,20 @@
 package main
 
 import (
+	"bufio"
 	"io/fs"
 	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
 
+	"github.com/hazemKrimi/jack-compiler/internal/parser"
 	"github.com/hazemKrimi/jack-compiler/internal/tokenizer"
 )
 
 func process(inputPath string) error {
-	source, err := os.ReadFile(inputPath)
+	file, err := os.Open(inputPath)
+	reader := bufio.NewReader(file)
 
 	if err != nil {
 		return err
@@ -19,13 +22,14 @@ func process(inputPath string) error {
 
 	tokens := make([]tokenizer.Token, 0, 1000)
 
-	if err := tokenizer.ExtractTokens(&tokens, source); err != nil {
+	if err := tokenizer.ExtractTokens(&tokens, reader); err != nil {
 		return err
 	}
 
+	parsed := parser.ParseTokens(tokens)
 	outputPath := strings.Replace(inputPath, ".jack", ".xml", 1)
 
-	if err := os.WriteFile(outputPath, source, 0644); err != nil {
+	if err := os.WriteFile(outputPath, []byte(parsed), 0644); err != nil {
 		return err
 	}