support logical operator keywords

Changes

2 changed files (+5/-3)

• grammar.js
  • @@ -167,7 +167,7 @@ postfix_expression: $ => prec.left(15, seq($._expression, choice('++', '--'))),
    static_cast_expression: $ => prec.right(14, seq('(', choice($.type, '!', 'owned'), ')', $._expression)), typeof_expression: $ => prec.right(14, seq('typeof', '(', $.type, ')')), sizeof_expression: $ => prec.right(14, seq('sizeof', '(', $.type, ')')), - unary_expression: $ => prec.right(14, seq(choice('!', '~', '++', '--', '-', '*', '&'), $._expression)), + unary_expression: $ => prec.right(14, seq(choice('!', 'not', '~', '++', '--', '-', '*', '&'), $._expression)), multiplicative_expression: $ => prec.left(13, seq($._expression, choice('*', '/', '%'), $._expression)), arithmetic_expression: $ => prec.left(12, seq($._expression, choice('+', '-'), $._expression)), bitshift_expression: $ => prec.left(11, seq($._expression, choice('<<', '>>'), $._expression)),
  • @@ -179,8 +179,8 @@ equality_expression: $ => prec.left(9, seq($._expression, choice('==', '!='), $._expression)),
    bitwise_and_expression: $ => prec.left(8, seq($._expression, '&', $._expression)), bitwise_xor_expression: $ => prec.left(7, seq($._expression, '^', $._expression)), bitwise_or_expression: $ => prec.left(6, seq($._expression, '|', $._expression)), - logical_and_expression: $ => prec.left(5, seq($._expression, '&&', $._expression)), - logical_or_expression: $ => prec.left(4, seq($._expression, '||', $._expression)), + logical_and_expression: $ => prec.left(5, seq($._expression, choice('&&', 'and'), $._expression)), + logical_or_expression: $ => prec.left(4, seq($._expression, choice('||', 'or'), $._expression)), null_coalescing_expression: $ => prec.left(3, seq($._expression, '??', $._expression)), ternary_expression: $ => prec.right(2, seq($._expression, '?', $._expression, ':', $._expression)),
• queries/highlights.scm
  • @@ -46,6 +46,7 @@ ] @type.builtin
    [ "abstract" + "and" "as" "async" "break"
  • @@ -77,6 +78,7 @@ "lock"
    "namespace" "new" "not" + "or" "out" "override" "owned"