Rename node accessor methods

Instead of child() vs concrete_child(), next_sibling() vs next_concrete_sibling(), etc,
the default is switched: child() refers to the concrete syntax tree, and named_child()
refers to the AST. Because the AST is abstract through exclusion of some nodes, the
names are clearer if the qualifier goes on the AST operations
This commit is contained in:
Max Brunsfeld 2015-09-08 23:16:24 -07:00
parent 245daffbc4
commit 7ee5eaa16a
16 changed files with 475 additions and 476 deletions

View file

@ -220,111 +220,111 @@ static const char *ts_symbol_names[] = {
};
static const TSNodeType ts_node_types[SYMBOL_COUNT] = {
[sym_program] = TSNodeTypeNormal,
[sym_program] = TSNodeTypeNamed,
[sym__statement] = TSNodeTypeHidden,
[sym_expression_statement] = TSNodeTypeNormal,
[sym_var_declaration] = TSNodeTypeNormal,
[sym_statement_block] = TSNodeTypeNormal,
[sym_if_statement] = TSNodeTypeNormal,
[sym_switch_statement] = TSNodeTypeNormal,
[sym_for_statement] = TSNodeTypeNormal,
[sym_for_in_statement] = TSNodeTypeNormal,
[sym_while_statement] = TSNodeTypeNormal,
[sym_try_statement] = TSNodeTypeNormal,
[sym_return_statement] = TSNodeTypeNormal,
[sym_throw_statement] = TSNodeTypeNormal,
[sym_break_statement] = TSNodeTypeNormal,
[sym_delete_statement] = TSNodeTypeNormal,
[sym_case] = TSNodeTypeNormal,
[sym_default] = TSNodeTypeNormal,
[sym_catch] = TSNodeTypeNormal,
[sym_finally] = TSNodeTypeNormal,
[sym_var_assignment] = TSNodeTypeNormal,
[sym_expression_statement] = TSNodeTypeNamed,
[sym_var_declaration] = TSNodeTypeNamed,
[sym_statement_block] = TSNodeTypeNamed,
[sym_if_statement] = TSNodeTypeNamed,
[sym_switch_statement] = TSNodeTypeNamed,
[sym_for_statement] = TSNodeTypeNamed,
[sym_for_in_statement] = TSNodeTypeNamed,
[sym_while_statement] = TSNodeTypeNamed,
[sym_try_statement] = TSNodeTypeNamed,
[sym_return_statement] = TSNodeTypeNamed,
[sym_throw_statement] = TSNodeTypeNamed,
[sym_break_statement] = TSNodeTypeNamed,
[sym_delete_statement] = TSNodeTypeNamed,
[sym_case] = TSNodeTypeNamed,
[sym_default] = TSNodeTypeNamed,
[sym_catch] = TSNodeTypeNamed,
[sym_finally] = TSNodeTypeNamed,
[sym_var_assignment] = TSNodeTypeNamed,
[sym__paren_expression] = TSNodeTypeHidden,
[sym__expression] = TSNodeTypeHidden,
[sym_object] = TSNodeTypeNormal,
[sym_array] = TSNodeTypeNormal,
[sym_function_expression] = TSNodeTypeNormal,
[sym_function_call] = TSNodeTypeNormal,
[sym_constructor_call] = TSNodeTypeNormal,
[sym_member_access] = TSNodeTypeNormal,
[sym_subscript_access] = TSNodeTypeNormal,
[sym_assignment] = TSNodeTypeNormal,
[sym_math_assignment] = TSNodeTypeNormal,
[sym_ternary] = TSNodeTypeNormal,
[sym_bool_op] = TSNodeTypeNormal,
[sym_math_op] = TSNodeTypeNormal,
[sym_rel_op] = TSNodeTypeNormal,
[sym_type_op] = TSNodeTypeNormal,
[sym_formal_parameters] = TSNodeTypeNormal,
[sym_arguments] = TSNodeTypeNormal,
[sym_pair] = TSNodeTypeNormal,
[sym_object] = TSNodeTypeNamed,
[sym_array] = TSNodeTypeNamed,
[sym_function_expression] = TSNodeTypeNamed,
[sym_function_call] = TSNodeTypeNamed,
[sym_constructor_call] = TSNodeTypeNamed,
[sym_member_access] = TSNodeTypeNamed,
[sym_subscript_access] = TSNodeTypeNamed,
[sym_assignment] = TSNodeTypeNamed,
[sym_math_assignment] = TSNodeTypeNamed,
[sym_ternary] = TSNodeTypeNamed,
[sym_bool_op] = TSNodeTypeNamed,
[sym_math_op] = TSNodeTypeNamed,
[sym_rel_op] = TSNodeTypeNamed,
[sym_type_op] = TSNodeTypeNamed,
[sym_formal_parameters] = TSNodeTypeNamed,
[sym_arguments] = TSNodeTypeNamed,
[sym_pair] = TSNodeTypeNamed,
[aux_sym_program_repeat1] = TSNodeTypeHidden,
[aux_sym_var_declaration_repeat1] = TSNodeTypeHidden,
[aux_sym_switch_statement_repeat1] = TSNodeTypeHidden,
[aux_sym_object_repeat1] = TSNodeTypeHidden,
[aux_sym_array_repeat1] = TSNodeTypeHidden,
[aux_sym_formal_parameters_repeat1] = TSNodeTypeHidden,
[ts_builtin_sym_error] = TSNodeTypeNormal,
[ts_builtin_sym_error] = TSNodeTypeNamed,
[ts_builtin_sym_end] = TSNodeTypeHidden,
[anon_sym_SEMI] = TSNodeTypeConcrete,
[anon_sym_var] = TSNodeTypeConcrete,
[anon_sym_COMMA] = TSNodeTypeConcrete,
[anon_sym_LBRACE] = TSNodeTypeConcrete,
[anon_sym_RBRACE] = TSNodeTypeConcrete,
[anon_sym_if] = TSNodeTypeConcrete,
[anon_sym_else] = TSNodeTypeConcrete,
[anon_sym_switch] = TSNodeTypeConcrete,
[anon_sym_for] = TSNodeTypeConcrete,
[anon_sym_LPAREN] = TSNodeTypeConcrete,
[anon_sym_RPAREN] = TSNodeTypeConcrete,
[anon_sym_in] = TSNodeTypeConcrete,
[anon_sym_while] = TSNodeTypeConcrete,
[anon_sym_try] = TSNodeTypeConcrete,
[anon_sym_return] = TSNodeTypeConcrete,
[anon_sym_throw] = TSNodeTypeConcrete,
[anon_sym_break] = TSNodeTypeConcrete,
[anon_sym_delete] = TSNodeTypeConcrete,
[anon_sym_case] = TSNodeTypeConcrete,
[anon_sym_COLON] = TSNodeTypeConcrete,
[anon_sym_default] = TSNodeTypeConcrete,
[anon_sym_catch] = TSNodeTypeConcrete,
[anon_sym_finally] = TSNodeTypeConcrete,
[anon_sym_EQ] = TSNodeTypeConcrete,
[anon_sym_LBRACK] = TSNodeTypeConcrete,
[anon_sym_RBRACK] = TSNodeTypeConcrete,
[anon_sym_function] = TSNodeTypeConcrete,
[anon_sym_new] = TSNodeTypeConcrete,
[anon_sym_DOT] = TSNodeTypeConcrete,
[anon_sym_PLUS_EQ] = TSNodeTypeConcrete,
[anon_sym_DASH_EQ] = TSNodeTypeConcrete,
[anon_sym_STAR_EQ] = TSNodeTypeConcrete,
[anon_sym_SLASH_EQ] = TSNodeTypeConcrete,
[anon_sym_QMARK] = TSNodeTypeConcrete,
[anon_sym_PIPE_PIPE] = TSNodeTypeConcrete,
[anon_sym_AMP_AMP] = TSNodeTypeConcrete,
[anon_sym_BANG] = TSNodeTypeConcrete,
[anon_sym_PLUS_PLUS] = TSNodeTypeConcrete,
[anon_sym_DASH_DASH] = TSNodeTypeConcrete,
[anon_sym_STAR] = TSNodeTypeConcrete,
[anon_sym_SLASH] = TSNodeTypeConcrete,
[anon_sym_PLUS] = TSNodeTypeConcrete,
[anon_sym_DASH] = TSNodeTypeConcrete,
[anon_sym_EQ_EQ_EQ] = TSNodeTypeConcrete,
[anon_sym_BANG_EQ_EQ] = TSNodeTypeConcrete,
[anon_sym_LT] = TSNodeTypeConcrete,
[anon_sym_GT] = TSNodeTypeConcrete,
[anon_sym_instanceof] = TSNodeTypeConcrete,
[anon_sym_typeof] = TSNodeTypeConcrete,
[sym_comment] = TSNodeTypeNormal,
[sym_string] = TSNodeTypeNormal,
[sym_regex] = TSNodeTypeNormal,
[sym_number] = TSNodeTypeNormal,
[sym_identifier] = TSNodeTypeNormal,
[sym_null] = TSNodeTypeNormal,
[sym_undefined] = TSNodeTypeNormal,
[sym_true] = TSNodeTypeNormal,
[sym_false] = TSNodeTypeNormal,
[anon_sym_SEMI] = TSNodeTypeAnonymous,
[anon_sym_var] = TSNodeTypeAnonymous,
[anon_sym_COMMA] = TSNodeTypeAnonymous,
[anon_sym_LBRACE] = TSNodeTypeAnonymous,
[anon_sym_RBRACE] = TSNodeTypeAnonymous,
[anon_sym_if] = TSNodeTypeAnonymous,
[anon_sym_else] = TSNodeTypeAnonymous,
[anon_sym_switch] = TSNodeTypeAnonymous,
[anon_sym_for] = TSNodeTypeAnonymous,
[anon_sym_LPAREN] = TSNodeTypeAnonymous,
[anon_sym_RPAREN] = TSNodeTypeAnonymous,
[anon_sym_in] = TSNodeTypeAnonymous,
[anon_sym_while] = TSNodeTypeAnonymous,
[anon_sym_try] = TSNodeTypeAnonymous,
[anon_sym_return] = TSNodeTypeAnonymous,
[anon_sym_throw] = TSNodeTypeAnonymous,
[anon_sym_break] = TSNodeTypeAnonymous,
[anon_sym_delete] = TSNodeTypeAnonymous,
[anon_sym_case] = TSNodeTypeAnonymous,
[anon_sym_COLON] = TSNodeTypeAnonymous,
[anon_sym_default] = TSNodeTypeAnonymous,
[anon_sym_catch] = TSNodeTypeAnonymous,
[anon_sym_finally] = TSNodeTypeAnonymous,
[anon_sym_EQ] = TSNodeTypeAnonymous,
[anon_sym_LBRACK] = TSNodeTypeAnonymous,
[anon_sym_RBRACK] = TSNodeTypeAnonymous,
[anon_sym_function] = TSNodeTypeAnonymous,
[anon_sym_new] = TSNodeTypeAnonymous,
[anon_sym_DOT] = TSNodeTypeAnonymous,
[anon_sym_PLUS_EQ] = TSNodeTypeAnonymous,
[anon_sym_DASH_EQ] = TSNodeTypeAnonymous,
[anon_sym_STAR_EQ] = TSNodeTypeAnonymous,
[anon_sym_SLASH_EQ] = TSNodeTypeAnonymous,
[anon_sym_QMARK] = TSNodeTypeAnonymous,
[anon_sym_PIPE_PIPE] = TSNodeTypeAnonymous,
[anon_sym_AMP_AMP] = TSNodeTypeAnonymous,
[anon_sym_BANG] = TSNodeTypeAnonymous,
[anon_sym_PLUS_PLUS] = TSNodeTypeAnonymous,
[anon_sym_DASH_DASH] = TSNodeTypeAnonymous,
[anon_sym_STAR] = TSNodeTypeAnonymous,
[anon_sym_SLASH] = TSNodeTypeAnonymous,
[anon_sym_PLUS] = TSNodeTypeAnonymous,
[anon_sym_DASH] = TSNodeTypeAnonymous,
[anon_sym_EQ_EQ_EQ] = TSNodeTypeAnonymous,
[anon_sym_BANG_EQ_EQ] = TSNodeTypeAnonymous,
[anon_sym_LT] = TSNodeTypeAnonymous,
[anon_sym_GT] = TSNodeTypeAnonymous,
[anon_sym_instanceof] = TSNodeTypeAnonymous,
[anon_sym_typeof] = TSNodeTypeAnonymous,
[sym_comment] = TSNodeTypeNamed,
[sym_string] = TSNodeTypeNamed,
[sym_regex] = TSNodeTypeNamed,
[sym_number] = TSNodeTypeNamed,
[sym_identifier] = TSNodeTypeNamed,
[sym_null] = TSNodeTypeNamed,
[sym_undefined] = TSNodeTypeNamed,
[sym_true] = TSNodeTypeNamed,
[sym_false] = TSNodeTypeNamed,
[sym__line_break] = TSNodeTypeHidden,
};