github/android-dev-ext
1
1
Fork 0
mirror of https://github.com/adelphes/android-dev-ext.git synced 2025-12-23 01:48:18 +00:00
Code Issues 41 Packages Projects Releases Wiki Activity

update primitive type compatibility

Browse Source
This commit is contained in:
Dave Holoway
2020-06-07 14:54:26 +01:00
parent b30228c10b
commit ce6ed14aaa
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
langserver/java/body-parser3.js
View File

@@ -1127,16 +1127,31 @@ function isTypeCastable(source_type, cast_type) {
* eg, long (J) is type-assignable to long, float and double (and their boxed counterparts) * eg, long (J) is type-assignable to long, float and double (and their boxed counterparts)
* Note that void (V) is never type-assignable to anything * Note that void (V) is never type-assignable to anything
*/ */
const valid_primitive_dest_types = { const valid_primitive_types = {
// conversions from a primitive to a value
from: {
B: /^[BSIJFD]$|^Ljava\/lang\/(Byte|Short|Integer|Long|Float|Double);$/,
S: /^[SIJFD]$|^Ljava\/lang\/(Short|Integer|Long|Float|Double);$/,
I: /^[IJFD]$|^Ljava\/lang\/(Integer|Long|Float|Double);$/, I: /^[IJFD]$|^Ljava\/lang\/(Integer|Long|Float|Double);$/,
J: /^[JFD]$|^Ljava\/lang\/(Long|Float|Double);$/, J: /^[JFD]$|^Ljava\/lang\/(Long|Float|Double);$/,
S: /^[SIJFD]$|^Ljava\/lang\/(Short|Integer|Long|Float|Double);$/,
B: /^[BSIJFD]$|^Ljava\/lang\/(Byte|Short|Integer|Long|Float|Double);$/,
F: /^[FD]$|^Ljava\/lang\/(Float|Double);$/, F: /^[FD]$|^Ljava\/lang\/(Float|Double);$/,
D: /^D$|^Ljava\/lang\/(Double);$/, D: /^D$|^Ljava\/lang\/(Double);$/,
C: /^C$|^Ljava\/lang\/(Character);$/, C: /^C$|^Ljava\/lang\/(Character);$/,
Z: /^Z$|^Ljava\/lang\/(Boolean);$/, Z: /^Z$|^Ljava\/lang\/(Boolean);$/,
V: /$^/, // V.test() always returns false V: /$^/, // V.test() always returns false
},
// conversions to a primitive from a value
to: {
B: /^[B]$|^Ljava\/lang\/(Byte);$/,
S: /^[BS]$|^Ljava\/lang\/(Byte|Short);$/,
I: /^[BSIC]$|^Ljava\/lang\/(Byte|Short|Integer|Character);$/,
J: /^[BSIJC]$|^Ljava\/lang\/(Byte|Short|Integer|Long|Character);$/,
F: /^[BSIJCF]$|^Ljava\/lang\/(Byte|Short|Integer|Long|Character|Float);$/,
D: /^[BSIJCFD]$|^Ljava\/lang\/(Byte|Short|Integer|Long|Character|Float|Double);$/,
C: /^C$|^Ljava\/lang\/(Character);$/,
Z: /^Z$|^Ljava\/lang\/(Boolean);$/,
V: /$^/, // V.test() always returns false
}
} }
/** /**
@@ -1156,8 +1171,11 @@ function isTypeAssignable(dest_type, value_type) {
// everything is assignable to Object // everything is assignable to Object
is_assignable = true; is_assignable = true;
} else if (value_type instanceof PrimitiveType) { } else if (value_type instanceof PrimitiveType) {
// primitives can only be assinged to other widening primitives or their class equivilents // primitive values can only be assigned to wider primitives or their class equivilents
is_assignable = valid_primitive_dest_types[value_type.typeSignature].test(dest_type.typeSignature); is_assignable = valid_primitive_types.from[value_type.typeSignature].test(dest_type.typeSignature);
} else if (dest_type instanceof PrimitiveType) {
// primitive variables can only be assigned from narrower primitives or their class equivilents
is_assignable = valid_primitive_types.to[dest_type.typeSignature].test(value_type.typeSignature);
} else if (value_type instanceof NullType) { } else if (value_type instanceof NullType) {
// null is assignable to any non-primitive // null is assignable to any non-primitive
is_assignable = !(dest_type instanceof PrimitiveType); is_assignable = !(dest_type instanceof PrimitiveType);