API: Implement vim_{get,set}_option

Some functions from upstream VIM were reintegrated for this:
- get_option_value_strict
- set_option_value_err
- set_option_value_for
- unset_global_local_option

4 files changed, 214 insertions, 17 deletions

diff --git a/src/api/helpers.c b/src/api/helpers.c
index 584249fcc6..40888f351d 100644
--- a/src/api/helpers.c
+++ b/src/api/helpers.c
@@ -5,8 +5,11 @@
 #include "api/helpers.h"
 #include "api/defs.h"
 #include "../vim.h"
+#include "../window.h"
 #include "memory.h"
 #include "eval.h"
+#include "option.h"
+#include "option_defs.h"
 
 #include "lib/khash.h"
 
@@ -22,6 +25,20 @@ static Object vim_to_object_rec(typval_T *obj, khash_t(Lookup) *lookup);
 
 static bool object_to_vim(Object obj, typval_T *tv, Error *err);
 
+static void set_option_value_for(char *key,
+                                 int numval,
+                                 char *stringval,
+                                 int opt_flags,
+                                 int opt_type,
+                                 void *from,
+                                 Error *err);
+
+static void set_option_value_err(char *key,
+                                 int numval,
+                                 char *stringval,
+                                 int opt_flags,
+                                 Error *err);
+
 void try_start()
 {
   ++trylevel;
@@ -134,6 +151,110 @@ Object dict_set_value(dict_T *dict, String key, Object value, Error *err)
   return rv;
 }
 
+Object get_option_from(void *from, int type, String name, Error *err)
+{
+  Object rv = {.type = kObjectTypeNil};
+
+  if (name.size == 0) {
+    set_api_error("Empty option name", err);
+    return rv;
+  }
+
+  // Return values
+  long numval;
+  char *stringval = NULL;
+  //
+  char key[name.size + 1];
+  memcpy(key, name.data, name.size);
+  key[name.size] = NUL;
+  int flags = get_option_value_strict(key, &numval, &stringval, type, from); 
+
+  if (!flags) {
+    set_api_error("invalid option name", err);
+    return rv;
+  }
+
+  if (flags & SOPT_BOOL) {
+    rv.type = kObjectTypeBool;
+    rv.data.boolean = numval ? true : false;
+  } else if (flags & SOPT_NUM) {
+    rv.type = kObjectTypeInt;
+    rv.data.integer = numval;
+  } else if (flags & SOPT_STRING) {
+    if (stringval) {
+      rv.type = kObjectTypeString;
+      rv.data.string.data = stringval;
+      rv.data.string.size = strlen(stringval);
+    } else {
+      set_api_error(N_("Unable to get option value"), err);
+    }
+  } else {
+    set_api_error(N_("internal error: unknown option type"), err);
+  }
+
+  return rv;
+}
+
+void set_option_to(void *to, int type, String name, Object value, Error *err)
+{
+  if (name.size == 0) {
+    set_api_error("Empty option name", err);
+    return;
+  }
+
+  char key[name.size + 1];
+  memcpy(key, name.data, name.size);
+  key[name.size] = NUL;
+  int flags = get_option_value_strict(key, NULL, NULL, type, to);
+
+  if (flags == 0) {
+    set_api_error("invalid option name", err);
+    return;
+  }
+
+  if (value.type == kObjectTypeNil) {
+    if (type == SREQ_GLOBAL) {
+      set_api_error("unable to unset option", err);
+      return;
+    } else if (!(flags & SOPT_GLOBAL)) {
+      set_api_error("cannot unset option that doesn't have a global value",
+                     err);
+      return;
+    } else {
+      unset_global_local_option(key, to);
+      return;
+    }
+  }
+
+  int opt_flags = (type ? OPT_LOCAL : OPT_GLOBAL);
+
+  if (flags & SOPT_BOOL) {
+    if (value.type != kObjectTypeBool) {
+      set_api_error("option requires a boolean value", err);
+      return;
+    }
+    bool val = value.data.boolean;
+    set_option_value_for(key, val, NULL, opt_flags, type, to, err);
+
+  } else if (flags & SOPT_NUM) {
+    if (value.type != kObjectTypeInt) {
+      set_api_error("option requires an integer value", err);
+      return;
+    }
+
+    int val = value.data.integer;
+    set_option_value_for(key, val, NULL, opt_flags, type, to, err);
+  } else {
+    if (value.type != kObjectTypeString) {
+      set_api_error("option requires a string value", err);
+      return;
+    }
+
+    char *val = xstrndup(value.data.string.data, value.data.string.size);
+    set_option_value_for(key, 0, val, opt_flags, type, to, err);
+  }
+}
+
 Object vim_to_object(typval_T *obj)
 {
   Object rv;
@@ -336,3 +457,71 @@ static Object vim_to_object_rec(typval_T *obj, khash_t(Lookup) *lookup)
 
   return rv;
 }
+
+
+static void set_option_value_for(char *key,
+                                 int numval,
+                                 char *stringval,
+                                 int opt_flags,
+                                 int opt_type,
+                                 void *from,
+                                 Error *err)
+{
+  win_T *save_curwin = NULL;
+  tabpage_T *save_curtab = NULL;
+  buf_T *save_curbuf = NULL;
+
+  try_start();
+  switch (opt_type)
+  {
+    case SREQ_WIN:
+      if (switch_win(&save_curwin, &save_curtab, (win_T *)from,
+            win_find_tabpage((win_T *)from), FALSE) == FAIL)
+      {
+        if (try_end(err)) {
+          return;
+        }
+        set_api_error("problem while switching windows", err);
+        return;
+      }
+      set_option_value_err(key, numval, stringval, opt_flags, err);
+      restore_win(save_curwin, save_curtab, TRUE);
+      break;
+    case SREQ_BUF:
+      switch_buffer(&save_curbuf, (buf_T *)from);
+      set_option_value_err(key, numval, stringval, opt_flags, err);
+      restore_buffer(save_curbuf);
+      break;
+    case SREQ_GLOBAL:
+      set_option_value_err(key, numval, stringval, opt_flags, err);
+      break;
+  }
+
+  if (err->set) {
+    return;
+  }
+
+  try_end(err);
+}
+
+
+static void set_option_value_err(char *key,
+                                 int numval,
+                                 char *stringval,
+                                 int opt_flags,
+                                 Error *err)
+{
+  char *errmsg;
+
+  if ((errmsg = (char *)set_option_value((uint8_t *)key,
+                                         numval,
+                                         (uint8_t *)stringval,
+                                         opt_flags)))
+  {
+    if (try_end(err)) {
+      return;
+    }
+
+    set_api_error(errmsg, err);
+  }
+}
diff --git a/src/api/helpers.h b/src/api/helpers.h
index d839fe30e7..d98ed3b22b 100644
--- a/src/api/helpers.h
+++ b/src/api/helpers.h
@@ -40,6 +40,25 @@ Object dict_get_value(dict_T *dict, String key, bool pop, Error *err);
 /// @return the old value, if any
 Object dict_set_value(dict_T *dict, String key, Object value, Error *err);
 
+/// Gets the value of a global or local(buffer, window) option.
+///
+/// @param from If `type` is `SREQ_WIN` or `SREQ_BUF`, this must be a pointer
+///        to the window or buffer.
+/// @param type One of `SREQ_GLOBAL`, `SREQ_WIN` or `SREQ_BUF`
+/// @param name The option name
+/// @param[out] err Details of an error that may have occurred
+/// @return the option value
+Object get_option_from(void *from, int type, String name, Error *err);
+
+/// Sets the value of a global or local(buffer, window) option.
+///
+/// @param to If `type` is `SREQ_WIN` or `SREQ_BUF`, this must be a pointer
+///        to the window or buffer.
+/// @param type One of `SREQ_GLOBAL`, `SREQ_WIN` or `SREQ_BUF`
+/// @param name The option name
+/// @param[out] err Details of an error that may have occurred
+void set_option_to(void *to, int type, String name, Object value, Error *err);
+
 /// Convert a vim object to an `Object` instance, recursively expanding
 /// Arrays/Dictionaries.
 ///
diff --git a/src/api/vim.c b/src/api/vim.c
index 93654da91f..7eaa27d580 100644
--- a/src/api/vim.c
+++ b/src/api/vim.c
@@ -139,19 +139,14 @@ Object vim_set_var(String name, Object value, Error *err)
   return dict_set_value(&globvardict, name, value, err);
 }
 
-String vim_get_option(String name, Error *err)
+Object vim_get_option(String name, Error *err)
 {
-  abort();
-}
-
-void vim_set_option(String name, String value, Error *err)
-{
-  abort();
+  return get_option_from(NULL, SREQ_GLOBAL, name, err);
 }
 
-void vim_del_option(String name, Error *err)
+void vim_set_option(String name, Object value, Error *err)
 {
-  abort();
+  set_option_to(NULL, SREQ_GLOBAL, name, value, err);
 }
 
 void vim_out_write(String str)
diff --git a/src/api/vim.h b/src/api/vim.h
index a18f9c69e9..81aadb2014 100644
--- a/src/api/vim.h
+++ b/src/api/vim.h
@@ -77,20 +77,14 @@ Object vim_set_var(String name, Object value, Error *err);
 /// @param name The option name
 /// @param[out] err Details of an error that may have occurred
 /// @return The option value
-String vim_get_option(String name, Error *err);
+Object vim_get_option(String name, Error *err);
 
 /// Sets an option value
 ///
 /// @param name The option name
 /// @param value The new option value
 /// @param[out] err Details of an error that may have occurred
-void vim_set_option(String name, String value, Error *err);
-
-/// Deletes an option, falling back to the default value
-///
-/// @param name The option name
-/// @param[out] err Details of an error that may have occurred
-void vim_del_option(String name, Error *err);
+void vim_set_option(String name, Object value, Error *err);
 
 /// Write a message to vim output buffer
 ///