fix escape sequences, catch clauses, pointer types

Changes

1 changed files (+5/-4)

• grammar.js
  • @@ -236,10 +236,10 @@ real: $ => /\d+(\.\d+)?([eE][+-]?\d+)?f?/,
    regex: $ => /\/([^\\\/\n]|\\[\\\/A-z0|\[\]^$?.(){}+\-*])+\/[gmxsu]*/, string: $ => seq( '"', - repeat(choice(/[^"%\\]+/, $.escape_sequence, $.string_formatter, /%[^$#0\- +'I\d.hlqLjzZtdiouxXeEfFgGaAcsCSpnm%]/)), + repeat(choice(/[^"%\\]+/, $.escape_sequence, $.string_formatter, /%[^$#0\- +'I\d\\.hlqLjzZtdiouxXeEfFgGaAcsCSpnm%]/)), '"' ), - escape_sequence: $ => /\\([abefnrtv\'"?]|[0-7]{3}|[xX][A-Fa-f0-9]{2}|[uU][A-Fa-f0-9]{4,8})/, + escape_sequence: $ => /\\([abefnrtv\\'"?]|[0-7]{3}|[xX][A-Fa-f0-9]{2}|[uU][A-Fa-f0-9]{4,8})/, string_formatter: $ => /%\$?[#0\- +'I]?\d*(\.\d+)?(hh?|ll?|q|L|j|z|Z|t)?[diouxXeEfFgGaAcsCSpnm%]/, template_string: $ => seq( '@"',
  • @@ -280,7 +280,7 @@ optional('dynamic'),
    optional(choice('unowned', 'owned', 'weak')), $.symbol, optional($.type_arguments), - optional('*'), + repeat('*'), optional('?'), repeat($.array_type) )
  • @@ -694,7 +694,8 @@ optional($.finally_clause)
    ), catch_clause: $ => seq( - 'catch', '(', $.type, $.identifier, ')', + 'catch', + optional(seq('(', $.type, $.identifier, ')')), $.block ),