diff --git a/lex/lexgen/codegen.go b/lex/lexgen/codegen.go index 1d7820a8..4a362a2b 100644 --- a/lex/lexgen/codegen.go +++ b/lex/lexgen/codegen.go @@ -184,9 +184,6 @@ func (gen *CodeGenerator) fieldType(fname string, def *lexicon.SchemaDef, option // NOTE: SchemaObject and SchemaUnion should be handled outside this function; as well as arrays of those types also count // TODO: another pass to check for type completeness switch v := def.Inner.(type) { - case lexicon.SchemaNull: - // NOTE: using "any" as a generic 'nil' type - return "any", nil case lexicon.SchemaBoolean: if optional { return "*bool", nil diff --git a/lex/lexgen/flatten.go b/lex/lexgen/flatten.go index 14e2ec33..37c915d3 100644 --- a/lex/lexgen/flatten.go +++ b/lex/lexgen/flatten.go @@ -172,7 +172,7 @@ func (fl *FlatLexicon) flattenType(fd *FlatDef, tpath []string, def *lexicon.Sch } // don't emit the array itself return nil - case lexicon.SchemaString, lexicon.SchemaNull, lexicon.SchemaInteger, lexicon.SchemaBoolean, lexicon.SchemaUnknown, lexicon.SchemaBytes: + case lexicon.SchemaString, lexicon.SchemaInteger, lexicon.SchemaBoolean, lexicon.SchemaUnknown, lexicon.SchemaBytes: // don't emit // NOTE: might want to emit some string "knownValue" lists in the future? case lexicon.SchemaCIDLink, lexicon.SchemaBlob: @@ -203,7 +203,7 @@ func (fl *FlatLexicon) flattenObject(fd *FlatDef, tpath []string, obj *lexicon.S tp := slices.Clone(tpath) tp = append(tp, fname) switch v := field.Inner.(type) { - case lexicon.SchemaNull, lexicon.SchemaBoolean, lexicon.SchemaInteger, lexicon.SchemaString, lexicon.SchemaBytes: + case lexicon.SchemaBoolean, lexicon.SchemaInteger, lexicon.SchemaString, lexicon.SchemaBytes: // no-op case lexicon.SchemaCIDLink, lexicon.SchemaBlob, lexicon.SchemaUnknown: // no-op, but maybe set a flag on def? diff --git a/lex/lexgen/util.go b/lex/lexgen/util.go index 0a8e110d..f6770fe4 100644 --- a/lex/lexgen/util.go +++ b/lex/lexgen/util.go @@ -25,8 +25,6 @@ func defType(sd *lexicon.SchemaDef) (string, error) { return "permission-set", nil case lexicon.SchemaPermission: return "permission", nil - case lexicon.SchemaNull: - return "null", nil case lexicon.SchemaBoolean: return "boolean", nil case lexicon.SchemaInteger: @@ -71,10 +69,8 @@ func defDescription(sd *lexicon.SchemaDef) string { case lexicon.SchemaSubscription: desc = v.Description case lexicon.SchemaPermissionSet: - // TODO: extract *some* description? - case lexicon.SchemaPermission: desc = v.Description - case lexicon.SchemaNull: + case lexicon.SchemaPermission: desc = v.Description case lexicon.SchemaBoolean: desc = v.Description