replace iota values with string constants

MlkMahmud · Dec 22, 2023 · 4038c20 · 4038c20
1 parent 6b1fa6b
commit 4038c20
Show file tree

Hide file tree

Showing 6 changed files with 208 additions and 277 deletions.
diff --git a/main.go b/main.go
@@ -31,7 +31,7 @@ func main() {
 	lexer := lexer.NewLexer()
 	parser := parser.NewParser()
 
-	filePaths := []string{}
+	jackFiles := []string{}
 
 	if info.IsDir() {
 		entries, err := os.ReadDir(source)
@@ -42,17 +42,17 @@ func main() {
 
 		for _, entry := range entries {
 			if fileName := entry.Name(); strings.HasSuffix(fileName, ".jack") {
-				filePaths = append(filePaths, filepath.Join(source, fileName))
+				jackFiles = append(jackFiles, filepath.Join(source, fileName))
 			}
 		}
 	} else {
 		if !strings.HasSuffix(source, ".jack") {
 			printHelpMessage()
 		}
-		filePaths = append(filePaths, source)
+		jackFiles = append(jackFiles, source)
 	}
 
-	for _, src := range filePaths {
+	for _, src := range jackFiles {
 		tokens := lexer.Tokenize(src)
 		class := parser.Parse(tokens)
 		fmt.Printf("ClassName: %s\nVar Count: %d\nSubroutine Count: %d\n", class.Name, len(class.Vars), len(class.Subroutines))

diff --git a/parser/parser.go b/parser/parser.go
@@ -335,7 +335,7 @@ func (parser *Parser) parseUnaryExpression() types.UnaryExpr {
 	// GRAMMAR: ('-' | '~') term
 	opToken := parser.getNextToken()
 	parser.assertToken(opToken, []string{"-", "~"})
-	operator, _ := types.GetUnaryOperator(opToken.Lexeme)
+	operator := types.UnaryOperator(opToken.Lexeme)
 
 	return types.UnaryExpr{
 		Operator: operator,
@@ -350,7 +350,7 @@ func (parser *Parser) parseExpression() types.Expr {
 
 	if helpers.IsBinaryOperator(nexToken) {
 		parser.assertToken(parser.getNextToken(), []string{"+", "-", "*", "/", "<", ">", "="})
-		operator, _ := types.GetBinaryOperator(nexToken.Lexeme)
+		operator := types.BinaryOperator(nexToken.Lexeme)
 
 		return types.BinaryExpr{
 			Left:     term,
@@ -361,7 +361,7 @@ func (parser *Parser) parseExpression() types.Expr {
 
 	if helpers.IsLogicalOperator(nexToken) {
 		parser.assertToken(parser.getNextToken(), []string{"&", "|"})
-		operator, _ := types.GetLogicalOperator(nexToken.Lexeme)
+		operator := types.LogicalOperator(nexToken.Lexeme)
 		return types.LogicalExpr{
 			Left:     term,
 			Operator: operator,
@@ -516,7 +516,7 @@ func (parser *Parser) parseSubroutineDec() (subroutine types.SubroutineDecl) {
 	parser.assertToken(subroutineTypeToken, []string{"boolean", "char", "className", "int", "void"})
 	parser.assertToken(subroutineNameToken, []string{"subroutineName"})
 
-	subroutineKind, _ := types.GetSymbolKindFromString(subroutineKindToken.Lexeme)
+	subroutineKind := types.SymbolKind(subroutineKindToken.Lexeme)
 
 	subroutine.Name = types.Ident{Name: subroutineNameToken.Lexeme}
 	subroutine.Kind = subroutineKind
@@ -540,7 +540,7 @@ func (parser *Parser) parseClassVarDec() (vars []types.VarDecl) {
 	parser.assertToken(varTypeToken, []string{"boolean", "char", "className", "int"})
 	parser.assertToken(varNameToken, []string{"varName"})
 
-	varKind, _ := types.GetSymbolKindFromString(varKindToken.Lexeme)
+	varKind := types.SymbolKind(varKindToken.Lexeme)
 	vars = append(vars, types.VarDecl{Name: varNameToken.Lexeme, Type: varTypeToken.Lexeme, Kind: varKind})
 
 	// Check if it's a multi var declaration.

diff --git a/testdata/expected/Array.json b/testdata/expected/Array.json
@@ -4,14 +4,16 @@
     {
       "Name": { "Name": "main" },
       "Params": null,
-      "Kind": 3,
+      "Kind": "function",
       "Type": "void",
       "Body": {
         "Statements": [
           {
             "Target": { "Name": "length" },
             "Value": {
-              "Arguments": [{ "Type": 3, "Value": "HOW MANY NUMBERS? " }],
+              "Arguments": [
+                { "Type": "string", "Value": "HOW MANY NUMBERS? " }
+              ],
               "Callee": {
                 "Object": { "Name": "Keyboard" },
                 "Property": { "Name": "readInt" }
@@ -28,7 +30,10 @@
               }
             }
           },
-          { "Target": { "Name": "i" }, "Value": { "Type": 1, "Value": "0" } },
+          {
+            "Target": { "Name": "i" },
+            "Value": { "Type": "int", "Value": "0" }
+          },
           {
             "Body": {
               "Statements": [
@@ -39,7 +44,7 @@
                   },
                   "Value": {
                     "Arguments": [
-                      { "Type": 3, "Value": "ENTER THE NEXT NUMBER: " }
+                      { "Type": "string", "Value": "ENTER THE NEXT NUMBER: " }
                     ],
                     "Callee": {
                       "Object": { "Name": "Keyboard" },
@@ -50,28 +55,34 @@
                 {
                   "Target": { "Name": "i" },
                   "Value": {
-                    "Operator": 0,
+                    "Operator": "+",
                     "Left": { "Name": "i" },
-                    "Right": { "Type": 1, "Value": "1" }
+                    "Right": { "Type": "int", "Value": "1" }
                   }
                 }
               ]
             },
             "Condition": {
-              "Operator": 4,
+              "Operator": "\u003c",
               "Left": { "Name": "i" },
               "Right": { "Name": "length" }
             }
           },
-          { "Target": { "Name": "i" }, "Value": { "Type": 1, "Value": "0" } },
-          { "Target": { "Name": "sum" }, "Value": { "Type": 1, "Value": "0" } },
+          {
+            "Target": { "Name": "i" },
+            "Value": { "Type": "int", "Value": "0" }
+          },
+          {
+            "Target": { "Name": "sum" },
+            "Value": { "Type": "int", "Value": "0" }
+          },
           {
             "Body": {
               "Statements": [
                 {
                   "Target": { "Name": "sum" },
                   "Value": {
-                    "Operator": 0,
+                    "Operator": "+",
                     "Left": { "Name": "sum" },
                     "Right": {
                       "Indexer": { "Name": "i" },
@@ -82,22 +93,22 @@
                 {
                   "Target": { "Name": "i" },
                   "Value": {
-                    "Operator": 0,
+                    "Operator": "+",
                     "Left": { "Name": "i" },
-                    "Right": { "Type": 1, "Value": "1" }
+                    "Right": { "Type": "int", "Value": "1" }
                   }
                 }
               ]
             },
             "Condition": {
-              "Operator": 4,
+              "Operator": "\u003c",
               "Left": { "Name": "i" },
               "Right": { "Name": "length" }
             }
           },
           {
             "Expression": {
-              "Arguments": [{ "Type": 3, "Value": "THE AVERAGE IS: " }],
+              "Arguments": [{ "Type": "string", "Value": "THE AVERAGE IS: " }],
               "Callee": {
                 "Object": { "Name": "Output" },
                 "Property": { "Name": "printString" }
@@ -108,7 +119,7 @@
             "Expression": {
               "Arguments": [
                 {
-                  "Operator": 3,
+                  "Operator": "/",
                   "Left": { "Name": "sum" },
                   "Right": { "Name": "length" }
                 }
@@ -131,10 +142,10 @@
           { "Expression": null }
         ],
         "Vars": [
-          { "Name": "a", "Kind": 6, "Type": "Array" },
-          { "Name": "length", "Kind": 6, "Type": "int" },
-          { "Name": "i", "Kind": 6, "Type": "int" },
-          { "Name": "sum", "Kind": 6, "Type": "int" }
+          { "Name": "a", "Kind": "var", "Type": "Array" },
+          { "Name": "length", "Kind": "var", "Type": "int" },
+          { "Name": "i", "Kind": "var", "Type": "int" },
+          { "Name": "sum", "Kind": "var", "Type": "int" }
         ]
       }
     }