parser fix for escaped strings

* don't use homegrown 'escapeInternals' function
* update various tests

Author: alunny

lib/parser/pbxproj.js

@@ -204,7 +204,7 @@ NonQuote
   = EscapedQuote / !DoubleQuote char:. { return char }
 
 EscapedQuote
-  = "\\" DoubleQuote { return '\"' }
+  = "\\" DoubleQuote { return '\\"' }
 
 LiteralString
   = literal:LiteralChar+ { return literal.join('') }

lib/parser/pbxproj.pegjs

@@ -38,12 +38,6 @@ function pbxWriter(contents) {
     this.indentLevel = 0;
 }
 
-function escapeInternals(str) {
-    return str.replace(QUOTED, function (orig, middle) {
-        return f('"%s"', middle.replace(/"/g, '\\"'));
-    });
-}
-
 util.inherits(pbxWriter, EventEmitter);
 
 pbxWriter.prototype.write = function (str) {
@@ -145,9 +139,6 @@ pbxWriter.prototype.writeObject = function (object) {
             this.indentLevel--;
             this.write("};\n");
         } else {
-            if (QUOTED.test(obj))
-                obj = escapeInternals(obj);
-
             if (cmt) {
                 this.write("%s = %s /* %s */;\n", key, obj, cmt)
             } else {

lib/pbxWriter.js

@@ -4,6 +4,7 @@ var PEG = require('pegjs'),
     grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
     parser = PEG.buildParser(grammar),
     rawProj = parser.parse(pbx),
+    util = require('util'),
     project = rawProj.project;
 
 exports['should parse the build config section'] = function (test) {
@@ -18,3 +19,12 @@ exports['should read a decimal value correctly'] = function (test) {
     test.strictEqual(debugSettings['IPHONEOS_DEPLOYMENT_TARGET'], '3.0');
     test.done();
 }
+
+exports['should read an escaped value correctly'] = function (test) {
+    var xcbConfig = project.objects['XCBuildConfiguration'],
+        debugSettings = xcbConfig['C01FCF4F08A954540054247B'].buildSettings,
+        expt = '"\\"$(PHONEGAPLIB)/Classes/JSON\\" \\"$(PHONEGAPLIB)/Classes\\""';
+
+    test.strictEqual(debugSettings['USER_HEADER_SEARCH_PATHS'], expt);
+    test.done();
+}

test/parser/build-config.js

@@ -0,0 +1,16 @@
+var PEG = require('pegjs'),
+    fs = require('fs'),
+    pbx = fs.readFileSync('test/parser/projects/header-search.pbxproj', 'utf-8'),
+    grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
+    parser = PEG.buildParser(grammar),
+    rawProj = parser.parse(pbx),
+    project = rawProj.project;
+
+exports['should read a decimal value correctly'] = function (test) {
+    var debug = project.objects['XCBuildConfiguration']['C01FCF4F08A954540054247B'],
+        hsPaths = debug.buildSettings['HEADER_SEARCH_PATHS'],
+        expected = '"\\"$(TARGET_BUILD_DIR)/usr/local/lib/include\\""';
+
+    test.equal(hsPaths[0], expected);
+    test.done();
+}

test/parser/header-search.js

@@ -0,0 +1,47 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+/* Begin XCBuildConfiguration section */
+		C01FCF4F08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 307D28A1123043350040C0FA /* CordovaBuildSettings.xcconfig */;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"\"$(TARGET_BUILD_DIR)/usr/local/lib/include\"",
+					"\"$(OBJROOT)/UninstalledProducts/include\"",
+					"\"$(BUILT_PRODUCTS_DIR)\"",
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 4.2;
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					CoreFoundation,
+					"-weak_framework",
+					UIKit,
+					"-weak_framework",
+					AVFoundation,
+					"-weak_framework",
+					CoreMedia,
+					"-weak-lSystem",
+					"-all_load",
+					"-Obj-C",
+				);
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = NO;
+				USER_HEADER_SEARCH_PATHS = "";
+			};
+			name = Debug;
+		};
+/* End XCBuildConfiguration section */
+	};
+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}

test/parser/projects/header-search.pbxproj

@@ -33,7 +33,8 @@ function testContentsInDepth(filename, test) {
         test.equal(writtenLines.length, contentLines.length);
 
         for (var i=0; i<writtenLines.length; i++) {
-            test.equal(writtenLines[i], contentLines[i])
+            test.equal(writtenLines[i], contentLines[i],
+                'match failed on line ' + (i+1))
         }
 
         test.done();
@@ -59,6 +60,9 @@ exports.writeSync = {
     'should write out the "build-config" test': function (test) {
         testProjectContents('test/parser/projects/build-config.pbxproj', test);
     },
+    'should write out the "header-search" test': function (test) {
+        testProjectContents('test/parser/projects/header-search.pbxproj', test);
+    },
     'should write out the "nested-object" test': function (test) {
         testProjectContents('test/parser/projects/nested-object.pbxproj', test);
     },