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

parse labels and break/continue targets

Browse Source
This commit is contained in:
Dave Holoway
2020-06-10 18:43:43 +01:00
parent 87a2d72ae3
commit cd725638cd
2 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,8 +99,19 @@ function statement(tokens, locals, method, imports, typemap) {
case 'statement-kw':
s = statementKeyword(tokens, locals, method, imports, typemap);
return s;
case 'modifier':
case 'ident':
// checking every statement identifier for a possible label is really inefficient, but trying to
// merge this into expression_or_var_decl is worse for now
if (tokens.peek(1).value === ':') {
const label = new Label(tokens.current);
tokens.inc(), tokens.inc();
// ignore and just return the next statement
// - we cannot return the label as a statement because for/if/while check the next statement type
// the labels should be collated and checked for duplicates, etc
return statement(tokens, locals, method, imports, typemap);
}
// fall-through to expression_or_var_decl
case 'modifier':
case 'primitive-type':
s = expression_or_var_decl(tokens, locals, method, imports, typemap);
if (Array.isArray(s)) {
@@ -158,8 +169,14 @@ class WhileStatement extends Statement {
test = null;
statement = null;
}
class BreakStatement extends Statement {}
class ContinueStatement extends Statement {}
class BreakStatement extends Statement {
/** @type {Token} */
target = null;
}
class ContinueStatement extends Statement {
/** @type {Token} */
target = null;
}
class DoStatement extends Statement {
test = null;
block = null;
@@ -193,6 +210,14 @@ class AssertStatement extends Statement {
expression = null;
message = null;
}
class Label {
/**
* @param {Token} token
*/
constructor(token) {
this.name_token = token;
}
}
/**
* @param {TokenList} tokens
@@ -253,11 +278,19 @@ function statementKeyword(tokens, locals, method, imports, typemap) {
case 'break':
tokens.inc();
s = new BreakStatement();
if (tokens.current.kind === 'ident') {
s.target = tokens.current;
tokens.inc();
}
semicolon(tokens);
break;
case 'continue':
tokens.inc();
s = new ContinueStatement();
if (tokens.current.kind === 'ident') {
s.target = tokens.current;
tokens.inc();
}
semicolon(tokens);
break;
case 'switch':