Skip to content

Commit

Permalink
Fixed: xml format now has the key sourcePath instead of path for the …
Browse files Browse the repository at this point in the history
…command objj and objj2objcskeleton
  • Loading branch information
Dogild committed Jun 8, 2015
1 parent 3f88e02 commit d358f0d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Objective-J/CommonJS/lib/objective-j.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions Objective-J/ObjJAcornCompiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Tools/objj2objcskeleton/objj2objcskeleton
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ function parser(args)
{
[errors addObject:@{
@"message": e.message,
@"path": sourcePath,
@"sourcePath": sourcePath,
@"line": e.line
}];

Expand Down

0 comments on commit d358f0d

Please sign in to comment.