Fixes eclipse-jdt#4971 - NumberFormatException in indexing when using dom based ops (eclipse-jdt#4972)

* Fixes eclipse-jdt#4971 - NumberFormatException in indexing when using dom based operations

Signed-off-by: Rob Stryker <rob@oxbeef.net>

Author: robstryker

org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DOMToModelPopulator.java

@@ -803,20 +803,31 @@ public Entry<Object, Integer> memberValue(Expression dom) {
 				value = token.substring(0, token.length() - 1);
 			}
 			if (value instanceof String valueString) {
+				ValueRadix valueRadix = null;
 				// I tried using `yield`, but this caused ECJ to throw an AIOOB, preventing compilation
 				switch (type) {
 					case IMemberValuePair.K_INT: {
 						try {
 							value =  Integer.parseInt(valueString);
 						} catch (NumberFormatException e) {
 							type = IMemberValuePair.K_LONG;
-							value = Long.parseLong(valueString);
+							valueRadix = numberToStringRadix(valueString);
+							value = Long.parseLong(valueRadix.val, valueRadix.radix);
 						}
 						break;
 					}
-					case IMemberValuePair.K_LONG: value = Long.parseLong(valueString); break;
-					case IMemberValuePair.K_SHORT: value = Short.parseShort(valueString); break;
-					case IMemberValuePair.K_BYTE: value = Byte.parseByte(valueString); break;
+					case IMemberValuePair.K_LONG:
+						valueRadix = numberToStringRadix(valueString);
+						value = Long.parseLong(valueRadix.val, valueRadix.radix);
+						break;
+					case IMemberValuePair.K_SHORT:
+						valueRadix = numberToStringRadix(valueString);
+						value = Short.parseShort(valueRadix.val, valueRadix.radix);
+						break;
+					case IMemberValuePair.K_BYTE:
+						valueRadix = numberToStringRadix(valueString);
+						value = Byte.parseByte(valueRadix.val, valueRadix.radix);
+						break;
 					case IMemberValuePair.K_FLOAT: value = Float.parseFloat(valueString); break;
 					case IMemberValuePair.K_DOUBLE: value = Double.parseDouble(valueString); break;
 					default: throw new IllegalArgumentException("Type not (yet?) supported"); //$NON-NLS-1$
@@ -835,6 +846,32 @@ public Entry<Object, Integer> memberValue(Expression dom) {
 		return new SimpleEntry<>(null, IMemberValuePair.K_UNKNOWN);
 	}
 
+	private record ValueRadix(String val, Integer radix) {}
+	private ValueRadix numberToStringRadix(String s) {
+		// 1. Remove underscores
+		s = s.replace("_", ""); //$NON-NLS-1$ //$NON-NLS-2$
+
+		// 2. Remove long suffix
+		if (s.endsWith("l") || s.endsWith("L")) {//$NON-NLS-1$ //$NON-NLS-2$
+		    s = s.substring(0, s.length() - 1);
+		}
+
+		int radix = 10;
+
+		// 3. Detect radix
+		if (s.startsWith("0x") || s.startsWith("0X")) {//$NON-NLS-1$ //$NON-NLS-2$
+		    radix = 16;
+		    s = s.substring(2);
+		} else if (s.startsWith("0b") || s.startsWith("0B")) {//$NON-NLS-1$ //$NON-NLS-2$
+		    radix = 2;
+		    s = s.substring(2);
+		} else if (s.startsWith("0") && s.length() > 1) {//$NON-NLS-1$
+		    radix = 8;
+		    s = s.substring(1);
+		}
+		return new ValueRadix(s, radix);
+	}
+
 	private int toAnnotationValuePairType(String token) {
 		// inspired by NumberLiteral.setToken
 		Scanner scanner = new Scanner();