sucessful parser

.gitignore

@@ -27,3 +27,5 @@ go.work
 # End of https://www.toptal.com/developers/gitignore/api/go
 
 parser/
+
+go.sum

Wyst.g4

@@ -2,10 +2,8 @@ grammar Wyst;
 
 WS : [ \t\r\n]+ -> skip;
 
-expr: expr ('*'|'/') expr
+expr: IDENTIFIER
-    | expr ('+'|'-') expr
-    | INT
-    | '(' expr ')'
     ;
 
 INT: [0-9]+;
+IDENTIFIER: [a-zA-Z_] ([a-zA-Z0-9] | '::')*;

go.mod

@@ -6,7 +6,4 @@ toolchain go1.22.6
 
 require github.com/antlr4-go/antlr/v4 v4.13.1 // direct
 
-require (
+require golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
-	// github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
-	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
-)

go.sum

@@ -1,7 +1,3 @@
-github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves=
-github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
-github.com/antlr4-go/antlr v0.0.0-20230518091524-98b52378c522 h1:o+W7GDFUwWtVkN28CW/nhh/aCmHn6OJddUs3+8vMMjs=
-github.com/antlr4-go/antlr v0.0.0-20230518091524-98b52378c522/go.mod h1:srLVvW4JLxy+tCG9Nn2l8al77mUIMCwAOLQocfLDU2w=
 github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
 github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=

main.go

@@ -1,9 +1,8 @@
 package main
 
-import (
+import "fmt"
-)
 
 func main() {
-	tree, parser := Parse("")
+	ast := Parse("abc123::hello")
-	iterateTree(tree, parser, 0)
+	fmt.Printf("%v", ast)
 }

parser.go

@@ -0,0 +1,53 @@
+package main
+
+import (
+	"github.com/antlr4-go/antlr/v4"
+	"github.com/wyst-lang/wyst/parser"
+)
+
+type ASTNode struct {
+	Rule  string
+	Text  string
+	Inner []ASTNode
+}
+
+func getTokenName(tokenType int, lexer *parser.WystLexer) string {
+	if tokenType >= 0 && tokenType < len(lexer.SymbolicNames) {
+		if lexer.SymbolicNames[tokenType] != "" {
+			return lexer.SymbolicNames[tokenType]
+		}
+		return lexer.LiteralNames[tokenType]
+	}
+	return "UNKNOWN"
+}
+
+func ConvertAST(node antlr.Tree, wparser *parser.WystParser, lexer *parser.WystLexer) ASTNode {
+	var ast = ASTNode{}
+	switch node := node.(type) {
+	case antlr.TerminalNode:
+		token := node.GetSymbol()
+		ast.Text = token.GetText()
+		ast.Rule = getTokenName(token.GetTokenType(), lexer)
+	default:
+		if ruleContext, ok := node.(antlr.RuleContext); ok {
+			ast.Rule = wparser.RuleNames[ruleContext.GetRuleIndex()]
+		}
+		if parseTree, ok := node.(antlr.ParseTree); ok {
+			ast.Text = parseTree.GetText()
+		}
+		for i := 0; i < node.GetChildCount(); i++ {
+			ast.Inner = append(ast.Inner, ConvertAST(node.GetChild(i), wparser, lexer))
+		}
+	}
+	return ast
+}
+
+func Parse(code string) ASTNode {
+	chars := antlr.NewInputStream(code)
+	lexer := parser.NewWystLexer(chars)
+	stream := antlr.NewCommonTokenStream(lexer, 0)
+	p := parser.NewWystParser(stream)
+	// p.AddErrorListener(antlr.NewDiagnosticErrorListener(true).WithContext(p))
+	tree := p.Expr()
+	return ConvertAST(tree, p, lexer)
+}

utils.go

@@ -3,22 +3,10 @@ package main
 import (
 	"fmt"
 
-	"github.com/antlr4-go/antlr/v4"
+	"github.com/antlr4-go/antlr"
 	"github.com/wyst-lang/wyst/parser"
 )
 
-func Parse(code string) (antlr.ParseTree, *parser.WystParser) {
-	chars := antlr.NewInputStream(code)
-	lexer := parser.NewWystLexer(chars)
-	stream := antlr.NewCommonTokenStream(lexer, 0)
-
-	p := parser.NewWystParser(stream)
-	// p.AddErrorListener(antlr.NewDiagnosticErrorListener(true).WithContext(p))
-
-	tree := p.Expr()
-	return tree, p
-}
-
 func iterateTree(node antlr.Tree, wparser *parser.WystParser, depth int) {
 	if ruleContext, ok := node.(antlr.RuleContext); ok {
 		ruleIndex := ruleContext.GetRuleIndex()