Skip to content

Commit 1f162ad

Browse files
DSouzaMDSouzaM
committed
Put synthetic DSL arguments on new lines
1 parent e446b60 commit 1f162ad

File tree

2 files changed

+61
-21
lines changed

2 files changed

+61
-21
lines changed

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/BinaryArithmetic.java

Lines changed: 57 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -349,22 +349,30 @@ public abstract static class TrueDivNode extends BinaryArithmeticRaiseNode {
349349
public static final Supplier<NotImplementedHandler> NOT_IMPLEMENTED = createHandler("/");
350350

351351
@Specialization
352-
public static double doII(int x, int y, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
352+
public static double doII(int x, int y,
353+
@Bind("this") Node inliningTarget,
354+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
353355
return doDD(x, y, inliningTarget, raiseNode);
354356
}
355357

356358
@Specialization
357-
public static double doLD(long x, double y, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
359+
public static double doLD(long x, double y,
360+
@Bind("this") Node inliningTarget,
361+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
358362
return doDD(x, y, inliningTarget, raiseNode);
359363
}
360364

361365
@Specialization
362-
public static double doDL(double x, long y, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
366+
public static double doDL(double x, long y,
367+
@Bind("this") Node inliningTarget,
368+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
363369
return doDD(x, y, inliningTarget, raiseNode);
364370
}
365371

366372
@Specialization
367-
public static double doDD(double x, double y, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
373+
public static double doDD(double x, double y,
374+
@Bind("this") Node inliningTarget,
375+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
368376
raiseDivisionByZero(y == 0.0, inliningTarget, raiseNode);
369377
return x / y;
370378
}
@@ -382,13 +390,17 @@ public abstract static class FloorDivNode extends BinaryArithmeticRaiseNode {
382390
public static final Supplier<NotImplementedHandler> NOT_IMPLEMENTED = createHandler("//");
383391

384392
@Specialization
385-
public static int doII(int left, int right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
393+
public static int doII(int left, int right,
394+
@Bind("this") Node inliningTarget,
395+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
386396
raiseIntDivisionByZero(right == 0, inliningTarget, raiseNode);
387397
return Math.floorDiv(left, right);
388398
}
389399

390400
@Specialization(rewriteOn = OverflowException.class)
391-
public static long doLL(long left, long right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) throws OverflowException {
401+
public static long doLL(long left, long right,
402+
@Bind("this") Node inliningTarget,
403+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) throws OverflowException {
392404
if (left == Long.MIN_VALUE && right == -1) {
393405
throw OverflowException.INSTANCE;
394406
}
@@ -397,19 +409,25 @@ public static long doLL(long left, long right, @Bind("this") Node inliningTarget
397409
}
398410

399411
@Specialization
400-
public static double doDL(double left, long right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
412+
public static double doDL(double left, long right,
413+
@Bind("this") Node inliningTarget,
414+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
401415
raiseDivisionByZero(right == 0, inliningTarget, raiseNode);
402416
return Math.floor(left / right);
403417
}
404418

405419
@Specialization
406-
public static double doDD(double left, double right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
420+
public static double doDD(double left, double right,
421+
@Bind("this") Node inliningTarget,
422+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
407423
raiseDivisionByZero(right == 0.0, inliningTarget, raiseNode);
408424
return Math.floor(left / right);
409425
}
410426

411427
@Specialization
412-
public static double doLD(long left, double right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
428+
public static double doLD(long left, double right,
429+
@Bind("this") Node inliningTarget,
430+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
413431
raiseDivisionByZero(right == 0.0, inliningTarget, raiseNode);
414432
return Math.floor(left / right);
415433
}
@@ -427,31 +445,41 @@ public abstract static class ModNode extends BinaryArithmeticRaiseNode {
427445
public static final Supplier<NotImplementedHandler> NOT_IMPLEMENTED = createHandler("%");
428446

429447
@Specialization
430-
public static int doII(int left, int right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
448+
public static int doII(int left, int right,
449+
@Bind("this") Node inliningTarget,
450+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
431451
raiseIntDivisionByZero(right == 0, inliningTarget, raiseNode);
432452
return Math.floorMod(left, right);
433453
}
434454

435455
@Specialization
436-
public static long doLL(long left, long right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
456+
public static long doLL(long left, long right,
457+
@Bind("this") Node inliningTarget,
458+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
437459
raiseIntDivisionByZero(right == 0, inliningTarget, raiseNode);
438460
return Math.floorMod(left, right);
439461
}
440462

441463
@Specialization
442-
public static double doDL(double left, long right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
464+
public static double doDL(double left, long right,
465+
@Bind("this") Node inliningTarget,
466+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
443467
raiseDivisionByZero(right == 0, inliningTarget, raiseNode);
444468
return FloatBuiltins.ModNode.mod(left, right);
445469
}
446470

447471
@Specialization
448-
public static double doDD(double left, double right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
472+
public static double doDD(double left, double right,
473+
@Bind("this") Node inliningTarget,
474+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
449475
raiseDivisionByZero(right == 0.0, inliningTarget, raiseNode);
450476
return FloatBuiltins.ModNode.mod(left, right);
451477
}
452478

453479
@Specialization
454-
public static double doLD(long left, double right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
480+
public static double doLD(long left, double right,
481+
@Bind("this") Node inliningTarget,
482+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode) {
455483
raiseDivisionByZero(right == 0.0, inliningTarget, raiseNode);
456484
return FloatBuiltins.ModNode.mod(left, right);
457485
}
@@ -612,35 +640,45 @@ public abstract static class DivModNode extends BinaryArithmeticRaiseNode {
612640
public static final Supplier<NotImplementedHandler> NOT_IMPLEMENTED = createHandler("divmod");
613641

614642
@Specialization
615-
public static PTuple doLL(int left, int right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode,
643+
public static PTuple doLL(int left, int right,
644+
@Bind("this") Node inliningTarget,
645+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode,
616646
@Shared("factory") @Cached PythonObjectFactory factory) {
617647
raiseIntDivisionByZero(right == 0, inliningTarget, raiseNode);
618648
return factory.createTuple(new Object[]{Math.floorDiv(left, right), Math.floorMod(left, right)});
619649
}
620650

621651
@Specialization
622-
public static PTuple doLL(long left, long right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode,
652+
public static PTuple doLL(long left, long right,
653+
@Bind("this") Node inliningTarget,
654+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode,
623655
@Shared("factory") @Cached PythonObjectFactory factory) {
624656
raiseIntDivisionByZero(right == 0, inliningTarget, raiseNode);
625657
return factory.createTuple(new Object[]{Math.floorDiv(left, right), Math.floorMod(left, right)});
626658
}
627659

628660
@Specialization
629-
public static PTuple doDL(double left, long right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode,
661+
public static PTuple doDL(double left, long right,
662+
@Bind("this") Node inliningTarget,
663+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode,
630664
@Shared("factory") @Cached PythonObjectFactory factory) {
631665
raiseDivisionByZero(right == 0, inliningTarget, raiseNode);
632666
return factory.createTuple(new Object[]{Math.floor(left / right), FloatBuiltins.ModNode.mod(left, right)});
633667
}
634668

635669
@Specialization
636-
public static PTuple doDD(double left, double right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode,
670+
public static PTuple doDD(double left, double right,
671+
@Bind("this") Node inliningTarget,
672+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode,
637673
@Shared("factory") @Cached PythonObjectFactory factory) {
638674
raiseDivisionByZero(right == 0.0, inliningTarget, raiseNode);
639675
return factory.createTuple(new Object[]{Math.floor(left / right), FloatBuiltins.ModNode.mod(left, right)});
640676
}
641677

642678
@Specialization
643-
public static PTuple doLD(long left, double right, @Bind("this") Node inliningTarget, @Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode,
679+
public static PTuple doLD(long left, double right,
680+
@Bind("this") Node inliningTarget,
681+
@Shared("raiseNode") @Cached PRaiseNode.Lazy raiseNode,
644682
@Shared("factory") @Cached PythonObjectFactory factory) {
645683
raiseDivisionByZero(right == 0.0, inliningTarget, raiseNode);
646684
return factory.createTuple(new Object[]{Math.floor(left / right), FloatBuiltins.ModNode.mod(left, right)});

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/IsNode.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ public static boolean doBB(boolean left, boolean right) {
110110
}
111111

112112
@Specialization
113-
public static boolean doBP(boolean left, PInt right, @Bind("this") Node inliningTarget) {
113+
public static boolean doBP(boolean left, PInt right,
114+
@Bind("this") Node inliningTarget) {
114115
Python3Core core = PythonContext.get(inliningTarget);
115116
if (left) {
116117
return right == core.getTrue();
@@ -177,7 +178,8 @@ public static boolean doDD(double left, double right) {
177178
}
178179

179180
@Specialization
180-
public static boolean doPB(PInt left, boolean right, @Bind("this") Node inliningTarget) {
181+
public static boolean doPB(PInt left, boolean right,
182+
@Bind("this") Node inliningTarget) {
181183
return doBP(right, left, inliningTarget);
182184
}
183185

0 commit comments

Comments
 (0)