TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

compiler: remove unused code and simplify error handling

Browse source 
After cbf26f3 some errors can't occur.
This commit is contained in:
Evgenii Stratonikov 2020-12-10 18:56:05 +03:00
parent ec1ff42872
commit 4dc5877674
1 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
pkg/compiler/debug.go
View file

@ -334,49 +334,27 @@ func (d *DebugParam) UnmarshalJSON(data []byte) error {
} }
// ToManifestParameter converts DebugParam to manifest.Parameter // ToManifestParameter converts DebugParam to manifest.Parameter
func (d *DebugParam) ToManifestParameter() (manifest.Parameter, error) { func (d *DebugParam) ToManifestParameter() manifest.Parameter {
return manifest.Parameter{ return manifest.Parameter{
Name: d.Name, Name: d.Name,
Type: d.TypeSC, Type: d.TypeSC,
}, nil }
} }
// ToManifestMethod converts MethodDebugInfo to manifest.Method // ToManifestMethod converts MethodDebugInfo to manifest.Method
func (m *MethodDebugInfo) ToManifestMethod() (manifest.Method, error) { func (m *MethodDebugInfo) ToManifestMethod() manifest.Method {
var ( var (
result manifest.Method result manifest.Method
err error
) )
parameters := make([]manifest.Parameter, len(m.Parameters)) parameters := make([]manifest.Parameter, len(m.Parameters))
for i, p := range m.Parameters { for i, p := range m.Parameters {
parameters[i], err = p.ToManifestParameter() parameters[i] = p.ToManifestParameter()
if err != nil {
return result, err
}
} }
result.Name = m.Name.Name result.Name = m.Name.Name
result.Offset = int(m.Range.Start) result.Offset = int(m.Range.Start)
result.Parameters = parameters result.Parameters = parameters
result.ReturnType = m.ReturnTypeSC result.ReturnType = m.ReturnTypeSC
return result, nil return result
}
// ToManifestEvent converts EventDebugInfo to manifest.Event
func (e *EventDebugInfo) ToManifestEvent() (manifest.Event, error) {
var (
result manifest.Event
err error
)
parameters := make([]manifest.Parameter, len(e.Parameters))
for i, p := range e.Parameters {
parameters[i], err = p.ToManifestParameter()
if err != nil {
return result, err
}
}
result.Name = e.Name
result.Parameters = parameters
return result, nil
} }
// MarshalJSON implements json.Marshaler interface. // MarshalJSON implements json.Marshaler interface.
@ -429,10 +407,7 @@ func (di *DebugInfo) ConvertToManifest(o *Options) (*manifest.Manifest, error) {
methods := make([]manifest.Method, 0) methods := make([]manifest.Method, 0)
for _, method := range di.Methods { for _, method := range di.Methods {
if method.IsExported && method.IsFunction && method.Name.Namespace == di.MainPkg { if method.IsExported && method.IsFunction && method.Name.Namespace == di.MainPkg {
mMethod, err := method.ToManifestMethod() mMethod := method.ToManifestMethod()
if err != nil {
return nil, err
}
for i := range o.SafeMethods { for i := range o.SafeMethods {
if mMethod.Name == o.SafeMethods[i] { if mMethod.Name == o.SafeMethods[i] {
mMethod.Safe = true mMethod.Safe = true