Skip to content

Commit bade0a8

Browse files
authored
[wpiunits] Use div instead of divide for kotlin compatibility (#7387)
1 parent 453335e commit bade0a8

32 files changed

+1293
-1293
lines changed

epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/EpilogueGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public static boolean shouldLog(Logged.Importance importance) {
176176
out.println(" config.loggingPeriod = Seconds.of(robot.getPeriod());");
177177
out.println(" }");
178178
out.println(" if (config.loggingPeriodOffset == null) {");
179-
out.println(" config.loggingPeriodOffset = config.loggingPeriod.divide(2);");
179+
out.println(" config.loggingPeriodOffset = config.loggingPeriod.div(2);");
180180
out.println(" }");
181181
out.println();
182182
out.println(" robot.addPeriodic(() -> {");

epilogue-processor/src/test/java/edu/wpi/first/epilogue/processor/EpilogueGeneratorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public static void bind(edu.wpi.first.epilogue.Example robot) {
172172
config.loggingPeriod = Seconds.of(robot.getPeriod());
173173
}
174174
if (config.loggingPeriodOffset == null) {
175-
config.loggingPeriodOffset = config.loggingPeriod.divide(2);
175+
config.loggingPeriodOffset = config.loggingPeriod.div(2);
176176
}
177177
178178
robot.addPeriodic(() -> {
@@ -252,7 +252,7 @@ public static void bind(edu.wpi.first.epilogue.AlphaBot robot) {
252252
config.loggingPeriod = Seconds.of(robot.getPeriod());
253253
}
254254
if (config.loggingPeriodOffset == null) {
255-
config.loggingPeriodOffset = config.loggingPeriod.divide(2);
255+
config.loggingPeriodOffset = config.loggingPeriod.div(2);
256256
}
257257
258258
robot.addPeriodic(() -> {
@@ -284,7 +284,7 @@ public static void bind(edu.wpi.first.epilogue.BetaBot robot) {
284284
config.loggingPeriod = Seconds.of(robot.getPeriod());
285285
}
286286
if (config.loggingPeriodOffset == null) {
287-
config.loggingPeriodOffset = config.loggingPeriod.divide(2);
287+
config.loggingPeriodOffset = config.loggingPeriod.div(2);
288288
}
289289
290290
robot.addPeriodic(() -> {

wpiunits/src/generate/main/java/Measure-interface.java.jinja

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,18 @@ public interface {{ helpers['type_decl'](name) }} extends Measure<{{ helpers['mt
6666
}
6767

6868
@Override
69-
default {{ helpers['type_usage'](name) }} divide(double divisor) {
69+
default {{ helpers['type_usage'](name) }} div(double divisor) {
7070
return ({{ helpers['type_usage'](name) }}) unit().ofBaseUnits(baseUnitMagnitude() / divisor);
7171
}
7272

7373
@Override
7474
default {{ config[name]['divide']['Time'] or "Velocity<{}>".format(helpers['mtou'](name)) }} per(TimeUnit period) {
75-
return divide(period.of(1));
75+
return div(period.of(1));
7676
}
7777
{% for unit in math_units -%}
7878
{% if unit == "Dimensionless" %}
7979
@Override
80-
default {{ helpers['type_usage'](name) }} divide({{ unit }} divisor) {
80+
default {{ helpers['type_usage'](name) }} div({{ unit }} divisor) {
8181
return ({{ helpers['type_usage'](name) }}) {{ config[name]['base_unit'] }}.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
8282
}
8383

@@ -103,23 +103,23 @@ public interface {{ helpers['type_decl'](name) }} extends Measure<{{ helpers['mt
103103
{% endif -%}
104104
{% if unit in config[name]['divide'] %}
105105
@Override
106-
default {{ config[name]['divide'][unit] }} divide({{ unit }} divisor) {
106+
default {{ config[name]['divide'][unit] }} div({{ unit }} divisor) {
107107
return {{ config[config[name]['divide'][unit]]['base_unit'] }}.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
108108
}
109109
{% elif unit == "Time" %}
110110
@Override
111-
default Velocity<{{ helpers['mtou'](name) }}> divide({{ unit }} divisor) {
111+
default Velocity<{{ helpers['mtou'](name) }}> div({{ unit }} divisor) {
112112
return VelocityUnit.combine(unit(), divisor.unit()).ofBaseUnits(baseUnitMagnitude() / divisor.baseUnitMagnitude());
113113
}
114114
{% elif unit == name %}
115115
@Override
116-
default Dimensionless divide({{ unit }} divisor) {
116+
default Dimensionless div({{ unit }} divisor) {
117117
return Value.of(baseUnitMagnitude() / divisor.baseUnitMagnitude());
118118
}
119119
{% else %}
120120
@Override
121-
default Per<{{ helpers['mtou'](name) }}, {{ helpers['mtou'](unit) }}> divide({{ unit }} divisor) {
122-
return (Per<{{ helpers['mtou'](name) }}, {{ helpers['mtou'](unit) }}>) Measure.super.divide(divisor);
121+
default Per<{{ helpers['mtou'](name) }}, {{ helpers['mtou'](unit) }}> div({{ unit }} divisor) {
122+
return (Per<{{ helpers['mtou'](name) }}, {{ helpers['mtou'](unit) }}>) Measure.super.div(divisor);
123123
}
124124
{% endif -%}
125125
{% endif -%}

wpiunits/src/generated/main/java/edu/wpi/first/units/measure/Acceleration.java

Lines changed: 50 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)