Update widlparser. Fixes #864.

Author: tabatkins

bikeshed/widlparser/test.py

@@ -152,6 +152,10 @@ def testDifference(input, output):
 typedef (short or Foo) maybeFoo;
 typedef sequence<(short or Foo)> maybeFoos;
 typedef FrozenArray<(short or Foo)> frozenMaybeFoos;
+typedef record<DOMString, Foo[]>? recordFoo;
+typedef record<DOMString, (short or Foo)>? recordMaybeFoo;
+typedef record<USVString, any> recordAny;
+typedef record<any, any> recordBroken;
 interface foo {
   [one] attribute Foo one;
   [two] Foo two()bar;

bikeshed/widlparser/widlparser/productions.py

@@ -529,13 +529,15 @@ class NonAnyType(Production):   # PrimitiveType [TypeSuffix] | "ByteString" [Typ
                                 # "USVString" TypeSuffix |
                                 # identifier [TypeSuffix] | "sequence" "<" Type ">" [Null] | "object" [TypeSuffix] |
                                 # "Date" [TypeSuffix] | "RegExp" [TypeSuffix] | "Error" TypeSuffix |
-                                # "DOMException" TypeSuffix | "Promise" "<" ReturnType ">" [Null] | BufferRelatedType [Nulls]
-                                # "FrozenArray" "<" Type ">" [Null]
+                                # "DOMException" TypeSuffix | "Promise" "<" ReturnType ">" [Null] | BufferRelatedType [Nulls] |
+                                # "FrozenArray" "<" Type ">" [Null] | "record" "<" StringType "," Type ">"
 
     BufferRelatedTypes = frozenset(['ArrayBuffer', 'DataView', 'Int8Array', 'Int16Array', 'Int32Array',
                                     'Uint8Array', 'Uint16Array', 'Uint32Array', 'Uint8ClampedArray',
                                     'Float32Array', 'Float64Array'])
 
+    StringTypes = frozenset(['ByteString', 'DOMString', 'USVString'])
+
     @classmethod
     def peek(cls, tokens):
         if (PrimitiveType.peek(tokens)):
@@ -560,12 +562,21 @@ def peek(cls, tokens):
         elif (token and token.isSymbol(cls.BufferRelatedTypes)):
             Symbol.peek(tokens, '?')
             return tokens.popPosition(True)
+        elif (token and token.isSymbol('record')):
+            if (Symbol.peek(tokens, '<')):
+                if (Symbol.peek(tokens, cls.StringTypes)):
+                    if (Symbol.peek(tokens, ',')):
+                        if (Type.peek(tokens)):
+                            if (Symbol.peek(tokens, '>')):
+                                Symbol.peek(tokens, '?')
+                                return tokens.popPosition(True)
         return tokens.popPosition(False)
 
     def __init__(self, tokens):
         Production.__init__(self, tokens)
         self.sequence = None
         self.promise = None
+        self.record = None
         self._openType = None
         self._closeType = None
         self.null = False
@@ -595,6 +606,14 @@ def __init__(self, tokens):
             elif (token.isSymbol(self.BufferRelatedTypes)):
                 self.type = Symbol(tokens, None, False)
                 self.null = Symbol(tokens, '?', False) if (Symbol.peek(tokens, '?')) else None
+            elif (token.isSymbol('record')):
+                self.record = Symbol(tokens)
+                self._openType = Symbol(tokens, '<')
+                self.keyType = Symbol(tokens)
+                self._comma = Symbol(tokens, ',')
+                self.type = Type(tokens)
+                self._closeType = Symbol(tokens, '>', False)
+                self.null = Symbol(tokens, '?', False) if (Symbol.peek(tokens, '?')) else None
             else:
                 self.type = Symbol(tokens, None, False)  # "ByteString" | "DOMString" | "USVString" | "object" | "Date" | "RegExp"
                 self.suffix = TypeSuffix(tokens) if (TypeSuffix.peek(tokens)) else None
@@ -607,6 +626,10 @@ def _unicode(self):
         if (self.promise):
             output = unicode(self.promise) + unicode(self._openType) + unicode(self.type) + unicode(self._closeType)
             return output + (unicode(self.null) if (self.null) else '')
+        if (self.record):
+            output = unicode(self.record) + unicode(self._openType) + unicode(self.keyType) + unicode(self._comma) + unicode(self.type) + unicode(self._closeType)
+            return output + (unicode(self.null) if (self.null) else '')
+
         output = unicode(self.type)
         output = output + (unicode(self.null) if (self.null) else '')
         return output + (unicode(self.suffix) if (self.suffix) else '')
@@ -626,6 +649,15 @@ def _markup(self, generator):
             generator.addText(self._closeType)
             generator.addText(self.null)
             return self
+        if (self.record):
+            self.record.markup(generator)
+            generator.addText(self._openType)
+            self.keyType.markup(generator)
+            generator.addText(self._comma)
+            self.type.markup(generator)
+            generator.addText(self._closeType)
+            generator.addText(self.null)
+            return self
         if (isinstance(self.type, basestring)):
             generator.addTypeName(self.type)
             if (self.suffix):
@@ -638,7 +670,7 @@ def _markup(self, generator):
         return self
 
     def __repr__(self):
-        output = '[NonAnyType: ' + ('[sequence] ' if (self.sequence) else '') + ('[Promise] ' if (self.promise) else '')
+        output = '[NonAnyType: ' + ('[sequence] ' if (self.sequence) else '') + ('[Promise] ' if (self.promise) else '') + ('[record] [StringType: ' + repr(self.keyType) + '] ' if (self.record) else '')
         output += repr(self.type) + ('[null]' if (self.null) else '')
         return output + (repr(self.suffix) if (self.suffix) else '') + ']'
 

bikeshed/widlparser/widlparser/tokenizer.py

@@ -56,7 +56,7 @@ class Tokenizer(object):
         'Date', 'deleter', 'dictionary', 'DOMString', 'double', 'enum', 'Error', 'exception', 'false', 'float',
         'Float32Array', 'Float64Array', 'FrozenArray', 'getter', 'implements', 'Infinity', '-Infinity', 'inherit', 'Int8Array',
         'Int16Array', 'Int32Array', 'interface', 'iterable', 'legacycaller', 'legacyiterable', 'long', 'maplike',
-        'namespace', 'NaN', 'null', 'object', 'octet', 'optional', 'or', 'partial', 'Promise', 'readonly', 'RegExp', 'required',
+        'namespace', 'NaN', 'null', 'object', 'octet', 'optional', 'or', 'partial', 'Promise', 'readonly', 'record', 'RegExp', 'required',
         'sequence', 'serializer', 'setlike', 'setter', 'short', 'static', 'stringifier', 'true', 'typedef',
         'Uint8Array', 'Uint16Array', 'Uint32Array', 'Uint8ClampedArray', 'unrestricted', 'unsigned', 'USVString',
         'void'))