Fix for being too strict when accepting PLISTs and also fixes a regre…

…ssion with erroring when parsing code with shebangs(!).

Closes cappuccino#69.

Reviewed by me.

Objective-J/CFPropertyList.js

@@ -11,8 +11,9 @@ function CFPropertyList()
     this._UID = generateObjectUID();
 }
 
-CFPropertyList.PLISTRE = /^\s*<\s*plist\s*>/i;
-CFPropertyList.DTDRE = /^\s*<\?\s*xml\s+version\s*=\s*\"1.0\"[^>]*\?>\s*<\!DOCTYPE\s+plist\s+PUBLIC\s+\"-\/\/Apple(?:\sComputer)?\/\/DTD\s+PLIST\s+1.0\/\/EN\"\s+\"http:\/\/www\.apple\.com\/DTDs\/PropertyList-1\.0\.dtd\"\s*>/i;
+// We are really liberal when accepting DOCTYPEs.
+CFPropertyList.DTDRE = /^\s*(?:<\?\s*xml\s+version\s*=\s*\"1.0\"[^>]*\?>\s*)?(?:<\!DOCTYPE[^>]*>\s*)?/i
+CFPropertyList.XMLRE = /^\s*(?:<\?\s*xml\s+version\s*=\s*\"1.0\"[^>]*\?>\s*)?(?:<\!DOCTYPE[^>]*>\s*)?<\s*plist[^>]*\>/i;
 
 CFPropertyList.FormatXMLDTD = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">";
 CFPropertyList.Format280NorthMagicNumber = "280NPLIST";
@@ -26,12 +27,8 @@ CFPropertyList.Format280North_v1_0    = -1000;
 
 CFPropertyList.sniffedFormatOfString = function(/*String*/ aString)
 {
-    // If the string starts with the plist DTD
-    if (aString.match(CFPropertyList.DTDRE))
-        return CFPropertyList.FormatXML_v1_0;
-
-    // If the string starts with <plist>...
-    if (aString.match(CFPropertyList.PLISTRE))
+    // Check if this is an XML Plist.
+    if (aString.match(CFPropertyList.XMLRE))
         return CFPropertyList.FormatXML_v1_0;
 
     if (aString.substr(0, CFPropertyList.Format280NorthMagicNumber.length) === CFPropertyList.Format280NorthMagicNumber)
@@ -456,6 +453,7 @@ function parseXML(/*String*/ aString)
     {
         XMLNode = new ActiveXObject("Microsoft.XMLDOM");
 
+        // Extract the DTD, which confuses IE.
         var matches = aString.match(CFPropertyList.DTDRE);
 
         if (matches)

Objective-J/CommonJS/lib/objective-j/loader.js

@@ -9,6 +9,7 @@ function ObjectiveJLoader() {
 
         //print("loading objective-j: " + topId + " (" + path + ")");
         factories[topId] = objj.make_narwhal_factory(path);
+        factories[topId].path = path;
     }
 
     loader.load = function(topId, path) {

Objective-J/Preprocessor.js

@@ -143,6 +143,9 @@ function preprocess(/*String*/ aString, /*String*/ aPath, /*unsigned*/ flags)
 
 function Preprocessor(/*String*/ aString, /*String*/ aPath, /*unsigned*/ flags)
 {
+    // Remove the shebang.
+    aString = aString.replace(/^#[^\n]+\n/, "\n");
+
     this._currentSelector = "";
     this._currentClass = "";
     this._currentSuperClass = "";

Tests/Objective-J/CFPropertyListTest.j

@@ -0,0 +1,17 @@
+
+var FILE = require("file"),
+    FileList = require("jake").FileList;
+
+@implementation CFPropertyListTest : OJTestCase
+
+- (void)testFormatSniffing
+{
+    var XMLPropertyLists = new FileList(FILE.join(FILE.dirname(module.path), "PropertyLists", "XML-*.plist"));
+
+    XMLPropertyLists.forEach(function(/*String*/ aPath)
+    {
+        [self assert:CFPropertyList.FormatXML_v1_0 equals:CFPropertyList.sniffedFormatOfString(FILE.read(aPath))];
+    });
+}
+
+@end

Tests/Objective-J/PropertyLists/XML-0.plist

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict/>
+</plist>

Tests/Objective-J/PropertyLists/XML-1.plist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

Tests/Objective-J/PropertyLists/XML-2.plist

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict/>
+</plist>

Tests/Objective-J/PropertyLists/XML-3.plist

@@ -0,0 +1,4 @@
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

Tests/Objective-J/PropertyLists/XML-4.plist

@@ -0,0 +1,3 @@
+<plist version="1.0">
+<dict/>
+</plist>

Tests/Objective-J/PropertyLists/XML-5.plist

@@ -0,0 +1,7 @@
+
+
+
+
+<plist version="1.0">
+<dict/>
+</plist>

Tests/Objective-J/PropertyLists/XML-6.plist

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0">
+<dict/>
+</plist>