More detailed error message in ambiguous cases.

src/parser/statement.js

@@ -116,8 +116,15 @@ pp.parseStatement = function (declaration, topLevel) {
         try {
           return this.parseBlock();
         } catch (err) {
-          if (objParseError && objParseError.pos >= err.pos) {
-            throw objParseError;
+          if (objParseError) {
+            if (objParseError.pos > err.pos) {
+              throw objParseError;
+            } else if (objParseError.pos < err.pos) {
+              throw err;
+            } else {
+              objParseError.message = "Cannot parse brace-delimited construct as an object or as a block. When parsed as an object, the error is: " + objParseError.message;
+              throw objParseError;
+            }
           } else {
             throw err;
           }

test/fixtures/core/uncategorised/345/options.json

@@ -1,3 +1,10 @@
 {
-  "throws": "Unexpected token (1:1)"
-}
+  "alternatives": {
+    "all": {
+      "throws": "Cannot parse brace-delimited construct as an object or as a block. When parsed as an object, the error is: Unexpected token (1:1)"
+    },
+    "noLsc": {
+      "throws": "Unexpected token (1:1)"
+    }
+  }
+}

test/fixtures/core/uncategorised/386/options.json

@@ -1,3 +1,10 @@
 {
-  "throws": "Unexpected token (4:1)"
-}
+  "alternatives": {
+    "all": {
+      "throws": "Cannot parse brace-delimited construct as an object or as a block. When parsed as an object, the error is: Unexpected token (4:1)"
+    },
+    "noLsc": {
+      "throws": "Unexpected token (4:1)"
+    }
+  }
+}

test/fixtures/esprima/invalid-syntax/migrated_0000/options.json

@@ -1,3 +1,10 @@
 {
-  "throws": "Unexpected token (1:1)"
-}
+  "alternatives": {
+    "all": {
+      "throws": "Cannot parse brace-delimited construct as an object or as a block. When parsed as an object, the error is: Unexpected token (1:1)"
+    },
+    "noLsc": {
+      "throws": "Unexpected token (1:1)"
+    }
+  }
+}

test/fixtures/esprima/invalid-syntax/migrated_0069/options.json

@@ -1,3 +1,10 @@
 {
-  "throws": "Unexpected token (1:1)"
-}
+  "alternatives": {
+    "all": {
+      "throws": "Cannot parse brace-delimited construct as an object or as a block. When parsed as an object, the error is: Unexpected token (1:1)"
+    },
+    "noLsc": {
+      "throws": "Unexpected token (1:1)"
+    }
+  }
+}

test/fixtures/lightscript/comprehension/object-paren-free/options.json

@@ -1,7 +1,7 @@
 {
   "alternatives": {
     "all": {
-      "throws": "Unexpected token, expected } (1:26)"
+      "throws": "Cannot parse brace-delimited construct as an object or as a block. When parsed as an object, the error is: Unexpected token, expected } (1:26)"
     },
     "noSeqExprParens": {
       "allPlugins": true,

test/fixtures/lightscript/object-block-ambiguity/pattern-block/actual.js

@@ -0,0 +1,4 @@
+{
+  a = b
+  x&
+}

test/fixtures/lightscript/object-block-ambiguity/pattern-block/options.json

@@ -0,0 +1,13 @@
+{
+  "alternatives": {
+    "all": {
+      "throws": "Cannot parse brace-delimited construct as an object or as a block. When parsed as an object, the error is: Unexpected token, expected , (3:3)"
+    },
+    "whiteblockOnly": {
+      "throws": "Unexpected token, expected , (3:3)"
+    },
+    "braceblock": {
+      "throws": "Unexpected token, expected , (3:3)"
+    }
+  }
+}