Add argc and argv multi-argument to go.

Make argc and argv test works in C.

Signed-off-by: Erez Geva <ErezGeva2@gmail.com>

3 files changed, 88 insertions, 1 deletions

diff --git a/Examples/test-suite/argcargvtest.i b/Examples/test-suite/argcargvtest.i
index 5711441d9..4aea298fb 100644
--- a/Examples/test-suite/argcargvtest.i
+++ b/Examples/test-suite/argcargvtest.i
@@ -1,6 +1,6 @@
 %module argcargvtest
 
-#if !defined(SWIGCSHARP) && !defined(SWIGD) && !defined(SWIGGO) && !defined(SWIGGUILE) && !defined(SWIGJAVA) && !defined(SWIGJAVASCRIPT) && !defined(SWIGMZSCHEME) && !defined(SWIGOCAML) && !defined(SWIGR) && !defined(SWIGSCILAB)
+#if !defined(SWIGCSHARP) && !defined(SWIGD) && !defined(SWIGGUILE) && !defined(SWIGJAVA) && !defined(SWIGJAVASCRIPT) && !defined(SWIGMZSCHEME) && !defined(SWIGOCAML) && !defined(SWIGR) && !defined(SWIGSCILAB)
 %include <argcargv.i>
 
 %apply (int ARGC, char **ARGV) { (size_t argc, const char **argv) }
@@ -18,7 +18,11 @@ const char* mainv(size_t argc, const char **argv, int idx)
   return argv[idx];
 }   
 
+#ifdef __cplusplus
 void initializeApp(size_t argc, const char **argv, bool setPGid = true, bool isMakeline = false)
+#else
+void initializeApp(size_t argc, const char **argv)
+#endif
 {
 }
 
diff --git a/Examples/test-suite/go/argcargvtest_runme.go b/Examples/test-suite/go/argcargvtest_runme.go
new file mode 100644
index 000000000..31c56b8c0
--- /dev/null
+++ b/Examples/test-suite/go/argcargvtest_runme.go
@@ -0,0 +1,19 @@
+package main
+
+import wrap "swigtests/argcargvtest"
+
+func main() {
+	largs := []string{"hi", "hola", "hello"}
+	if ri := wrap.Mainc(largs); ri != 3 {
+		panic(ri)
+	}
+
+	targs := []string{"hi", "hola"}
+	if rs := wrap.Mainv(targs, 1); rs != "hola" {
+		panic(rs)
+	}
+
+//	wrap.Mainv("hello", 1)  // Fail compilation!!
+
+	wrap.InitializeApp(largs)
+}
diff --git a/Lib/go/argcargv.i b/Lib/go/argcargv.i
new file mode 100644
index 000000000..437832bb2
--- /dev/null
+++ b/Lib/go/argcargv.i
@@ -0,0 +1,64 @@
+/* ------------------------------------------------------------
+ * SWIG library containing argc and argv multi-argument typemaps
+ * ------------------------------------------------------------ */
+
+%typemap(gotype) (int ARGC, char **ARGV) "[]string"
+
+%insert(go_wrapper) %{
+//export cgo_swig_get_string_slice_idx
+func cgo_swig_get_string_slice_idx(s []string, i C.swig_intgo) string {
+    return s[i]
+}
+%}
+
+%{
+extern
+#ifdef __cplusplus
+  "C"
+#endif
+_gostring_ cgo_swig_get_string_slice_idx(_goslice_ s, intgo i);
+%}
+
+%typemap(in) (int ARGC, char **ARGV) {
+  $1_ltype len = ($1_ltype)$input.len;
+  size_t aralloc = (size_t)((len + 1) * sizeof(char *));
+  if (len <= 0 || $input.array == NULL) {
+    _swig_gopanic("array must contain at least 1 element");
+  }
+  $2 = ($2_ltype) Swig_malloc((int)aralloc);
+  if ($2 == NULL) {
+    _swig_gopanic("fail allocating memory for array");
+  }
+  memset($2, 0, aralloc);
+  $1 = len;
+  {
+    $1_ltype i;
+    for (i = 0; i < len; i++) {
+      char *p;
+      _gostring_ st = cgo_swig_get_string_slice_idx($input, (intgo)i);
+      if (st.n <= 0) {
+        _swig_gopanic("string length must be positive");
+      }
+      p = (char *) Swig_malloc((int)(st.n + 1));
+      if (p == NULL) {
+        _swig_gopanic("fail allocating memory for a string");
+      }
+      memcpy(p, st.p, st.n);
+      p[st.n] = 0;
+      $2[i] = p;
+    }
+    $2[i] = NULL;
+  }
+}
+
+%typemap(freearg) (int ARGC, char **ARGV) {
+  if ($2 != NULL) {
+    $1_ltype i;
+    for (i = 0; i < $1; i++) {
+      if ($2[i] != NULL) {
+        Swig_free((void *)$2[i]);
+      }
+    }
+    Swig_free((void *)$2);
+  }
+}