Skip to content

Commit 45039c5

Browse files
fuhsnnfuhsnn
authored
Move addUse() return statement to keep() (#243)
1 parent 4595820 commit 45039c5

23 files changed

Lines changed: 63 additions & 108 deletions

File tree

  • chapter02/src/main/java/com/seaofnodes/simple/node
  • chapter03/src/main/java/com/seaofnodes/simple/node
  • chapter04/src/main/java/com/seaofnodes/simple/node
  • chapter05/src/main/java/com/seaofnodes/simple/node
  • chapter06/src/main/java/com/seaofnodes/simple/node
  • chapter07/src/main/java/com/seaofnodes/simple/node
  • chapter08/src/main/java/com/seaofnodes/simple/node
  • chapter09/src/main/java/com/seaofnodes/simple/node
  • chapter10/src/main/java/com/seaofnodes/simple/node
  • chapter11/src/main/java/com/seaofnodes/simple/node
  • chapter12/src/main/java/com/seaofnodes/simple/node
  • chapter13/src/main/java/com/seaofnodes/simple/node
  • chapter14/src/main/java/com/seaofnodes/simple/node
  • chapter15/src/main/java/com/seaofnodes/simple/node
  • chapter16/src/main/java/com/seaofnodes/simple/node
  • chapter17/src/main/java/com/seaofnodes/simple/node
  • chapter18/src/main/java/com/seaofnodes/simple/node
  • chapter19/src/main/java/com/seaofnodes/simple/node
  • chapter20/src/main/java/com/seaofnodes/simple/node
  • chapter21/src/main/java/com/seaofnodes/simple/node
  • chapter22/src/main/java/com/seaofnodes/simple/node
  • chapter23/src/main/java/com/seaofnodes/simple/node
  • chapter24/src/main/java/com/seaofnodes/simple/node

‎chapter02/src/main/java/com/seaofnodes/simple/node/Node.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Node setDef(int idx, Node new_def ) {
153153
}
154154

155155
// Breaks the edge invariants, used temporarily
156-
protected <N extends Node> N addUse(Node n) { _outputs.add(n); return (N)this; }
156+
protected <N extends Node> void addUse(N n) { _outputs.add(n); }
157157

158158
// Remove node 'use' from 'def's (i.e. our) output list, by compressing the list in-place.
159159
// Return true if the output list is empty afterward.

‎chapter03/src/main/java/com/seaofnodes/simple/node/Node.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ Node addDef(Node new_def) {
177177
}
178178

179179
// Breaks the edge invariants, used temporarily
180-
protected <N extends Node> N addUse(Node n) { _outputs.add(n); return (N)this; }
180+
protected <N extends Node> void addUse(N n) { _outputs.add(n); }
181181

182182
// Remove node 'use' from 'def's (i.e. our) output list, by compressing the list in-place.
183183
// Return true if the output list is empty afterward.

‎chapter04/src/main/java/com/seaofnodes/simple/node/Node.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ Node addDef(Node new_def) {
168168
}
169169

170170
// Breaks the edge invariants, used temporarily
171-
protected <N extends Node> N addUse(Node n) { _outputs.add(n); return (N)this; }
171+
protected <N extends Node> void addUse(N n) { _outputs.add(n); }
172172

173173
// Remove node 'use' from 'def's (i.e. our) output list, by compressing the list in-place.
174174
// Return true if the output list is empty afterward.
@@ -206,7 +206,7 @@ public void kill( ) {
206206

207207
// Shortcuts to stop DCE mid-parse
208208
// Add bogus null use to keep node alive
209-
public <N extends Node> N keep() { return addUse(null); }
209+
public <N extends Node> N keep() { addUse(null); return (N)this; }
210210
// Remove bogus null.
211211
public <N extends Node> N unkeep() { delUse(null); return (N)this; }
212212
// ------------------------------------------------------------------------

‎chapter05/src/main/java/com/seaofnodes/simple/node/Node.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ Node addDef(Node new_def) {
168168
}
169169

170170
// Breaks the edge invariants, used temporarily
171-
protected <N extends Node> N addUse(Node n) { _outputs.add(n); return (N)this; }
171+
protected <N extends Node> void addUse(N n) { _outputs.add(n); }
172172

173173
// Remove node 'use' from 'def's (i.e. our) output list, by compressing the list in-place.
174174
// Return true if the output list is empty afterward.
@@ -206,7 +206,7 @@ public void kill( ) {
206206

207207
// Shortcuts to stop DCE mid-parse
208208
// Add bogus null use to keep node alive
209-
public <N extends Node> N keep() { return addUse(null); }
209+
public <N extends Node> N keep() { addUse(null); return (N)this; }
210210
// Remove bogus null.
211211
public <N extends Node> N unkeep() { delUse(null); return (N)this; }
212212
// ------------------------------------------------------------------------

‎chapter06/src/main/java/com/seaofnodes/simple/node/Node.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ Node addDef(Node new_def) {
189189
}
190190

191191
// Breaks the edge invariants, used temporarily
192-
protected <N extends Node> N addUse(Node n) { _outputs.add(n); return (N)this; }
192+
protected <N extends Node> void addUse(N n) { _outputs.add(n); }
193193

194194
// Remove node 'use' from 'def's (i.e. our) output list, by compressing the list in-place.
195195
// Return true if the output list is empty afterward.
@@ -227,7 +227,7 @@ public void kill( ) {
227227

228228
// Shortcuts to stop DCE mid-parse
229229
// Add bogus null use to keep node alive
230-
public <N extends Node> N keep() { return addUse(null); }
230+
public <N extends Node> N keep() { addUse(null); return (N)this; }
231231
// Remove bogus null.
232232
public <N extends Node> N unkeep() { delUse(null); return (N)this; }
233233
// ------------------------------------------------------------------------

‎chapter07/src/main/java/com/seaofnodes/simple/node/Node.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ Node addDef(Node new_def) {
222222
}
223223

224224
// Breaks the edge invariants, used temporarily
225-
protected <N extends Node> N addUse(Node n) { _outputs.add(n); return (N)this; }
225+
protected <N extends Node> void addUse(N n) { _outputs.add(n); }
226226

227227
// Remove node 'use' from 'def's (i.e. our) output list, by compressing the list in-place.
228228
// Return true if the output list is empty afterward.
@@ -260,7 +260,7 @@ public void kill( ) {
260260

261261
// Shortcuts to stop DCE mid-parse
262262
// Add bogus null use to keep node alive
263-
public <N extends Node> N keep() { return addUse(null); }
263+
public <N extends Node> N keep() { addUse(null); return (N)this; }
264264
// Remove bogus null.
265265
public <N extends Node> N unkeep() { delUse(null); return (N)this; }
266266

‎chapter08/src/main/java/com/seaofnodes/simple/node/Node.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ Node addDef(Node new_def) {
224224
}
225225

226226
// Breaks the edge invariants, used temporarily
227-
protected <N extends Node> N addUse(Node n) { _outputs.add(n); return (N)this; }
227+
protected <N extends Node> void addUse(N n) { _outputs.add(n); }
228228

229229
// Remove node 'use' from 'def's (i.e. our) output list, by compressing the list in-place.
230230
// Return true if the output list is empty afterward.
@@ -262,7 +262,7 @@ public void kill( ) {
262262

263263
// Shortcuts to stop DCE mid-parse
264264
// Add bogus null use to keep node alive
265-
public <N extends Node> N keep() { return addUse(null); }
265+
public <N extends Node> N keep() { addUse(null); return (N)this; }
266266
// Remove bogus null.
267267
public <N extends Node> N unkeep() { delUse(null); return (N)this; }
268268

‎chapter09/src/main/java/com/seaofnodes/simple/node/Node.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ Node addDef(Node new_def) {
234234
}
235235

236236
// Breaks the edge invariants, used temporarily
237-
protected <N extends Node> N addUse(Node n) { _outputs.add(n); return (N)this; }
237+
protected <N extends Node> void addUse(N n) { _outputs.add(n); }
238238

239239
// Remove node 'use' from 'def's (i.e. our) output list, by compressing the list in-place.
240240
// Return true if the output list is empty afterward.
@@ -281,7 +281,7 @@ public void kill( ) {
281281

282282
// Shortcuts to stop DCE mid-parse
283283
// Add bogus null use to keep node alive
284-
public <N extends Node> N keep() { return addUse(null); }
284+
public <N extends Node> N keep() { addUse(null); return (N)this; }
285285
// Remove bogus null.
286286
public <N extends Node> N unkeep() { delUse(null); return (N)this; }
287287

‎chapter10/src/main/java/com/seaofnodes/simple/node/Node.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ Node addDef(Node new_def) {
207207
}
208208

209209
// Breaks the edge invariants, used temporarily
210-
protected <N extends Node> N addUse(Node n) { _outputs.add(n); return (N)this; }
210+
protected <N extends Node> void addUse(N n) { _outputs.add(n); }
211211

212212
// Remove node 'use' from 'def's (i.e. our) output list, by compressing the list in-place.
213213
// Return true if the output list is empty afterward.
@@ -254,12 +254,9 @@ public void kill( ) {
254254

255255
// Shortcuts to stop DCE mid-parse
256256
// Add bogus null use to keep node alive
257-
public <N extends Node> N keep() { return addUse(null); }
257+
public <N extends Node> N keep() { addUse(null); return (N)this; }
258258
// Remove bogus null.
259-
public <N extends Node> N unkeep() {
260-
delUse(null);
261-
return (N)this;
262-
}
259+
public <N extends Node> N unkeep() { delUse(null); return (N)this; }
263260
// Test "keep" status
264261
public boolean iskeep() { return Utils.find(_outputs,null) != -1; }
265262

‎chapter11/src/main/java/com/seaofnodes/simple/node/Node.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public Node addDef(Node new_def) {
207207
}
208208

209209
// Breaks the edge invariants, used temporarily
210-
protected <N extends Node> N addUse(Node n) { _outputs.add(n); return (N)this; }
210+
protected <N extends Node> void addUse(N n) { _outputs.add(n); }
211211

212212
// Remove node 'use' from 'def's (i.e. our) output list, by compressing the list in-place.
213213
// Return true if the output list is empty afterward.
@@ -254,12 +254,9 @@ public void kill( ) {
254254

255255
// Shortcuts to stop DCE mid-parse
256256
// Add bogus null use to keep node alive
257-
public <N extends Node> N keep() { return addUse(null); }
257+
public <N extends Node> N keep() { addUse(null); return (N)this; }
258258
// Remove bogus null.
259-
public <N extends Node> N unkeep() {
260-
delUse(null);
261-
return (N)this;
262-
}
259+
public <N extends Node> N unkeep() { delUse(null); return (N)this; }
263260
// Test "keep" status
264261
public boolean iskeep() { return Utils.find(_outputs,null) != -1; }
265262

0 commit comments

Comments
 (0)