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

split shift operators from bitwise operators

Browse Source
This commit is contained in:
Dave Holoway
2020-06-06 15:14:05 +01:00
parent f294cb2af1
commit 4ba7fd1b3d
1 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -818,7 +818,7 @@ function expression(tokens, locals, method, imports, typemap, precedence_stack =
let matches = qualifiedTerm(tokens, locals, method, imports, typemap); let matches = qualifiedTerm(tokens, locals, method, imports, typemap);
for(;;) { for(;;) {
if (!/^(assignment|equality|comparison|bitwise|logical|muldiv|plumin|instanceof)-operator/.test(tokens.current.kind) && !/\?/.test(tokens.current.value)) { if (!/^(assignment|equality|comparison|bitwise|shift|logical|muldiv|plumin|instanceof)-operator/.test(tokens.current.kind) && !/\?/.test(tokens.current.value)) {
break; break;
} }
const binary_operator = tokens.current; const binary_operator = tokens.current;
@@ -880,6 +880,8 @@ function resolveBinaryOpExpression(tokens, lhs, op, rhs) {
return resolveComparison(tokens, ident, lhs, op, rhs); return resolveComparison(tokens, ident, lhs, op, rhs);
case 'bitwise-operator': case 'bitwise-operator':
return resolveBitwise(tokens, ident, lhs, op, rhs); return resolveBitwise(tokens, ident, lhs, op, rhs);
case 'shift-operator':
return resolveShift(tokens, ident, lhs, op, rhs);
case 'logical-operator': case 'logical-operator':
return resolveLogical(tokens, ident, lhs, op, rhs); return resolveLogical(tokens, ident, lhs, op, rhs);
case 'instanceof-operator': case 'instanceof-operator':
@@ -909,8 +911,12 @@ function resolveAssignment(tokens, ident, lhs, op, rhs) {
if (pre_assign_operator) { if (pre_assign_operator) {
switch (getOperatorType(pre_assign_operator)) { switch (getOperatorType(pre_assign_operator)) {
case "bitwise-operator": case "bitwise-operator":
// ^ is classed as a bitwise operator, but is also a logical operator // ^&| are both bitwise and logical operators
checkOperator(tokens, lhsvar, op, rhsvar, pre_assign_operator === '^' ? /^[BSIJCZ]{2}$/ : /^[BSIJC]{2}$/); checkOperator(tokens, lhsvar, op, rhsvar, /^[BSIJCZ]{2}$/);
rhsvar = new Value(rhs.source, lhsvar.type);
break;
case "shift-operator":
checkOperator(tokens, lhsvar, op, rhsvar, /^[BSIJC]{2}$/);
rhsvar = new Value(rhs.source, lhsvar.type); rhsvar = new Value(rhs.source, lhsvar.type);
break; break;
case "logical-operator": case "logical-operator":
@@ -1220,15 +1226,30 @@ function checkOperator(tokens, lhs, op, rhs, re) {
function resolveBitwise(tokens, ident, lhs, op, rhs) { function resolveBitwise(tokens, ident, lhs, op, rhs) {
let type = PrimitiveType.map.I; let type = PrimitiveType.map.I;
if (lhs.variables[0] && rhs.variables[0]) { if (lhs.variables[0] && rhs.variables[0]) {
// ^ is classed as a bitwise operator, but is also a logical operator // ^&| are both bitwse and logical operators
checkOperator(tokens, lhs.variables[0], op, rhs.variables[0], op.value === '^' ? /^[BSIJCZ]{2}$/ : /^[BSIJC]{2}$/); checkOperator(tokens, lhs.variables[0], op, rhs.variables[0], /^[BSIJCZ]{2}$/);
if (op.value === '^' && lhs.variables[0].type.typeSignature === 'Z') { if (lhs.variables[0].type.typeSignature === 'Z') {
type = PrimitiveType.map.Z; type = PrimitiveType.map.Z;
} }
} }
return new ResolvedIdent(ident, [Value.build(ident, lhs, rhs, type)]); return new ResolvedIdent(ident, [Value.build(ident, lhs, rhs, type)]);
} }
/**
* @param {TokenList} tokens
* @param {string} ident
* @param {ResolvedIdent} lhs
* @param {Token} op
* @param {ResolvedIdent} rhs
*/
function resolveShift(tokens, ident, lhs, op, rhs) {
if (lhs.variables[0] && rhs.variables[0]) {
// ^&| are both bitwse and logical operators
checkOperator(tokens, lhs.variables[0], op, rhs.variables[0], /^[BSIJC]{2}$/);
}
return new ResolvedIdent(ident, [Value.build(ident, lhs, rhs, PrimitiveType.map.I)]);
}
/** /**
* @param {TokenList} tokens * @param {TokenList} tokens
* @param {string} ident * @param {string} ident
@@ -2301,14 +2322,15 @@ function tokenize(source, offset = 0, length = source.length) {
* \+\+|-- inc * \+\+|-- inc
* [!=]= equality * [!=]= equality
* [<>]=? comparison * [<>]=? comparison
* [&|^]|<<|>>>? bitwise * [&|^] bitwise
* <<|>>>? shift
* &&|[|][|] logical * &&|[|][|] logical
* [*%/] muldiv * [*%/] muldiv
* [+-] plumin * [+-] plumin
* [~!] unary * [~!] unary
* ``` * ```
*/ */
const operator_re = /^(?:(=|[/%*&|^+-]=|>>>?=|<<=)|(\+\+|--)|([!=]=)|([<>]=?)|([&|^]|<<|>>>?)|(&&|[|][|])|([*%/])|([+-])|([~!]))$/; const operator_re = /^(?:(=|[/%*&|^+-]=|>>>?=|<<=)|(\+\+|--)|([!=]=)|([<>]=?)|([&|^])|(<<|>>>?)|(&&|[|][|])|([*%/])|([+-])|([~!]))$/;
/** /**
* @typedef { * @typedef {
'assignment-operator'| 'assignment-operator'|
@@ -2316,6 +2338,7 @@ const operator_re = /^(?:(=|[/%*&|^+-]=|>>>?=|<<=)|(\+\+|--)|([!=]=)|([<>]=?)|([
'equality-operator'| 'equality-operator'|
'comparison-operator'| 'comparison-operator'|
'bitwise-operator'| 'bitwise-operator'|
'shift-operator'|
'logical-operator'| 'logical-operator'|
'muldiv-operator'| 'muldiv-operator'|
'plumin-operator'| 'plumin-operator'|
@@ -2328,6 +2351,7 @@ const operator_token_types = [
'equality-operator', 'equality-operator',
'comparison-operator', 'comparison-operator',
'bitwise-operator', 'bitwise-operator',
'shift-operator',
'logical-operator', 'logical-operator',
'muldiv-operator', 'muldiv-operator',
'plumin-operator', 'plumin-operator',