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

remove local modifier validation during parse

Browse Source 
add parameter modifier checking to validation
This commit is contained in:
Dave Holoway
2020-06-15 17:16:39 +01:00
parent 4af183e4e1
commit 14582503da
2 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -352,7 +352,8 @@ function statement(tokens, mdecls, method, imports, typemap) {
}
// modifiers are only allowed on local variable decls
if (modifiers.length) {
s = var_decl(modifiers, tokens, mdecls, method, imports, typemap);
const type = typeIdent(tokens, method, imports, typemap);
s = var_ident_list(modifiers, type, null, tokens, mdecls, method, imports, typemap)
addLocals(tokens, mdecls, s);
semicolon(tokens);
return s;
@@ -789,7 +790,6 @@ function parameterDeclaration(type_vars, owner, tokens, imports, typemap) {
modifiers.push(tokens.current);
tokens.inc();
}
checkLocalModifiers(tokens, modifiers);
let type_ident = typeIdent(tokens, owner, imports, typemap, { no_array_qualifiers: false, type_vars });
const varargs = tokens.isValue('...');
let name_token = tokens.current;
@@ -1148,7 +1148,6 @@ function catchFinallyBlocks(s, tokens, mdecls, method, imports, typemap) {
mdecls.pushScope();
let exceptionVar;
if (catchinfo.types[0] && catchinfo.name) {
checkLocalModifiers(tokens, mods);
exceptionVar = new Local(mods, catchinfo.name.value, catchinfo.name, catchinfo.types[0], 0);
mdecls.locals.push(exceptionVar);
}
@@ -1360,19 +1359,6 @@ function checkThrowExpression(tokens, throw_expression, typemap) {
}
}
/**
* @param {TokenList} tokens
* @param {MethodDeclarations} mdecls
* @param {Scope} scope
* @param {ResolvedImport[]} imports
* @param {Map<string,JavaType>} typemap
* @returns {Local[]}
*/
function var_decl(mods, tokens, mdecls, scope, imports, typemap) {
const type = typeIdent(tokens, scope, imports, typemap);
return var_ident_list(mods, type, null, tokens, mdecls, scope, imports, typemap)
}
/**
*
* @param {Token[]} mods
@@ -1385,7 +1371,6 @@ function var_decl(mods, tokens, mdecls, scope, imports, typemap) {
* @param {Map<string,JavaType>} typemap
*/
function var_ident_list(mods, type, first_ident, tokens, mdecls, scope, imports, typemap) {
checkLocalModifiers(tokens, mods);
const new_locals = [];
for (;;) {
let name;
@@ -1467,20 +1452,6 @@ function expression_list_or_var_decl(tokens, mdecls, scope, imports, typemap) {
return expressions;
}
/**
* @param {Token[]} mods
*/
function checkLocalModifiers(tokens, mods) {
for (let i=0; i < mods.length; i++) {
if (mods[i].value !== 'final') {
addproblem(tokens, ParseProblem.Error(mods[i], `Modifier '${mods[i].source}' cannot be applied to local variable declarations.`));
} else if (mods.findIndex(m => m.source === 'final') < i) {
addproblem(tokens, ParseProblem.Error(mods[i], `Repeated 'final' modifier.`));
}
}
}
/**
* Operator precedence levels.
* Lower number = higher precedence.