Merge pull request web-platform-tests#11496 (Update webidl2 to v13.0.3)

Author: gsnedders

interfaces/pointerevents-extension.idl

@@ -0,0 +1,8 @@
+dictionary PointerEventInit : MouseEventInit {
+    sequence<PointerEvent> coalescedEvents;
+};
+
+[Constructor(DOMString type, optional PointerEventInit eventInitDict)]
+interface PointerEvent : MouseEvent {
+    sequence<PointerEvent> getCoalescedEvents();
+};

pointerevents/extension/idlharness.html

@@ -34,23 +34,12 @@
 interface MouseEvent {
 };
 
-</pre>
-
-<pre id='idl'>
-dictionary PointerEventInit : MouseEventInit {
-    sequence<PointerEvent> coalescedEvents;
-};
-
-[Constructor(DOMString type, optional PointerEventInit eventInitDict)]
-interface PointerEvent : MouseEvent {
-    sequence<PointerEvent> getCoalescedEvents();
-};
-
 </pre>
 <script>
 promise_test(async function () {
   const dom = await fetch('/interfaces/dom.idl').then(r => r.text());
   const uievents = await fetch('/interfaces/uievents.idl').then(r => r.text());
+  const idl = await fetch('/interfaces/pointerevents-extension.idl').then(r => r.text());
 
   const idl_array = new IdlArray();
   idl_array.add_untested_idls(dom, { only: ['EventInit'] });
@@ -61,7 +50,7 @@
   });
   idl_array.add_untested_idls(
       document.getElementById("untested_idl").textContent);
-  idl_array.add_idls(document.getElementById("idl").textContent);
+  idl_array.add_idls(idl);
   idl_array.test();
 }, 'pointerevents extension interfaces');
 </script>

resources/test/tests/functional/idlharness/IdlInterface/test_to_json_operation.html

@@ -167,7 +167,7 @@
                 "status_string": "FAIL"
             },
             {
-                "message": "assert_true: {\"type\":\"return-type\",\"sequence\":false,\"generic\":null,\"nullable\":false,\"union\":false,\"idlType\":\"DOMException\"} is not an appropriate return value for the toJSON operation of N expected true got false",
+                "message": "assert_true: {\"type\":\"return-type\",\"generic\":null,\"nullable\":false,\"union\":false,\"idlType\":\"DOMException\",\"extAttrs\":[]} is not an appropriate return value for the toJSON operation of N expected true got false",
                 "name": "Test toJSON operation of N",
                 "properties": {},
                 "status_string": "FAIL"

resources/test/tests/unit/basic.html

@@ -24,7 +24,12 @@
         assert_equals(typeof WebIDL2.parse, "function");
     }, 'WebIDL2 namespace should have a parse method');
     test(function() {
-        assert_throws(new TypeError(), function() {  WebIDL2.parse("I'm a syntax error"); });
+        try {
+            WebIDL2.parse("I'm a syntax error");
+            throw new Error("Web IDL didn't throw");
+        } catch (e) {
+            assert_true(e.constructor.name === "WebIDLParseError");
+        }
     }, 'WebIDL2 parse method should bail on incorrect WebIDL');
     test(function() {
         assert_equals(typeof WebIDL2.parse("interface Foo {};"), "object");

resources/webidl2/.gitmodules

@@ -1,5 +1,13 @@
 # Change Log
 
+## [v10.2.1](https://github.com/w3c/webidl2.js/tree/v10.2.1) (2018-03-09)
+[Full Changelog](https://github.com/w3c/webidl2.js/compare/v10.2.0...v10.2.1)
+
+**Merged pull requests:**
+
+- Optimise tokenisation and whitespace skipping [\#139](https://github.com/w3c/webidl2.js/pull/139) ([ricea](https://github.com/ricea))
+- refactor: small syntax changes [\#137](https://github.com/w3c/webidl2.js/pull/137) ([saschanaz](https://github.com/saschanaz))
+
 ## [v10.2.0](https://github.com/w3c/webidl2.js/tree/v10.2.0) (2018-01-30)
 [Full Changelog](https://github.com/w3c/webidl2.js/compare/v10.1.0...v10.2.0)
 

resources/webidl2/CHANGELOG.md

@@ -45,23 +45,6 @@ In the browser:
 </script>
 ```
 
-### Advanced Parsing
-
-`parse()` can optionally accept a second parameter, an options object, which can be used to
-modify parsing behavior.
-
-The following options are recognized:
-```JS
-{
-  allowNestedTypedefs: false
-}
-```
-
-And their meanings are as follows:
-
-* `allowNestedTypedefs`: Boolean indicating whether the parser should accept `typedef`s as valid members of `interface`s.
-This is non-standard syntax and therefore the default is `false`.
-
 ### Errors
 
 When there is a syntax error in the WebIDL, it throws an exception object with the following
@@ -93,17 +76,18 @@ attached to a field called `idlType`:
 
 ```JS
 {
-  "sequence": false,
+  "type": "attribute-type",
   "generic": null,
-  "idlType": "void",
+  "idlType": "unsigned short",
   "nullable": false,
   "union": false,
+  "extAttrs": [...]
 }
 ```
 
 Where the fields are as follows:
 
-* `sequence`: Boolean indicating if it is a sequence. Same as `generic === "sequence"`.
+* `type`: String indicating where this type is used. Can be `null` if not applicable.
 * `generic`: String indicating the generic type (e.g. "Promise", "sequence"). `null`
   otherwise.
 * `idlType`: Can be different things depending on context. In most cases, this will just
@@ -113,6 +97,7 @@ Where the fields are as follows:
   description for the type in the sequence, the eventual value of the promise, etc.
 * `nullable`: Boolean indicating whether this is nullable or not.
 * `union`: Boolean indicating whether this is a union type or not.
+* `extAttrs`: A list of [extended attributes](#extended-attributes).
 
 ### Interface
 
@@ -211,11 +196,13 @@ A callback looks like this:
   "type": "callback",
   "name": "AsyncOperationCallback",
   "idlType": {
+    "type": "return-type",
     "sequence": false,
     "generic": null,
     "nullable": false,
     "union": false,
-    "idlType": "void"
+    "idlType": "void",
+    "extAttrs": []
   },
   "arguments": [...],
   "extAttrs": []
@@ -244,11 +231,13 @@ A dictionary looks like this:
     "name": "fillPattern",
     "required": false,
     "idlType": {
+      "type": "dictionary-type",
       "sequence": false,
       "generic": null,
       "nullable": true,
       "union": false,
-      "idlType": "DOMString"
+      "idlType": "DOMString",
+      "extAttrs": [...]
     },
     "extAttrs": [],
     "default": {
@@ -311,17 +300,21 @@ A typedef looks like this:
 {
   "type": "typedef",
   "idlType": {
+    "type": "typedef-type",
     "sequence": true,
     "generic": "sequence",
     "nullable": false,
     "union": false,
     "idlType": {
+      "type": "typedef-type",
       "sequence": false,
       "generic": null,
       "nullable": false,
       "union": false,
-      "idlType": "Point"
-    }
+      "idlType": "Point",
+      "extAttrs": [...]
+    },
+    "extAttrs": [...]
   },
   "name": "PointSequence",
   "extAttrs": []
@@ -388,23 +381,27 @@ An operation looks like this:
   "static": false,
   "stringifier": false,
   "idlType": {
+    "type": "return-type",
     "sequence": false,
     "generic": null,
     "nullable": false,
     "union": false,
-    "idlType": "void"
+    "idlType": "void",
+    "extAttrs": []
   },
   "name": "intersection",
   "arguments": [{
     "optional": false,
     "variadic": true,
     "extAttrs": [],
     "idlType": {
+      "type": "argument-type",
       "sequence": false,
       "generic": null,
       "nullable": false,
       "union": false,
-      "idlType": "long"
+      "idlType": "long",
+      "extAttrs": [...]
     },
     "name": "ints"
   }],
@@ -437,11 +434,13 @@ An attribute member looks like this:
   "inherit": false,
   "readonly": false,
   "idlType": {
+    "type": "attribute-type",
     "sequence": false,
     "generic": null,
     "nullable": false,
     "union": false,
-    "idlType": "RegExp"
+    "idlType": "RegExp",
+    "extAttrs": [...]
   },
   "name": "regexp",
   "extAttrs": []
@@ -467,7 +466,15 @@ A constant member looks like this:
 {
   "type": "const",
   "nullable": false,
-  "idlType": "boolean",
+  "idlType": {
+    "type": "const-type",
+    "sequence": false,
+    "generic": null,
+    "nullable": false,
+    "union": false,
+    "idlType": "boolean"
+    "extAttrs": []
+  },
   "name": "DEBUG",
   "value": {
     "type": "boolean",
@@ -481,7 +488,7 @@ The fields are as follows:
 
 * `type`: Always "const".
 * `nullable`: Whether its type is nullable.
-* `idlType`: The type of the constant (a simple type, the type name).
+* `idlType`: An [IDL Type](#idl-type) of the constant that represents a simple type, the type name.
 * `name`: The name of the constant.
 * `value`: The constant value as described by [Const Values](#default-and-const-values)
 * `extAttrs`: A list of [extended attributes](#extended-attributes).
@@ -497,11 +504,13 @@ The arguments (e.g. for an operation) look like this:
     "variadic": true,
     "extAttrs": [],
     "idlType": {
+      "type": "argument-type",
       "sequence": false,
       "generic": null,
       "nullable": false,
       "union": false,
-      "idlType": "long"
+      "idlType": "long",
+      "extAttrs": [...]
     },
     "name": "ints"
   }]
@@ -546,8 +555,6 @@ The fields are as follows:
 * `type`: Always `"extended-attribute"`.
 * `rhs`: If there is a right-hand side, this will capture its `type` (which can be
   "identifier" or "identifier-list") and its `value`.
-* `typePair`: If the extended attribute is a `MapClass` this will capture the
-  map's key type and value type respectively.
 
 ### Default and Const Values
 
@@ -587,14 +594,6 @@ The fields are as follows:
 
 ## Testing
 
-In order to run the tests you need to ensure that the widlproc submodule inside `test` is
-initialized and up to date:
-
-```Bash
-git submodule init
-git submodule update
-```
-
 ### Running
 
 The test runs with mocha and expect.js. Normally, running mocha in the root directory

resources/webidl2/README.md

@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>WebIDL 2 Checker</title>
+
+<script src='../lib/webidl2.js'></script>
+<script>
+let parserResult = undefined;
+
+function formatParserOutput() {
+  const outputEl = document.getElementById('webidl-checker-output');
+  if (parserResult) {
+    const prettyPrintEl = document.getElementById('pretty-print');
+    outputEl.innerText = JSON.stringify(parserResult, null, prettyPrintEl.checked ? 2 : null);
+  } else {
+    outputEl.innerText = '';
+  }
+}
+
+function checkWebIDL(textToCheck) {
+  const validation = document.getElementById('webidl-checker-validation');
+  parserResult = null;
+  try {
+    parserResult = WebIDL2.parse(textToCheck);
+    validation.innerText = 'WebIDL parsed successfully!';
+  } catch (e) {
+    validation.innerText = 'Exception while parsing WebIDL. See JavaScript console for more details.\n\n' + e.toString();
+    // Pass it along to the JavaScript console.
+    throw e;
+  } finally {
+    formatParserOutput();
+  }
+}
+</script>
+<style>
+textarea {
+  font-family: monospace;
+}
+</style>
+</head>
+<body>
+<h2>WebIDL Checker</h2>
+<p>This is an online checker for WebIDL built on the <a href="https://github.com/w3c/webidl2.js">webidl2.js</a> project.</p>
+<p>Enter your WebIDL to check below:</p>
+<textarea id='webidl-to-check' rows='20' cols='80'></textarea>
+<br>
+<input type='button' value='Check WebIDL' onclick='checkWebIDL(document.getElementById("webidl-to-check").value)'>
+<p>Validation results:</p>
+<textarea id='webidl-checker-validation' rows='20' cols='80'></textarea>
+<p>Parser output:</p>
+<textarea id='webidl-checker-output' rows='20' cols='80'></textarea>
+<br>
+<input type='checkbox' id='pretty-print' checked='true' onchange='formatParserOutput()'>Pretty Print
+</body>
+</html>