(2_1_X)[TIMOB-10501] iOS: Improve source error logging for CommonJS code

iphone/Classes/KrollBridge.mm

@@ -717,15 +717,15 @@ - (id)krollObjectForProxy:(id)proxy
 	return result;
 }
 
--(id)loadCommonJSModule:(NSString*)code withPath:(NSString*)path
+-(id)loadCommonJSModule:(NSString*)code withSourceURL:(NSURL *)sourceURL
 {
 	NSString *js = [[NSString alloc] initWithFormat:TitaniumModuleRequireFormat,code];
 
 	/* This most likely should be integrated with normal code flow, but to
 	 * minimize impact until a in-depth reconsideration of KrollContext can be
 	 * done, we should have as little footprint 
 	 */
-	KrollEval *eval = [[KrollEval alloc] initWithCode:js];
+	KrollEval *eval = [[KrollEval alloc] initWithCode:js sourceURL:sourceURL startingLineNo:1];
 	TiValueRef exception = NULL;
 	TiValueRef resultRef = [eval jsInvokeInContext:context exception:&exception];
 	[js release];
@@ -832,7 +832,7 @@ -(id)require:(KrollContext*)kroll path:(NSString*)path
         }
 
 		NSString * dataContents = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-		wrapper = [self loadCommonJSModule:dataContents withPath:path];
+		wrapper = [self loadCommonJSModule:dataContents withSourceURL:url_];
         [dataContents release];
 
         if ([[self host] debugMode] && ![module isJSModule]) {

iphone/Classes/KrollContext.h

@@ -114,8 +114,12 @@
 @interface KrollEval : NSObject {
 @private
 	NSString *code;
+	NSURL *sourceURL;
+	NSInteger startingLineNo;
 }
 -(id)initWithCode:(NSString*)code;
+-(id)initWithCode:(NSString*)code sourceURL:(NSURL *)sourceURL;
+-(id)initWithCode:(NSString*)code sourceURL:(NSURL *)sourceURL startingLineNo:(NSInteger)startingLineNo;
 -(TiValueRef) jsInvokeInContext: (KrollContext*)context exception: (TiValueRef *)exceptionPointer;
 -(void)invoke:(KrollContext*)context;
 -(id)invokeWithResult:(KrollContext*)context;

iphone/Classes/KrollContext.mm

@@ -563,27 +563,48 @@ @implementation KrollEval
 
 -(id)initWithCode:(NSString*)code_
 {
-	if (self = [super init])
-	{
+	return [self initWithCode:code_ sourceURL:nil];
+}
+
+- (id)initWithCode:(NSString *)code_ sourceURL:(NSURL *)sourceURL_
+{
+	return [self initWithCode:code_ sourceURL:sourceURL_ startingLineNo:1];
+}
+
+- (id)initWithCode:(NSString *)code_ sourceURL:(NSURL *)sourceURL_ startingLineNo:(NSInteger)startingLineNo_
+{
+    self = [super init];
+    if (self) {
 		code = [code_ copy];
-	}
-	return self;
+		sourceURL = [sourceURL_ copy];
+		startingLineNo = startingLineNo_;
+    }
+    return self;
 }
+
 -(void)dealloc
 {
 	[code release];
+	[sourceURL release];
 	[super dealloc];
 }
 
 -(TiValueRef) jsInvokeInContext: (KrollContext*)context exception: (TiValueRef *)exceptionPointer
 {
     pthread_mutex_lock(&KrollEntryLock);
-	TiStringRef js = TiStringCreateWithCFString((CFStringRef) code);
+	TiStringRef jsCode = TiStringCreateWithCFString((CFStringRef) code);
+	TiStringRef jsURL = NULL;
+	if (sourceURL != nil) {
+		jsURL = TiStringCreateWithUTF8CString([[sourceURL absoluteString] UTF8String]);
+	}
 	TiObjectRef global = TiContextGetGlobalObject([context context]);
 
-	TiValueRef result = TiEvalScript([context context], js, global, NULL, 1, exceptionPointer);
+	TiValueRef result = TiEvalScript([context context], jsCode, global, jsURL, startingLineNo, exceptionPointer);
 
-	TiStringRelease(js);
+	TiStringRelease(jsCode);
+	if (jsURL != NULL) {
+		TiStringRelease(jsURL);
+	}
     pthread_mutex_unlock(&KrollEntryLock);
 
 	return result;