Merge pull request #5 from e2l3n/tpopov/rebase-onto-origin

Rebase origin onto master

Author: e2l3n

lib/parser/pbxproj.js

@@ -1,11 +1,22 @@
 {
     function merge(hash, secondHash) {
         secondHash = secondHash[0]
-        for(var i in secondHash)
-            hash[i] = secondHash[i]
+        for(var i in secondHash) {
+       		hash[i] = merge_obj(hash[i], secondHash[i]);
+        }
 
         return hash;
     }
+    
+    function merge_obj(obj, secondObj) {
+    	if (!obj)
+    		return secondObj;
+
+        for(var i in secondObj)
+            obj[i] = merge_obj(obj[i], secondObj[i]);
+
+        return obj;
+    }
 }
 
 /*
@@ -155,17 +166,20 @@ ArrayEntry
   = SimpleArrayEntry / CommentedArrayEntry
 
 SimpleArrayEntry
-  = val:Value "," { return val }
+  = val:Value EndArrayEntry { return val }
 
 CommentedArrayEntry
-  = val:Value _ comment:InlineComment ","
+  = val:Value _ comment:InlineComment EndArrayEntry
     {
         var result = Object.create(null);
         result.value = val.trim();
         result.comment = comment.trim();
         return result;
     }
 
+EndArrayEntry
+  = "," / _ &")"
+
 /*
  *  Identifiers and Values
  */

lib/parser/pbxproj.pegjs

@@ -1,10 +1,11 @@
 var path = require('path'),
+    util = require('util'),
     M_EXTENSION = /[.]m$/, SOURCE_FILE = 'sourcecode.c.objc',
     H_EXTENSION = /[.]h$/, HEADER_FILE = 'sourcecode.c.h',
     BUNDLE_EXTENSION = /[.]bundle$/, BUNDLE = '"wrapper.plug-in"',
     XIB_EXTENSION = /[.]xib$/, XIB_FILE = 'file.xib',
     DYLIB_EXTENSION = /[.]dylib$/, DYLIB = '"compiled.mach-o.dylib"',
-    FRAMEWORK_EXTENSION = /[.]framework/, FRAMEWORK = 'wrapper.framework',
+    FRAMEWORK_EXTENSION = /[.]framework$/, FRAMEWORK = 'wrapper.framework',
     ARCHIVE_EXTENSION = /[.]a$/, ARCHIVE = 'archive.ar',
     PNG_EXTENSION = /[.]png/, PNG_IMAGE = "image.png",
     DEFAULT_SOURCE_TREE = '"<group>"',
@@ -97,7 +98,7 @@ function pbxFile(filepath, opt) {
     if (opt.compilerFlags) {
         if (!this.settings)
           this.settings = {};
-        this.settings.COMPILER_FLAGS = opt.compilerFlags;
+          this.settings.COMPILER_FLAGS = util.format('"%s"', opt.compilerFlags);
     }
 }