github/android-dev-ext
1
1
Fork 0
mirror of https://github.com/adelphes/android-dev-ext.git synced 2026-01-02 06:47:59 +00:00
Code Issues 41 Packages Projects Releases Wiki Activity

add support for synchronized statement

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

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

@@ -215,6 +215,12 @@ class ForStatement extends Statement {
/** @type {Statement} */ /** @type {Statement} */
statement = null; statement = null;
} }
class SynchronizedStatement extends Statement {
/** @type {ResolvedIdent} */
expression = null;
/** @type {Statement} */
statement = null;
}
/** /**
* @param {TokenList} tokens * @param {TokenList} tokens
@@ -328,6 +334,11 @@ function statementKeyword(tokens, locals, method, imports, typemap) {
s = new ForStatement(); s = new ForStatement();
forStatement(s, tokens, locals.slice(), method, imports, typemap); forStatement(s, tokens, locals.slice(), method, imports, typemap);
break; break;
case 'synchronized':
tokens.inc();
s = new SynchronizedStatement();
synchronizedStatement(s, tokens, locals, method, imports, typemap);
break;
default: default:
s = new InvalidStatement(); s = new InvalidStatement();
addproblem(tokens, ParseProblem.Error(tokens.current, `Unexpected token: ${tokens.current.value}`)); addproblem(tokens, ParseProblem.Error(tokens.current, `Unexpected token: ${tokens.current.value}`));
@@ -447,6 +458,26 @@ function enhancedFor(s, tokens, locals, method, imports, typemap) {
s.statement = nonVarDeclStatement(tokens, locals, method, imports, typemap); s.statement = nonVarDeclStatement(tokens, locals, method, imports, typemap);
} }
/**
* @param {SynchronizedStatement} s
* @param {TokenList} tokens
* @param {Local[]} locals
* @param {SourceMC} method
* @param {ResolvedImport[]} imports
* @param {Map<string,JavaType>} typemap
*/
function synchronizedStatement(s, tokens, locals, method, imports, typemap) {
tokens.expectValue('(');
s.expression = expression(tokens, locals, method, imports, typemap);
if (s.expression.variables[0]) {
if (s.expression.variables[0].type instanceof PrimitiveType) {
addproblem(tokens, ParseProblem.Error(tokens.current, `synchronized lock expression must be a reference type`));
}
}
tokens.expectValue(')');
s.statement = nonVarDeclStatement(tokens, locals, method, imports, typemap);
}
/** /**
* @param {TryStatement} s * @param {TryStatement} s
* @param {TokenList} tokens * @param {TokenList} tokens
@@ -2462,14 +2493,14 @@ function tokenize(source, offset = 0, length = source.length) {
* int|long|short|byte|float|double|char|boolean|void primitive type * int|long|short|byte|float|double|char|boolean|void primitive type
* new * new
* instanceof * instanceof
* public|private|protected|static|final|abstract|native|volatile|transient|synchronized modifier * public|private|protected|static|final|abstract|native|volatile|transient modifier
* if|else|while|for|do|try|catch|finally|switch|case|default|return|break|continue statement keyword * if|else|while|for|do|try|catch|finally|switch|case|default|return|break|continue|throw|synchronized statement keyword
* class|enum|interface type keyword * class|enum|interface type keyword
* package|import package keyword * package|import package keyword
* \w+ word * \w+ word
* ``` * ```
*/ */
const word_re = /(?:(true|false)|(this|super|null)|(int|long|short|byte|float|double|char|boolean|void)|(new)|(instanceof)|(public|private|protected|static|final|abstract|native|volatile|transient|synchronized)|(if|else|while|for|do|try|catch|finally|switch|case|default|return|break|continue|throw)|(class|enum|interface)|(package|import)|(\w+))\b/g; const word_re = /(?:(true|false)|(this|super|null)|(int|long|short|byte|float|double|char|boolean|void)|(new)|(instanceof)|(public|private|protected|static|final|abstract|native|volatile|transient)|(if|else|while|for|do|try|catch|finally|switch|case|default|return|break|continue|throw|synchronized)|(class|enum|interface)|(package|import)|(\w+))\b/g;
const word_token_types = [ const word_token_types = [
'boolean-literal', 'boolean-literal',
'object-literal', 'object-literal',