Skip to content

Commit 9ea15e1

Browse files
LipenLipen
committed
Rename
1 parent 476ed40 commit 9ea15e1

File tree

3 files changed

+73
-73
lines changed

3 files changed

+73
-73
lines changed

‎jacodb-ets/src/main/kotlin/org/jacodb/ets/proto/ConvertToProto.kt‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -45,107 +45,107 @@ import model.Namespace as ProtoNamespace
4545
import model.NamespaceSignature as ProtoNamespaceSignature
4646
import model.Scene as ProtoScene
4747

48-
fun EtsScene.toProto2(): ProtoScene {
48+
fun EtsScene.toProto(): ProtoScene {
4949
return ProtoScene(
50-
files = projectFiles.map { it.toProto2() },
51-
sdkFiles = sdkFiles.map { it.toProto2() },
50+
files = projectFiles.map { it.toProto() },
51+
sdkFiles = sdkFiles.map { it.toProto() },
5252
)
5353
}
5454

55-
fun EtsFile.toProto2(): ProtoFile {
55+
fun EtsFile.toProto(): ProtoFile {
5656
return ProtoFile(
57-
signature = signature.toProto2(),
58-
classes = classes.map { it.toProto2() },
59-
namespaces = namespaces.map { it.toProto2() },
57+
signature = signature.toProto(),
58+
classes = classes.map { it.toProto() },
59+
namespaces = namespaces.map { it.toProto() },
6060
)
6161
}
6262

63-
fun EtsNamespace.toProto2(): ProtoNamespace {
63+
fun EtsNamespace.toProto(): ProtoNamespace {
6464
return ProtoNamespace(
65-
signature = signature.toProto2(),
66-
classes = classes.map { it.toProto2() },
67-
namespaces = namespaces.map { it.toProto2() },
65+
signature = signature.toProto(),
66+
classes = classes.map { it.toProto() },
67+
namespaces = namespaces.map { it.toProto() },
6868
)
6969
}
7070

71-
fun EtsClass.toProto2(): ProtoClass {
71+
fun EtsClass.toProto(): ProtoClass {
7272
return ProtoClass(
73-
signature = signature.toProto2(),
74-
type_parameters = typeParameters.map { it.toProto2() },
75-
fields = fields.map { it.toProto2() },
76-
methods = methods.map { it.toProto2() },
73+
signature = signature.toProto(),
74+
type_parameters = typeParameters.map { it.toProto() },
75+
fields = fields.map { it.toProto() },
76+
methods = methods.map { it.toProto() },
7777
)
7878
}
7979

80-
fun EtsField.toProto2(): ProtoField {
80+
fun EtsField.toProto(): ProtoField {
8181
check(this is EtsFieldImpl)
8282
return ProtoField(
83-
signature = signature.toProto2(),
84-
modifiers = modifiers.toProto2(),
83+
signature = signature.toProto(),
84+
modifiers = modifiers.toProto(),
8585
is_optional = isOptional,
8686
is_definitely_assigned = isDefinitelyAssigned,
8787
)
8888
}
8989

90-
fun EtsMethod.toProto2(): ProtoMethod {
90+
fun EtsMethod.toProto(): ProtoMethod {
9191
return ProtoMethod(
92-
signature = signature.toProto2(),
93-
modifiers = modifiers.toProto2(),
94-
cfg = cfg.toProto2(),
92+
signature = signature.toProto(),
93+
modifiers = modifiers.toProto(),
94+
cfg = cfg.toProto(),
9595
)
9696
}
9797

98-
fun EtsFileSignature.toProto2(): ProtoFileSignature {
98+
fun EtsFileSignature.toProto(): ProtoFileSignature {
9999
return ProtoFileSignature(
100100
project_name = projectName,
101101
file_name = fileName,
102102
)
103103
}
104104

105-
fun EtsNamespaceSignature.toProto2(): ProtoNamespaceSignature {
105+
fun EtsNamespaceSignature.toProto(): ProtoNamespaceSignature {
106106
return ProtoNamespaceSignature(
107107
name = name,
108-
file_ = file.toProto2(),
109-
parent = namespace?.toProto2(),
108+
file_ = file.toProto(),
109+
parent = namespace?.toProto(),
110110
)
111111
}
112112

113-
fun EtsClassSignature.toProto2(): ProtoClassSignature {
113+
fun EtsClassSignature.toProto(): ProtoClassSignature {
114114
return ProtoClassSignature(
115115
name = name,
116-
file_ = file.toProto2(),
117-
namespace = namespace?.toProto2(),
116+
file_ = file.toProto(),
117+
namespace = namespace?.toProto(),
118118
)
119119
}
120120

121-
fun EtsMethodSignature.toProto2(): ProtoMethodSignature {
121+
fun EtsMethodSignature.toProto(): ProtoMethodSignature {
122122
return ProtoMethodSignature(
123123
name = name,
124-
enclosing_class = enclosingClass.toProto2(),
125-
parameters = parameters.map { it.toProto2() },
126-
returnType = returnType.toProto2(),
124+
enclosing_class = enclosingClass.toProto(),
125+
parameters = parameters.map { it.toProto() },
126+
returnType = returnType.toProto(),
127127
)
128128
}
129129

130-
fun EtsMethodParameter.toProto2(): ProtoMethodParameter {
130+
fun EtsMethodParameter.toProto(): ProtoMethodParameter {
131131
return ProtoMethodParameter(
132132
name = name,
133-
type = type.toProto2(),
133+
type = type.toProto(),
134134
isOptional = isOptional,
135135
isRest = isRest,
136136
)
137137
}
138138

139-
fun EtsFieldSignature.toProto2(): ProtoFieldSignature {
139+
fun EtsFieldSignature.toProto(): ProtoFieldSignature {
140140
return ProtoFieldSignature(
141141
name = name,
142-
enclosing_class = enclosingClass.toProto2(),
143-
type = type.toProto2(),
142+
enclosing_class = enclosingClass.toProto(),
143+
type = type.toProto(),
144144
)
145145
}
146146

147-
fun EtsModifiers.toProto2(): Int {
147+
fun EtsModifiers.toProto(): Int {
148148
return mask
149149
}
150150

151-
fun EtsBlockCfg.toProto2(): ProtoBlockCfg = TODO()
151+
fun EtsBlockCfg.toProto(): ProtoBlockCfg = TODO()

‎jacodb-ets/src/main/kotlin/org/jacodb/ets/proto/EtsTypeToProto.kt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ import model.UnionType as ProtoUnionType
5959
import model.UnknownType as ProtoUnknownType
6060
import model.VoidType as ProtoVoidType
6161

62-
fun EtsType.toProto2(): ProtoType = accept(EtsTypeToProto2)
62+
fun EtsType.toProto(): ProtoType = accept(EtsTypeToProto)
6363

64-
private object EtsTypeToProto2 : EtsType.Visitor<ProtoType> {
64+
private object EtsTypeToProto : EtsType.Visitor<ProtoType> {
6565
override fun visit(type: EtsRawType): ProtoType {
6666
// NOTE: !!!
6767
val unknownType = ProtoUnknownType()
@@ -80,31 +80,31 @@ private object EtsTypeToProto2 : EtsType.Visitor<ProtoType> {
8080

8181
override fun visit(type: EtsUnionType): ProtoType {
8282
val unionType = ProtoUnionType(
83-
types = type.types.map { it.toProto2() },
83+
types = type.types.map { it.toProto() },
8484
)
8585
return ProtoType(union_type = unionType)
8686
}
8787

8888
override fun visit(type: EtsIntersectionType): ProtoType {
8989
val intersectionType = ProtoIntersectionType(
90-
types = type.types.map { it.toProto2() },
90+
types = type.types.map { it.toProto() },
9191
)
9292
return ProtoType(intersection_type = intersectionType)
9393
}
9494

9595
override fun visit(type: EtsGenericType): ProtoType {
9696
val genericType = ProtoGenericType(
9797
type_name = type.typeName,
98-
default_type = type.defaultType?.toProto2(),
99-
constraint = type.constraint?.toProto2()
98+
default_type = type.defaultType?.toProto(),
99+
constraint = type.constraint?.toProto()
100100
)
101101
return ProtoType(generic_type = genericType)
102102
}
103103

104104
override fun visit(type: EtsAliasType): ProtoType {
105105
val aliasType = ProtoAliasType(
106106
name = type.name,
107-
original_type = type.originalType.toProto2(),
107+
original_type = type.originalType.toProto(),
108108
// TODO: local signature
109109
)
110110
return ProtoType(alias_type = aliasType)
@@ -158,39 +158,39 @@ private object EtsTypeToProto2 : EtsType.Visitor<ProtoType> {
158158

159159
override fun visit(type: EtsClassType): ProtoType {
160160
val classType = ProtoClassType(
161-
signature = type.signature.toProto2(),
162-
type_parameters = type.typeParameters.map { it.toProto2() },
161+
signature = type.signature.toProto(),
162+
type_parameters = type.typeParameters.map { it.toProto() },
163163
)
164164
return ProtoType(class_type = classType)
165165
}
166166

167167
override fun visit(type: EtsUnclearRefType): ProtoType {
168168
val unclearRefType = ProtoUnclearRefType(
169169
name = type.typeName,
170-
type_parameters = type.typeParameters.map { it.toProto2() },
170+
type_parameters = type.typeParameters.map { it.toProto() },
171171
)
172172
return ProtoType(unclear_ref_type = unclearRefType)
173173
}
174174

175175
override fun visit(type: EtsArrayType): ProtoType {
176176
val arrayType = ProtoArrayType(
177-
element_type = type.elementType.toProto2(),
177+
element_type = type.elementType.toProto(),
178178
dimensions = type.dimensions,
179179
)
180180
return ProtoType(array_type = arrayType)
181181
}
182182

183183
override fun visit(type: EtsTupleType): ProtoType {
184184
val tupleType = ProtoTupleType(
185-
types = type.types.map { it.toProto2() },
185+
types = type.types.map { it.toProto() },
186186
)
187187
return ProtoType(tuple_type = tupleType)
188188
}
189189

190190
override fun visit(type: EtsFunctionType): ProtoType {
191191
val functionType = ProtoFunctionType(
192-
signature = type.signature.toProto2(),
193-
type_parameters = type.typeParameters.map { it.toProto2() },
192+
signature = type.signature.toProto(),
193+
type_parameters = type.typeParameters.map { it.toProto() },
194194
)
195195
return ProtoType(function_type = functionType)
196196
}

‎jacodb-ets/src/main/kotlin/org/jacodb/ets/proto/EtsValueToProto.kt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ import model.StaticFieldRef as ProtoStaticFieldRef
4242
import model.This as ProtoThis
4343
import model.Value as ProtoValue
4444

45-
fun EtsValue.toProto2(): ProtoValue = accept(EtsValueToProto2)
45+
fun EtsValue.toProto(): ProtoValue = accept(EtsValueToProto)
4646

47-
private object EtsValueToProto2 : EtsValue.Visitor<ProtoValue> {
47+
private object EtsValueToProto : EtsValue.Visitor<ProtoValue> {
4848
override fun visit(value: EtsLocal): ProtoValue {
49-
val local = value.toProto2()
49+
val local = value.toProto()
5050
return ProtoValue(local = local)
5151
}
5252

5353
private fun visitConstant(value: EtsConstant): ProtoValue {
54-
val constant = value.toProto2()
54+
val constant = value.toProto()
5555
return ProtoValue(constant = constant)
5656
}
5757

@@ -80,51 +80,51 @@ private object EtsValueToProto2 : EtsValue.Visitor<ProtoValue> {
8080
}
8181

8282
override fun visit(value: EtsThis): ProtoValue {
83-
val this_ = ProtoThis(type = value.type.toProto2())
83+
val this_ = ProtoThis(type = value.type.toProto())
8484
return ProtoValue(ref = ProtoRef(this_ = this_))
8585
}
8686

8787
override fun visit(value: EtsParameterRef): ProtoValue {
8888
val paramRef = ProtoParameterRef(
8989
index = value.index,
90-
type = value.type.toProto2(),
90+
type = value.type.toProto(),
9191
)
9292
return ProtoValue(ref = ProtoRef(parameter = paramRef))
9393
}
9494

9595
override fun visit(value: EtsArrayAccess): ProtoValue {
9696
val arrayAccess = ProtoArrayAccess(
97-
array = value.array.toProto2(),
98-
index = value.index.toProto2(),
99-
type = value.type.toProto2(),
97+
array = value.array.toProto(),
98+
index = value.index.toProto(),
99+
type = value.type.toProto(),
100100
)
101101
return ProtoValue(ref = ProtoRef(array_access = arrayAccess))
102102
}
103103

104104
override fun visit(value: EtsInstanceFieldRef): ProtoValue {
105105
val instanceFieldRef = ProtoInstanceFieldRef(
106-
instance = value.instance.toProto2(),
107-
field_ = value.field.toProto2(),
108-
type = value.type.toProto2(),
106+
instance = value.instance.toProto(),
107+
field_ = value.field.toProto(),
108+
type = value.type.toProto(),
109109
)
110110
return ProtoValue(ref = ProtoRef(field_ref = ProtoFieldRef(instance = instanceFieldRef)))
111111
}
112112

113113
override fun visit(value: EtsStaticFieldRef): ProtoValue {
114114
val staticFieldRef = ProtoStaticFieldRef(
115-
field_ = value.field.toProto2(),
116-
type = value.type.toProto2(),
115+
field_ = value.field.toProto(),
116+
type = value.type.toProto(),
117117
)
118118
return ProtoValue(ref = ProtoRef(field_ref = ProtoFieldRef(static = staticFieldRef)))
119119
}
120120
}
121121

122-
fun EtsLocal.toProto2(): ProtoLocal = ProtoLocal(
122+
fun EtsLocal.toProto(): ProtoLocal = ProtoLocal(
123123
name = this.name,
124-
type = this.type.toProto2(),
124+
type = this.type.toProto(),
125125
)
126126

127-
fun EtsConstant.toProto2(): ProtoConstant = ProtoConstant(
127+
fun EtsConstant.toProto(): ProtoConstant = ProtoConstant(
128128
value_ = this.toString(),
129-
type = this.type.toProto2()
129+
type = this.type.toProto()
130130
)

0 commit comments

Comments
 (0)