svn commit: samba r7135 - in branches/SAMBA_4_0/source/scripting/ejs: .

[tridge at samba.org]

Author: tridge
Date: 2005-05-31 04:12:55 +0000 (Tue, 31 May 2005)
New Revision: 7135

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7135

Log:
make typeof() complient with ECMA 11.4.3

Modified:
   branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c	2005-05-31 03:37:01 UTC (rev 7134)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c	2005-05-31 04:12:55 UTC (rev 7135)
@@ -35,20 +35,20 @@
 		MprType type;
 		const char *name;
 	} types[] = {
-		{ MPR_TYPE_UNDEFINED, "undefined" },
-		{ MPR_TYPE_NULL, "null" },
-		{ MPR_TYPE_BOOL, "boolean" },
-		{ MPR_TYPE_CFUNCTION, "function" },
-		{ MPR_TYPE_FLOAT, "float" },
-		{ MPR_TYPE_INT, "int" },
-		{ MPR_TYPE_INT64, "int64" },
-		{ MPR_TYPE_OBJECT, "object" },
-		{ MPR_TYPE_FUNCTION, "function" },
-		{ MPR_TYPE_STRING, "string" },
+		{ MPR_TYPE_UNDEFINED,        "undefined" },
+		{ MPR_TYPE_NULL,             "object" },
+		{ MPR_TYPE_BOOL,             "boolean" },
+		{ MPR_TYPE_CFUNCTION,        "function" },
+		{ MPR_TYPE_FLOAT,            "number" },
+		{ MPR_TYPE_INT,              "number" },
+		{ MPR_TYPE_INT64,            "number" },
+		{ MPR_TYPE_OBJECT,           "object" },
+		{ MPR_TYPE_FUNCTION,         "function" },
+		{ MPR_TYPE_STRING,           "string" },
 		{ MPR_TYPE_STRING_CFUNCTION, "function" }
 	};
 	int i;
-	const char *type = "unknown";
+	const char *type = NULL;
 
 	if (argc != 1) return -1;
 	
@@ -58,6 +58,7 @@
 			break;
 		}
 	}
+	if (type == NULL) return -1;
 
 	ejsSetReturnString(eid, type);
 	return 0;