Revert "Merge pull request #494 from richardbeare/enumR2015B"

This reverts commit cb8973f313, reversing
changes made to ac3284f78c.

Examples/test-suite/r/Makefile.in

@@ -5,7 +5,7 @@
 LANGUAGE     = r
 SCRIPTSUFFIX = _runme.R
 WRAPSUFFIX   = .R
-RUNR         = R CMD BATCH --no-save --no-restore '--args $(SCRIPTDIR)'
+RUNR         = R CMD BATCH --no-save --no-restore
 
 srcdir       = @srcdir@
 top_srcdir   = @top_srcdir@
@@ -44,7 +44,6 @@ include $(srcdir)/../common.mk
 	+$(swig_and_compile_multi_cpp)
 	$(run_multitestcase)
 
-
 # Runs the testcase.
 #
 # Run the runme if it exists.  If not just load the R wrapper to

Examples/test-suite/r/arrays_dimensionless_runme.R

@@ -1,6 +1,4 @@
-clargs <- commandArgs(trailing=TRUE)
+source("unittest.R")
-source(file.path(clargs[1], "unittest.R"))
-
 dyn.load(paste("arrays_dimensionless", .Platform$dynlib.ext, sep=""))
 source("arrays_dimensionless.R")
 cacheMetaData(1)

Examples/test-suite/r/funcptr_runme.R

@@ -1,6 +1,4 @@
-clargs <- commandArgs(trailing=TRUE)
+source("unittest.R")
-source(file.path(clargs[1], "unittest.R"))
-
 dyn.load(paste("funcptr", .Platform$dynlib.ext, sep=""))
 source("funcptr.R")
 cacheMetaData(1)

Examples/test-suite/r/ignore_parameter_runme.R

@@ -1,6 +1,4 @@
-clargs <- commandArgs(trailing=TRUE)
+source("unittest.R")
-source(file.path(clargs[1], "unittest.R"))
-
 dyn.load(paste("ignore_parameter", .Platform$dynlib.ext, sep=""))
 source("ignore_parameter.R")
 cacheMetaData(1)

Examples/test-suite/r/integers_runme.R

@@ -1,6 +1,4 @@
-clargs <- commandArgs(trailing=TRUE)
+source("unittest.R")
-source(file.path(clargs[1], "unittest.R"))
-
 dyn.load(paste("integers", .Platform$dynlib.ext, sep=""))
 source("integers.R")
 cacheMetaData(1)

Examples/test-suite/r/overload_method_runme.R

@@ -1,6 +1,4 @@
-clargs <- commandArgs(trailing=TRUE)
+source("unittest.R")
-source(file.path(clargs[1], "unittest.R"))
-
 dyn.load(paste("overload_method", .Platform$dynlib.ext, sep=""))
 source("overload_method.R")
 cacheMetaData(1)

Examples/test-suite/r/preproc_constants_runme.R

@@ -1,11 +0,0 @@
-clargs <- commandArgs(trailing=TRUE)
-source(file.path(clargs[1], "unittest.R"))
-
-dyn.load(paste("preproc_constants", .Platform$dynlib.ext, sep=""))
-source("preproc_constants.R")
-cacheMetaData(1)
-
-v <- enumToInteger('kValue', '_MyEnum')
-print(v)
-unittest(v,4)
-q(save="no")

Examples/test-suite/r/r_copy_struct_runme.R

@@ -1,6 +1,4 @@
-clargs <- commandArgs(trailing=TRUE)
+source("unittest.R")
-source(file.path(clargs[1], "unittest.R"))
-
 dyn.load(paste("r_copy_struct", .Platform$dynlib.ext, sep=""))
 source("r_copy_struct.R")
 cacheMetaData(1)

Examples/test-suite/r/r_legacy_runme.R

@@ -1,6 +1,4 @@
-clargs <- commandArgs(trailing=TRUE)
+source("unittest.R")
-source(file.path(clargs[1], "unittest.R"))
-
 dyn.load(paste("r_legacy", .Platform$dynlib.ext, sep=""))
 source("r_legacy.R")
 cacheMetaData(1)

Examples/test-suite/r/r_sexp_runme.R

@@ -1,6 +1,4 @@
-clargs <- commandArgs(trailing=TRUE)
+source("unittest.R")
-source(file.path(clargs[1], "unittest.R"))
-
 dyn.load(paste("r_sexp", .Platform$dynlib.ext, sep=""))
 source("r_sexp.R")
 cacheMetaData(1)

Examples/test-suite/r/rename_simple_runme.R

@@ -1,6 +1,4 @@
-clargs <- commandArgs(trailing=TRUE)
+source("unittest.R")
-source(file.path(clargs[1], "unittest.R"))
-
 dyn.load(paste("rename_simple", .Platform$dynlib.ext, sep=""))
 source("rename_simple.R")
 cacheMetaData(1)

Examples/test-suite/r/simple_array_runme.R

@@ -1,5 +1,4 @@
-clargs <- commandArgs(trailing=TRUE)
+source("unittest.R")
-source(file.path(clargs[1], "unittest.R"))
 dyn.load(paste("simple_array", .Platform$dynlib.ext, sep=""))
 source("simple_array.R")
 cacheMetaData(1)

Examples/test-suite/r/unions_runme.R

@@ -1,5 +1,4 @@
-clargs <- commandArgs(trailing=TRUE)
+source("unittest.R")
-source(file.path(clargs[1], "unittest.R"))
 dyn.load(paste("unions", .Platform$dynlib.ext, sep=""))
 source("unions.R")
 cacheMetaData(1)

Source/Modules/r.cxx

@@ -12,11 +12,11 @@
  * ----------------------------------------------------------------------------- */
 
 #include "swigmod.h"
-#include <limits.h>
 
 static const double DEFAULT_NUMBER = .0000123456712312312323;
 
-static String *replaceInitialDash(const String *name) {
+static String* replaceInitialDash(const String *name)
+{
   String *retval;
   if (!Strncmp(name, "_", 1)) {
     retval = Copy(name);
@@ -65,21 +65,6 @@ static String *getRTypeName(SwigType *t, int *outCount = NULL) {
   */
 }
 
-static String *getNamespacePrefix(const String *enumRef) {
-  // for use from enumDeclaration.
-  // returns the namespace part of a string
-  // Do we have any "::"?
-  String *name = NewString(enumRef);
-
-  while (Strstr(name, "::")) {
-    name = NewStringf("%s", Strchr(name, ':') + 2);
-  }
-  String *result = NewStringWithSize(enumRef, Len(enumRef) - Len(name));
-
-  Delete(name);
-  return (result);
-}
-
 /*********************
  Tries to get the name of the R class corresponding  to the given type
   e.g. struct A * is ARef,  struct A**  is  ARefRef.
@@ -175,17 +160,20 @@ static String *getRClassNameCopyStruct(String *retType, int addRef) {
   
   if(addRef) {
     for(int i = 0; i < n; i++) {
-      if (Strcmp(Getitem(l, i), "p.") == 0 || Strncmp(Getitem(l, i), "a(", 2) == 0)
+      if(Strcmp(Getitem(l, i), "p.") == 0 || 
+	 Strncmp(Getitem(l, i), "a(", 2) == 0)
 	Printf(tmp, "Ref");
     }
   }
+  
 #else
   char *retName = Char(SwigType_manglestr(retType));
   if(!retName)
     return(tmp);
   
   if(addRef) {
-    while (retName && strlen(retName) > 1 && strncmp(retName, "_p", 2) == 0) {
+    while(retName && strlen(retName) > 1 && 
+	  strncmp(retName, "_p", 2) == 0)  {
       retName += 2;
       Printf(tmp, "Ref");
     }
@@ -210,7 +198,10 @@ static String *getRClassNameCopyStruct(String *retType, int addRef) {
 static void writeListByLine(List *l, File *out, bool quote = 0) {
   int i, n = Len(l);
   for(i = 0; i < n; i++) 
-    Printf(out, "%s%s%s%s%s\n", tab8, quote ? "\"" : "", Getitem(l, i), quote ? "\"" : "", i < n - 1 ? "," : "");
+    Printf(out, "%s%s%s%s%s\n", tab8, 
+	   quote ? "\"" :"",  
+	   Getitem(l, i), 
+	   quote ? "\"" :"", i < n-1 ? "," : "");
 }
 
 
@@ -240,13 +231,10 @@ static void showUsage() {
 }
 
 static bool expandTypedef(SwigType *t) {
-  if (SwigType_isenum(t))
+  if (SwigType_isenum(t)) return false;
-    return false;
   String *prefix = SwigType_prefix(t);
-  if (Strncmp(prefix, "f", 1))
+  if (Strncmp(prefix, "f", 1)) return false;
-    return false;
+  if (Strncmp(prefix, "p.f", 3)) return false;
-  if (Strncmp(prefix, "p.f", 3))
-    return false;
   return true;
 }
 
@@ -272,9 +260,7 @@ static void replaceRClass(String *tm, SwigType *type) {
   Replaceall(tm, "$R_class", tmp);
   Replaceall(tm, "$*R_class", tmp_base);
   Replaceall(tm, "$&R_class", tmp_ref);
-  Delete(tmp);
+  Delete(tmp); Delete(tmp_base); Delete(tmp_ref);
-  Delete(tmp_base);
-  Delete(tmp_ref);
 }
 
 static double getNumber(String *value) {
@@ -286,7 +272,6 @@ static double getNumber(String *value) {
   return(d);
 }
 
-
 class R : public Language {
 public:
   R();
@@ -305,19 +290,24 @@ public:
   int membervariableHandler(Node *n);
 
   int typedefHandler(Node *n);
-  static List *Swig_overload_rank(Node *n, bool script_lang_wrapping);
+  static List *Swig_overload_rank(Node *n,
+			   bool script_lang_wrapping);
 
   int memberfunctionHandler(Node *n) {
     if (debugMode)
-      Printf(stdout, "<memberfunctionHandler> %s %s\n", Getattr(n, "name"), Getattr(n, "type"));
+      Printf(stdout, "<memberfunctionHandler> %s %s\n", 
+	     Getattr(n, "name"),
+	     Getattr(n, "type"));
     member_name = Getattr(n, "sym:name");
     processing_class_member_function = 1;
     int status = Language::memberfunctionHandler(n);    
     processing_class_member_function = 0;
     return status;
   }
+
   /* Grab the name of the current class being processed so that we can 
-     deal with members of that class. */ int classHandler(Node *n) {
+     deal with members of that class. */
+  int classHandler(Node *n){
     if(!ClassMemberTable) 
       ClassMemberTable = NewHash();
     
@@ -373,18 +363,22 @@ protected:
 	   name,
 	   "',\n", tab8, 
 	   "prototype = list(parameterTypes = c(", s_paramTypes, "),\n",
-           tab8, tab8, tab8, "returnType = '", SwigType_manglestr(t), "'),\n", tab8, "contains = 'CRoutinePointer')\n\n##\n", NIL);
+	   tab8, tab8, tab8,
+	   "returnType = '", SwigType_manglestr(t), "'),\n", tab8, 
+	   "contains = 'CRoutinePointer')\n\n##\n", NIL);
     
     return SWIG_OK;
   }
   
 
-  void addSMethodInfo(String *name, String *argType, int nargs);
+  void addSMethodInfo(String *name, 
+		      String *argType, int nargs);
   // Simple initialization such as constant strings that can be reused. 
   void init(); 
   
   
-  void addAccessor(String *memberName, Wrapper *f, String *name, int isSet = -1);
+  void addAccessor(String *memberName, Wrapper *f, 
+		   String *name, int isSet = -1);
   
   static int getFunctionPointerNumArgs(Node *n, SwigType *tt);
 
@@ -487,7 +481,14 @@ functionPointerProxyTable(0),
   namespaceFunctions(0),
   namespaceMethods(0),
   namespaceClasses(0),
-Argv(0), Argc(0), inCPlusMode(false), DllName(0), Rpackage(0), noInitializationCode(false), outputNamespaceInfo(false), UnProtectWrapupCode(0) {
+  Argv(0),
+  Argc(0),
+  inCPlusMode(false),
+  DllName(0),
+  Rpackage(0),
+  noInitializationCode(false),
+  outputNamespaceInfo(false),
+  UnProtectWrapupCode(0) {
 }
 
 bool R::debugMode = false;
@@ -525,8 +526,7 @@ void R::addSMethodInfo(String *name, String *argType, int nargs) {
   if(str)
     max = atoi(Char(str));
   if(max < nargs) {
-    if (str)
+    if(str)  Delete(str);
-      Delete(str);
     str = NewStringf("%d", max);
     Setattr(tb, "max", str);
   }
@@ -656,11 +656,21 @@ String *R::createFunctionPointerHandler(SwigType *t, Node *n, int *numArgs) {
   
   Printf(f->code, "%s\n\n", setExprElements);
   
-  Printv(f->code, "r_swig_cb_data->retValue = R_tryEval(", "r_swig_cb_data->expr,", " R_GlobalEnv,", " &r_swig_cb_data->errorOccurred", ");\n", NIL);
+  Printv(f->code, "r_swig_cb_data->retValue = R_tryEval(", 
+	 "r_swig_cb_data->expr,",
+	 " R_GlobalEnv,",
+	 " &r_swig_cb_data->errorOccurred",
+	 ");\n", 
+	 NIL);
   
   Printv(f->code, "\n",
 	 "if(r_swig_cb_data->errorOccurred) {\n",
-         "R_SWIG_popCallbackFunctionData(1);\n", "Rf_error(\"error in calling R function as a function pointer (", funName, ")\");\n", "}\n", NIL);
+	 "R_SWIG_popCallbackFunctionData(1);\n",
+	 "Rf_error(\"error in calling R function as a function pointer (",
+	 funName,
+	 ")\");\n",
+	 "}\n",
+	 NIL);
    
    
    
@@ -720,7 +730,8 @@ String *R::createFunctionPointerHandler(SwigType *t, Node *n, int *numArgs) {
 }
 
 void R::init() {
-  UnProtectWrapupCode = NewStringf("%s", "vmaxset(r_vmax);\nif(r_nprotect)  Rf_unprotect(r_nprotect);\n\n");
+  UnProtectWrapupCode =  
+    NewStringf("%s", "vmaxset(r_vmax);\nif(r_nprotect)  Rf_unprotect(r_nprotect);\n\n");
   
   SClassDefs = NewHash();
   
@@ -1002,7 +1013,8 @@ int R::OutputClassMemberTable(Hash *tb, File *out) {
       The other pairs are  member name and the name of the R function to access it.
  out - the stream where we write the code.
 ********************************************************************/
-int R::OutputMemberReferenceMethod(String *className, int isSet, List *el, File *out) {
+int R::OutputMemberReferenceMethod(String *className, int isSet, 
+				   List *el, File *out) {
   int numMems = Len(el), j;
   int varaccessor = 0;
   if (numMems == 0) 
@@ -1078,15 +1090,21 @@ int R::OutputMemberReferenceMethod(String *className, int isSet, List *el, File
 	"stop(\"No ", (isSet ? "modifiable" : "accessible"), " field named \", name, \" in ", className,
 	": fields are \", paste(names(accessorFuns), sep = \", \")", 
 	")", "\n}\n", NIL); */
-  Printv(f->code, ";", tab8, "idx = pmatch(name, names(accessorFuns));\n", tab8, "if(is.na(idx)) \n", tab8, tab4, NIL);
+  Printv(f->code, ";", tab8,
-  Printf(f->code, "return(callNextMethod(x, name%s));\n", isSet ? ", value" : "");
+	 "idx = pmatch(name, names(accessorFuns));\n",
+	 tab8,
+	 "if(is.na(idx)) \n",
+	 tab8, tab4, NIL);
+  Printf(f->code, "return(callNextMethod(x, name%s));\n",
+	 isSet ? ", value" : "");
   Printv(f->code, tab8, "f = accessorFuns[[idx]];\n", NIL);
   if(isSet) {
     Printv(f->code, tab8, "f(x, value);\n", NIL);
     Printv(f->code, tab8, "x;\n", NIL); // make certain to return the S value.
   } else {
     if (varaccessor) {
-      Printv(f->code, tab8, "if (is.na(match(name, vaccessors))) function(...){f(x, ...)} else f(x);\n", NIL);
+      Printv(f->code, tab8,
+	     "if (is.na(match(name, vaccessors))) function(...){f(x, ...)} else f(x);\n", NIL);
     } else {
       Printv(f->code, tab8, "function(...){f(x, ...)};\n", NIL);
     }
@@ -1095,12 +1113,15 @@ int R::OutputMemberReferenceMethod(String *className, int isSet, List *el, File
   
   
   Printf(out, "# Start of accessor method for %s\n", className);
-  Printf(out, "setMethod('$%s', '_p%s', ", isSet ? "<-" : "", getRClassName(className));
+  Printf(out, "setMethod('$%s', '_p%s', ",
+	 isSet ? "<-" : "", 
+	 getRClassName(className)); 
   Wrapper_print(f, out);
   Printf(out, ");\n");
   
   if(isSet) {
-    Printf(out, "setMethod('[[<-', c('_p%s', 'character'),", getRClassName(className));
+    Printf(out, "setMethod('[[<-', c('_p%s', 'character'),", 
+	   getRClassName(className)); 
     Insert(f->code, 2, "name = i;\n");
     Printf(attr->code, "%s", f->code);
     Wrapper_print(attr, out);
@@ -1135,11 +1156,14 @@ int R::OutputArrayMethod(String *className, List *el, File *out) {
     String *item = Getitem(el, j);
     String *dup = Getitem(el, j + 1);
     if (!Strcmp(item, "__getitem__")) {
-      Printf(out, "setMethod('[', '_p%s', function(x, i, j, ..., drop =TRUE) ", getRClassName(className));
+      Printf(out, 
+	     "setMethod('[', '_p%s', function(x, i, j, ..., drop =TRUE) ", 
+	     getRClassName(className));
       Printf(out, "  sapply(i, function (n)  %s(x, as.integer(n-1))))\n\n", dup);
     }
     if (!Strcmp(item, "__setitem__")) {
-      Printf(out, "setMethod('[<-', '_p%s', function(x, i, j, ..., value)", getRClassName(className));
+      Printf(out, "setMethod('[<-', '_p%s', function(x, i, j, ..., value)", 
+	     getRClassName(className));
       Printf(out, "  sapply(1:length(i), function(n) %s(x, as.integer(i[n]-1), value[n])))\n\n", dup);
     }
     
@@ -1160,15 +1184,12 @@ int R::enumDeclaration(Node *n) {
   String *name = Getattr(n, "name");
   String *tdname = Getattr(n, "tdname");
   
-  if (cplus_mode != PUBLIC) {
-    return (SWIG_NOWRAP);
-  }
-
   /* Using name if tdname is empty. */
   
   if(Len(tdname) == 0)
     tdname = name;
 
+
   if(!tdname || Strcmp(tdname, "") == 0) {
     Language::enumDeclaration(n);
     return SWIG_OK;
@@ -1176,112 +1197,37 @@ int R::enumDeclaration(Node *n) {
   
   String *mangled_tdname = SwigType_manglestr(tdname);
   String *scode = NewString("");
-  String *possiblescode = NewString("");
   
-  // Need to create some C code to return the enum values.
+  Printv(scode, "defineEnumeration('", mangled_tdname, "'", 
-  // Presumably a C function for each element of the enum..
+	 ",\n",  tab8, tab8, tab4, ".values = c(\n", NIL);
-  // There is probably some sneaky way to use the
-  // standard methods of variable/constant access, but I can't see
-  // it yet.
-  // Need to fetch the namespace part of the enum in tdname, so
-  // that we can address the correct enum. Perhaps there is already an
-  // attribute that has this info, but I can't find it. That leaves
-  // searching for ::. Obviously needs to work if there is no nesting.
-  //
-  // One issue is that swig is generating defineEnumeration calls for
-  // enums in the private part of classes. This usually isn't a
-  // problem, but the model in which some C code returns the
-  // underlying value won't compile because it is accessing a private
-  // type.
-  //
-  // It will be best to turn off binding to private parts of
-  // classes.
-
-  String *cppcode = NewString("");
-  // this is the namespace that will get used inside the functions
-  // returning enumerations.
-  String *namespaceprefix = getNamespacePrefix(tdname);
-  Wrapper *eW = NewWrapper();
-  Node *kk;
-
-  for (kk = firstChild(n); kk; kk = nextSibling(kk)) {
-    String *ename = Getattr(kk, "name");
-    String *fname = NewString("");
-    String *cfunctname = NewStringf("R_swigenum_%s_%s", mangled_tdname, ename);
-    String *rfunctname = NewStringf("R_swigenum_%s_%s_get", mangled_tdname, ename);
-    Printf(fname, "%s(void){", cfunctname);
-    Printf(cppcode, "SWIGEXPORT SEXP \n%s\n", fname);
-    Printf(cppcode, "int result;\n");
-    Printf(cppcode, "SEXP r_ans = R_NilValue;\n");
-    Printf(cppcode, "result = (int)%s%s;\n", namespaceprefix, ename);
-    Printf(cppcode, "r_ans = Rf_ScalarInteger(result);\n");
-    Printf(cppcode, "return(r_ans);\n}\n");
-
-    // Now emit the r binding functions
-    Printf(possiblescode, "`%s` = function(.copy=FALSE) {\n", rfunctname);
-    Printf(possiblescode, ".Call(\'%s\', as.logical(.copy), PACKAGE=\'%s\')\n}\n\n", cfunctname, Rpackage);
-    Printf(possiblescode, "attr(`%s`, \'returnType\')=\'integer\'\n", rfunctname);
-    Printf(possiblescode, "class(`%s`) = c(\"SWIGfunction\", class(\'%s\'))\n\n", rfunctname, rfunctname);
-    Delete(ename);
-    Delete(fname);
-    Delete(cfunctname);
-    Delete(rfunctname);
-  }
-
-  Printv(cppcode, "", NIL);
-
-  Printf(eW->code, "%s", cppcode);
-  Delete(cppcode);
-
-  Delete(namespaceprefix);
-
-  Printv(scode, "defineEnumeration('", mangled_tdname, "'", ",\n", tab8, tab8, tab4, ".values = c(\n", NIL);
   
   Node *c;
   int value = -1; // First number is zero
-  bool needenumfunc = false;    // Track whether we need runtime C
-                                // calls to deduce correct enum values
   for (c = firstChild(n); c; c = nextSibling(c)) {
     //      const char *tag = Char(nodeType(c));
     //      if (Strcmp(tag,"cdecl") == 0) {        
     name = Getattr(c, "name");
-    // This needs to match the version earlier - could have stored it.
-    String *rfunctname = NewStringf("R_swigenum_%s_%s_get()", mangled_tdname, name);
     String *val = Getattr(c, "enumvalue");
-    String *numstring = NewString("");
-
     if(val && Char(val)) {
-      double inval = getNumber(val);
+      int inval = (int) getNumber(val);
-      if (inval == DEFAULT_NUMBER) {
+      if(inval == DEFAULT_NUMBER) 
-        // This should indicate there is some fancy text there
-        // so we want to call the special R functions
-        needenumfunc = true;
-        Printf(numstring, "%s", rfunctname);
-      } else {
-        value = (int) inval;
-        Printf(numstring, "%d", value);
-
-      }
-    } else {
 	value++;
-      Printf(numstring, "%d", value);
+      else 
-    }
+	value = inval;
-    Printf(scode, "%s%s%s'%s' = %s%s\n", tab8, tab8, tab8, name, numstring, nextSibling(c) ? ", " : "");
+    } else
-    Delete(rfunctname);
+      value++;
-    Delete(numstring);
+    
+    Printf(scode, "%s%s%s'%s' = %d%s\n", tab8, tab8, tab8, name, value,
+	   nextSibling(c) ? ", " : "");
+    //      }
   }
   
   Printv(scode, "))", NIL);
-
-  if (needenumfunc) {
-    Wrapper_print(eW, f_wrapper);
-    Printf(sfile, "%s\n", possiblescode);
-  }
   Printf(sfile, "%s\n", scode);
   
   Delete(scode);
-  Delete(possiblescode);
   Delete(mangled_tdname);
+  
   return SWIG_OK;
 }
 
@@ -1304,14 +1250,16 @@ int R::variableWrapper(Node *n) {
   
   if(!SwigType_isconst(ty)) {
     Wrapper *f = NewWrapper();
-    Printf(f->def, "%s = \nfunction(value%s)\n{\n", name, addCopyParam ? ", .copy = FALSE" : "");
+    Printf(f->def, "%s = \nfunction(value%s)\n{\n", 
-    Printv(f->code, "if(missing(value)) {\n", name, "_get(", addCopyParam ? ".copy" : "", ")\n}", NIL);
+	   name, addCopyParam ? ", .copy = FALSE" : "");
-    Printv(f->code, " else {\n", name, "_set(value)\n}\n}", NIL);
+    Printv(f->code, "if(missing(value)) {\n", 
+	   name, "_get(", addCopyParam ? ".copy" : "", ")\n}", NIL);
+    Printv(f->code, " else {\n", 
+	   name, "_set(value)\n}\n}", NIL);
     
     Wrapper_print(f, sfile);
     DelWrapper(f);
   } else {
-    Printf(sfile, "## constant in variableWrapper\n");
     Printf(sfile, "%s = %s_get\n", name, name);
   }
 
@@ -1319,8 +1267,8 @@ int R::variableWrapper(Node *n) {
 }
 
 
-
+void R::addAccessor(String *memberName, Wrapper *wrapper, String *name, 
-void R::addAccessor(String *memberName, Wrapper *wrapper, String *name, int isSet) {
+		    int isSet) {
   if(isSet < 0) {
     int n = Len(name);
     char *ptr = Char(name);
@@ -1358,14 +1306,14 @@ struct Overloaded {
 };
 
 
-List *R::Swig_overload_rank(Node *n, bool script_lang_wrapping) {
+List * R::Swig_overload_rank(Node *n, 
+				 bool script_lang_wrapping) {
   Overloaded  nodes[MAX_OVERLOAD];
   int         nnodes = 0;
   Node *o = Getattr(n,"sym:overloaded");
 
 
-  if (!o)
+  if (!o) return 0;
-    return 0;
 
   Node *c = o;
   while (c) {
@@ -1448,12 +1396,10 @@ List *R::Swig_overload_rank(Node *n, bool script_lang_wrapping) {
 	      t1v = atoi(Char(t1));
 	      t2v = atoi(Char(t2));
 	      differ = t1v-t2v;
-            } else if (!t1 && t2)
+	    }
-              differ = 1;
+	    else if (!t1 && t2) differ = 1;
-            else if (t1 && !t2)
+	    else if (t1 && !t2) differ = -1;
-              differ = -1;
+	    else if (!t1 && !t2) differ = -1;
-            else if (!t1 && !t2)
-              differ = -1;
 	    num_checked++;
 	    if (differ > 0) {
 	      Overloaded t = nodes[i];
@@ -1538,7 +1484,8 @@ List *R::Swig_overload_rank(Node *n, bool script_lang_wrapping) {
 		      if (!Getattr(nodes[j].n, "overload:ignore"))
 			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[j].n), Getline(nodes[j].n),
 				     "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-                      Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n), "using %s instead.\n", Swig_name_decl(nodes[i].n));
+			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n),
+				     "using %s instead.\n", Swig_name_decl(nodes[i].n));
 		    }
 		  }
 		  nodes[j].error = 1;
@@ -1554,7 +1501,8 @@ List *R::Swig_overload_rank(Node *n, bool script_lang_wrapping) {
 		      if (!Getattr(nodes[j].n, "overload:ignore"))
 			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[j].n), Getline(nodes[j].n),
 				     "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-                      Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n), "using %s instead.\n", Swig_name_decl(nodes[i].n));
+			Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n),
+				     "using %s instead.\n", Swig_name_decl(nodes[i].n));
 		    }
 		  }
 		  nodes[j].error = 1;
@@ -1569,12 +1517,14 @@ List *R::Swig_overload_rank(Node *n, bool script_lang_wrapping) {
 	      if (script_lang_wrapping) {
 		Swig_warning(WARN_LANG_OVERLOAD_SHADOW, Getfile(nodes[j].n), Getline(nodes[j].n),
 			     "Overloaded method %s effectively ignored,\n", Swig_name_decl(nodes[j].n));
-                Swig_warning(WARN_LANG_OVERLOAD_SHADOW, Getfile(nodes[i].n), Getline(nodes[i].n), "as it is shadowed by %s.\n", Swig_name_decl(nodes[i].n));
+		Swig_warning(WARN_LANG_OVERLOAD_SHADOW, Getfile(nodes[i].n), Getline(nodes[i].n),
+			     "as it is shadowed by %s.\n", Swig_name_decl(nodes[i].n));
 	      } else {
 		if (!Getattr(nodes[j].n, "overload:ignore"))
 		  Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[j].n), Getline(nodes[j].n),
 			       "Overloaded method %s ignored,\n", Swig_name_decl(nodes[j].n));
-                Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n), "using %s instead.\n", Swig_name_decl(nodes[i].n));
+		  Swig_warning(WARN_LANG_OVERLOAD_IGNORED, Getfile(nodes[i].n), Getline(nodes[i].n),
+			       "using %s instead.\n", Swig_name_decl(nodes[i].n));
 	      }
 	      nodes[j].error = 1;
 	    }
@@ -1608,13 +1558,17 @@ void R::dispatchFunction(Node *n) {
   if (constructor)
     Replace(sfname, "new_", "", DOH_REPLACE_FIRST);
 
-  Printf(f->def, "`%s` <- function(...) {", sfname);
+  Printf(f->def,
+	 "`%s` <- function(...) {", sfname);
   if (debugMode) {
     Swig_print_node(n);
   }
   List *dispatch = Swig_overload_rank(n, true);
   int   nfunc = Len(dispatch);
-  Printv(f->code, "argtypes <- mapply(class, list(...));\n", "argv <- list(...);\n", "argc <- length(argtypes);\n", NIL);
+  Printv(f->code, 
+	 "argtypes <- mapply(class, list(...));\n",
+	 "argv <- list(...);\n",
+	 "argc <- length(argtypes);\n", NIL );
 
   Printf(f->code, "# dispatch functions %d\n", nfunc);
   int cur_args = -1;
@@ -1664,23 +1618,38 @@ void R::dispatchFunction(Node *n) {
 	  if (debugMode) {
 	    Printf(stdout, "<rtypecheck>%s\n", tmcheck);
 	  }
-          Printf(f->code, "%s(%s)", j == 0 ? "" : " && ", tmcheck);
+	  Printf(f->code, "%s(%s)",
+		 j == 0? "" : " && ",
+		 tmcheck);
 	  p = Getattr(p, "tmap:in:next");
 	  continue;
 	}
 	if (tm) {
 	  if (Strcmp(tm,"numeric")==0) {
-            Printf(f->code, "%sis.numeric(argv[[%d]])", j == 0 ? "" : " && ", j + 1);
+	    Printf(f->code, "%sis.numeric(argv[[%d]])",
-          } else if (Strcmp(tm, "integer") == 0) {
+		j == 0 ? "" : " && ",
-            Printf(f->code, "%s(is.integer(argv[[%d]]) || is.numeric(argv[[%d]]))", j == 0 ? "" : " && ", j + 1, j + 1);
+		j+1);
-          } else if (Strcmp(tm, "character") == 0) {
+	  }
-            Printf(f->code, "%sis.character(argv[[%d]])", j == 0 ? "" : " && ", j + 1);
+	  else if (Strcmp(tm,"integer")==0) {
-          } else {
+	    Printf(f->code, "%s(is.integer(argv[[%d]]) || is.numeric(argv[[%d]]))",
-            Printf(f->code, "%sextends(argtypes[%d], '%s')", j == 0 ? "" : " && ", j + 1, tm);
+		j == 0 ? "" : " && ",
+		j+1, j+1);
+	  }
+	  else if (Strcmp(tm,"character")==0) {
+	    Printf(f->code, "%sis.character(argv[[%d]])",
+		j == 0 ? "" : " && ",
+		j+1);
+	  }
+	  else {
+	    Printf(f->code, "%sextends(argtypes[%d], '%s')",
+		j == 0 ? "" : " && ",
+		j+1,
+		tm);
 	  }
 	}
 	if (!SwigType_ispointer(Getattr(p, "type"))) {
-          Printf(f->code, " && length(argv[[%d]]) == 1", j + 1);
+	  Printf(f->code, " && length(argv[[%d]]) == 1",
+	      j+1);
 	}
 	p = Getattr(p, "tmap:in:next");
       }
@@ -1690,7 +1659,10 @@ void R::dispatchFunction(Node *n) {
     }
   }
   if (cur_args != -1) {
-    Printf(f->code, "} else {\n" "stop(\"cannot find overloaded function for %s with argtypes (\"," "toString(argtypes),\")\");\n" "}", sfname);
+    Printf(f->code, "} else {\n"
+	   "stop(\"cannot find overloaded function for %s with argtypes (\","
+	   "toString(argtypes),\")\");\n"
+	   "}", sfname);
   }
   Printv(f->code, ";\nf(...)", NIL);
   Printv(f->code, ";\n}", NIL);
@@ -1708,7 +1680,8 @@ int R::functionWrapper(Node *n) {
   String *type = Getattr(n, "type"); 
   
   if (debugMode) {
-    Printf(stdout, "<functionWrapper> %s %s %s\n", fname, iname, type);
+    Printf(stdout, 
+	   "<functionWrapper> %s %s %s\n", fname, iname, type);
   }
   String *overname = 0;
   String *nodeType = Getattr(n, "nodeType");
@@ -1726,7 +1699,8 @@ int R::functionWrapper(Node *n) {
   }
   
   if (debugMode) 
-    Printf(stdout, "<functionWrapper> processing parameters\n");
+    Printf(stdout, 
+	   "<functionWrapper> processing parameters\n");
   
   
   ParmList *l = Getattr(n, "parms");
@@ -1736,8 +1710,10 @@ int R::functionWrapper(Node *n) {
   p = l;
   while(p) {
     SwigType *resultType = Getattr(p, "type");
-    if (expandTypedef(resultType) && SwigType_istypedef(resultType)) {
+    if (expandTypedef(resultType) && 
-      SwigType *resolved = SwigType_typedef_resolve_all(resultType);
+	SwigType_istypedef(resultType)) {
+      SwigType *resolved =
+	SwigType_typedef_resolve_all(resultType);
       if (expandTypedef(resolved)) {
 	Setattr(p, "type", Copy(resolved));
       }
@@ -1745,19 +1721,24 @@ int R::functionWrapper(Node *n) {
     p = nextSibling(p);
   } 
 
-  String *unresolved_return_type = Copy(type);
+  String *unresolved_return_type = 
-  if (expandTypedef(type) && SwigType_istypedef(type)) {
+    Copy(type);
-    SwigType *resolved = SwigType_typedef_resolve_all(type);
+  if (expandTypedef(type) &&
+      SwigType_istypedef(type)) {
+    SwigType *resolved = 
+      SwigType_typedef_resolve_all(type);
     if (expandTypedef(resolved)) {
       type = Copy(resolved);
       Setattr(n, "type", type);
     }
   }
   if (debugMode) 
-    Printf(stdout, "<functionWrapper> unresolved_return_type %s\n", unresolved_return_type);
+    Printf(stdout, "<functionWrapper> unresolved_return_type %s\n",
+	   unresolved_return_type);
   if(processing_member_access_function) {
     if (debugMode)
-      Printf(stdout, "<functionWrapper memberAccess> '%s' '%s' '%s' '%s'\n", fname, iname, member_name, class_name);
+      Printf(stdout, "<functionWrapper memberAccess> '%s' '%s' '%s' '%s'\n", 
+	     fname, iname, member_name, class_name);
     
     if(opaqueClassDeclaration)
       return SWIG_OK;
@@ -1815,7 +1796,8 @@ int R::functionWrapper(Node *n) {
 
   //    if(addCopyParam)
   if (debugMode)
-    Printf(stdout, "Adding a .copy argument to %s for %s = %s\n", iname, type, addCopyParam ? "yes" : "no");
+    Printf(stdout, "Adding a .copy argument to %s for %s = %s\n", 
+	   iname, type, addCopyParam ? "yes" : "no");
 
   Printv(f->def, "SWIGEXPORT SEXP\n", wname, " ( ", NIL);
 
@@ -1910,7 +1892,8 @@ int R::functionWrapper(Node *n) {
 
 	String *snargs = NewStringf("%d", nargs);
 	Printv(sfun->code, "if(is.function(", name, ")) {", "\n",
-               "assert('...' %in% names(formals(", name, ")) || length(formals(", name, ")) >= ", snargs, ");\n} ", NIL);
+	       "assert('...' %in% names(formals(", name, 
+	       ")) || length(formals(", name, ")) >= ", snargs, ");\n} ", NIL);
 	Delete(snargs);
 
 	Printv(sfun->code, "else {\n",
@@ -1918,7 +1901,11 @@ int R::functionWrapper(Node *n) {
 	       name, " = getNativeSymbolInfo(", name, ");",
 	       "\n};\n",
 	       "if(is(", name, ", \"NativeSymbolInfo\")) {\n",
-               name, " = ", name, "$address", ";\n}\n", "if(is(", name, ", \"ExternalReference\")) {\n", name, " = ", name, "@ref;\n}\n", "}; \n", NIL);
+	       name, " = ", name, "$address", ";\n}\n",
+	       "if(is(", name, ", \"ExternalReference\")) {\n",
+	       name, " = ", name, "@ref;\n}\n",
+	       "}; \n",
+	       NIL);
       } else {
 	Printf(sfun->code, "%s\n", tm);
       }
@@ -1961,7 +1948,8 @@ int R::functionWrapper(Node *n) {
 
       Printf(f->code,"%s\n",tm);
       if(funcptr_name) 
-        Printf(f->code, "} else {\n%s = %s;\nR_SWIG_pushCallbackFunctionData(%s, NULL);\n}\n", lname, funcptr_name, name);
+	Printf(f->code, "} else {\n%s = %s;\nR_SWIG_pushCallbackFunctionData(%s, NULL);\n}\n", 
+	       lname, funcptr_name, name);
       Printv(f->def, inFirstArg ? "" : ", ", "SEXP ", name, NIL);
       if (Len(name) != 0) 
 	inFirstArg = false;
@@ -2063,7 +2051,8 @@ int R::functionWrapper(Node *n) {
 #endif
 
   } else {
-    Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(type, 0), fname);
+    Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number,
+		 "Unable to use return type %s in function %s.\n", SwigType_str(type, 0), fname);
   }
 
 
@@ -2074,7 +2063,9 @@ int R::functionWrapper(Node *n) {
     if(!isVoidReturnType)
       Printf(tmp, "Rf_protect(r_ans);\n");
 
-    Printf(tmp, "Rf_protect(R_OutputValues = Rf_allocVector(VECSXP,%d));\nr_nprotect += %d;\n", numOutArgs + !isVoidReturnType, isVoidReturnType ? 1 : 2);
+    Printf(tmp, "Rf_protect(R_OutputValues = Rf_allocVector(VECSXP,%d));\nr_nprotect += %d;\n", 
+	   numOutArgs + !isVoidReturnType, 
+	   isVoidReturnType ? 1 : 2);
 
     if(!isVoidReturnType)
       Printf(tmp, "SET_VECTOR_ELT(R_OutputValues, 0, r_ans);\n");
@@ -2113,10 +2104,13 @@ int R::functionWrapper(Node *n) {
   }
 
 
-  Printv(sfun->code, ";", (Len(tm) ? "ans = " : ""), ".Call('", wname, "', ", sargs, "PACKAGE='", Rpackage, "');\n", NIL);
+  Printv(sfun->code, ";", (Len(tm) ? "ans = " : ""), ".Call('", wname, 
-  if (Len(tm)) {
+	 "', ", sargs, "PACKAGE='", Rpackage, "');\n", NIL);
+  if(Len(tm))
+    {
       Printf(sfun->code, "%s\n\n", tm); 
-    if (constructor) {
+      if (constructor)
+	{ 
 	  String *finalizer = NewString(iname);
 	  Replace(finalizer, "new_", "", DOH_REPLACE_FIRST);
 	  Printf(sfun->code, "reg.finalizer(ans@ref, delete_%s)\n", finalizer);
@@ -2143,11 +2137,15 @@ int R::functionWrapper(Node *n) {
     replaceRClass(tm, retType);
   }  
     
-  Printv(sfile, "attr(`", sfname, "`, 'returnType') = '", isVoidReturnType ? "void" : (tm ? tm : ""), "'\n", NIL);
+  Printv(sfile, "attr(`", sfname, "`, 'returnType') = '", 
+	 isVoidReturnType ? "void" : (tm ? tm : ""), 
+	 "'\n", NIL); 
     
   if(nargs > 0)
-    Printv(sfile, "attr(`", sfname, "`, \"inputTypes\") = c(", s_inputTypes, ")\n", NIL);
+    Printv(sfile, "attr(`", sfname, "`, \"inputTypes\") = c(",
-  Printv(sfile, "class(`", sfname, "`) = c(\"SWIGFunction\", class('", sfname, "'))\n\n", NIL);
+	   s_inputTypes, ")\n", NIL);
+  Printv(sfile, "class(`", sfname, "`) = c(\"SWIGFunction\", class('", 
+	 sfname, "'))\n\n", NIL); 
 
   if (memoryProfile) {
     Printv(sfile, "memory.profile()\n", NIL);
@@ -2155,6 +2153,7 @@ int R::functionWrapper(Node *n) {
   if (aggressiveGc) {
     Printv(sfile, "gc()\n", NIL);
   }
+
   // Printv(sfile, "setMethod('", name, "', '", name, "', ", iname, ")\n\n\n");
 
 
@@ -2168,7 +2167,8 @@ int R::functionWrapper(Node *n) {
     addAccessor(member_name, sfun, iname);
   }
 
-  if (Getattr(n, "sym:overloaded") && !Getattr(n, "sym:nextSibling")) {
+  if (Getattr(n, "sym:overloaded") &&
+      !Getattr(n, "sym:nextSibling")) {
     dispatchFunction(n);
   }
 
@@ -2205,7 +2205,8 @@ int R::addRegistrationRoutine(String *rname, int nargs) {
   if(!registrationTable) 
     registrationTable = NewHash();
 
-  String *el = NewStringf("{\"%s\", (DL_FUNC) &%s, %d}", rname, rname, nargs);
+  String *el = 
+    NewStringf("{\"%s\", (DL_FUNC) &%s, %d}", rname, rname, nargs);
   
   Setattr(registrationTable, rname, el);
 
@@ -2279,7 +2280,9 @@ void R::registerClass(Node *n) {
 	Printf(base, "c(");
 	for(int i = 0; i < Len(l); i++) {
 	  registerClass(Getitem(l, i));
-          Printf(base, "'_p%s'%s", SwigType_manglestr(Getattr(Getitem(l, i), "name")), i < Len(l) - 1 ? ", " : "");
+	  Printf(base, "'_p%s'%s", 
+		 SwigType_manglestr(Getattr(Getitem(l, i), "name")), 
+		 i < Len(l)-1 ? ", " : "");                
 	}
 	Printf(base, ")");
       } else {
@@ -2338,12 +2341,15 @@ int R::classDeclaration(Node *n) {
     class_member_set_functions = NULL;
   }
   if (Getattr(n, "has_destructor")) {
-    Printf(sfile, "setMethod('delete', '_p%s', function(obj) {delete%s(obj)})\n", getRClassName(Getattr(n, "name")), getRClassName(Getattr(n, "name")));
+    Printf(sfile, "setMethod('delete', '_p%s', function(obj) {delete%s(obj)})\n",
+	   getRClassName(Getattr(n, "name")),
+	   getRClassName(Getattr(n, "name")));
 
   }
   if(!opaque && !Strcmp(kind, "struct") && copyStruct) {
 
-    String *def = NewStringf("setClass(\"%s\",\n%srepresentation(\n", name, tab4);
+    String *def = 
+      NewStringf("setClass(\"%s\",\n%srepresentation(\n", name, tab4);
     bool firstItem = true;
 
     for(Node *c = firstChild(n); c; ) {
@@ -2373,7 +2379,8 @@ int R::classDeclaration(Node *n) {
 	c = nextSibling(c);
 	continue;
       }
-      if (Strcmp(tp, "character") && Strstr(Getattr(c, "decl"), "p.")) {
+      if (Strcmp(tp, "character") &&
+	  Strstr(Getattr(c, "decl"), "p.")) {
 	c = nextSibling(c);
 	continue;
       }
@@ -2441,8 +2448,10 @@ int R::generateCopyRoutines(Node *n) {
   if (debugMode)
     Printf(stdout, "generateCopyRoutines:  name = %s, %s\n", name, type);
 
-  Printf(copyToR->def, "CopyToR%s = function(value, obj = new(\"%s\"))\n{\n", mangledName, name);
+  Printf(copyToR->def, "CopyToR%s = function(value, obj = new(\"%s\"))\n{\n", 
-  Printf(copyToC->def, "CopyToC%s = function(value, obj)\n{\n", mangledName);
+	 mangledName, name);
+  Printf(copyToC->def, "CopyToC%s = function(value, obj)\n{\n", 
+	 mangledName);
 
   Node *c = firstChild(n);
 
@@ -2463,7 +2472,8 @@ int R::generateCopyRoutines(Node *n) {
     if (Strstr(tp, "R_class")) {
       continue;
     }
-    if (Strcmp(tp, "character") && Strstr(Getattr(c, "decl"), "p.")) {
+    if (Strcmp(tp, "character") &&
+	Strstr(Getattr(c, "decl"), "p.")) {
       continue;
     }
 
@@ -2484,16 +2494,17 @@ int R::generateCopyRoutines(Node *n) {
   
   
   Printf(sfile, "# Start definition of copy methods for %s\n", rclassName);  
-  Printf(sfile, "setMethod('copyToR', '_p_%s', CopyToR%s);\n", rclassName, mangledName);
+  Printf(sfile, "setMethod('copyToR', '_p_%s', CopyToR%s);\n", rclassName, 
-  Printf(sfile, "setMethod('copyToC', '%s', CopyToC%s);\n\n", rclassName, mangledName);
+	 mangledName);
+  Printf(sfile, "setMethod('copyToC', '%s', CopyToC%s);\n\n", rclassName, 
+	 mangledName);
   
   Printf(sfile, "# End definition of copy methods for %s\n", rclassName);  
   Printf(sfile, "# End definition of copy functions & methods for %s\n", rclassName);  
       
   String *m = NewStringf("%sCopyToR", name);
   addNamespaceMethod(m);
-  char *tt = Char(m);
+  char *tt = Char(m);  tt[Len(m)-1] = 'C';
-  tt[Len(m) - 1] = 'C';
   addNamespaceMethod(m);
   Delete(m);
   Delete(rclassName);
@@ -2527,7 +2538,8 @@ int R::typedefHandler(Node *n) {
     trueName += 7;
     if (debugMode)
       Printf(stdout, "<typedefHandler> Defining S class %s\n", trueName);
-    Printf(s_classes, "setClass('_p%s', contains = 'ExternalReference')\n", SwigType_manglestr(name));
+    Printf(s_classes, "setClass('_p%s', contains = 'ExternalReference')\n", 
+	   SwigType_manglestr(name));
   }
 
   return Language::typedefHandler(n);
@@ -2547,7 +2559,8 @@ int R::membervariableHandler(Node *n) {
   processing_member_access_function = 1;
   member_name = Getattr(n,"sym:name");
   if (debugMode)
-    Printf(stdout, "<membervariableHandler> name = %s, sym:name = %s\n", Getattr(n, "name"), member_name);
+    Printf(stdout, "<membervariableHandler> name = %s, sym:name = %s\n", 
+	   Getattr(n, "name"), member_name);
 
   int status(Language::membervariableHandler(n));
 
@@ -2670,7 +2683,8 @@ void R::main(int argc, char *argv[]) {
   Could make this work for String or File and then just store the resulting string
   rather than the collection of arguments and argc.
 */
-int R::outputCommandLineArguments(File *out) {
+int R::outputCommandLineArguments(File *out)
+{
   if(Argc < 1 || !Argv || !Argv[0])
     return(-1);
 
@@ -2687,7 +2701,8 @@ int R::outputCommandLineArguments(File *out) {
 
 /* How SWIG instantiates an object from this module. 
    See swigmain.cxx */
-extern "C" Language *swig_r(void) {
+extern "C" 
+Language *swig_r(void) {
   return new R();
 }
 
@@ -2707,8 +2722,10 @@ String *R::processType(SwigType *t, Node *n, int *nargs) {
     Printf(stdout, "processType %s (tdname = %s)\n", Getattr(n, "name"), tmp);
   
   SwigType *td = t;
-  if (expandTypedef(t) && SwigType_istypedef(t)) {
+  if (expandTypedef(t) &&
-    SwigType *resolved = SwigType_typedef_resolve_all(t);
+      SwigType_istypedef(t)) {
+    SwigType *resolved = 
+      SwigType_typedef_resolve_all(t);
     if (expandTypedef(resolved)) {
       td = Copy(resolved);
     }
@@ -2733,14 +2750,17 @@ String *R::processType(SwigType *t, Node *n, int *nargs) {
 
   if(SwigType_isfunctionpointer(t)) {
     if (debugMode)
-      Printf(stdout, "<processType> Defining pointer handler %s\n", t);
+      Printf(stdout, 
+	     "<processType> Defining pointer handler %s\n",  t);
        
     String *tmp = createFunctionPointerHandler(t, n, nargs);
     return tmp;
   }
+
 #if 0
   SwigType_isfunction(t) && SwigType_ispointer(t)
 #endif
+
     return NULL;
 }
 
@@ -2753,3 +2773,8 @@ String *R::processType(SwigType *t, Node *n, int *nargs) {
 
 
 /*************************************************************************************/
+
+
+
+
+