Minor improvements in the DOT parser, better error handling

examples/graph/graphviz/graphviz_gallery.html

@@ -57,9 +57,7 @@
         <option value="data/transparency.gv.txt">transparency</option>
         <option value="data/twopi2.gv.txt">twopi2</option>
         <option value="data/unix.gv.txt">unix</option>
-        <!-- TODO: get example world working (needs some extension of the DOT parser)
         <option value="data/world.gv.txt">world</option>
-        -->
     </select>
 </p>
 

src/graph/dotparser.js

@@ -439,6 +439,9 @@
         }
 
         // parse node
+        if (tokenType != TOKENTYPE.IDENTIFIER) {
+            throw newSyntaxError('Identifier expected');
+        }
         var id = token; // id can be a string or a number
         getToken();
 
@@ -448,6 +451,9 @@
             if (!graph.attr) {
                 graph.attr = {};
             }
+            if (tokenType != TOKENTYPE.IDENTIFIER) {
+                throw newSyntaxError('Identifier expected');
+            }
             graph.attr[id] = token;
             getToken();
             // TODO: implement comma separated list with "ID=ID"
@@ -468,7 +474,7 @@
         // optional subgraph keyword
         if (token == 'subgraph') {
             subgraph = {};
-            subgraph.type = token;
+            subgraph.type = 'subgraph';
             getToken();
 
             // optional graph id
@@ -488,7 +494,7 @@
                 };
             }
 
-            // TODO: copy global node and edge attributes into subgraph?
+            // TODO: copy global node and edge attributes into subgraph or not?
 
             // statements
             parseStatements(subgraph);
@@ -591,14 +597,19 @@
                 to = subgraph;
             }
             else {
+                if (tokenType != TOKENTYPE.IDENTIFIER) {
+                    throw newSyntaxError('Identifier or subgraph expected');
+                }
                 to = token;
                 addNode(graph, {
                     id: to
                 });
                 getToken();
-                var attr = parseAttributeList();
             }
 
+            // parse edge attributes
+            var attr = parseAttributeList();
+
             // create edge
             var edge = createEdge(graph, from, to, type, attr);
             addEdge(graph, edge);

vis.js

@@ -7247,6 +7247,9 @@ Timeline.prototype.getItemRange = function getItemRange() {
         }
 
         // parse node
+        if (tokenType != TOKENTYPE.IDENTIFIER) {
+            throw newSyntaxError('Identifier expected');
+        }
         var id = token; // id can be a string or a number
         getToken();
 
@@ -7256,6 +7259,9 @@ Timeline.prototype.getItemRange = function getItemRange() {
             if (!graph.attr) {
                 graph.attr = {};
             }
+            if (tokenType != TOKENTYPE.IDENTIFIER) {
+                throw newSyntaxError('Identifier expected');
+            }
             graph.attr[id] = token;
             getToken();
             // TODO: implement comma separated list with "ID=ID"
@@ -7276,7 +7282,7 @@ Timeline.prototype.getItemRange = function getItemRange() {
         // optional subgraph keyword
         if (token == 'subgraph') {
             subgraph = {};
-            subgraph.type = token;
+            subgraph.type = 'subgraph';
             getToken();
 
             // optional graph id
@@ -7296,7 +7302,7 @@ Timeline.prototype.getItemRange = function getItemRange() {
                 };
             }
 
-            // TODO: copy global node and edge attributes into subgraph?
+            // TODO: copy global node and edge attributes into subgraph or not?
 
             // statements
             parseStatements(subgraph);
@@ -7399,14 +7405,19 @@ Timeline.prototype.getItemRange = function getItemRange() {
                 to = subgraph;
             }
             else {
+                if (tokenType != TOKENTYPE.IDENTIFIER) {
+                    throw newSyntaxError('Identifier or subgraph expected');
+                }
                 to = token;
                 addNode(graph, {
                     id: to
                 });
                 getToken();
-                var attr = parseAttributeList();
             }
 
+            // parse edge attributes
+            var attr = parseAttributeList();
+
             // create edge
             var edge = createEdge(graph, from, to, type, attr);
             addEdge(graph, edge);