mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-06 09:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim/api: Actually dump AST, fix some bugs in nvim_parse_expression

Browse Source
This commit is contained in:
ZyX
2017-11-05 01:33:44 +03:00
parent b9d5aea073
commit 07ec709141
3 changed files with 262 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/viml/parser/expressions.c
View File

@@ -616,7 +616,7 @@ static const char *const eltkn_type_tab[] = {
[kExprLexArrow] = "Arrow",
};
static const char *const eltkn_cmp_type_tab[] = {
const char *const eltkn_cmp_type_tab[] = {
[kExprCmpEqual] = "Equal",
[kExprCmpMatches] = "Matches",
[kExprCmpGreater] = "Greater",
@@ -624,7 +624,7 @@ static const char *const eltkn_cmp_type_tab[] = {
[kExprCmpIdentical] = "Identical",
};
static const char *const ccs_tab[] = {
const char *const ccs_tab[] = {
[kCCStrategyUseOption] = "UseOption",
[kCCStrategyMatchCase] = "MatchCase",
[kCCStrategyIgnoreCase] = "IgnoreCase",
@@ -725,8 +725,7 @@ viml_pexpr_repr_token_end:
return ret;
}
#ifdef UNIT_TESTING
static const char *const east_node_type_tab[] = {
const char *const east_node_type_tab[] = {
[kExprNodeMissing] = "Missing",
[kExprNodeOpMissing] = "OpMissing",
[kExprNodeTernary] = "Ternary",
@@ -766,7 +765,6 @@ static const char *const east_node_type_tab[] = {
[kExprNodeOption] = "Option",
[kExprNodeEnvironment] = "Environment",
};
#endif
/// Represent `int` character as a string
///
@@ -2148,10 +2146,10 @@ viml_pexpr_parse_invalid_comma:
}
#define EXP_VAL_COLON "E15: Expected value, got colon: %.*s"
case kExprLexColon: {
bool is_ternary = false;
if (kv_size(ast_stack) < 2) {
goto viml_pexpr_parse_invalid_colon;
}
bool is_ternary = false;
bool can_be_ternary = true;
bool is_subscript = false;
for (size_t i = 1; i < kv_size(ast_stack); i++) {

9
src/nvim/viml/parser/expressions.h
View File

@@ -341,6 +341,15 @@ typedef struct {
/// Array mapping ExprASTNodeType to maximum amount of children node may have
extern const uint8_t node_maxchildren[];
/// Array mapping ExprASTNodeType values to their stringified versions
extern const char *const east_node_type_tab[];
/// Array mapping ExprComparisonType values to their stringified versions
extern const char *const eltkn_cmp_type_tab[];
/// Array mapping ExprCaseCompareStrategy values to their stringified versions
extern const char *const ccs_tab[];
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "viml/parser/expressions.h.generated.h"
#endif