netsurf: Update www/netsurf to 3.7

pkgsrc changes:
- Remove patches/patch-libsvgtiny_src_svgtiny__internal.h, fixed differently by
  upstream
- Remove patches/patch-nsgenbind* all of them were from upstream and no more
  needed

Changes:
3.7
---
NetSurf 3.7 features performance improvements, improved page layout, and many
fixes. Also new is a treeview search feature, which allows Hotlist (Bookmarks),
History and Cookies to be searched.

10 files changed, 10 insertions, 677 deletions

diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 941297c8f0e..4322c26f717 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2017/08/24 20:03:42 adam Exp $
+# $NetBSD: Makefile,v 1.63 2017/10/23 10:45:41 leot Exp $
 
-DISTNAME=	netsurf-all-3.6
+DISTNAME=	netsurf-all-3.7
 PKGNAME=	${DISTNAME:S/-all//}
-PKGREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/netsurf/releases/source-full/
 
diff --git a/www/netsurf/PLIST b/www/netsurf/PLIST
index 48fac46444c..78f9b12b538 100644
--- a/www/netsurf/PLIST
+++ b/www/netsurf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/11/20 13:02:14 leot Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/10/23 10:45:41 leot Exp $
 bin/netsurf-gtk
 share/netsurf/Messages
 share/netsurf/SearchEngines
@@ -19,7 +19,7 @@ share/netsurf/en/maps.html
 share/netsurf/en/welcome.html
 share/netsurf/favicon.png
 share/netsurf/fr/Messages
-share/netsurf/history.gtk2.ui
+share/netsurf/globalhistory.gtk2.ui
 share/netsurf/hotlist.gtk2.ui
 share/netsurf/icons/arrow-l.png
 share/netsurf/icons/content.png
@@ -36,6 +36,7 @@ share/netsurf/it/welcome.html
 share/netsurf/ja/welcome.html
 share/netsurf/languages
 share/netsurf/licence.html
+share/netsurf/localhistory.gtk2.ui
 share/netsurf/login.gtk2.ui
 share/netsurf/maps.html
 share/netsurf/netsurf-16x16.xpm
diff --git a/www/netsurf/distinfo b/www/netsurf/distinfo
index 049c87a53cc..ddaede9c917 100644
--- a/www/netsurf/distinfo
+++ b/www/netsurf/distinfo
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.9 2017/01/14 23:33:34 leot Exp $
+$NetBSD: distinfo,v 1.10 2017/10/23 10:45:41 leot Exp $
 
-SHA1 (netsurf-all-3.6.tar.gz) = d25345415b9b26343c22929280c48066302da916
-RMD160 (netsurf-all-3.6.tar.gz) = 73b7768434b5365c912761837f7d6003c28fb84c
-SHA512 (netsurf-all-3.6.tar.gz) = 1b7dcc80efe8e3944e5db7d74da749821adb3ae39700df3efa6ecb347a00e33350e1d56d4139654d50ac41563edf3de52f0eb25bff6490d74144a7970fb6c3b4
-Size (netsurf-all-3.6.tar.gz) = 8403623 bytes
-SHA1 (patch-libsvgtiny_src_svgtiny__internal.h) = 7e8a0b4d00f5c65b2845f8167a55af8785fac203
+SHA1 (netsurf-all-3.7.tar.gz) = 599807124ed09cc61303be3f7cc5341e913b57c4
+RMD160 (netsurf-all-3.7.tar.gz) = d8c66a1f1262913096304ef43f58e9b4b0cc22a8
+SHA512 (netsurf-all-3.7.tar.gz) = 569c5a1bcce35bd69d3679ff5d7edd086238882ad24a9bcbdb51fccc2a950de45946f840aa38afb339c4c290c3070b4d6fe08eb6c912e9403489415beb3d6a91
+Size (netsurf-all-3.7.tar.gz) = 8281249 bytes
 SHA1 (patch-netsurf_utils_config.h) = de48304e3484a883509ea3ad92658788f7869041
 SHA1 (patch-nsgenbind_src_Makefile) = 1798b84c28fbb9bbdaafe3f182fbd301f5438df1
-SHA1 (patch-nsgenbind_src_nsgenbind-ast.c) = 5931ab321f15dc9754b71545d40bac01274938f6
-SHA1 (patch-nsgenbind_src_nsgenbind-ast.h) = acae94b6386be7dbde190eb7218a25a622b4763b
-SHA1 (patch-nsgenbind_src_nsgenbind-parser.y) = d16777ad3dde63ff4e00553103998326a1ad2903
-SHA1 (patch-nsgenbind_src_webidl-ast.c) = 09d8007e7e5a7b9799a721f180ee16b2cfbda0a9
-SHA1 (patch-nsgenbind_src_webidl-ast.h) = e01bf956b170ad53c60c993ec728d03d1b208e5b
-SHA1 (patch-nsgenbind_src_webidl-parser.y) = 930e39c1efa0fb4c4d4d9737584f83250cbb4a8f
diff --git a/www/netsurf/patches/patch-libsvgtiny_src_svgtiny__internal.h b/www/netsurf/patches/patch-libsvgtiny_src_svgtiny__internal.h
deleted file mode 100644
index e757878c06d..00000000000
--- a/www/netsurf/patches/patch-libsvgtiny_src_svgtiny__internal.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libsvgtiny_src_svgtiny__internal.h,v 1.1 2017/01/14 23:33:34 leot Exp $
-
-Fix build for gperf>=3.1 where 'len' parameter of the hash function
-and of the lookup function is of type 'size_t'.
-
---- libsvgtiny/src/svgtiny_internal.h.orig	2016-11-19 14:22:38.000000000 +0000
-+++ libsvgtiny/src/svgtiny_internal.h
-@@ -105,6 +105,6 @@ void svgtiny_list_free(struct svgtiny_li
- /* colors.gperf */
- const struct svgtiny_named_color *
- 		svgtiny_color_lookup(register const char *str,
--				register unsigned int len);
-+				register size_t len);
- 
- #endif
diff --git a/www/netsurf/patches/patch-nsgenbind_src_nsgenbind-ast.c b/www/netsurf/patches/patch-nsgenbind_src_nsgenbind-ast.c
deleted file mode 100644
index e7761156de7..00000000000
--- a/www/netsurf/patches/patch-nsgenbind_src_nsgenbind-ast.c
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-nsgenbind_src_nsgenbind-ast.c,v 1.1 2016/12/04 12:41:47 martin Exp $
-
-Backport of upstream:
-
-commit 3b3b926d7fb92361b1e8eed2efb351c32cb7bfaa
-Author: Vincent Sanders <vince@kyllikki.org>
-Date:   Sun Nov 27 14:17:11 2016 +0000
-
-    restructure AST node creation to avoid casts
-    
-    This changes Abstract Syntax Tree node creation for both webidl and
-    genbind syntax tress. If a node is to be created with a numeric value
-    instead of a pointer a separate API is now used instead of casting
-    through void.
-    
-    This fixes parsing and AST building on big endian 64bit platforms
-    where casting through void, which is completely undefined behaviour,
-    generates different and non-functioning code. The solution in this
-    patch is properly portable and correct without relying on casting at
-    all.
-    
-    Thanks to James Clarke <jrtc27@jrtc27.com> for the original debugging
-    and patch demonstrating how to work round the bug.
-
-diff --git a/src/nsgenbind-ast.c b/src/nsgenbind-ast.c
-index 49732a0..f78fe26 100644
---- nsgenbind/src/nsgenbind-ast.c.orig
-+++ nsgenbind/src/nsgenbind-ast.c
-@@ -132,6 +132,19 @@ genbind_new_node(enum genbind_node_type type, struct genbind_node *l, void *r)
-         return nn;
- }
- 
-+struct genbind_node *
-+genbind_new_number_node(enum genbind_node_type type,
-+                        struct genbind_node *l,
-+                        int number)
-+{
-+        struct genbind_node *nn;
-+        nn = calloc(1, sizeof(struct genbind_node));
-+        nn->type = type;
-+        nn->l = l;
-+        nn->r.number = number;
-+        return nn;
-+}
-+
- 
- /* exported interface defined in nsgenbind-ast.h */
- int
diff --git a/www/netsurf/patches/patch-nsgenbind_src_nsgenbind-ast.h b/www/netsurf/patches/patch-nsgenbind_src_nsgenbind-ast.h
deleted file mode 100644
index 794ce99568b..00000000000
--- a/www/netsurf/patches/patch-nsgenbind_src_nsgenbind-ast.h
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-nsgenbind_src_nsgenbind-ast.h,v 1.1 2016/12/04 12:41:47 martin Exp $
-
-Backport of upstream:
-
-commit 3b3b926d7fb92361b1e8eed2efb351c32cb7bfaa
-Author: Vincent Sanders <vince@kyllikki.org>
-Date:   Sun Nov 27 14:17:11 2016 +0000
-
-    restructure AST node creation to avoid casts
-    
-    This changes Abstract Syntax Tree node creation for both webidl and
-    genbind syntax tress. If a node is to be created with a numeric value
-    instead of a pointer a separate API is now used instead of casting
-    through void.
-    
-    This fixes parsing and AST building on big endian 64bit platforms
-    where casting through void, which is completely undefined behaviour,
-    generates different and non-functioning code. The solution in this
-    patch is properly portable and correct without relying on casting at
-    all.
-    
-    Thanks to James Clarke <jrtc27@jrtc27.com> for the original debugging
-    and patch demonstrating how to work round the bug.
-
-diff --git a/src/nsgenbind-ast.h b/src/nsgenbind-ast.h
-index 49db23b..6fb7221 100644
---- nsgenbind/src/nsgenbind-ast.h.orig
-+++ nsgenbind/src/nsgenbind-ast.h
-@@ -71,7 +71,18 @@ int genbind_parsefile(char *infilename, struct genbind_node **ast);
- 
- char *genbind_strapp(char *a, char *b);
- 
-+/**
-+ * create a new node with value from pointer
-+ */
- struct genbind_node *genbind_new_node(enum genbind_node_type type, struct genbind_node *l, void *r);
-+
-+/**
-+ * create a new number node
-+ *
-+ * Create a node with of number type
-+ */
-+struct genbind_node *genbind_new_number_node(enum genbind_node_type type, struct genbind_node *l, int number);
-+
- struct genbind_node *genbind_node_link(struct genbind_node *tgt, struct genbind_node *src);
- 
- struct genbind_node *genbind_node_prepend(struct genbind_node *list, struct genbind_node *inst);
diff --git a/www/netsurf/patches/patch-nsgenbind_src_nsgenbind-parser.y b/www/netsurf/patches/patch-nsgenbind_src_nsgenbind-parser.y
deleted file mode 100644
index e1d92960145..00000000000
--- a/www/netsurf/patches/patch-nsgenbind_src_nsgenbind-parser.y
+++ /dev/null
@@ -1,93 +0,0 @@
-$NetBSD: patch-nsgenbind_src_nsgenbind-parser.y,v 1.1 2016/12/04 12:41:47 martin Exp $
-
-Backport of upstream:
-
-commit 3b3b926d7fb92361b1e8eed2efb351c32cb7bfaa
-Author: Vincent Sanders <vince@kyllikki.org>
-Date:   Sun Nov 27 14:17:11 2016 +0000
-
-    restructure AST node creation to avoid casts
-    
-    This changes Abstract Syntax Tree node creation for both webidl and
-    genbind syntax tress. If a node is to be created with a numeric value
-    instead of a pointer a separate API is now used instead of casting
-    through void.
-    
-    This fixes parsing and AST building on big endian 64bit platforms
-    where casting through void, which is completely undefined behaviour,
-    generates different and non-functioning code. The solution in this
-    patch is properly portable and correct without relying on casting at
-    all.
-    
-    Thanks to James Clarke <jrtc27@jrtc27.com> for the original debugging
-    and patch demonstrating how to work round the bug.
-
-diff --git a/src/nsgenbind-parser.y b/src/nsgenbind-parser.y
-index c6b9a74..fd41c37 100644
---- nsgenbind/src/nsgenbind-parser.y.orig
-+++ nsgenbind/src/nsgenbind-parser.y
-@@ -138,17 +138,17 @@ add_method(struct genbind_node **genbind_ast,
-         }
- 
-         location_node = genbind_new_node(GENBIND_NODE_TYPE_FILE,
--                                genbind_new_node(GENBIND_NODE_TYPE_LINE,
--                                                 cdata_node,
--                                                 (void *)lineno),
-+                                genbind_new_number_node(GENBIND_NODE_TYPE_LINE,
-+                                                        cdata_node,
-+                                                        lineno),
-                                          strdup(filename));
- 
-         /* generate method node */
-         method_node = genbind_new_node(GENBIND_NODE_TYPE_METHOD,
-                                  NULL,
--                                 genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-+                                 genbind_new_number_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-                                                   location_node,
--                                                  (void *)methodtype));
-+                                                  methodtype));
- 
-         class_node = genbind_node_find_type_ident(*genbind_ast,
-                                                   NULL,
-@@ -304,11 +304,11 @@ BindingArg:
-         {
-                 $$ = genbind_new_node(GENBIND_NODE_TYPE_METHOD,
-                         NULL,
--                        genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-+                        genbind_new_number_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-                                 genbind_new_node(GENBIND_NODE_TYPE_CDATA,
-                                                  NULL,
-                                                  $2),
--                                (void *)$1));
-+                                $1));
-         }
-         ;
- 
-@@ -568,11 +568,11 @@ ClassArg:
-         TOK_PROPERTY Modifiers TOK_IDENTIFIER ';'
-         {
-                 $$ = genbind_new_node(GENBIND_NODE_TYPE_PROPERTY, NULL,
--                        genbind_new_node(GENBIND_NODE_TYPE_MODIFIER,
-+                        genbind_new_number_node(GENBIND_NODE_TYPE_MODIFIER,
-                                 genbind_new_node(GENBIND_NODE_TYPE_IDENT,
-                                                  NULL,
-                                                  $3),
--                                         (void *)$2));
-+                                         $2));
-         }
-         |
-         TOK_FLAGS ClassFlags ';'
-@@ -584,11 +584,11 @@ ClassArg:
-         {
-                 $$ = genbind_new_node(GENBIND_NODE_TYPE_METHOD,
-                         NULL,
--                        genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-+                        genbind_new_number_node(GENBIND_NODE_TYPE_METHOD_TYPE,
-                                 genbind_new_node(GENBIND_NODE_TYPE_CDATA,
-                                                  NULL,
-                                                  $2),
--                                (void *)$1));
-+                                $1));
-         }
-         ;
- 
diff --git a/www/netsurf/patches/patch-nsgenbind_src_webidl-ast.c b/www/netsurf/patches/patch-nsgenbind_src_webidl-ast.c
deleted file mode 100644
index 22289160daf..00000000000
--- a/www/netsurf/patches/patch-nsgenbind_src_webidl-ast.c
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-nsgenbind_src_webidl-ast.c,v 1.1 2016/12/04 12:41:47 martin Exp $
-
-Backport of upstream:
-
-commit 3b3b926d7fb92361b1e8eed2efb351c32cb7bfaa
-Author: Vincent Sanders <vince@kyllikki.org>
-Date:   Sun Nov 27 14:17:11 2016 +0000
-
-    restructure AST node creation to avoid casts
-    
-    This changes Abstract Syntax Tree node creation for both webidl and
-    genbind syntax tress. If a node is to be created with a numeric value
-    instead of a pointer a separate API is now used instead of casting
-    through void.
-    
-    This fixes parsing and AST building on big endian 64bit platforms
-    where casting through void, which is completely undefined behaviour,
-    generates different and non-functioning code. The solution in this
-    patch is properly portable and correct without relying on casting at
-    all.
-    
-    Thanks to James Clarke <jrtc27@jrtc27.com> for the original debugging
-    and patch demonstrating how to work round the bug.
-
-diff --git a/src/webidl-ast.c b/src/webidl-ast.c
-index 0d908ce..a1133e3 100644
---- nsgenbind/src/webidl-ast.c.orig
-+++ nsgenbind/src/webidl-ast.c
-@@ -120,6 +120,7 @@ webidl_node_add(struct webidl_node *node, struct webidl_node *list)
- 
- 
- struct webidl_node *
-+/* exported interface documented in webidl-ast.h */
- webidl_node_new(enum webidl_node_type type,
- 		struct webidl_node *l,
- 		void *r)
-@@ -128,7 +129,21 @@ webidl_node_new(enum webidl_node_type type,
- 	nn = calloc(1, sizeof(struct webidl_node));
- 	nn->type = type;
- 	nn->l = l;
--	nn->r.text = r;
-+	nn->r.value = r;
-+	return nn;
-+}
-+
-+/* exported interface documented in webidl-ast.h */
-+struct webidl_node *
-+webidl_new_number_node(enum webidl_node_type type,
-+                       struct webidl_node *l,
-+                       int number)
-+{
-+	struct webidl_node *nn;
-+	nn = calloc(1, sizeof(struct webidl_node));
-+	nn->type = type;
-+	nn->l = l;
-+	nn->r.number = number;
- 	return nn;
- }
- 
diff --git a/www/netsurf/patches/patch-nsgenbind_src_webidl-ast.h b/www/netsurf/patches/patch-nsgenbind_src_webidl-ast.h
deleted file mode 100644
index 12f0b81ea47..00000000000
--- a/www/netsurf/patches/patch-nsgenbind_src_webidl-ast.h
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-nsgenbind_src_webidl-ast.h,v 1.1 2016/12/04 12:41:47 martin Exp $
-
-Backport of upstream:
-
-commit 3b3b926d7fb92361b1e8eed2efb351c32cb7bfaa
-Author: Vincent Sanders <vince@kyllikki.org>
-Date:   Sun Nov 27 14:17:11 2016 +0000
-
-    restructure AST node creation to avoid casts
-    
-    This changes Abstract Syntax Tree node creation for both webidl and
-    genbind syntax tress. If a node is to be created with a numeric value
-    instead of a pointer a separate API is now used instead of casting
-    through void.
-    
-    This fixes parsing and AST building on big endian 64bit platforms
-    where casting through void, which is completely undefined behaviour,
-    generates different and non-functioning code. The solution in this
-    patch is properly portable and correct without relying on casting at
-    all.
-    
-    Thanks to James Clarke <jrtc27@jrtc27.com> for the original debugging
-    and patch demonstrating how to work round the bug.
-
-diff --git a/src/webidl-ast.h b/src/webidl-ast.h
-index bd9b313..fad070b 100644
---- nsgenbind/src/webidl-ast.h.orig
-+++ nsgenbind/src/webidl-ast.h
-@@ -92,8 +92,17 @@ typedef int (webidl_callback_t)(struct webidl_node *node, void *ctx);
- 
- int webidl_cmp_node_type(struct webidl_node *node, void *ctx);
- 
-+/**
-+ * create a new node with a pointer value
-+ */
- struct webidl_node *webidl_node_new(enum webidl_node_type, struct webidl_node *l, void *r);
- 
-+/**
-+ * create a new node with an integer value
-+ */
-+struct webidl_node *webidl_new_number_node(enum webidl_node_type type, struct webidl_node *l, int number);
-+
-+
- void webidl_node_set(struct webidl_node *node, enum webidl_node_type type, void *r);
- 
- struct webidl_node *webidl_node_prepend(struct webidl_node *list, struct webidl_node *node);
diff --git a/www/netsurf/patches/patch-nsgenbind_src_webidl-parser.y b/www/netsurf/patches/patch-nsgenbind_src_webidl-parser.y
deleted file mode 100644
index acd46e26ef1..00000000000
--- a/www/netsurf/patches/patch-nsgenbind_src_webidl-parser.y
+++ /dev/null
@@ -1,352 +0,0 @@
-$NetBSD: patch-nsgenbind_src_webidl-parser.y,v 1.1 2016/12/04 12:41:47 martin Exp $
-
-Backport of upstream:
-
-commit 3b3b926d7fb92361b1e8eed2efb351c32cb7bfaa
-Author: Vincent Sanders <vince@kyllikki.org>
-Date:   Sun Nov 27 14:17:11 2016 +0000
-
-    restructure AST node creation to avoid casts
-    
-    This changes Abstract Syntax Tree node creation for both webidl and
-    genbind syntax tress. If a node is to be created with a numeric value
-    instead of a pointer a separate API is now used instead of casting
-    through void.
-    
-    This fixes parsing and AST building on big endian 64bit platforms
-    where casting through void, which is completely undefined behaviour,
-    generates different and non-functioning code. The solution in this
-    patch is properly portable and correct without relying on casting at
-    all.
-    
-    Thanks to James Clarke <jrtc27@jrtc27.com> for the original debugging
-    and patch demonstrating how to work round the bug.
-
-diff --git a/src/webidl-parser.y b/src/webidl-parser.y
-index ec3309c..0e46b17 100644
---- nsgenbind/src/webidl-parser.y.orig
-+++ nsgenbind/src/webidl-parser.y
-@@ -735,9 +735,9 @@ ConstValue:
-         |
-         TOK_INT_LITERAL
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_LITERAL_INT,
--                                     NULL,
--                                     (void *)$1);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_LITERAL_INT,
-+                                            NULL,
-+                                            $1);
-         }
-         |
-         TOK_NULL_LITERAL
-@@ -750,16 +750,16 @@ ConstValue:
- BooleanLiteral:
-         TOK_TRUE
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_LITERAL_BOOL,
--                                     NULL,
--                                     (void *)true);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_LITERAL_BOOL,
-+                                            NULL,
-+                                            (int)true);
-         }
-         |
-         TOK_FALSE
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_LITERAL_BOOL,
--                                     NULL,
--                                     (void *)false);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_LITERAL_BOOL,
-+                                            NULL,
-+                                            (int)false);
-         }
-         ;
- 
-@@ -846,16 +846,18 @@ Attribute:
- 
-                 /* deal with inherit modifier */
-                 if ($1) {
--                        attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
-+                        attribute = webidl_new_number_node(
-+                                          WEBIDL_NODE_TYPE_MODIFIER,
-                                           attribute,
--                                          (void *)WEBIDL_TYPE_MODIFIER_INHERIT);
-+                                          WEBIDL_TYPE_MODIFIER_INHERIT);
-                 }
- 
-                 /* deal with readonly modifier */
-                 if ($2) {
--                        attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
-+                        attribute = webidl_new_number_node(
-+                                         WEBIDL_NODE_TYPE_MODIFIER,
-                                          attribute,
--                                         (void *)WEBIDL_TYPE_MODIFIER_READONLY);
-+                                         WEBIDL_TYPE_MODIFIER_READONLY);
-                 }
- 
-                 $$ = webidl_node_new(WEBIDL_NODE_TYPE_ATTRIBUTE,
-@@ -880,14 +882,16 @@ StaticMemberRest:
-         {
-                 struct webidl_node *attribute;
- 
--                attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
--                                       $2, (void *)WEBIDL_TYPE_MODIFIER_STATIC);
-+                attribute = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER,
-+                                                   $2,
-+                                                   WEBIDL_TYPE_MODIFIER_STATIC);
- 
-                 /* deal with readonly modifier */
-                 if ($1) {
--                        attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
-+                        attribute = webidl_new_number_node(
-+                                         WEBIDL_NODE_TYPE_MODIFIER,
-                                          attribute,
--                                         (void *)WEBIDL_TYPE_MODIFIER_READONLY);
-+                                         WEBIDL_TYPE_MODIFIER_READONLY);
-                 }
- 
-                 $$ = webidl_node_new(WEBIDL_NODE_TYPE_ATTRIBUTE,
-@@ -900,8 +904,9 @@ StaticMemberRest:
-                 struct webidl_node *operation;
- 
-                 /* add static modifier */
--                operation = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
--                                       $2, (void *)WEBIDL_TYPE_MODIFIER_STATIC);
-+                operation = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER,
-+                                                   $2,
-+                                                   WEBIDL_TYPE_MODIFIER_STATIC);
- 
-                 /* put return type on the operation */
-                 operation = webidl_node_prepend($1, operation);
-@@ -1015,16 +1020,16 @@ Specials:
- Special:
-         TOK_GETTER
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
--                                     NULL,
--                                     (void *)WEBIDL_TYPE_SPECIAL_GETTER);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+                                            NULL,
-+                                            WEBIDL_TYPE_SPECIAL_GETTER);
-         }
-         |
-         TOK_SETTER
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
--                                     NULL,
--                                     (void *)WEBIDL_TYPE_SPECIAL_SETTER);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+                                            NULL,
-+                                            WEBIDL_TYPE_SPECIAL_SETTER);
-         }
-         |
-         TOK_CREATOR
-@@ -1032,23 +1037,23 @@ Special:
-                 /* second edition removed this special but the
-                  * specifications still use it!
-                  */
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
--                                     NULL,
--                                     (void *)WEBIDL_TYPE_SPECIAL_CREATOR);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+                                            NULL,
-+                                            WEBIDL_TYPE_SPECIAL_CREATOR);
-         }
-         |
-         TOK_DELETER
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
--                                     NULL,
--                                     (void *)WEBIDL_TYPE_SPECIAL_DELETER);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+                                            NULL,
-+                                            WEBIDL_TYPE_SPECIAL_DELETER);
-         }
-         |
-         TOK_LEGACYCALLER
-         {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL,
--                                     NULL,
--                                     (void *)WEBIDL_TYPE_SPECIAL_LEGACYCALLER);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL,
-+                                            NULL,
-+                                            WEBIDL_TYPE_SPECIAL_LEGACYCALLER);
-         }
-         ;
- 
-@@ -1679,8 +1684,9 @@ SingleType:
-         TOK_ANY TypeSuffixStartingWithArray
-         {
-                 /* todo deal with TypeSuffixStartingWithArray */
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE,
--                                     NULL, (void *)WEBIDL_TYPE_ANY);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                            NULL,
-+                                            WEBIDL_TYPE_ANY);
-         }
-         ;
- 
-@@ -1742,29 +1748,39 @@ NonAnyType:
-         |
-         TOK_STRING TypeSuffix
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_STRING);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        $2,
-+                                        WEBIDL_TYPE_STRING);
-         }
-         |
-         TOK_IDENTIFIER TypeSuffix
-         {
-             struct webidl_node *type;
--            type = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_USER);
-+            type = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                          $2,
-+                                          WEBIDL_TYPE_USER);
-             $$ = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, type, $1);
-         }
-         |
-         TOK_SEQUENCE '<' Type '>' Null
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $3, (void *)WEBIDL_TYPE_SEQUENCE);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        $3,
-+                                        WEBIDL_TYPE_SEQUENCE);
-         }
-         |
-         TOK_OBJECT TypeSuffix
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_OBJECT);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        $2,
-+                                        WEBIDL_TYPE_OBJECT);
-         }
-         |
-         TOK_DATE TypeSuffix
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_DATE);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        $2,
-+                                        WEBIDL_TYPE_DATE);
-         }
-         ;
- 
-@@ -1778,7 +1794,9 @@ ConstType:
-         TOK_IDENTIFIER Null
-         {
-             struct webidl_node *type;
--            type = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_USER);
-+            type = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                          NULL,
-+                                          WEBIDL_TYPE_USER);
-             type = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, type, $1);
-             $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE, NULL, type);
-         }
-@@ -1793,17 +1811,23 @@ PrimitiveType:
-         |
-         TOK_BOOLEAN
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_BOOL);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        NULL,
-+                                        WEBIDL_TYPE_BOOL);
-         }
-         |
-         TOK_BYTE
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_BYTE);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        NULL,
-+                                        WEBIDL_TYPE_BYTE);
-         }
-         |
-         TOK_OCTET
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_OCTET);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        NULL,
-+                                        WEBIDL_TYPE_OCTET);
-         }
-         ;
- 
-@@ -1811,9 +1835,9 @@ PrimitiveType:
- UnrestrictedFloatType:
-         TOK_UNRESTRICTED FloatType
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
--                                 $2,
--                                 (void *)WEBIDL_TYPE_MODIFIER_UNRESTRICTED);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER,
-+                                        $2,
-+                                        WEBIDL_TYPE_MODIFIER_UNRESTRICTED);
-         }
-         |
-         FloatType
-@@ -1823,12 +1847,16 @@ UnrestrictedFloatType:
- FloatType:
-         TOK_FLOAT
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_FLOAT);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        NULL,
-+                                        WEBIDL_TYPE_FLOAT);
-         }
-         |
-         TOK_DOUBLE
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_DOUBLE);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        NULL,
-+                                        WEBIDL_TYPE_DOUBLE);
-         }
-         ;
- 
-@@ -1836,9 +1864,9 @@ FloatType:
- UnsignedIntegerType:
-         TOK_UNSIGNED IntegerType
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER,
--                                 $2,
--                                 (void *)WEBIDL_TYPE_MODIFIER_UNSIGNED);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER,
-+                                        $2,
-+                                        WEBIDL_TYPE_MODIFIER_UNSIGNED);
-         }
-         |
-         IntegerType
-@@ -1848,15 +1876,21 @@ UnsignedIntegerType:
- IntegerType:
-         TOK_SHORT
-         {
--            $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_SHORT);
-+            $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                        NULL,
-+                                        WEBIDL_TYPE_SHORT);
-         }
-         |
-         TOK_LONG OptionalLong
-         {
-             if ($2) {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_LONGLONG);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                            NULL,
-+                                            WEBIDL_TYPE_LONGLONG);
-             } else {
--                $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_LONG);
-+                $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                            NULL,
-+                                            WEBIDL_TYPE_LONG);
-             }
-         }
-         ;
-@@ -1927,7 +1961,9 @@ ReturnType:
-         TOK_VOID
-         {
-             struct webidl_node *type;
--            type = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_VOID);
-+            type = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE,
-+                                          NULL,
-+                                          WEBIDL_TYPE_VOID);
-             $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE, NULL, type);
-         }
-