Merge pull request #63 from ipld/struct-tuple-repr-codegen

Struct tuple representation codegen
ipld · Jul 30, 2020 · d70a19d · d70a19d
2 parents 2b1aabc + bfd1bba
commit d70a19d
Show file tree

Hide file tree

Showing 11 changed files with 611 additions and 15 deletions.
diff --git a/node/gendemo/tMsg3.go b/node/gendemo/tMsg3.go
diff --git a/schema/errors.go b/schema/errors.go
@@ -2,6 +2,8 @@ package schema
 
 import (
 	"fmt"
+
+	"github.com/ipld/go-ipld-prime"
 )
 
 // TODO: errors in this package remain somewhat slapdash.
@@ -20,19 +22,22 @@ import (
 //  - it's possible that we should wrap *all* schema-level errors in a single "ipld.ErrSchemaNoMatch" error of some kind, to fix the above.  as yet undecided.
 
 // ErrNoSuchField may be returned from lookup functions on the Node
-// interface when a field is requested which doesn't exist, or from Insert
-// on a MapBuilder when a key doesn't match a field name in the structure.
+// interface when a field is requested which doesn't exist,
+// or from assigning data into on a MapAssembler for a struct
+// when the key doesn't match a field name in the structure
+// (or, when assigning data into a ListAssembler and the list size has
+// reached out of bounds, in case of a struct with list-like representations!).
 type ErrNoSuchField struct {
 	Type Type
 
-	FieldName string
+	Field ipld.PathSegment
 }
 
 func (e ErrNoSuchField) Error() string {
 	if e.Type == nil {
-		return fmt.Sprintf("no such field: {typeinfomissing}.%s", e.FieldName)
+		return fmt.Sprintf("no such field: {typeinfomissing}.%s", e.Field)
 	}
-	return fmt.Sprintf("no such field: %s.%s", e.Type.Name(), e.FieldName)
+	return fmt.Sprintf("no such field: %s.%s", e.Type.Name(), e.Field)
 }
 
 // ErrNotUnionStructure means data was fed into a union assembler that can't match the union.

diff --git a/schema/gen/go/README.md b/schema/gen/go/README.md
@@ -56,10 +56,10 @@ Legend:
 | ... ... including optional     |     ✔     |     ✔    |
 | ... ... including renames      |     ✔     |     ✔    |
 | ... ... including implicits    |     ⚠     |     ⚠    |
-| ... tuple representation       |     ✘     |     ✘    |
-| ... ... including optional     |           |          |
-| ... ... including renames      |           |          |
-| ... ... including implicits    |           |          |
+| ... tuple representation       |     ✔     |     ✔    |
+| ... ... including optional     |     ✔     |     ✔    |
+| ... ... including renames      |     -     |     -    |
+| ... ... including implicits    |     ⚠     |     ⚠    |
 | ... stringjoin representation  |     ✔     |     ✔    |
 | ... ... including optional     |     -     |     -    |
 | ... ... including renames      |     -     |     -    |

diff --git a/schema/gen/go/genStruct.go b/schema/gen/go/genStruct.go
@@ -113,7 +113,7 @@ func (g structGenerator) EmitNodeMethodLookupByString(w io.Writer) {
 				{{- end}}
 			{{- end}}
 			default:
-				return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, FieldName: key}
+				return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ipld.PathSegmentOfString(key)}
 			}
 		}
 	`, w, g.AdjCfg, g)

diff --git a/schema/gen/go/genStructReprMap.go b/schema/gen/go/genStructReprMap.go
@@ -102,7 +102,7 @@ func (g structReprMapReprGenerator) EmitNodeMethodLookupByString(w io.Writer) {
 				{{- end}}
 			{{- end}}
 			default:
-				return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, FieldName: key}
+				return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ipld.PathSegmentOfString(key)}
 			}
 		}
 	`, w, g.AdjCfg, g)