From d358f0d27bb26850a400158ac761775697b8f231 Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Mon, 8 Jun 2015 10:30:54 -0700 Subject: [PATCH] Fixed: xml format now has the key sourcePath instead of path for the command objj and objj2objcskeleton --- Objective-J/CommonJS/lib/objective-j.js | 2 +- Objective-J/ObjJAcornCompiler.js | 4 ++-- Tools/objj2objcskeleton/objj2objcskeleton | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Objective-J/CommonJS/lib/objective-j.js b/Objective-J/CommonJS/lib/objective-j.js index efb14d6f3..f3e1db5c4 100644 --- a/Objective-J/CommonJS/lib/objective-j.js +++ b/Objective-J/CommonJS/lib/objective-j.js @@ -143,7 +143,7 @@ exports.run = function(args) { var dict = new CFMutableDictionary(); dict.addValueForKey('line', e.line ? e.line : 0); - dict.addValueForKey('path', e.path ? e.path : mainFilePath); + dict.addValueForKey('sourcePath', e.path ? e.path : mainFilePath); dict.addValueForKey('message', e.message); errors.push(dict); diff --git a/Objective-J/ObjJAcornCompiler.js b/Objective-J/ObjJAcornCompiler.js index af3258043..fd7e0e1ec 100644 --- a/Objective-J/ObjJAcornCompiler.js +++ b/Objective-J/ObjJAcornCompiler.js @@ -398,7 +398,7 @@ var ObjJAcornCompiler = function(/*String*/ aString, /*CFURL*/ aURL, /*unsigned* { var dict = new CFMutableDictionary(); dict.addValueForKey('line', e.line); - dict.addValueForKey('path', this.URL.path()); + dict.addValueForKey('sourcePath', this.URL.path()); dict.addValueForKey('message', message); print(CFPropertyListCreateXMLData([dict], kCFPropertyListXMLFormat_v1_0).rawString()); @@ -468,7 +468,7 @@ ObjJAcornCompiler.prototype.compilePass2 = function() { var dict = new CFMutableDictionary(); dict.addValueForKey('line', warning.line) - dict.addValueForKey('path', this.URL.path()) + dict.addValueForKey('sourcePath', this.URL.path()) dict.addValueForKey('message', message) warnings.push(dict); diff --git a/Tools/objj2objcskeleton/objj2objcskeleton b/Tools/objj2objcskeleton/objj2objcskeleton index 30f96c0ee..c855c5c54 100644 --- a/Tools/objj2objcskeleton/objj2objcskeleton +++ b/Tools/objj2objcskeleton/objj2objcskeleton @@ -213,7 +213,7 @@ function parser(args) { [errors addObject:@{ @"message": e.message, - @"path": sourcePath, + @"sourcePath": sourcePath, @"line": e.line }];