mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-26 22:42:41 -08:00
Code Issues Projects Releases Wiki Activity

Fix Integer.MIN_VALUE not getting parsed correctly and add [-+]0[xb] (#10586)

Browse source 
* Fix Integer.MIN_VALUE not getting parsed correctly and add [-+]0[xb]

* Handle number parsing edgecases

* Revert "Handle number parsing edgecases"

This reverts commit 6b7b01e636.

* Fix formatting
This commit is contained in:
camelStyleUser 2025-04-04 20:12:03 +03:00 • committed by GitHub
parent 2159f6450b
commit bd0436bbff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/src/mindustry/logic/LAssembler.java
View file

@ -11,7 +11,8 @@ import mindustry.logic.LExecutor.*;
public class LAssembler{
public static ObjectMap<String, Func<String[], LStatement>> customParsers = new ObjectMap<>();
private static final int invalidNum = Integer.MIN_VALUE;
private static final int invalidNumNegative = Integer.MIN_VALUE;
private static final int invalidNumPositive = Integer.MAX_VALUE;
private boolean privileged;
/** Maps names to variable. */
@ -72,9 +73,11 @@ public class LAssembler{
//remove spaces for non-strings
symbol = symbol.replace(' ', '_');
double value = parseDouble(symbol);
//use a positive invalid number if number might be negative, else use a negative invalid number
int usedInvalidNum = symbol.startsWith("-") ? invalidNumPositive : invalidNumNegative;
double value = parseDouble(symbol, usedInvalidNum);
if(value == invalidNum){
if(value == usedInvalidNum){
return putVar(symbol);
}else{
//this creates a hidden const variable with the specified value
@ -82,10 +85,14 @@ public class LAssembler{
}
}
double parseDouble(String symbol){
double parseDouble(String symbol, int invalidNum){
//parse hex/binary syntax
if(symbol.startsWith("0b")) return Strings.parseLong(symbol, 2, 2, symbol.length(), invalidNum);
if(symbol.startsWith("+0b")) return Strings.parseLong(symbol, 2, 3, symbol.length(), invalidNum);
if(symbol.startsWith("-0b")) return -Strings.parseLong(symbol, 2, 3, symbol.length(), invalidNum);//FIXME: breaks with Long.MIN_VALUE
if(symbol.startsWith("0x")) return Strings.parseLong(symbol, 16, 2, symbol.length(), invalidNum);
if(symbol.startsWith("+0x")) return Strings.parseLong(symbol, 16, 3, symbol.length(), invalidNum);
if(symbol.startsWith("-0x")) return -Strings.parseLong(symbol, 16, 3, symbol.length(), invalidNum);//FIXME: breaks with Long.MIN_VALUE
if(symbol.startsWith("%") && (symbol.length() == 7 || symbol.length() == 9)) return parseColor(symbol);
return Strings.parseDouble(symbol, invalidNum);