From 4e3d516cee5643169bb1d24322cd549cb2d64030 Mon Sep 17 00:00:00 2001
From: Marcelo Matus <mmatus@acms.arizona.edu>
Date: Tue, 10 Feb 2004 09:55:58 +0000
Subject: [PATCH] now use the new argcargv.i

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5707 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/primitive_types.i         | 12 +-------
 .../python/primitive_types_runme.py           | 29 +++++--------------
 2 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/Examples/test-suite/primitive_types.i b/Examples/test-suite/primitive_types.i
index fc90c1d42..8fcbf939e 100644
--- a/Examples/test-suite/primitive_types.i
+++ b/Examples/test-suite/primitive_types.i
@@ -187,7 +187,7 @@
 #define def_float 1
 #define def_double 1
 #define def_char 'H'
-#define def_pint  (int*)0
+#define def_pint  0
 #define def_sizet 1
 #define def_hello Hola
 #define def_myint 1
@@ -338,7 +338,6 @@ macro(size_t,             pfx, sizet)
 
 #ifdef SWIGPYTHON
 %apply (char *STRING, int LENGTH) { (const char *str, size_t len) }
-%apply (int ARGC, char **ARGV) { (size_t argc, const char **argv) }
 #endif
 
 %inline {
@@ -398,15 +397,6 @@ macro(size_t,             pfx, sizet)
      return len;
    }
 
-   int mainc(size_t argc, const char **argv) 
-   {
-     return argc;
-   }
-
-   const char* mainv(size_t argc, const char **argv, int idx) 
-   {
-     return argv[idx];
-   }   
    
  };
 
diff --git a/Examples/test-suite/python/primitive_types_runme.py b/Examples/test-suite/python/primitive_types_runme.py
index 97434e690..df30e9df0 100644
--- a/Examples/test-suite/python/primitive_types_runme.py
+++ b/Examples/test-suite/python/primitive_types_runme.py
@@ -194,17 +194,13 @@ if t.var_namet != 'hol\0\0':
   print "bad namet", t.var_namet
   raise RuntimeError
 
-largs=['hi','hola','hello']
-if t.mainc(largs) != 3:
-  raise RuntimeError, "bad main typemap"
-
-targs=('hi','hola')
-if t.mainv(targs,1) != 'hola':
-  raise RuntimeError, "bad main typemap"
 
 if t.strlen('hile') != 4:
   raise RuntimeError, "bad string typemap"
 
+if t.strlen('hil\0') != 4:
+  raise RuntimeError, "bad string typemap"
+
 
 cvar.var_char = '\0'
 if cvar.var_char != '\0':
@@ -250,31 +246,22 @@ pchar_setitem(pc, 3, 'a')
 pchar_setitem(pc, 4, 0)
 
 
+if t.strlen(pc) != 4:
+  raise RuntimeError, "bad string typemap"
+
 cvar.var_pchar = pc
 if cvar.var_pchar != "hola":
-  raise RuntimeError, "bad char empty case"
+  raise RuntimeError, "bad pointer case"
 
 cvar.var_namet = pc
 if cvar.var_namet != "hola\0":
-  raise RuntimeError, "bad char empty case"
+  raise RuntimeError, "bad pointer case"
 
-targs=('hi', pc)
-if t.mainv(targs,1) != 'hola':
-  raise RuntimeError, "bad main typemap"
 
 #
 # Now when things should fail
 #
 
-try:
-  error = 0
-  t.mainv('hello',1)
-  error = 1
-except TypeError:
-  pass
-if error:
-  raise RuntimeError, "bad main typemap"
-
 
 try:
   error = 0