Merge branch 'devel' of https://github.com/Neha03/gsoc2012-javascript into devel

Conflicts:
	.project
	COPYRIGHT
	Doc/Manual/style.css
	Examples/Makefile.in
	Examples/test-suite/common.mk
	Lib/typemaps/strings.swg
	Makefile.in
	Source/DOH/fio.c
	Source/Makefile.am
	Source/Modules/emit.cxx
	Source/Modules/javascript.cxx
	configure.in

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/oliverb-javascript-v8@13764 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Source/DOH/fio.c

@@ -490,6 +490,7 @@ int DohCopyto(DOH *in, DOH *out) {
       return nbytes;
     }
   }
+  return nbytes;
 }
 
 
@@ -588,4 +589,5 @@ DOH *DohReadline(DOH *in) {
     Putc(c, s);
     n++;
   }
+  return s;
 }

Source/Makefile.am

@@ -50,7 +50,6 @@ eswig_SOURCES =	CParse/cscanner.c		\
 		Modules/java.cxx		\
 		Modules/lang.cxx		\
 		Modules/javascript.cxx		\
-		Modules/javascript_emitter.cxx		\
 		Modules/javascript_v8.cxx		\
 		Modules/lua.cxx			\
 		Modules/main.cxx		\

Source/Modules/emit.cxx

@@ -470,6 +470,7 @@ String *emit_action(Node *n) {
 
   if (catchlist) {
     int unknown_catch = 0;
+    int has_varargs = 0;
     Printf(eaction, "}\n");
     for (Parm *ep = catchlist; ep; ep = nextSibling(ep)) {
       String *em = Swig_typemap_lookup("throws", ep, "_e", 0);
@@ -480,6 +481,7 @@ String *emit_action(Node *n) {
           Printf(eaction, "catch(%s) {", SwigType_str(et, "_e"));
         } else if (SwigType_isvarargs(etr)) {
           Printf(eaction, "catch(...) {");
+          has_varargs = 1;
         } else {
           Printf(eaction, "catch(%s) {", SwigType_str(et, "&_e"));
         }
@@ -490,8 +492,8 @@ String *emit_action(Node *n) {
         unknown_catch = 1;
       }
     }
-    if (unknown_catch) {
-    Printf(eaction, "catch(...) { throw; }\n");
+    if (unknown_catch && !has_varargs) {
+      Printf(eaction, "catch(...) { throw; }\n");
     }
   }