mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2025-04-06 14:30:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename modulo to remainder

Browse Source
This commit is contained in:
Octavia Togami 2024-02-24 15:56:26 -08:00
parent 1acb9d6338
commit 2db12d7ddf
No known key found for this signature in database
GPG Key ID: CC364524D1983C99
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
worldedit-core/src/main/antlr/com/sk89q/worldedit/antlr/Expression.g4
View File

@ -6,7 +6,7 @@ PLUS : '+' ;
MINUS : '-' ;
TIMES : '*' ;
DIVIDE : '/' ;
MODULO : '%' ;
REMAINDER : '%' ;
POWER : '^' | '**' ;
LEFT_SHIFT : '<<' ;
RIGHT_SHIFT : '>>' ;
@ -17,7 +17,7 @@ PLUS_ASSIGN : '+=' ;
MINUS_ASSIGN : '-=' ;
TIMES_ASSIGN : '*=' ;
DIVIDE_ASSIGN : '/=' ;
MODULO_ASSIGN : '%=' ;
REMAINDER_ASSIGN : '%=' ;
POWER_ASSIGN : '^=' ;
EQUAL : '==' ;
@ -144,7 +144,7 @@ assignmentOperator
| POWER_ASSIGN
| TIMES_ASSIGN
| DIVIDE_ASSIGN
| MODULO_ASSIGN
| REMAINDER_ASSIGN
| PLUS_ASSIGN
| MINUS_ASSIGN
;
@ -202,7 +202,7 @@ multiplicativeExpression
op=
( TIMES
| DIVIDE
| MODULO
| REMAINDER
) right=powerExpression # MultiplicativeExpr
;

2
worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/Expression.java
View File

@ -45,7 +45,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
* <ul>
* <li>Logical: &amp;&amp;, ||, ! (unary)</li>
* <li>Bitwise: ~ (unary), &gt;&gt;, &lt;&lt;</li>
* <li>Arithmetic: +, -, *, /, % (modulo), ^ (power), - (unary), --, ++ (prefix only)</li>
* <li>Arithmetic: +, -, *, /, % (remainder), ^ (power), - (unary), --, ++ (prefix only)</li>
* <li>Comparison: &lt;=, &gt;=, &gt;, &lt;, ==, !=, ~= (near)</li>
* </ul>
*

8
worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/invoke/CompilingVisitor.java
View File

@ -56,13 +56,13 @@ import static com.sk89q.worldedit.antlr.ExpressionLexer.LESS_THAN;
import static com.sk89q.worldedit.antlr.ExpressionLexer.LESS_THAN_OR_EQUAL;
import static com.sk89q.worldedit.antlr.ExpressionLexer.MINUS;
import static com.sk89q.worldedit.antlr.ExpressionLexer.MINUS_ASSIGN;
import static com.sk89q.worldedit.antlr.ExpressionLexer.MODULO;
import static com.sk89q.worldedit.antlr.ExpressionLexer.MODULO_ASSIGN;
import static com.sk89q.worldedit.antlr.ExpressionLexer.NEAR;
import static com.sk89q.worldedit.antlr.ExpressionLexer.NOT_EQUAL;
import static com.sk89q.worldedit.antlr.ExpressionLexer.PLUS;
import static com.sk89q.worldedit.antlr.ExpressionLexer.PLUS_ASSIGN;
import static com.sk89q.worldedit.antlr.ExpressionLexer.POWER_ASSIGN;
import static com.sk89q.worldedit.antlr.ExpressionLexer.REMAINDER;
import static com.sk89q.worldedit.antlr.ExpressionLexer.REMAINDER_ASSIGN;
import static com.sk89q.worldedit.antlr.ExpressionLexer.RIGHT_SHIFT;
import static com.sk89q.worldedit.antlr.ExpressionLexer.TIMES;
import static com.sk89q.worldedit.antlr.ExpressionLexer.TIMES_ASSIGN;
@ -403,7 +403,7 @@ class CompilingVisitor extends ExpressionBaseVisitor<MethodHandle> {
return (l, r) -> l * r;
case DIVIDE:
return (l, r) -> l / r;
case MODULO:
case REMAINDER:
return (l, r) -> l % r;
default:
throw ExpressionHelper.evalException(ctx, "Invalid text for multiplicative expr: " + ctx.op.getText());
@ -555,7 +555,7 @@ class CompilingVisitor extends ExpressionBaseVisitor<MethodHandle> {
case DIVIDE_ASSIGN:
value /= arg;
break;
case MODULO_ASSIGN:
case REMAINDER_ASSIGN:
value %= arg;
break;
case PLUS_ASSIGN: