Refactored some more of the global symbol table code

Author: NickyBoy89

java2go.go

@@ -113,15 +113,9 @@ or to fix crashes with the symbol handling`,
 				continue
 			}
 
-			symbols := symbol.ParseSymbols(file.Ast, file.Source)
-
-			files[index].Symbols = symbols
-
-			if _, exist := symbol.GlobalScope.Packages[symbols.Package]; !exist {
-				symbol.GlobalScope.Packages[symbols.Package] = &symbol.PackageScope{Files: make(map[string]*symbol.FileScope)}
-			}
-
-			symbol.GlobalScope.Packages[symbols.Package].AddSymbolsFromFile(symbols)
+			symbols := files[index].ParseSymbols()
+			// Add the symbols to the global symbol table
+			symbol.AddSymbolsToPackage(symbols)
 		}
 
 		// Go back through the symbol tables and fill in anything that could not be resolved

parsing/source_file.go

@@ -32,6 +32,8 @@ func (file *SourceFile) ParseAST() error {
 	return nil
 }
 
-func (file *SourceFile) ParseSymbols() {
-	file.Symbols = symbol.ParseSymbols(file.Ast, file.Source)
+func (file *SourceFile) ParseSymbols() *symbol.FileScope {
+	symbols := symbol.ParseSymbols(file.Ast, file.Source)
+	file.Symbols = symbols
+	return symbols
 }

symbol/globals.go

@@ -1,10 +1,22 @@
 package symbol
 
 var (
-	// The global symbol table
+	// GlobalScope represents the global symbol table, and contains a mapping
+	// between the package's path, and its symbols
+	//
+	// Example:
+	// "net.java.math" -> Symbols { Vectors, Cos }
 	GlobalScope = &GlobalSymbols{Packages: make(map[string]*PackageScope)}
 )
 
+// AddSymbolsToPackage adds a given file's symbols to the global package scope
+func AddSymbolsToPackage(symbols *FileScope) {
+	if _, exist := GlobalScope.Packages[symbols.Package]; !exist {
+		GlobalScope.Packages[symbols.Package] = NewPackageScope()
+	}
+	GlobalScope.Packages[symbols.Package].Files[symbols.BaseClass.Class.Name] = symbols
+}
+
 // A GlobalSymbols represents a global view of all the packages in the parsed source
 type GlobalSymbols struct {
 	// Every package's path associatedd with its definition

symbol/package_scope.go

@@ -6,6 +6,12 @@ type PackageScope struct {
 	Files map[string]*FileScope
 }
 
+func NewPackageScope() *PackageScope {
+	return &PackageScope{
+		Files: make(map[string]*FileScope),
+	}
+}
+
 func (ps *PackageScope) ExcludeFile(excludedFileName string) *PackageScope {
 	newScope := &PackageScope{Files: make(map[string]*FileScope)}
 	for fileName, fileScope := range ps.Files {