Merge pull request #201 from vmarkovtsev/master

Port to Semantic UAST

internal/pb/pb.pb.go

@@ -437,11 +437,10 @@ func (m *UASTChangesSaverResults) GetChanges() []*UASTChange {
 }
 
 type ShotnessRecord struct {
-	InternalRole string          `protobuf:"bytes,1,opt,name=internal_role,json=internalRole,proto3" json:"internal_role,omitempty"`
-	Roles        []int32         `protobuf:"varint,2,rep,packed,name=roles" json:"roles,omitempty"`
-	Name         string          `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-	File         string          `protobuf:"bytes,4,opt,name=file,proto3" json:"file,omitempty"`
-	Counters     map[int32]int32 `protobuf:"bytes,5,rep,name=counters" json:"counters,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+	Type     string          `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
+	Name     string          `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	File     string          `protobuf:"bytes,3,opt,name=file,proto3" json:"file,omitempty"`
+	Counters map[int32]int32 `protobuf:"bytes,4,rep,name=counters" json:"counters,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 }
 
 func (m *ShotnessRecord) Reset()                    { *m = ShotnessRecord{} }
@@ -449,20 +448,13 @@ func (m *ShotnessRecord) String() string            { return proto.CompactTextSt
 func (*ShotnessRecord) ProtoMessage()               {}
 func (*ShotnessRecord) Descriptor() ([]byte, []int) { return fileDescriptorPb, []int{10} }
 
-func (m *ShotnessRecord) GetInternalRole() string {
+func (m *ShotnessRecord) GetType() string {
 	if m != nil {
-		return m.InternalRole
+		return m.Type
 	}
 	return ""
 }
 
-func (m *ShotnessRecord) GetRoles() []int32 {
-	if m != nil {
-		return m.Roles
-	}
-	return nil
-}
-
 func (m *ShotnessRecord) GetName() string {
 	if m != nil {
 		return m.Name
@@ -736,86 +728,85 @@ func init() {
 func init() { proto.RegisterFile("pb.proto", fileDescriptorPb) }
 
 var fileDescriptorPb = []byte{
-	// 1294 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0xdf, 0x72, 0xdb, 0xc4,
-	0x17, 0x1e, 0x59, 0xfe, 0x7b, 0x64, 0x27, 0xed, 0xb6, 0xbf, 0xc6, 0xf5, 0x6f, 0x52, 0x8c, 0x28,
-	0x25, 0xd0, 0xa2, 0x32, 0x2e, 0x17, 0x50, 0x6e, 0x9a, 0x26, 0x74, 0x9a, 0x99, 0x06, 0x98, 0x75,
-	0x03, 0x97, 0x9a, 0x8d, 0xb5, 0x49, 0x04, 0xd6, 0xca, 0xb3, 0x2b, 0x39, 0xf1, 0xcb, 0x70, 0xc7,
-	0x0c, 0x30, 0xc3, 0x70, 0xc1, 0x0b, 0x70, 0xc1, 0xb3, 0x70, 0xc3, 0x4b, 0x30, 0xfb, 0x4f, 0x96,
-	0x8c, 0x52, 0xb8, 0xd3, 0x39, 0xe7, 0x3b, 0xbb, 0xdf, 0x7e, 0xe7, 0xec, 0x91, 0x04, 0xdd, 0xc5,
-	0x69, 0xb0, 0xe0, 0x69, 0x96, 0xfa, 0x7f, 0x36, 0xa0, 0x7b, 0x4c, 0x33, 0x12, 0x91, 0x8c, 0xa0,
-	0x21, 0x74, 0x96, 0x94, 0x8b, 0x38, 0x65, 0x43, 0x67, 0xec, 0xec, 0xb5, 0xb0, 0x35, 0x11, 0x82,
-	0xe6, 0x05, 0x11, 0x17, 0xc3, 0xc6, 0xd8, 0xd9, 0xeb, 0x61, 0xf5, 0x8c, 0xee, 0x01, 0x70, 0xba,
-	0x48, 0x45, 0x9c, 0xa5, 0x7c, 0x35, 0x74, 0x55, 0xa4, 0xe4, 0x41, 0x0f, 0x60, 0xfb, 0x94, 0x9e,
-	0xc7, 0x2c, 0xcc, 0x59, 0x7c, 0x15, 0x66, 0x71, 0x42, 0x87, 0xcd, 0xb1, 0xb3, 0xe7, 0xe2, 0x81,
-	0x72, 0x9f, 0xb0, 0xf8, 0xea, 0x75, 0x9c, 0x50, 0xe4, 0xc3, 0x80, 0xb2, 0xa8, 0x84, 0x6a, 0x29,
-	0x94, 0x47, 0x59, 0x54, 0x60, 0x86, 0xd0, 0x99, 0xa5, 0x49, 0x12, 0x67, 0x62, 0xd8, 0xd6, 0xcc,
-	0x8c, 0x89, 0xee, 0x42, 0x97, 0xe7, 0x4c, 0x27, 0x76, 0x54, 0x62, 0x87, 0xe7, 0x4c, 0x25, 0xbd,
-	0x84, 0x9b, 0x36, 0x14, 0x2e, 0x28, 0x0f, 0xe3, 0x8c, 0x26, 0xc3, 0xee, 0xd8, 0xdd, 0xf3, 0x26,
-	0xbb, 0x81, 0x3d, 0x74, 0x80, 0x35, 0xfa, 0x2b, 0xca, 0x8f, 0x32, 0x9a, 0x7c, 0xce, 0x32, 0xbe,
-	0xc2, 0x5b, 0xbc, 0xe2, 0x1c, 0xed, 0xc3, 0xad, 0x1a, 0x18, 0xba, 0x01, 0xee, 0x77, 0x74, 0xa5,
-	0xb4, 0xea, 0x61, 0xf9, 0x88, 0x6e, 0x43, 0x6b, 0x49, 0xe6, 0x39, 0x55, 0x42, 0x39, 0x58, 0x1b,
-	0x4f, 0x1b, 0x9f, 0x38, 0xfe, 0x13, 0xd8, 0x79, 0x9e, 0x73, 0x16, 0xa5, 0x97, 0x6c, 0xba, 0x20,
-	0x5c, 0xd0, 0x63, 0x92, 0xf1, 0xf8, 0x0a, 0xa7, 0x97, 0xfa, 0x70, 0xf3, 0x3c, 0x61, 0x62, 0xe8,
-	0x8c, 0xdd, 0xbd, 0x01, 0xb6, 0xa6, 0xff, 0xb3, 0x03, 0xb7, 0xeb, 0xb2, 0x64, 0x3d, 0x18, 0x49,
-	0xa8, 0xd9, 0x5a, 0x3d, 0xa3, 0xfb, 0xb0, 0xc5, 0xf2, 0xe4, 0x94, 0xf2, 0x30, 0x3d, 0x0b, 0x79,
-	0x7a, 0x29, 0x14, 0x89, 0x16, 0xee, 0x6b, 0xef, 0x97, 0x67, 0x38, 0xbd, 0x14, 0xe8, 0x03, 0xb8,
-	0xb9, 0x46, 0xd9, 0x6d, 0x5d, 0x05, 0xdc, 0xb6, 0xc0, 0x03, 0xed, 0x46, 0x8f, 0xa0, 0xa9, 0xd6,
-	0x69, 0x2a, 0xcd, 0x86, 0xc1, 0x35, 0x07, 0xc0, 0x0a, 0xe5, 0xff, 0xda, 0x58, 0x1f, 0x71, 0x9f,
-	0x91, 0xf9, 0x4a, 0xc4, 0x02, 0x53, 0x91, 0xcf, 0x33, 0x81, 0xc6, 0xe0, 0x9d, 0x73, 0xc2, 0xf2,
-	0x39, 0xe1, 0x71, 0xb6, 0x32, 0xdd, 0x55, 0x76, 0xa1, 0x11, 0x74, 0x05, 0x49, 0x16, 0xf3, 0x98,
-	0x9d, 0x1b, 0xde, 0x85, 0x8d, 0x1e, 0x43, 0x67, 0xc1, 0xd3, 0x6f, 0xe9, 0x2c, 0x53, 0x4c, 0xbd,
-	0xc9, 0xff, 0xea, 0xa9, 0x58, 0x14, 0x7a, 0x08, 0xad, 0xb3, 0x78, 0x4e, 0x2d, 0xf3, 0x6b, 0xe0,
-	0x1a, 0x83, 0x3e, 0x84, 0xf6, 0x82, 0xa6, 0x8b, 0xb9, 0x6c, 0xbc, 0x37, 0xa0, 0x0d, 0x08, 0x1d,
-	0x01, 0xd2, 0x4f, 0x61, 0xcc, 0x32, 0xca, 0xc9, 0x2c, 0x93, 0xf7, 0xa5, 0xad, 0x78, 0x8d, 0x82,
-	0x83, 0x34, 0x59, 0x70, 0x2a, 0x04, 0x8d, 0x74, 0x32, 0x4e, 0x2f, 0x4d, 0xfe, 0x4d, 0x9d, 0x75,
-	0xb4, 0x4e, 0xf2, 0x7f, 0x73, 0xe0, 0xee, 0xb5, 0x09, 0x35, 0xf5, 0x74, 0xfe, 0x6b, 0x3d, 0x1b,
-	0xf5, 0xf5, 0x44, 0xd0, 0x94, 0x2d, 0x3f, 0x74, 0xc7, 0xee, 0x9e, 0x8b, 0x9b, 0xf6, 0xce, 0xc7,
-	0x2c, 0x8a, 0x67, 0x46, 0xac, 0x16, 0xb6, 0x26, 0xba, 0x03, 0xed, 0x98, 0x45, 0x8b, 0x8c, 0x2b,
-	0x5d, 0x5c, 0x6c, 0x2c, 0x7f, 0x0a, 0x9d, 0x83, 0x34, 0x5f, 0x48, 0xe9, 0x6e, 0x43, 0x2b, 0x66,
-	0x11, 0xbd, 0x52, 0x7d, 0xdb, 0xc3, 0xda, 0x40, 0x13, 0x68, 0x27, 0xea, 0x08, 0x8a, 0xc7, 0x9b,
-	0x55, 0x31, 0x48, 0xff, 0x3e, 0xf4, 0x5f, 0xa7, 0xf9, 0xec, 0x82, 0x46, 0x2f, 0x62, 0xb3, 0xb2,
-	0xae, 0xa0, 0xa3, 0x48, 0x69, 0xc3, 0xff, 0xd1, 0x81, 0x3b, 0x66, 0xef, 0xcd, 0x0e, 0x7b, 0x08,
-	0x7d, 0x89, 0x09, 0x67, 0x3a, 0x6c, 0x0a, 0xd2, 0x0d, 0x0c, 0x1c, 0x7b, 0x32, 0x6a, 0x79, 0x3f,
-	0x86, 0x2d, 0x53, 0x43, 0x0b, 0xef, 0x6c, 0xc0, 0x07, 0x3a, 0x6e, 0x13, 0x3e, 0x82, 0xbe, 0x49,
-	0xd0, 0xac, 0xf4, 0x14, 0x19, 0x04, 0x65, 0xce, 0xd8, 0xd3, 0x10, 0x65, 0xf8, 0x3f, 0x38, 0x00,
-	0x27, 0xfb, 0xd3, 0xd7, 0x07, 0x17, 0x84, 0x9d, 0x53, 0xf4, 0x7f, 0xe8, 0x29, 0x7a, 0xa5, 0x5b,
-	0xdb, 0x95, 0x8e, 0x2f, 0xe4, 0xcd, 0xdd, 0x05, 0x10, 0x7c, 0x16, 0x9e, 0xd2, 0xb3, 0x94, 0x53,
-	0x33, 0x63, 0x7b, 0x82, 0xcf, 0x9e, 0x2b, 0x87, 0xcc, 0x95, 0x61, 0x72, 0x96, 0x51, 0x6e, 0xe6,
-	0x6c, 0x57, 0xf0, 0xd9, 0xbe, 0xb4, 0xd1, 0x5b, 0xe0, 0xe5, 0x44, 0x64, 0x36, 0xb9, 0xa9, 0xc7,
-	0xb0, 0x74, 0x99, 0xec, 0x5d, 0x50, 0x96, 0x49, 0x6f, 0xe9, 0xc5, 0xa5, 0x47, 0xe5, 0xfb, 0xcf,
-	0x60, 0x67, 0x4d, 0x53, 0x4c, 0xc9, 0x92, 0x72, 0x2b, 0xe9, 0xbb, 0xd0, 0x99, 0x69, 0xb7, 0xaa,
-	0x82, 0x37, 0xf1, 0x82, 0x35, 0x14, 0xdb, 0x98, 0xff, 0x97, 0x03, 0x5b, 0xd3, 0x8b, 0x34, 0x63,
-	0x54, 0x08, 0x4c, 0x67, 0x29, 0x8f, 0xd0, 0x3b, 0x30, 0x50, 0x97, 0x83, 0x91, 0x79, 0xc8, 0xd3,
-	0xb9, 0x3d, 0x71, 0xdf, 0x3a, 0x71, 0x3a, 0xa7, 0xb2, 0xc4, 0x32, 0x26, 0xbb, 0x55, 0x95, 0x58,
-	0x19, 0xc5, 0x64, 0x73, 0x4b, 0x93, 0x0d, 0x41, 0x53, 0x6a, 0x65, 0x0e, 0xa7, 0x9e, 0xd1, 0xa7,
-	0xd0, 0x9d, 0xa5, 0xb9, 0x5c, 0x4f, 0x98, 0x7b, 0xbb, 0x1b, 0x54, 0x59, 0xc8, 0x5a, 0xaa, 0xb8,
-	0x9e, 0xe9, 0x05, 0x7c, 0xf4, 0x19, 0x0c, 0x2a, 0xa1, 0xf2, 0x1c, 0x6f, 0xd5, 0xcc, 0xf1, 0x56,
-	0x79, 0x8e, 0x1f, 0xc2, 0x8e, 0xdd, 0x66, 0xb3, 0x05, 0xdf, 0x87, 0x0e, 0x57, 0x3b, 0x5b, 0xbd,
-	0xb6, 0x37, 0x18, 0x61, 0x1b, 0xf7, 0xdf, 0x03, 0x4f, 0xb6, 0xc9, 0xcb, 0x58, 0xa8, 0x57, 0x65,
-	0xe9, 0xf5, 0xa6, 0x6f, 0x92, 0x35, 0xfd, 0xef, 0x1d, 0x18, 0x96, 0x90, 0x7a, 0xab, 0x63, 0x2a,
-	0x04, 0x39, 0xa7, 0xe8, 0x69, 0xf9, 0x92, 0x78, 0x93, 0xfb, 0xc1, 0x75, 0x48, 0x15, 0x30, 0x3a,
-	0xe8, 0x94, 0xd1, 0x0b, 0x80, 0xb5, 0xb3, 0xe6, 0x4d, 0xe6, 0x97, 0x15, 0xf0, 0x26, 0xfd, 0xca,
-	0xda, 0x25, 0x3d, 0x4e, 0xa0, 0xf7, 0x2a, 0x66, 0x74, 0x9a, 0x91, 0x4c, 0xdd, 0x5a, 0x12, 0x45,
-	0x34, 0x32, 0x52, 0x6a, 0x43, 0x9e, 0x8e, 0xd3, 0x24, 0x5d, 0xd2, 0xc8, 0xc8, 0x69, 0x4d, 0x75,
-	0x6e, 0xd5, 0x45, 0x91, 0x79, 0x05, 0x59, 0xd3, 0xff, 0xc3, 0x81, 0xf6, 0x21, 0x5d, 0x1e, 0x92,
-	0x0d, 0x71, 0x2a, 0xef, 0xfe, 0x31, 0xb4, 0x84, 0xdc, 0xd7, 0x70, 0x84, 0xa0, 0x60, 0x82, 0x75,
-	0x00, 0x7d, 0x0c, 0xbd, 0x39, 0x61, 0xe7, 0x39, 0x91, 0x4d, 0xec, 0x2a, 0x95, 0xee, 0x04, 0x7a,
-	0xdd, 0xe0, 0x95, 0x0d, 0x68, 0x5d, 0xd6, 0xc0, 0xd1, 0x4b, 0xd8, 0xaa, 0x06, 0x6b, 0xf4, 0x19,
-	0x57, 0xf5, 0xa9, 0xec, 0xbd, 0x56, 0x47, 0x40, 0xe7, 0x90, 0xac, 0x0e, 0xe9, 0x52, 0xa0, 0x07,
-	0xd0, 0x8c, 0xe8, 0xd2, 0xd6, 0x0a, 0x05, 0xc6, 0x2f, 0xd9, 0x18, 0x06, 0x2a, 0x3e, 0x7a, 0x06,
-	0xbd, 0xc2, 0x55, 0xd3, 0x99, 0xbb, 0xd5, 0x7d, 0x3b, 0xe6, 0x34, 0xe5, 0x4d, 0x7f, 0x72, 0xe0,
-	0x96, 0x5c, 0x62, 0xb3, 0x3f, 0x27, 0x72, 0xfc, 0xaf, 0x2c, 0x83, 0x7b, 0x41, 0x0d, 0x46, 0xb2,
-	0x2a, 0xd8, 0x90, 0x95, 0x90, 0xb3, 0x27, 0xa2, 0xcb, 0x50, 0x4f, 0xf9, 0x86, 0xea, 0xcd, 0x6e,
-	0x44, 0x97, 0x47, 0xd2, 0x1e, 0xed, 0x43, 0xaf, 0xc0, 0xd7, 0x50, 0xbd, 0x57, 0xa5, 0xda, 0xb5,
-	0x47, 0x2e, 0x73, 0xfd, 0x06, 0x7a, 0x53, 0xca, 0xe4, 0x27, 0x1a, 0xcb, 0xd6, 0xb7, 0x4e, 0x2e,
-	0xd2, 0x30, 0x30, 0xf9, 0x65, 0x20, 0x0b, 0x4e, 0x59, 0x26, 0x2c, 0x03, 0x6b, 0x97, 0x7b, 0xc3,
-	0xad, 0x5e, 0x9c, 0xdf, 0x1d, 0xd8, 0x39, 0xd0, 0xb0, 0x62, 0x03, 0x2b, 0xc4, 0xd7, 0x70, 0x43,
-	0x58, 0x5f, 0x78, 0xba, 0x0a, 0x23, 0xb2, 0x32, 0xa2, 0x3c, 0x0a, 0xae, 0xc9, 0x09, 0x0a, 0xc7,
-	0xf3, 0xd5, 0x21, 0x59, 0x99, 0xcf, 0x44, 0x51, 0x71, 0x8e, 0x8e, 0xe1, 0x56, 0x0d, 0xac, 0x46,
-	0x99, 0x7f, 0x34, 0xcf, 0x7a, 0xbb, 0x92, 0x36, 0xbf, 0x38, 0xb0, 0xbd, 0x59, 0xc3, 0xb7, 0xa1,
-	0x7d, 0x41, 0x49, 0x44, 0xb9, 0x5a, 0xce, 0x9b, 0xf4, 0x8a, 0x0f, 0x59, 0x6c, 0x02, 0xe8, 0xa9,
-	0xd4, 0x8b, 0x65, 0x85, 0x5e, 0xb2, 0xd4, 0x9b, 0x65, 0x3e, 0x30, 0x80, 0x62, 0x34, 0x6a, 0x53,
-	0x8f, 0xc6, 0x52, 0xe8, 0xdf, 0x3e, 0x71, 0xfb, 0x25, 0xbe, 0xa7, 0x6d, 0xf5, 0x4b, 0xf1, 0xe4,
-	0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x31, 0x05, 0x6a, 0xf9, 0x5e, 0x0c, 0x00, 0x00,
+	// 1272 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0x5d, 0x6f, 0x1b, 0x45,
+	0x17, 0xd6, 0xfa, 0xdb, 0x67, 0xf3, 0xd1, 0x4e, 0xfb, 0x36, 0xae, 0x5f, 0xa5, 0x98, 0x55, 0x29,
+	0x81, 0x96, 0x2d, 0x72, 0xb9, 0x80, 0x72, 0xd3, 0x34, 0xa1, 0x6a, 0xa4, 0x06, 0xd0, 0xb8, 0x85,
+	0x4b, 0x6b, 0xe2, 0x9d, 0xc4, 0x0b, 0xde, 0xd9, 0xd5, 0xcc, 0xac, 0x93, 0xfd, 0x33, 0xdc, 0x21,
+	0x01, 0x12, 0xe2, 0x82, 0x3f, 0xc0, 0x05, 0xbf, 0x85, 0xdf, 0x81, 0xe6, 0x6b, 0xbd, 0x36, 0x9b,
+	0xc2, 0xdd, 0x9e, 0x73, 0x9e, 0x33, 0xf3, 0xcc, 0x73, 0xce, 0x9c, 0xb1, 0xa1, 0x97, 0x9d, 0x85,
+	0x19, 0x4f, 0x65, 0x1a, 0xfc, 0xd5, 0x80, 0xde, 0x29, 0x95, 0x24, 0x22, 0x92, 0xa0, 0x01, 0x74,
+	0x97, 0x94, 0x8b, 0x38, 0x65, 0x03, 0x6f, 0xe4, 0x1d, 0xb4, 0xb1, 0x33, 0x11, 0x82, 0xd6, 0x9c,
+	0x88, 0xf9, 0xa0, 0x31, 0xf2, 0x0e, 0xfa, 0x58, 0x7f, 0xa3, 0x7b, 0x00, 0x9c, 0x66, 0xa9, 0x88,
+	0x65, 0xca, 0x8b, 0x41, 0x53, 0x47, 0x2a, 0x1e, 0xf4, 0x00, 0x76, 0xcf, 0xe8, 0x45, 0xcc, 0xa6,
+	0x39, 0x8b, 0xaf, 0xa6, 0x32, 0x4e, 0xe8, 0xa0, 0x35, 0xf2, 0x0e, 0x9a, 0x78, 0x5b, 0xbb, 0xdf,
+	0xb0, 0xf8, 0xea, 0x75, 0x9c, 0x50, 0x14, 0xc0, 0x36, 0x65, 0x51, 0x05, 0xd5, 0xd6, 0x28, 0x9f,
+	0xb2, 0xa8, 0xc4, 0x0c, 0xa0, 0x3b, 0x4b, 0x93, 0x24, 0x96, 0x62, 0xd0, 0x31, 0xcc, 0xac, 0x89,
+	0xee, 0x42, 0x8f, 0xe7, 0xcc, 0x24, 0x76, 0x75, 0x62, 0x97, 0xe7, 0x4c, 0x27, 0xbd, 0x84, 0x9b,
+	0x2e, 0x34, 0xcd, 0x28, 0x9f, 0xc6, 0x92, 0x26, 0x83, 0xde, 0xa8, 0x79, 0xe0, 0x8f, 0xf7, 0x43,
+	0x77, 0xe8, 0x10, 0x1b, 0xf4, 0xd7, 0x94, 0x9f, 0x48, 0x9a, 0x7c, 0xc1, 0x24, 0x2f, 0xf0, 0x0e,
+	0x5f, 0x73, 0x0e, 0x0f, 0xe1, 0x56, 0x0d, 0x0c, 0xdd, 0x80, 0xe6, 0xf7, 0xb4, 0xd0, 0x5a, 0xf5,
+	0xb1, 0xfa, 0x44, 0xb7, 0xa1, 0xbd, 0x24, 0x8b, 0x9c, 0x6a, 0xa1, 0x3c, 0x6c, 0x8c, 0xa7, 0x8d,
+	0x4f, 0xbd, 0xe0, 0x09, 0xec, 0x3d, 0xcf, 0x39, 0x8b, 0xd2, 0x4b, 0x36, 0xc9, 0x08, 0x17, 0xf4,
+	0x94, 0x48, 0x1e, 0x5f, 0xe1, 0xf4, 0xd2, 0x1c, 0x6e, 0x91, 0x27, 0x4c, 0x0c, 0xbc, 0x51, 0xf3,
+	0x60, 0x1b, 0x3b, 0x33, 0xf8, 0xc5, 0x83, 0xdb, 0x75, 0x59, 0xaa, 0x1e, 0x8c, 0x24, 0xd4, 0x6e,
+	0xad, 0xbf, 0xd1, 0x7d, 0xd8, 0x61, 0x79, 0x72, 0x46, 0xf9, 0x34, 0x3d, 0x9f, 0xf2, 0xf4, 0x52,
+	0x68, 0x12, 0x6d, 0xbc, 0x65, 0xbc, 0x5f, 0x9d, 0xe3, 0xf4, 0x52, 0xa0, 0x0f, 0xe1, 0xe6, 0x0a,
+	0xe5, 0xb6, 0x6d, 0x6a, 0xe0, 0xae, 0x03, 0x1e, 0x19, 0x37, 0x7a, 0x04, 0x2d, 0xbd, 0x4e, 0x4b,
+	0x6b, 0x36, 0x08, 0xaf, 0x39, 0x00, 0xd6, 0xa8, 0xe0, 0xb7, 0xc6, 0xea, 0x88, 0x87, 0x8c, 0x2c,
+	0x0a, 0x11, 0x0b, 0x4c, 0x45, 0xbe, 0x90, 0x02, 0x8d, 0xc0, 0xbf, 0xe0, 0x84, 0xe5, 0x0b, 0xc2,
+	0x63, 0x59, 0xd8, 0xee, 0xaa, 0xba, 0xd0, 0x10, 0x7a, 0x82, 0x24, 0xd9, 0x22, 0x66, 0x17, 0x96,
+	0x77, 0x69, 0xa3, 0xc7, 0xd0, 0xcd, 0x78, 0xfa, 0x1d, 0x9d, 0x49, 0xcd, 0xd4, 0x1f, 0xff, 0xaf,
+	0x9e, 0x8a, 0x43, 0xa1, 0x87, 0xd0, 0x3e, 0x8f, 0x17, 0xd4, 0x31, 0xbf, 0x06, 0x6e, 0x30, 0xe8,
+	0x23, 0xe8, 0x64, 0x34, 0xcd, 0x16, 0xaa, 0xf1, 0xde, 0x82, 0xb6, 0x20, 0x74, 0x02, 0xc8, 0x7c,
+	0x4d, 0x63, 0x26, 0x29, 0x27, 0x33, 0xa9, 0xee, 0x4b, 0x47, 0xf3, 0x1a, 0x86, 0x47, 0x69, 0x92,
+	0x71, 0x2a, 0x04, 0x8d, 0x4c, 0x32, 0x4e, 0x2f, 0x6d, 0xfe, 0x4d, 0x93, 0x75, 0xb2, 0x4a, 0x0a,
+	0x7e, 0xf7, 0xe0, 0xee, 0xb5, 0x09, 0x35, 0xf5, 0xf4, 0xfe, 0x6b, 0x3d, 0x1b, 0xf5, 0xf5, 0x44,
+	0xd0, 0x52, 0x2d, 0x3f, 0x68, 0x8e, 0x9a, 0x07, 0x4d, 0xdc, 0x72, 0x77, 0x3e, 0x66, 0x51, 0x3c,
+	0xb3, 0x62, 0xb5, 0xb1, 0x33, 0xd1, 0x1d, 0xe8, 0xc4, 0x2c, 0xca, 0x24, 0xd7, 0xba, 0x34, 0xb1,
+	0xb5, 0x82, 0x09, 0x74, 0x8f, 0xd2, 0x3c, 0x53, 0xd2, 0xdd, 0x86, 0x76, 0xcc, 0x22, 0x7a, 0xa5,
+	0xfb, 0xb6, 0x8f, 0x8d, 0x81, 0xc6, 0xd0, 0x49, 0xf4, 0x11, 0x34, 0x8f, 0xb7, 0xab, 0x62, 0x91,
+	0xc1, 0x7d, 0xd8, 0x7a, 0x9d, 0xe6, 0xb3, 0x39, 0x8d, 0x5e, 0xc4, 0x76, 0x65, 0x53, 0x41, 0x4f,
+	0x93, 0x32, 0x46, 0xf0, 0x93, 0x07, 0x77, 0xec, 0xde, 0x9b, 0x1d, 0xf6, 0x10, 0xb6, 0x14, 0x66,
+	0x3a, 0x33, 0x61, 0x5b, 0x90, 0x5e, 0x68, 0xe1, 0xd8, 0x57, 0x51, 0xc7, 0xfb, 0x31, 0xec, 0xd8,
+	0x1a, 0x3a, 0x78, 0x77, 0x03, 0xbe, 0x6d, 0xe2, 0x2e, 0xe1, 0x63, 0xd8, 0xb2, 0x09, 0x86, 0x95,
+	0x99, 0x22, 0xdb, 0x61, 0x95, 0x33, 0xf6, 0x0d, 0x44, 0x1b, 0xc1, 0x8f, 0x1e, 0xc0, 0x9b, 0xc3,
+	0xc9, 0xeb, 0xa3, 0x39, 0x61, 0x17, 0x14, 0xfd, 0x1f, 0xfa, 0x9a, 0x5e, 0xe5, 0xd6, 0xf6, 0x94,
+	0xe3, 0x4b, 0x75, 0x73, 0xf7, 0x01, 0x04, 0x9f, 0x4d, 0xcf, 0xe8, 0x79, 0xca, 0xa9, 0x9d, 0xb1,
+	0x7d, 0xc1, 0x67, 0xcf, 0xb5, 0x43, 0xe5, 0xaa, 0x30, 0x39, 0x97, 0x94, 0xdb, 0x39, 0xdb, 0x13,
+	0x7c, 0x76, 0xa8, 0x6c, 0xf4, 0x0e, 0xf8, 0x39, 0x11, 0xd2, 0x25, 0xb7, 0xcc, 0x18, 0x56, 0x2e,
+	0x9b, 0xbd, 0x0f, 0xda, 0xb2, 0xe9, 0x6d, 0xb3, 0xb8, 0xf2, 0xe8, 0xfc, 0xe0, 0x19, 0xec, 0xad,
+	0x68, 0x8a, 0x09, 0x59, 0x52, 0xee, 0x24, 0x7d, 0x0f, 0xba, 0x33, 0xe3, 0xd6, 0x55, 0xf0, 0xc7,
+	0x7e, 0xb8, 0x82, 0x62, 0x17, 0x0b, 0xfe, 0xf4, 0x60, 0x67, 0x32, 0x4f, 0x25, 0xa3, 0x42, 0x60,
+	0x3a, 0x4b, 0x79, 0xa4, 0x1a, 0x4d, 0x16, 0x59, 0x39, 0x9e, 0xd4, 0x77, 0x39, 0xb2, 0x1a, 0x95,
+	0x91, 0x85, 0xa0, 0xa5, 0x44, 0xb0, 0x87, 0xd2, 0xdf, 0xe8, 0x33, 0xe8, 0xcd, 0xd2, 0x5c, 0xdd,
+	0x12, 0x77, 0x7d, 0xf7, 0xc3, 0xf5, 0xe5, 0x55, 0x91, 0x74, 0xdc, 0x0c, 0xeb, 0x12, 0x3e, 0xfc,
+	0x1c, 0xb6, 0xd7, 0x42, 0xd5, 0x01, 0xdd, 0xae, 0x19, 0xd0, 0xed, 0xea, 0x80, 0x3e, 0x86, 0x3d,
+	0xb7, 0xcd, 0x66, 0x6f, 0x7d, 0x00, 0x5d, 0xae, 0x77, 0x76, 0x42, 0xec, 0x6e, 0x30, 0xc2, 0x2e,
+	0x1e, 0xbc, 0x0f, 0xbe, 0xaa, 0xff, 0xcb, 0x58, 0xe8, 0x37, 0xb0, 0xf2, 0x6e, 0x99, 0x2b, 0xe2,
+	0xcc, 0xe0, 0x07, 0x0f, 0x06, 0x15, 0xa4, 0xd9, 0xea, 0x94, 0x0a, 0x41, 0x2e, 0x28, 0x7a, 0x5a,
+	0xed, 0x7e, 0x7f, 0x7c, 0x3f, 0xbc, 0x0e, 0xa9, 0x03, 0x56, 0x07, 0x93, 0x32, 0x7c, 0x01, 0xb0,
+	0x72, 0xd6, 0x3c, 0x51, 0x41, 0x55, 0x01, 0x7f, 0xbc, 0xb5, 0xb6, 0x76, 0x45, 0x8f, 0x37, 0xd0,
+	0x7f, 0x15, 0x33, 0x3a, 0x91, 0x44, 0xea, 0xeb, 0x48, 0xa2, 0x88, 0x46, 0x56, 0x4a, 0x63, 0xa8,
+	0xd3, 0x71, 0x9a, 0xa4, 0x4b, 0x1a, 0x59, 0x39, 0x9d, 0xa9, 0xcf, 0xad, 0xdb, 0x23, 0xb2, 0x6f,
+	0x8b, 0x33, 0x55, 0xb7, 0x74, 0x8e, 0xe9, 0xf2, 0x98, 0x6c, 0x88, 0xb3, 0xf6, 0xa8, 0x8f, 0xa0,
+	0x2d, 0xd4, 0xbe, 0x96, 0x23, 0x84, 0x25, 0x13, 0x6c, 0x02, 0xe8, 0x13, 0xe8, 0x2f, 0x08, 0xbb,
+	0xc8, 0x89, 0xea, 0xce, 0xa6, 0x56, 0xe9, 0x4e, 0x68, 0xd6, 0x0d, 0x5f, 0xb9, 0x80, 0xd1, 0x65,
+	0x05, 0x1c, 0xbe, 0x84, 0x9d, 0xf5, 0x60, 0x8d, 0x3e, 0xa3, 0x75, 0x7d, 0xd6, 0xf6, 0x5e, 0xa9,
+	0x23, 0xa0, 0x7b, 0x4c, 0x8a, 0x63, 0xba, 0x14, 0xe8, 0x01, 0xb4, 0x22, 0xba, 0x74, 0xb5, 0x42,
+	0xa1, 0xf5, 0x2b, 0x36, 0x96, 0x81, 0x8e, 0x0f, 0x9f, 0x41, 0xbf, 0x74, 0xd5, 0x74, 0xe6, 0xfe,
+	0xfa, 0xbe, 0x5d, 0x7b, 0x9a, 0xea, 0xa6, 0x3f, 0x7b, 0x70, 0x4b, 0x2d, 0xb1, 0xd9, 0x9f, 0x63,
+	0x35, 0xd7, 0x0b, 0xc7, 0xe0, 0x5e, 0x58, 0x83, 0x51, 0xac, 0x4a, 0x36, 0xa4, 0x10, 0x6a, 0xa8,
+	0x44, 0x74, 0x39, 0x35, 0xe3, 0xbb, 0xa1, 0x7b, 0xb3, 0x17, 0xd1, 0xe5, 0x89, 0xb2, 0x87, 0x87,
+	0xd0, 0x2f, 0xf1, 0x35, 0x54, 0xef, 0xad, 0x53, 0xed, 0xb9, 0x23, 0x57, 0xb9, 0x7e, 0x0b, 0xfd,
+	0x09, 0x65, 0xea, 0xb7, 0x17, 0x93, 0xab, 0x5b, 0xa7, 0x16, 0x69, 0x58, 0x98, 0x7a, 0xf2, 0x55,
+	0xc1, 0x29, 0xd3, 0x85, 0xd6, 0x0c, 0x9c, 0x5d, 0xed, 0x8d, 0xe6, 0xfa, 0xc5, 0xf9, 0xc3, 0x83,
+	0xbd, 0x23, 0x03, 0x2b, 0x37, 0x70, 0x42, 0x7c, 0x03, 0x37, 0x84, 0xf3, 0x4d, 0xcf, 0x8a, 0x69,
+	0x44, 0x0a, 0x2b, 0xca, 0xa3, 0xf0, 0x9a, 0x9c, 0xb0, 0x74, 0x3c, 0x2f, 0x8e, 0x49, 0x61, 0x7f,
+	0xff, 0x89, 0x35, 0xe7, 0xf0, 0x14, 0x6e, 0xd5, 0xc0, 0x6a, 0x94, 0xf9, 0x47, 0xf3, 0xac, 0xb6,
+	0xab, 0x68, 0xf3, 0xab, 0x07, 0xbb, 0x9b, 0x35, 0x7c, 0x17, 0x3a, 0x73, 0x4a, 0x22, 0xca, 0xf5,
+	0x72, 0xfe, 0xb8, 0x5f, 0xfe, 0x42, 0xc5, 0x36, 0x80, 0x9e, 0x2a, 0xbd, 0x98, 0x2c, 0xf5, 0x52,
+	0xa5, 0xde, 0x2c, 0xf3, 0x91, 0x05, 0x94, 0xa3, 0xd1, 0x98, 0x66, 0x34, 0x56, 0x42, 0xff, 0xf6,
+	0xdb, 0x75, 0xab, 0xc2, 0xf7, 0xac, 0xa3, 0xff, 0x2b, 0x3c, 0xf9, 0x3b, 0x00, 0x00, 0xff, 0xff,
+	0x7c, 0xd1, 0x8f, 0x8d, 0x37, 0x0c, 0x00, 0x00,
 }

internal/pb/pb.proto

@@ -88,11 +88,10 @@ message UASTChangesSaverResults {
 }
 
 message ShotnessRecord {
-    string internal_role = 1;
-    repeated int32 roles = 2;
-    string name = 3;
-    string file = 4;
-    map<int32, int32> counters = 5;
+    string type = 1;
+    string name = 2;
+    string file = 3;
+    map<int32, int32> counters = 4;
 }
 
 message ShotnessAnalysisResults {

internal/plumbing/uast/changes_xpather.go

@@ -4,10 +4,10 @@ import (
 	"bytes"
 	"io"
 	"log"
+	"sort"
 
 	"github.com/minio/highwayhash"
 	"gopkg.in/bblfsh/client-go.v3/tools"
-	bblfsh "gopkg.in/bblfsh/sdk.v2/uast"
 	"gopkg.in/bblfsh/sdk.v2/uast/nodes"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 )
@@ -73,6 +73,16 @@ func (xpather ChangesXPather) hash(nodesToHash []nodes.Node) map[uint64]nodes.No
 
 func stringifyUASTNode(node nodes.Node, writer io.Writer) {
 	for element := range tools.Iterate(tools.NewIterator(node, tools.PositionOrder)) {
-		writer.Write([]byte(bblfsh.TokenOf(element.(nodes.Object)) + "|" + bblfsh.TypeOf(element) + ">"))
+		var keys []string
+		obj := element.(nodes.Object)
+		for key, val := range obj {
+			if _, ok := val.(nodes.String); ok {
+				keys = append(keys, key)
+			}
+		}
+		sort.Strings(keys)
+		for _, key := range keys {
+			writer.Write([]byte(key + "=" + string(obj[key].(nodes.String)) + ";"))
+		}
 	}
 }

internal/plumbing/uast/test/utils.go

@@ -24,7 +24,7 @@ func ParseBlobFromTestRepo(hash, name string, client *bblfsh.Client) nodes.Node
 	if err != nil {
 		panic(err)
 	}
-	request := client.NewParseRequest().Content(string(data)).Filename(name).Mode(bblfsh.Annotated)
+	request := client.NewParseRequest().Content(string(data)).Filename(name).Mode(bblfsh.Semantic)
 	response, _, err := request.UAST()
 	if err != nil {
 		panic(err)

internal/plumbing/uast/uast.go

@@ -267,7 +267,7 @@ func (exr *Extractor) extractUAST(
 		defer cancel()
 	}
 	request := client.NewParseRequest().
-		Content(string(data)).Filename(name).Mode(bblfsh.Annotated).Context(ctx)
+		Content(string(data)).Filename(name).Mode(bblfsh.Semantic).Context(ctx)
 	response, _, err := request.UAST()
 	if err != nil {
 		if strings.Contains("missing driver", err.Error()) {

leaves/comment_sentiment.go

@@ -150,7 +150,7 @@ func (sent *CommentSentimentAnalysis) validate() {
 // calls. The repository which is going to be analysed is supplied as an argument.
 func (sent *CommentSentimentAnalysis) Initialize(repository *git.Repository) error {
 	sent.commentsByDay = map[int][]string{}
-	sent.xpather = &uast_items.ChangesXPather{XPath: "//*[@role='Comment']"}
+	sent.xpather = &uast_items.ChangesXPather{XPath: "//uast:Comment"}
 	sent.validate()
 	sent.OneShotMergeProcessor.Initialize()
 	return nil
@@ -324,11 +324,7 @@ func (sent *CommentSentimentAnalysis) mergeComments(extracted []nodes.Node) []st
 			if pos.End() != nil && maxEnd < int(pos.End().Line) {
 				maxEnd = int(pos.End().Line)
 			}
-			token := strings.TrimSpace(uast.TokenOf(node.(nodes.Object)))
-			// FIXME(vmarkovtsev): remove this hack when https://github.com/bblfsh/go-driver/issues/39 is fixed
-			if len(token) > 0 && token[0] == '#' {
-				token = token[1:]
-			}
+			token := strings.TrimSpace(string(node.(nodes.Object)["Text"].(nodes.String)))
 			if token != "" {
 				buffer = append(buffer, token)
 			}

leaves/comment_sentiment_test.go

@@ -156,12 +156,12 @@ func TestCommentSentimentConsume(t *testing.T) {
 	hash2 := "2a7392320b332494a08d5113aabe6d056fef7e9d"
 	root1 := uast_test.ParseBlobFromTestRepo(hash1, "labours.py", client)
 	root2 := uast_test.ParseBlobFromTestRepo(hash2, "labours.py", client)
-	comments, _ := tools.Filter(root2, "//*[@role='Comment']")
+	comments, _ := tools.Filter(root2, "//uast:Comment")
 	for _, c := range query.AllNodes(comments) {
 		obj := c.(nodes.Object)
-		t := strings.TrimSpace(uast.TokenOf(obj))
+		t := strings.TrimSpace(string(obj["Text"].(nodes.String)))
 		if t == "we need to adjust the peak, it may not be less than the decayed value" {
-			obj[uast.KeyToken] = nodes.String("license copyright boring")
+			obj["Text"] = nodes.String("license copyright boring")
 		} else if t == "Tensorflow 1.5 parses sys.argv unconditionally *applause*" {
 			obj[uast.KeyPos].(nodes.Object)[uast.KeyStart] = nil
 		}
@@ -179,7 +179,7 @@ func TestCommentSentimentConsume(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Nil(t, result)
 	assert.Len(t, sent.commentsByDay, 1)
-	assert.Len(t, sent.commentsByDay[0], 6)
+	assert.Len(t, sent.commentsByDay[0], 4)
 }
 
 var (

leaves/shotness.go

@@ -13,7 +13,6 @@ import (
 	"gopkg.in/bblfsh/sdk.v2/uast"
 	uast_nodes "gopkg.in/bblfsh/sdk.v2/uast/nodes"
 	"gopkg.in/bblfsh/sdk.v2/uast/query"
-	"gopkg.in/bblfsh/sdk.v2/uast/role"
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 	"gopkg.in/src-d/hercules.v7/internal/core"
@@ -45,10 +44,10 @@ const (
 
 	// DefaultShotnessXpathStruct is the default UAST XPath to choose the analysed nodes.
 	// It extracts functions.
-	DefaultShotnessXpathStruct = "//*[@role='Function' and @role='Declaration']"
+	DefaultShotnessXpathStruct = "//uast:FunctionGroup"
 	// DefaultShotnessXpathName is the default UAST XPath to choose the names of the analysed nodes.
 	// It looks at the current tree level and at the immediate children.
-	DefaultShotnessXpathName = "/*[1]/*/*[@role='Function' and @role='Identifier' and @role='Name'] | /*[1]"
+	DefaultShotnessXpathName = "//uast:Function/../../Name | /name"
 )
 
 type nodeShotness struct {
@@ -60,10 +59,9 @@ type nodeShotness struct {
 // NodeSummary carries the node attributes which annotate the "shotness" analysis' counters.
 // These attributes are supposed to uniquely identify each node.
 type NodeSummary struct {
-	InternalRole string
-	Roles        []role.Role
-	Name         string
-	File         string
+	Type string
+	Name string
+	File string
 }
 
 // ShotnessResult is returned by ShotnessAnalysis.Finalize() and represents the analysis result.
@@ -73,7 +71,7 @@ type ShotnessResult struct {
 }
 
 func (node NodeSummary) String() string {
-	return node.InternalRole + "_" + node.Name + "_" + node.File
+	return node.Type + "_" + node.Name + "_" + node.File
 }
 
 // Name of this PipelineItem. Uniquely identifies the type, used for mapping keys, etc.
@@ -172,10 +170,9 @@ func (shotness *ShotnessAnalysis) Consume(deps map[string]interface{}) (map[stri
 
 	addNode := func(name string, node uast_nodes.Node, fileName string) {
 		nodeSummary := NodeSummary{
-			InternalRole: uast.TypeOf(node),
-			Roles:        uast.RolesOf(node.(uast_nodes.Object)),
-			Name:         name,
-			File:         fileName,
+			Type: uast.TypeOf(node),
+			Name: name,
+			File: fileName,
 		}
 		key := nodeSummary.String()
 		exists := allNodes[key]
@@ -391,15 +388,8 @@ func (shotness *ShotnessAnalysis) Serialize(result interface{}, binary bool, wri
 
 func (shotness *ShotnessAnalysis) serializeText(result *ShotnessResult, writer io.Writer) {
 	for i, summary := range result.Nodes {
-		fmt.Fprintf(writer, "  - name: %s\n    file: %s\n    internal_role: %s\n    roles: [",
-			summary.Name, summary.File, summary.InternalRole)
-		for j, r := range summary.Roles {
-			if j < len(summary.Roles)-1 {
-				fmt.Fprintf(writer, "%d,", r)
-			} else {
-				fmt.Fprintf(writer, "%d]\n    counters: {", r)
-			}
-		}
+		fmt.Fprintf(writer, "  - name: %s\n    file: %s\n    internal_role: %s\n    counters: {",
+			summary.Name, summary.File, summary.Type)
 		keys := make([]int, len(result.Counters[i]))
 		j := 0
 		for key := range result.Counters[i] {
@@ -426,14 +416,10 @@ func (shotness *ShotnessAnalysis) serializeBinary(result *ShotnessResult, writer
 	}
 	for i, summary := range result.Nodes {
 		record := &pb.ShotnessRecord{
-			Name:         summary.Name,
-			File:         summary.File,
-			InternalRole: summary.InternalRole,
-			Roles:        make([]int32, len(summary.Roles)),
-			Counters:     map[int32]int32{},
-		}
-		for j, r := range summary.Roles {
-			record.Roles[j] = int32(r)
+			Name:     summary.Name,
+			File:     summary.File,
+			Type:     summary.Type,
+			Counters: map[int32]int32{},
 		}
 		for key, val := range result.Counters[i] {
 			record.Counters[int32(key)] = int32(val)
@@ -479,15 +465,11 @@ func (shotness *ShotnessAnalysis) extractNodes(root uast_nodes.Node) (map[string
 		if internal[uast_nodes.UniqueKey(node)] {
 			continue
 		}
-		it, err := tools.Filter(node, shotness.XpathName)
+		nodeName, err := tools.FilterNode(node, shotness.XpathName)
 		if err != nil {
 			return nil, err
 		}
-		nodeNames := query.AllNodes(it)
-		if len(nodeNames) == 0 {
-			continue
-		}
-		res[uast.TokenOf(nodeNames[0].(uast_nodes.Object))] = node
+		res[string(nodeName.(uast_nodes.Object)["Name"].(uast_nodes.String))] = node
 	}
 	return res, nil
 }

leaves/shotness_test.go

@@ -182,7 +182,7 @@ func TestShotnessConsume(t *testing.T) {
 	assert.Len(t, sh.files, 1)
 	assert.Len(t, sh.files["new.java"], 18)
 	for _, node := range sh.nodes {
-		assert.Equal(t, node.Summary.InternalRole, "MethodDeclaration")
+		assert.Equal(t, node.Summary.Type, "uast:FunctionGroup")
 		if node.Summary.Name != "testUnpackEntryFromFile" {
 			assert.Equal(t, node.Count, 1)
 			if node.Summary.Name != "testUnpackEntryFromStreamToFile" {
@@ -202,10 +202,10 @@ func TestShotnessConsume(t *testing.T) {
 		t.FailNow()
 	}
 	assert.Equal(t, result.Nodes[14].String(),
-		"MethodDeclaration_testUnpackEntryFromStreamToFile_"+newfileName)
+		"uast:FunctionGroup_testUnpackEntryFromStreamToFile_"+newfileName)
 	assert.Equal(t, result.Counters[14], map[int]int{14: 1, 13: 1})
 	assert.Equal(t, result.Nodes[15].String(),
-		"MethodDeclaration_testUnpackEntryFromStream_"+newfileName)
+		"uast:FunctionGroup_testUnpackEntryFromStream_"+newfileName)
 	assert.Equal(t, result.Counters[15], map[int]int{
 		8: 1, 0: 1, 5: 1, 6: 1, 11: 1, 1: 1, 13: 1, 17: 1, 3: 1, 15: 1, 9: 1, 4: 1, 7: 1, 16: 1, 2: 1, 12: 1, 10: 1})
 	uastChanges[0] = uast_items.Change{
@@ -242,93 +242,75 @@ func TestShotnessSerializeText(t *testing.T) {
 	sh.Serialize(result, false, buffer)
 	assert.Equal(t, buffer.String(), `  - name: testAddEntry
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testArchiveEquals
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testContainsAnyEntry
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testDuplicateEntryAtAddOrReplace
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testDuplicateEntryAtAdd
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testDuplicateEntryAtReplace
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testPackEntries
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testPackEntry
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testPreserveRoot
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testRemoveDirs
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testRemoveEntry
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testRepackArchive
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testUnexplode
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testUnpackEntryFromFile
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":2,"14":1,"15":1,"16":1,"17":1}
   - name: testUnpackEntryFromStreamToFile
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"13":1,"14":1}
   - name: testUnpackEntryFromStream
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: testZipException
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,59,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
   - name: unexplodeWithException
     file: test.java
-    internal_role: MethodDeclaration
-    roles: [111,100,41,45]
+    internal_role: uast:FunctionGroup
     counters: {"0":1,"1":1,"2":1,"3":1,"4":1,"5":1,"6":1,"7":1,"8":1,"9":1,"10":1,"11":1,"12":1,"13":1,"15":1,"16":1,"17":1}
 `)
 }