The section kind specific maps are gone
I've REPLACED IT with the unified sections map. Interfaces, baby!
This commit is contained in:
parent
9269161138
commit
f3c72f8f30
@ -14,70 +14,40 @@ func (parser *ParsingOperation) parseBody () (err error) {
|
|||||||
|
|
||||||
switch sectionType {
|
switch sectionType {
|
||||||
case "data":
|
case "data":
|
||||||
var section *DataSection
|
section, parseErr := parser.parseDataSection()
|
||||||
section, err = parser.parseDataSection()
|
err = parser.tree.addSection(section)
|
||||||
if parser.tree.dataSections == nil {
|
|
||||||
parser.tree.dataSections =
|
|
||||||
make(map[string] *DataSection)
|
|
||||||
}
|
|
||||||
parser.tree.dataSections[section.name] = section
|
|
||||||
parser.tree.sections[section.name] = section
|
|
||||||
if err != nil { return }
|
if err != nil { return }
|
||||||
|
if parseErr != nil { return }
|
||||||
|
|
||||||
case "type":
|
case "type":
|
||||||
var section *TypeSection
|
section, parseErr := parser.parseTypeSection()
|
||||||
section, err = parser.parseTypeSection()
|
err = parser.tree.addSection(section)
|
||||||
if parser.tree.typeSections == nil {
|
|
||||||
parser.tree.typeSections =
|
|
||||||
make(map[string] *TypeSection)
|
|
||||||
}
|
|
||||||
parser.tree.typeSections[section.name] = section
|
|
||||||
parser.tree.sections[section.name] = section
|
|
||||||
if err != nil { return }
|
if err != nil { return }
|
||||||
|
if parseErr != nil { return }
|
||||||
|
|
||||||
case "objt":
|
case "objt":
|
||||||
var section *ObjtSection
|
section, parseErr := parser.parseObjtSection()
|
||||||
section, err = parser.parseObjtSection()
|
err = parser.tree.addSection(section)
|
||||||
if parser.tree.objtSections == nil {
|
|
||||||
parser.tree.objtSections =
|
|
||||||
make(map[string] *ObjtSection)
|
|
||||||
}
|
|
||||||
parser.tree.objtSections[section.name] = section
|
|
||||||
parser.tree.sections[section.name] = section
|
|
||||||
if err != nil { return }
|
if err != nil { return }
|
||||||
|
if parseErr != nil { return }
|
||||||
|
|
||||||
case "face":
|
case "face":
|
||||||
var section *FaceSection
|
section, parseErr := parser.parseFaceSection()
|
||||||
section, err = parser.parseFaceSection()
|
err = parser.tree.addSection(section)
|
||||||
if parser.tree.faceSections == nil {
|
|
||||||
parser.tree.faceSections =
|
|
||||||
make(map[string] *FaceSection)
|
|
||||||
}
|
|
||||||
parser.tree.faceSections[section.name] = section
|
|
||||||
parser.tree.sections[section.name] = section
|
|
||||||
if err != nil { return }
|
if err != nil { return }
|
||||||
|
if parseErr != nil { return }
|
||||||
|
|
||||||
case "enum":
|
case "enum":
|
||||||
var section *EnumSection
|
section, parseErr := parser.parseEnumSection()
|
||||||
section, err = parser.parseEnumSection()
|
err = parser.tree.addSection(section)
|
||||||
if parser.tree.enumSections == nil {
|
|
||||||
parser.tree.enumSections =
|
|
||||||
make(map[string] *EnumSection)
|
|
||||||
}
|
|
||||||
parser.tree.enumSections[section.name] = section
|
|
||||||
parser.tree.sections[section.name] = section
|
|
||||||
if err != nil { return }
|
if err != nil { return }
|
||||||
|
if parseErr != nil { return }
|
||||||
|
|
||||||
case "func":
|
case "func":
|
||||||
var section *FuncSection
|
section, parseErr := parser.parseFuncSection()
|
||||||
section, err = parser.parseFuncSection()
|
err = parser.tree.addSection(section)
|
||||||
if parser.tree.funcSections == nil {
|
|
||||||
parser.tree.funcSections =
|
|
||||||
make(map[string] *FuncSection)
|
|
||||||
}
|
|
||||||
parser.tree.funcSections[section.name] = section
|
|
||||||
parser.tree.sections[section.name] = section
|
|
||||||
if err != nil { return }
|
if err != nil { return }
|
||||||
|
if parseErr != nil { return }
|
||||||
|
|
||||||
default:
|
default:
|
||||||
err = parser.token.NewError (
|
err = parser.token.NewError (
|
||||||