Skip to content

Commit 697de9e

Browse files
gselzergselzer
committed
Clean up .list files
1 parent 975501a commit 697de9e

8 files changed

Lines changed: 48 additions & 130 deletions

File tree

‎templates/main/java/org/scijava/ops/core/builder/OpBuilder.list‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
arities = (1..maxArity).collect()
33

44
[OpBuilder.java]
5-
inplaceArityNumber = ```
6-
{ arity, num ->
7-
arity == 1 ? '1' :
8-
"${arity}_${num}"
9-
}
10-
```
115
inplaceMatchNumber = ```
126
{ arity, num ->
137
arity == 1 ? '' :

‎templates/main/java/org/scijava/ops/core/builder/OpBuilder.vm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public class OpBuilder {
252252
}
253253

254254
#foreach($a in [1..$arity])
255-
public Inplaces.Arity$inplaceArityNumber.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() {
255+
public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() {
256256
return Inplaces.match${inplaceMatchNumber.call($arity, $a)}(ops, opName, $inputTypes.call($arity));
257257
}
258258
#end
@@ -293,7 +293,7 @@ public class OpBuilder {
293293
}
294294

295295
#foreach($a in [1..$arity])
296-
public Inplaces.Arity$inplaceArityNumber.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() {
296+
public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() {
297297
return Inplaces.match${inplaceMatchNumber.call($arity, $a)}(ops, opName, $inputTypes.call($arity));
298298
}
299299
#end
@@ -375,7 +375,7 @@ public class OpBuilder {
375375
}
376376

377377
#foreach($a in [1..$arity])
378-
public Inplaces.Arity$inplaceArityNumber.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}(){
378+
public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}(){
379379
return Inplaces.match${inplaceMatchNumber.call($arity, $a)}(ops, opName, $inputTypesFromArgs.call($arity));
380380
}
381381
#end

‎templates/main/java/org/scijava/ops/function/Computers.list‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
arities = (0..maxArity).collect()
33

44
[Computers.java]
5-
generics = ```
6-
{ arity ->
7-
'<' + String.join(', ', genericParamTypes(arity)) + '>'
8-
}
9-
```
105
nilArgs = ```
116
{ arity ->
127
names = nilNames(arity)
@@ -25,25 +20,4 @@ matchParams = ```
2520
String.join(', ', nilArgs)
2621
}
2722
```
28-
typeArgs = ```
29-
{ arity ->
30-
String.join(', ', nilNames(arity).stream().map{a -> "${a}.getType()"}.collect())
31-
}
32-
```
33-
computeParams = ```
34-
{ arity ->
35-
typeParams = typeParamsList(arity)
36-
typeParams.set(arity, "@Mutable " + typeParams.get(arity))
37-
String.join(', ', typeParams)
38-
}
39-
```
40-
acceptParams = ```
41-
{ arity ->
42-
String.join(', ', typeParamsList(arity).stream().map{a -> "final " + a}.collect())
43-
}
44-
```
45-
computeArgs = ```
46-
{ arity ->
47-
String.join(', ', genericsNamesList(arity))
48-
}
49-
```
23+

‎templates/main/java/org/scijava/ops/function/Consumers.list‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ typeParamsList = ```
2525
```
2626

2727
[Consumers.java]
28-
consumerArity = ```
29-
{ arity ->
30-
arity == 0 ? 'Consumer' :
31-
arity == 1 ? 'BiConsumer' :
32-
"Consumers.Arity${arity+1}"
33-
}
34-
```
3528
objectString =```
3629
{ arity ->
3730
String.join(', ', (1..arity).stream().map{a -> "Object"}.collect())
@@ -57,15 +50,3 @@ generic = ```
5750
genericsList(arity)[num-1]
5851
}
5952
```
60-
acceptParams = ```
61-
{ arity ->
62-
types = typeParamsList(arity)
63-
String.join(', ', (1..arity).stream().map{a -> "final ${types[a-1]}"}.collect())
64-
}
65-
```
66-
acceptArgs = ```
67-
{ arity ->
68-
names = genericsNamesList(arity)
69-
String.join(', ', (1..arity).stream().map{a -> "${names[a-1]}"}.collect())
70-
}
71-
```

‎templates/main/java/org/scijava/ops/function/Functions.list‎

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,6 @@
22
arities = (3..maxArity).collect()
33

44
[Functions.java]
5-
arityClassName = ```
6-
{ arity ->
7-
arity == 0 ? 'Producer' :
8-
arity == 1 ? 'Function' :
9-
arity == 2 ? 'BiFunction' :
10-
"Functions.Arity${arity}"
11-
}
12-
```
13-
arityClass = ```
14-
{ arity ->
15-
arityClassName.call(arity) + '.class'
16-
}
17-
```
18-
generics = ```
19-
{ arity ->
20-
'<' + String.join(', ', genericParamTypes(arity)) + '>'
21-
}
22-
```
235
genericsO2 = ```
246
{ arity ->
257
arity == 0 ? '<O2>' :
@@ -33,11 +15,6 @@ matchParams = ```
3315
String.join(', ', (0..arity).stream().map{a -> "final Nil<${generics[a]}> ${names[a]}Type"}.collect())
3416
}
3517
```
36-
typeArgs = ```
37-
{ arity ->
38-
String.join(', ', genericsNamesList(arity).stream().map{a -> "${a}Type.getType()"}.collect())
39-
}
40-
```
4118
nilArgs = ```
4219
{ arity ->
4320
names = genericsNamesList(arity)
@@ -46,16 +23,4 @@ nilArgs = ```
4623
String.join(', ', names.stream().map{a -> "${a}Type"}.collect())
4724
}
4825
```
49-
applyParams = ```
50-
{ arity ->
51-
typeParams = typeParamsList(arity)
52-
typeParams.remove(typeParams.size() - 1)
53-
String.join(', ', typeParams)
54-
}
55-
```
56-
applyArgs = ```
57-
{ arity ->
58-
names = genericsNamesList(arity)
59-
String.join(', ', names[0..names.size() - 2])
60-
}
61-
```
26+

‎templates/main/java/org/scijava/ops/function/Functions.vm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public final class Functions {
5252
static {
5353
final Map<Class<?>, Integer> functions = new HashMap<>(10);
5454
#foreach($arity in [0..$maxArity])
55-
functions.put($arityClass.call($arity), $arity);
55+
functions.put(${functionArity.call($arity)}.class, $arity);
5656
#end
5757
ALL_FUNCTIONS = ImmutableBiMap.copyOf(functions);
5858
}
@@ -71,8 +71,8 @@ public final class Functions {
7171

7272
#foreach($arity in [0..$maxArity])
7373
@SuppressWarnings({ "unchecked" })
74-
public static $generics.call($arity) $arityClassName.call($arity)$generics.call($arity) match(final OpService ops, final String opName, $matchParams.call($arity)) {
75-
return matchHelper(ops, opName, ${arityClassName.call($arity)}.class, $nilArgs.call($arity));
74+
public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) match(final OpService ops, final String opName, $matchParams.call($arity)) {
75+
return matchHelper(ops, opName, ${functionArity.call($arity)}.class, $nilArgs.call($arity));
7676
}
7777

7878
#end

‎templates/main/java/org/scijava/ops/function/Globals.list‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ nilNames = ```
6464
genericsNamesList(arity).stream().map{a -> "${a}Type"}.collect()
6565
}
6666
```
67+
typeArgs = ```
68+
{ arity ->
69+
String.join(', ', nilNames(arity).stream().map{a -> "${a}.getType()"}.collect())
70+
}
71+
```
6772
typeParamsList = ```
6873
{ arity ->
6974
gpt = genericParamTypes(arity)
@@ -78,4 +83,39 @@ typeParamsListWithoutOutput = ```
7883
(0..arity-1).stream().map{a -> "${gpt[a]} ${names[a]}"}.collect()
7984
}
8085
```
86+
applyParams = ```
87+
{ arity ->
88+
typeParams = typeParamsList(arity)
89+
typeParams.remove(typeParams.size() - 1)
90+
String.join(', ', typeParams)
91+
}
92+
```
93+
applyArgs = ```
94+
{ arity ->
95+
names = genericsNamesList(arity)
96+
String.join(', ', names[0..names.size() - 2])
97+
}
98+
```
99+
computeParams = ```
100+
{ arity ->
101+
typeParams = typeParamsList(arity)
102+
typeParams.set(arity, "@Mutable " + typeParams.get(arity))
103+
String.join(', ', typeParams)
104+
}
105+
```
106+
acceptParams = ```
107+
{ arity ->
108+
String.join(', ', typeParamsList(arity).stream().map{a -> "final " + a}.collect())
109+
}
110+
```
111+
computeArgs = ```
112+
{ arity ->
113+
String.join(', ', genericsNamesList(arity))
114+
}
115+
```
116+
acceptArgs = ```
117+
{ arity ->
118+
computeArgs(arity)
119+
}
120+
```
81121

‎templates/main/java/org/scijava/ops/function/OpWrappers.list‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -64,42 +64,6 @@ matchParams = ```
6464
String.join(', ', nilArgs)
6565
}
6666
```
67-
typeArgs = ```
68-
{ arity ->
69-
String.join(', ', nilNames(arity).stream().map{a -> "${a}.getType()"}.collect())
70-
}
71-
```
72-
applyParams = ```
73-
{ arity ->
74-
typeParams = typeParamsList(arity)
75-
typeParams.remove(typeParams.size() - 1);
76-
String.join(', ', typeParams)
77-
}
78-
```
79-
applyArgs = ```
80-
{ arity ->
81-
names = genericsNamesList(arity)
82-
names.remove(names.size() - 1)
83-
String.join(', ', names)
84-
}
85-
```
86-
computeParams = ```
87-
{ arity ->
88-
typeParams = typeParamsList(arity)
89-
typeParams.set(arity, "@Mutable " + typeParams.get(arity))
90-
String.join(', ', typeParams)
91-
}
92-
```
93-
acceptParams = ```
94-
{ arity ->
95-
String.join(', ', typeParamsList(arity).stream().map{a -> "final " + a}.collect())
96-
}
97-
```
98-
computeArgs = ```
99-
{ arity ->
100-
String.join(', ', genericsNamesList(arity))
101-
}
102-
```
10367
mutateArgsList = ```
10468
{ arity, io ->
10569
inplaceTypeVarNums(arity, io).stream().map{a -> a == 'O' ? "ioType" : "in${a}Type"}.collect()

0 commit comments

Comments
 (0)