diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2024-09-23 07:14:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-23 07:14:10 -0700 |
| commit | 34a40d3a50f71a4b5e06c36ed9f9110983984dbf (patch) | |
| tree | 69f647ce5f5dba8f16cb2a55a2511b89df4db87e /src/nvim/main.c | |
| parent | 47e6b2233feffc6e9d94f6086fb904eb5688fa25 (diff) | |
| parent | 17027d64726864c7bbdba5bee004eb581ac4b54a (diff) | |
| download | rneovim-34a40d3a50f71a4b5e06c36ed9f9110983984dbf.tar.gz rneovim-34a40d3a50f71a4b5e06c36ed9f9110983984dbf.tar.bz2 rneovim-34a40d3a50f71a4b5e06c36ed9f9110983984dbf.zip | |
Merge #30435 refactor: rename "Dictionary" => "Dict"
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index e060d0dcaf..dc102f6f6d 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -967,8 +967,8 @@ static void remote_request(mparm_T *params, int remote_args, char *server_addr, os_exit(2); } - if (o.type == kObjectTypeDictionary) { - rvobj.data.dictionary = o.data.dictionary; + if (o.type == kObjectTypeDict) { + rvobj.data.dict = o.data.dict; } else { fprintf(stderr, "vim._cs_remote returned unexpected value\n"); os_exit(2); @@ -977,32 +977,32 @@ static void remote_request(mparm_T *params, int remote_args, char *server_addr, TriState should_exit = kNone; TriState tabbed = kNone; - for (size_t i = 0; i < rvobj.data.dictionary.size; i++) { - if (strequal(rvobj.data.dictionary.items[i].key.data, "errmsg")) { - if (rvobj.data.dictionary.items[i].value.type != kObjectTypeString) { + for (size_t i = 0; i < rvobj.data.dict.size; i++) { + if (strequal(rvobj.data.dict.items[i].key.data, "errmsg")) { + if (rvobj.data.dict.items[i].value.type != kObjectTypeString) { fprintf(stderr, "vim._cs_remote returned an unexpected type for 'errmsg'\n"); os_exit(2); } - fprintf(stderr, "%s\n", rvobj.data.dictionary.items[i].value.data.string.data); + fprintf(stderr, "%s\n", rvobj.data.dict.items[i].value.data.string.data); os_exit(2); - } else if (strequal(rvobj.data.dictionary.items[i].key.data, "result")) { - if (rvobj.data.dictionary.items[i].value.type != kObjectTypeString) { + } else if (strequal(rvobj.data.dict.items[i].key.data, "result")) { + if (rvobj.data.dict.items[i].value.type != kObjectTypeString) { fprintf(stderr, "vim._cs_remote returned an unexpected type for 'result'\n"); os_exit(2); } - printf("%s", rvobj.data.dictionary.items[i].value.data.string.data); - } else if (strequal(rvobj.data.dictionary.items[i].key.data, "tabbed")) { - if (rvobj.data.dictionary.items[i].value.type != kObjectTypeBoolean) { + printf("%s", rvobj.data.dict.items[i].value.data.string.data); + } else if (strequal(rvobj.data.dict.items[i].key.data, "tabbed")) { + if (rvobj.data.dict.items[i].value.type != kObjectTypeBoolean) { fprintf(stderr, "vim._cs_remote returned an unexpected type for 'tabbed'\n"); os_exit(2); } - tabbed = rvobj.data.dictionary.items[i].value.data.boolean ? kTrue : kFalse; - } else if (strequal(rvobj.data.dictionary.items[i].key.data, "should_exit")) { - if (rvobj.data.dictionary.items[i].value.type != kObjectTypeBoolean) { + tabbed = rvobj.data.dict.items[i].value.data.boolean ? kTrue : kFalse; + } else if (strequal(rvobj.data.dict.items[i].key.data, "should_exit")) { + if (rvobj.data.dict.items[i].value.type != kObjectTypeBoolean) { fprintf(stderr, "vim._cs_remote returned an unexpected type for 'should_exit'\n"); os_exit(2); } - should_exit = rvobj.data.dictionary.items[i].value.data.boolean ? kTrue : kFalse; + should_exit = rvobj.data.dict.items[i].value.data.boolean ? kTrue : kFalse; } } if (should_exit == kNone || tabbed == kNone) { |