From 2792a0e33c0845fdd5b1b752d99ee573f6534256 Mon Sep 17 00:00:00 2001
From: Thiago de Arruda <tpadilha84@gmail.com>
Date: Tue, 9 Sep 2014 08:59:48 -0300
Subject: api/msgpack-rpc: Remove Position type, using arrays instead.

---
 src/nvim/api/window.c | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

(limited to 'src/nvim/api/window.c')

diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 1ab441bed3..967d8acda4 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -33,14 +33,14 @@ Buffer window_get_buffer(Window window, Error *err)
 /// @param window The window handle
 /// @param[out] err Details of an error that may have occurred
 /// @return the (row, col) tuple
-Position window_get_cursor(Window window, Error *err)
+Array window_get_cursor(Window window, Error *err)
 {
-  Position rv = POSITION_INIT;
+  Array rv = ARRAY_DICT_INIT;
   win_T *win = find_window_by_handle(window, err);
 
   if (win) {
-    rv.row = win->w_cursor.lnum;
-    rv.col = win->w_cursor.col;
+    ADD(rv, INTEGER_OBJ(win->w_cursor.lnum));
+    ADD(rv, INTEGER_OBJ(win->w_cursor.col));
   }
 
   return rv;
@@ -51,31 +51,35 @@ Position window_get_cursor(Window window, Error *err)
 /// @param window The window handle
 /// @param pos the (row, col) tuple representing the new position
 /// @param[out] err Details of an error that may have occurred
-void window_set_cursor(Window window, Position pos, Error *err)
+void window_set_cursor(Window window, Array pos, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
-  if (!win) {
+  if (pos.size != 2 || pos.items[0].type != kObjectTypeInteger ||
+      pos.items[1].type != kObjectTypeInteger) {
+    set_api_error("\"pos\" argument must be a [row, col] array", err);
     return;
   }
 
-  if (pos.row <= 0 || pos.row > win->w_buffer->b_ml.ml_line_count) {
-    set_api_error("cursor position outside buffer", err);
+  if (!win) {
     return;
   }
 
-  if (pos.row > LONG_MAX || pos.row < LONG_MIN) {
-    set_api_error("Row value outside range", err);
+  int64_t row = pos.items[0].data.integer;
+  int64_t col = pos.items[1].data.integer;
+
+  if (row <= 0 || row > win->w_buffer->b_ml.ml_line_count) {
+    set_api_error("cursor position outside buffer", err);
     return;
   }
 
-  if (pos.col > INT_MAX || pos.col < INT_MIN) {
+  if (col > MAXCOL || col < 0) {
     set_api_error("Column value outside range", err);
     return;
   }
 
-  win->w_cursor.lnum = (linenr_T)pos.row;
-  win->w_cursor.col = (colnr_T)pos.col;
+  win->w_cursor.lnum = (linenr_T)row;
+  win->w_cursor.col = (colnr_T)col;
   win->w_cursor.coladd = 0;
   // When column is out of range silently correct it.
   check_cursor_col_win(win);
@@ -243,14 +247,14 @@ void window_set_option(Window window, String name, Object value, Error *err)
 /// @param window The window handle
 /// @param[out] err Details of an error that may have occurred
 /// @return The (row, col) tuple with the window position
-Position window_get_position(Window window, Error *err)
+Array window_get_position(Window window, Error *err)
 {
-  Position rv = POSITION_INIT;
+  Array rv = ARRAY_DICT_INIT;
   win_T *win = find_window_by_handle(window, err);
 
   if (win) {
-    rv.col = win->w_wincol;
-    rv.row = win->w_winrow;
+    ADD(rv, INTEGER_OBJ(win->w_winrow));
+    ADD(rv, INTEGER_OBJ(win->w_wincol));
   }
 
   return rv;
-- 
cgit 


From 545acf2024ea2653ae6937d570a37aa0340caa5e Mon Sep 17 00:00:00 2001
From: Thiago de Arruda <tpadilha84@gmail.com>
Date: Fri, 12 Sep 2014 11:24:01 -0300
Subject: api metadata: Allow typed container information in api functions

Adapt gendeclarations.lua/msgpack-gen.lua to allow the `ArrayOf(...)` and
`DictionaryOf(...)` types in function headers. These are simple macros that
expand to Array and Dictionary respectively, but the information is kept in the
metadata object, which is useful for building clients in statically typed
languages.
---
 src/nvim/api/window.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/nvim/api/window.c')

diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 967d8acda4..dd256f2b6d 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -33,7 +33,7 @@ Buffer window_get_buffer(Window window, Error *err)
 /// @param window The window handle
 /// @param[out] err Details of an error that may have occurred
 /// @return the (row, col) tuple
-Array window_get_cursor(Window window, Error *err)
+ArrayOf(Integer, 2) window_get_cursor(Window window, Error *err)
 {
   Array rv = ARRAY_DICT_INIT;
   win_T *win = find_window_by_handle(window, err);
@@ -51,7 +51,7 @@ Array window_get_cursor(Window window, Error *err)
 /// @param window The window handle
 /// @param pos the (row, col) tuple representing the new position
 /// @param[out] err Details of an error that may have occurred
-void window_set_cursor(Window window, Array pos, Error *err)
+void window_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
@@ -247,7 +247,7 @@ void window_set_option(Window window, String name, Object value, Error *err)
 /// @param window The window handle
 /// @param[out] err Details of an error that may have occurred
 /// @return The (row, col) tuple with the window position
-Array window_get_position(Window window, Error *err)
+ArrayOf(Integer, 2) window_get_position(Window window, Error *err)
 {
   Array rv = ARRAY_DICT_INIT;
   win_T *win = find_window_by_handle(window, err);
-- 
cgit