Cover all type combinations

Fix bug in pointer type resolution
This commit is contained in:
Lea Anthony
2023-02-21 07:52:29 +11:00
parent b606561f8d
commit dc0d99a8e9
4 changed files with 582 additions and 13 deletions
+9 -9
View File
@@ -16,23 +16,23 @@ This package contains the static analyser used for parsing Wails projects so tha
- [x] Multiple input parameters
- [x] Multiple output parameters
- [x] Named output parameters
- [x] int
- [x] int/8/16/32/64
- [x] Pointer
- [x] uint/8/16/32/64
- [x] Pointer
- [x] uint
- [ ] Pointer
- [x] float
- [ ] Pointer
- [x] Pointer
- [x] string
- [ ] Pointer
- [x] Pointer
- [x] bool
- [ ] Pointer
- [x] Pointer
- [ ] Struct
- [x] Pointer
- [x] Slices
- [ ] Pointer
- [x] Recursive
- [x] Slices
- [x] Pointer
- [x] Maps
- [ ] Pointer
- [x] Pointer
- [ ] Model Parsing
- [x] In same package
- [ ] In different package
+5 -4
View File
@@ -341,12 +341,13 @@ func (p *Project) parseParameters(params *ast.FieldList, pkg *ParsedPackage) []*
}
func (p *Project) parseParameterType(field *ast.Field, pkg *ParsedPackage) *ParameterType {
var result ParameterType
result := &ParameterType{}
result.Name = getTypeString(field.Type)
switch t := field.Type.(type) {
case *ast.StarExpr:
result.IsStruct = isStructType(t.X)
result = p.parseParameterType(&ast.Field{Type: t.X}, pkg)
result.IsPointer = true
result.IsStruct = isStructType(t.X)
case *ast.StructType:
result.IsStruct = true
case *ast.ArrayType:
@@ -365,7 +366,7 @@ func (p *Project) parseParameterType(field *ast.Field, pkg *ParsedPackage) *Para
p.getStructDef(result.Name, pkg)
}
}
return &result
return result
}
func (p *Project) getStructDef(name string, pkg *ParsedPackage) {
@@ -467,7 +468,7 @@ func isStructType(expr ast.Expr) bool {
}
func getDirectoryForPackage(pkg *ast.Package) string {
for filename, _ := range pkg.Files {
for filename := range pkg.Files {
path := filepath.Dir(filename)
abs, err := filepath.Abs(path)
if err != nil {
File diff suppressed because it is too large Load Diff
@@ -48,24 +48,108 @@ func (*GreetService) IntPointerInputNamedOutputs(in *int) (output *int, err erro
return in, nil
}
func (*GreetService) UIntPointerInAndOutput(in *uint) *uint {
return in
}
func (*GreetService) UInt8PointerInAndOutput(in *uint8) *uint8 {
return in
}
func (*GreetService) UInt16PointerInAndOutput(in *uint16) *uint16 {
return in
}
func (*GreetService) UInt32PointerInAndOutput(in *uint32) *uint32 {
return in
}
func (*GreetService) UInt64PointerInAndOutput(in *uint64) *uint64 {
return in
}
func (*GreetService) IntPointerInAndOutput(in *int) *int {
return in
}
func (*GreetService) Int8PointerInAndOutput(in *int8) *int8 {
return in
}
func (*GreetService) Int16PointerInAndOutput(in *int16) *int16 {
return in
}
func (*GreetService) Int32PointerInAndOutput(in *int32) *int32 {
return in
}
func (*GreetService) Int64PointerInAndOutput(in *int64) *int64 {
return in
}
func (*GreetService) IntInIntOut(in int) int {
return in
}
func (*GreetService) Int8InIntOut(in int8) int8 {
return in
}
func (*GreetService) Int16InIntOut(in int16) int16 {
return in
}
func (*GreetService) Int32InIntOut(in int32) int32 {
return in
}
func (*GreetService) Int64InIntOut(in int64) int64 {
return in
}
func (*GreetService) UIntInUIntOut(in uint) uint {
return in
}
func (*GreetService) UInt8InUIntOut(in uint8) uint8 {
return in
}
func (*GreetService) UInt16InUIntOut(in uint16) uint16 {
return in
}
func (*GreetService) UInt32InUIntOut(in uint32) uint32 {
return in
}
func (*GreetService) UInt64InUIntOut(in uint64) uint64 {
return in
}
func (*GreetService) Float32InFloat32Out(in float32) float32 {
return in
}
func (*GreetService) Float64InFloat64Out(in float64) float64 {
return in
}
func (*GreetService) PointerFloat32InFloat32Out(in *float32) *float32 {
return in
}
func (*GreetService) PointerFloat64InFloat64Out(in *float64) *float64 {
return in
}
func (*GreetService) BoolInBoolOut(in bool) bool {
return in
}
func (*GreetService) PointerBoolInBoolOut(in *bool) *bool {
return in
}
func (*GreetService) PointerStringInStringOut(in *string) *string {
return in
}
func (*GreetService) StructPointerInputErrorOutput(in *Person) error {
return nil
}
@@ -77,6 +161,12 @@ func (*GreetService) StructPointerInputStructPointerOutput(in *Person) *Person {
func (*GreetService) MapIntInt(in map[int]int) {
}
func (*GreetService) PointerMapIntInt(in *map[int]int) {
}
func (*GreetService) MapIntPointerInt(in map[*int]int) {
}
func (*GreetService) MapIntSliceInt(in map[int][]int) {
}
@@ -84,6 +174,9 @@ func (*GreetService) MapIntSliceIntInMapIntSliceIntOut(in map[int][]int) (out ma
return nil
}
func (*GreetService) ArrayInt(in [4]int) {
}
func main() {
app := application.New(application.Options{
Bind: []interface{}{