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

add support for array qualifiers after a variable name

Browse Source
This commit is contained in:
Dave Holoway
2020-06-07 15:40:28 +01:00
parent c56732c689
commit fc9d58b9da
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -523,7 +523,7 @@ function catchFinallyBlocks(s, tokens, locals, method, imports, typemap) {
let exceptionVar; let exceptionVar;
if (catchinfo.types[0] && catchinfo.name) { if (catchinfo.types[0] && catchinfo.name) {
checkLocalModifiers(tokens, mods); checkLocalModifiers(tokens, mods);
exceptionVar = new Local(mods, catchinfo.name.value, catchinfo.name, catchinfo.types[0]); exceptionVar = new Local(mods, catchinfo.name.value, catchinfo.name, catchinfo.types[0], 0);
} }
catchinfo.block = statementBlock(tokens, [...locals, exceptionVar], method, imports, typemap); catchinfo.block = statementBlock(tokens, [...locals, exceptionVar], method, imports, typemap);
s.catches.push(catchinfo); s.catches.push(catchinfo);
@@ -755,8 +755,15 @@ function expression_or_var_decl(tokens, locals, method, imports, typemap) {
const new_locals = []; const new_locals = [];
checkLocalModifiers(tokens, mods); checkLocalModifiers(tokens, mods);
for (;;) { for (;;) {
let local = new Local(mods, tokens.current.value, tokens.current, matches.types[0]); const name = tokens.current;
tokens.inc(); tokens.inc();
// look for [] after the variable name
let postnamearrdims = 0;
while (tokens.isValue('[')) {
postnamearrdims += 1;
tokens.expectValue(']');
}
let local = new Local(mods, name.value, name, matches.types[0], postnamearrdims);
if (tokens.isValue('=')) { if (tokens.isValue('=')) {
const op = tokens.previous; const op = tokens.previous;
local.init = expression(tokens, locals, method, imports, typemap); local.init = expression(tokens, locals, method, imports, typemap);
@@ -2177,12 +2184,20 @@ class Local {
* @param {string} name * @param {string} name
* @param {Token} decltoken * @param {Token} decltoken
* @param {JavaType} type * @param {JavaType} type
* @param {JavaType} type
* @param {number} postnamearrdims
*/ */
constructor(modifiers, name, decltoken, type) { constructor(modifiers, name, decltoken, type, postnamearrdims) {
this.finalToken = modifiers.find(m => m.source === 'final') || null; this.finalToken = modifiers.find(m => m.source === 'final') || null;
this.name = name; this.name = name;
this.decltoken = decltoken; this.decltoken = decltoken;
if (postnamearrdims > 0) {
this.type = (type instanceof ArrayType)
? new ArrayType(type.base, type.arrdims + postnamearrdims)
: new ArrayType(type, postnamearrdims);
} else {
this.type = type; this.type = type;
}
this.init = null; this.init = null;
} }
} }