mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-30 03:26:47 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

NomDL: Need to include the deps in the package

Browse Source
This commit is contained in:
Erik Arvidsson
2015-10-20 17:29:05 -04:00
parent 55436d745b
commit 91f720be81
25 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/flickr/types.go
+3 -2
View File
@@ -15,7 +15,6 @@ var __mainPackageInFile_types_CachedRef = __mainPackageInFile_types_Ref()
// type package definition cache.
func __mainPackageInFile_types_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("User",
[]types.Field{
types.Field{"Id", types.MakePrimitiveTypeRef(types.StringKind), false},
@@ -34,7 +33,9 @@ func __mainPackageInFile_types_Ref() ref.Ref {
},
types.Choices{},
),
}, []ref.Ref{})
}, []ref.Ref{
ref.Parse("sha1-4c734206e6aaef5464ff0e307c2f66751a1469de"),
})
return types.RegisterPackage(&p)
}
clients/gen/sha1_4c734206e6aaef5464ff0e307c2f66751a1469de/sha1_4c734206e6aaef5464ff0e307c2f66751a1469de.go
+3 -2
View File
@@ -15,7 +15,6 @@ var __sha1_4c734206e6aaef5464ff0e307c2f66751a1469dePackageInFile_sha1_4c734206e6
// type package definition cache.
func __sha1_4c734206e6aaef5464ff0e307c2f66751a1469dePackageInFile_sha1_4c734206e6aaef5464ff0e307c2f66751a1469de_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("RemotePhoto",
[]types.Field{
types.Field{"Id", types.MakePrimitiveTypeRef(types.StringKind), false},
@@ -34,7 +33,9 @@ func __sha1_4c734206e6aaef5464ff0e307c2f66751a1469dePackageInFile_sha1_4c734206e
},
types.Choices{},
),
}, []ref.Ref{})
}, []ref.Ref{
ref.Parse("sha1-52bbaa7c5bcb39759981ccb12ee457f21fa7517d"),
})
return types.RegisterPackage(&p)
}
clients/gen/sha1_52bbaa7c5bcb39759981ccb12ee457f21fa7517d/sha1_52bbaa7c5bcb39759981ccb12ee457f21fa7517d.go
-1
View File
@@ -14,7 +14,6 @@ var __sha1_52bbaa7c5bcb39759981ccb12ee457f21fa7517dPackageInFile_sha1_52bbaa7c5b
// type package definition cache.
func __sha1_52bbaa7c5bcb39759981ccb12ee457f21fa7517dPackageInFile_sha1_52bbaa7c5bcb39759981ccb12ee457f21fa7517d_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("Geoposition",
[]types.Field{
types.Field{"Latitude", types.MakePrimitiveTypeRef(types.Float32Kind), false},
clients/music/mp3_importer/types.go
-1
View File
@@ -14,7 +14,6 @@ var __mainPackageInFile_types_CachedRef = __mainPackageInFile_types_Ref()
// type package definition cache.
func __mainPackageInFile_types_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("Song",
[]types.Field{
types.Field{"Title", types.MakePrimitiveTypeRef(types.StringKind), false},
clients/pitchmap/index/types.go
-1
View File
@@ -14,7 +14,6 @@ var __mainPackageInFile_types_CachedRef = __mainPackageInFile_types_Ref()
// type package definition cache.
func __mainPackageInFile_types_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("Pitch",
[]types.Field{
types.Field{"X", types.MakePrimitiveTypeRef(types.Float64Kind), false},
clients/quad_tree/types.go
+3 -2
View File
@@ -16,7 +16,6 @@ var __mainPackageInFile_types_CachedRef = __mainPackageInFile_types_Ref()
// type package definition cache.
func __mainPackageInFile_types_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("Node",
[]types.Field{
types.Field{"Geoposition", types.MakeTypeRef(ref.Parse("sha1-52bbaa7c5bcb39759981ccb12ee457f21fa7517d"), 0), false},
@@ -46,7 +45,9 @@ func __mainPackageInFile_types_Ref() ref.Ref {
},
types.Choices{},
),
}, []ref.Ref{})
}, []ref.Ref{
ref.Parse("sha1-52bbaa7c5bcb39759981ccb12ee457f21fa7517d"),
})
return types.RegisterPackage(&p)
}
clients/sfcrime_importer/types.go
+3 -2
View File
@@ -15,7 +15,6 @@ var __mainPackageInFile_types_CachedRef = __mainPackageInFile_types_Ref()
// type package definition cache.
func __mainPackageInFile_types_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("Incident",
[]types.Field{
types.Field{"ID", types.MakePrimitiveTypeRef(types.Int64Kind), false},
@@ -32,7 +31,9 @@ func __mainPackageInFile_types_Ref() ref.Ref {
},
types.Choices{},
),
}, []ref.Ref{})
}, []ref.Ref{
ref.Parse("sha1-52bbaa7c5bcb39759981ccb12ee457f21fa7517d"),
})
return types.RegisterPackage(&p)
}
clients/sfcrime_search/types.go
+3 -2
View File
@@ -15,7 +15,6 @@ var __mainPackageInFile_types_CachedRef = __mainPackageInFile_types_Ref()
// type package definition cache.
func __mainPackageInFile_types_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("Incident",
[]types.Field{
types.Field{"Category", types.MakePrimitiveTypeRef(types.StringKind), false},
@@ -37,7 +36,9 @@ func __mainPackageInFile_types_Ref() ref.Ref {
},
types.Choices{},
),
}, []ref.Ref{})
}, []ref.Ref{
ref.Parse("sha1-52bbaa7c5bcb39759981ccb12ee457f21fa7517d"),
})
return types.RegisterPackage(&p)
}
datas/types.go
-1
View File
@@ -14,7 +14,6 @@ var __datasPackageInFile_types_CachedRef = __datasPackageInFile_types_Ref()
// type package definition cache.
func __datasPackageInFile_types_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("Commit",
[]types.Field{
types.Field{"value", types.MakePrimitiveTypeRef(types.ValueKind), false},
nomdl/codegen/codegen.go
+8 -6
View File
@@ -254,17 +254,19 @@ func (gen *codeGen) Resolve(t types.TypeRef) types.TypeRef {
func (gen *codeGen) WritePackage() {
pkgTypes := gen.pkg.Types()
data := struct {
HasImports bool
HasTypes bool
FileID string
Imports []string
Name string
Types []types.TypeRef
HasImports bool
HasTypes bool
FileID string
Imports []string
Dependencies []ref.Ref
Name string
Types []types.TypeRef
}{
len(gen.imports) > 0,
len(pkgTypes) > 0,
gen.fileid,
gen.imports,
gen.pkg.Dependencies(),
gen.pkg.Name,
pkgTypes,
}
nomdl/codegen/header.tmpl
+4 -3
View File
@@ -16,10 +16,11 @@ var __{{.Name}}PackageInFile_{{.FileID}}_CachedRef = __{{.Name}}PackageInFile_{{
// package implemented by this file and registers it with the global
// type package definition cache.
func __{{.Name}}PackageInFile_{{.FileID}}_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
{{range $t := .Types}}
p := types.NewPackage([]types.TypeRef{ {{range $t := .Types}}
{{toTypesTypeRef $t "" ""}},{{end}}
}, []ref.Ref{})
}, []ref.Ref{ {{range $deps := .Dependencies}}
ref.Parse("{{$deps}}"),{{end}}
})
return types.RegisterPackage(&p)
}
{{end}}
nomdl/codegen/test/enum_struct.go
-1
View File
@@ -14,7 +14,6 @@ var __testPackageInFile_enum_struct_CachedRef = __testPackageInFile_enum_struct_
// type package definition cache.
func __testPackageInFile_enum_struct_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeEnumTypeRef("Handedness", "right", "left", "switch"),
types.MakeStructTypeRef("EnumStruct",
[]types.Field{
nomdl/codegen/test/gen/sha1_8bbcfa69bdfc9953c4034f8591964e0387983910/sha1_8bbcfa69bdfc9953c4034f8591964e0387983910.go
-1
View File
@@ -14,7 +14,6 @@ var __sha1_8bbcfa69bdfc9953c4034f8591964e0387983910PackageInFile_sha1_8bbcfa69bd
// type package definition cache.
func __sha1_8bbcfa69bdfc9953c4034f8591964e0387983910PackageInFile_sha1_8bbcfa69bdfc9953c4034f8591964e0387983910_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("S",
[]types.Field{
types.Field{"s", types.MakePrimitiveTypeRef(types.StringKind), false},
nomdl/codegen/test/gen/sha1_fa6ca544e2613ecf1ac0467b3d655d8305c6ae8c/sha1_fa6ca544e2613ecf1ac0467b3d655d8305c6ae8c.go
+3 -2
View File
@@ -15,7 +15,6 @@ var __sha1_fa6ca544e2613ecf1ac0467b3d655d8305c6ae8cPackageInFile_sha1_fa6ca544e2
// type package definition cache.
func __sha1_fa6ca544e2613ecf1ac0467b3d655d8305c6ae8cPackageInFile_sha1_fa6ca544e2613ecf1ac0467b3d655d8305c6ae8c_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("D",
[]types.Field{
types.Field{"structField", types.MakeTypeRef(ref.Parse("sha1-8bbcfa69bdfc9953c4034f8591964e0387983910"), 0), false},
@@ -29,7 +28,9 @@ func __sha1_fa6ca544e2613ecf1ac0467b3d655d8305c6ae8cPackageInFile_sha1_fa6ca544e
},
types.Choices{},
),
}, []ref.Ref{})
}, []ref.Ref{
ref.Parse("sha1-8bbcfa69bdfc9953c4034f8591964e0387983910"),
})
return types.RegisterPackage(&p)
}
nomdl/codegen/test/ref.go
-1
View File
@@ -15,7 +15,6 @@ var __testPackageInFile_ref_CachedRef = __testPackageInFile_ref_Ref()
// type package definition cache.
func __testPackageInFile_ref_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("StructWithRef",
[]types.Field{
types.Field{"r", types.MakeCompoundTypeRef("", types.RefKind, types.MakeCompoundTypeRef("", types.SetKind, types.MakePrimitiveTypeRef(types.Float32Kind))), false},
nomdl/codegen/test/struct.go
-1
View File
@@ -14,7 +14,6 @@ var __testPackageInFile_struct_CachedRef = __testPackageInFile_struct_Ref()
// type package definition cache.
func __testPackageInFile_struct_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("Struct",
[]types.Field{
types.Field{"s", types.MakePrimitiveTypeRef(types.StringKind), false},
nomdl/codegen/test/struct_optional.go
-1
View File
@@ -14,7 +14,6 @@ var __testPackageInFile_struct_optional_CachedRef = __testPackageInFile_struct_o
// type package definition cache.
func __testPackageInFile_struct_optional_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("OptionalStruct",
[]types.Field{
types.Field{"s", types.MakePrimitiveTypeRef(types.StringKind), true},
nomdl/codegen/test/struct_primitives.go
-1
View File
@@ -14,7 +14,6 @@ var __testPackageInFile_struct_primitives_CachedRef = __testPackageInFile_struct
// type package definition cache.
func __testPackageInFile_struct_primitives_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("StructPrimitives",
[]types.Field{
types.Field{"uint64", types.MakePrimitiveTypeRef(types.UInt64Kind), false},
nomdl/codegen/test/struct_recursive.go
-1
View File
@@ -14,7 +14,6 @@ var __testPackageInFile_struct_recursive_CachedRef = __testPackageInFile_struct_
// type package definition cache.
func __testPackageInFile_struct_recursive_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("Tree",
[]types.Field{
types.Field{"children", types.MakeCompoundTypeRef("", types.ListKind, types.MakeTypeRef(ref.Ref{}, 0)), false},
nomdl/codegen/test/struct_with_imports.go
+3 -2
View File
@@ -15,7 +15,6 @@ var __testPackageInFile_struct_with_imports_CachedRef = __testPackageInFile_stru
// type package definition cache.
func __testPackageInFile_struct_with_imports_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeEnumTypeRef("E", "E1", "Ignored"),
types.MakeStructTypeRef("ImportUser",
[]types.Field{
@@ -24,7 +23,9 @@ func __testPackageInFile_struct_with_imports_Ref() ref.Ref {
},
types.Choices{},
),
}, []ref.Ref{})
}, []ref.Ref{
ref.Parse("sha1-fa6ca544e2613ecf1ac0467b3d655d8305c6ae8c"),
})
return types.RegisterPackage(&p)
}
nomdl/codegen/test/struct_with_imports_test.go
+11
View File
@@ -6,6 +6,7 @@ import (
"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
leaf "github.com/attic-labs/noms/nomdl/codegen/test/gen/sha1_8bbcfa69bdfc9953c4034f8591964e0387983910"
dep "github.com/attic-labs/noms/nomdl/codegen/test/gen/sha1_fa6ca544e2613ecf1ac0467b3d655d8305c6ae8c"
"github.com/attic-labs/noms/types"
)
func TestWithImportsDef(t *testing.T) {
@@ -50,3 +51,13 @@ func TestListOfImportsDef(t *testing.T) {
assert.EqualValues(leaf.E2, l.Get(1).EnumField())
assert.EqualValues(leaf.E1, l.Get(2).EnumField())
}
func TestDepsAndPackageRefs(t *testing.T) {
assert := assert.New(t)
tr := NewImportUser().ImportedStruct().TypeRef()
assert.Equal(types.UnresolvedKind, tr.Kind())
assert.True(tr.HasPackageRef())
p := types.LookupPackage(tr.PackageRef())
assert.NotNil(p)
assert.IsType(types.Package{}, *p)
}
nomdl/codegen/test/struct_with_list.go
-1
View File
@@ -14,7 +14,6 @@ var __testPackageInFile_struct_with_list_CachedRef = __testPackageInFile_struct_
// type package definition cache.
func __testPackageInFile_struct_with_list_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("StructWithList",
[]types.Field{
types.Field{"l", types.MakeCompoundTypeRef("", types.ListKind, types.MakePrimitiveTypeRef(types.UInt8Kind)), false},
nomdl/codegen/test/struct_with_union_field.go
-1
View File
@@ -14,7 +14,6 @@ var __testPackageInFile_struct_with_union_field_CachedRef = __testPackageInFile_
// type package definition cache.
func __testPackageInFile_struct_with_union_field_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("StructWithUnionField",
[]types.Field{
types.Field{"a", types.MakePrimitiveTypeRef(types.Float32Kind), false},
nomdl/codegen/test/struct_with_unions.go
-1
View File
@@ -14,7 +14,6 @@ var __testPackageInFile_struct_with_unions_CachedRef = __testPackageInFile_struc
// type package definition cache.
func __testPackageInFile_struct_with_unions_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("StructWithUnions",
[]types.Field{
types.Field{"a", types.MakeTypeRef(ref.Ref{}, 1), false},
nomdl/codegen/testDeps/leafDep/leafDep.go
-1
View File
@@ -14,7 +14,6 @@ var __testPackageInFile_leafDep_CachedRef = __testPackageInFile_leafDep_Ref()
// type package definition cache.
func __testPackageInFile_leafDep_Ref() ref.Ref {
p := types.NewPackage([]types.TypeRef{
types.MakeStructTypeRef("S",
[]types.Field{
types.Field{"s", types.MakePrimitiveTypeRef(types.StringKind), false},