Merge remote-tracking branch 'origin/master' into flow/trapezoid

2025-11-20 20:54:27 +01:00 · 2019-06-25 22:36:13 -05:00
parent db2a21cea1 95967151ae
commit 24600355c8
81 changed files with 8414 additions and 4300 deletions
--- a/src/diagrams/class/classDb.js
+++ b/src/diagrams/class/classDb.js
@@ -44,17 +44,23 @@ export const addRelation = function (relation) {
  relations.push(relation)
 }

-export const addMembers = function (className, MembersArr) {
+export const addMember = function (className, member) {
  const theClass = classes[className]
-  if (typeof MembersArr === 'string') {
-    if (MembersArr.substr(-1) === ')') {
-      theClass.methods.push(MembersArr)
+  if (typeof member === 'string') {
+    if (member.substr(-1) === ')') {
+      theClass.methods.push(member)
    } else {
-      theClass.members.push(MembersArr)
+      theClass.members.push(member)
    }
  }
 }

+export const addMembers = function (className, MembersArr) {
+  if (Array.isArray(MembersArr)) {
+    MembersArr.forEach(member => addMember(className, member))
+  }
+}
+
 export const cleanupLabel = function (label) {
  if (label.substring(0, 1) === ':') {
    return label.substr(2).trim()
@@ -82,6 +88,7 @@ export default {
  getClasses,
  getRelations,
  addRelation,
+  addMember,
  addMembers,
  cleanupLabel,
  lineType,
--- a/src/diagrams/class/classRenderer.js
+++ b/src/diagrams/class/classRenderer.js
@@ -1,9 +1,8 @@
+import * as d3 from 'd3'
 import dagre from 'dagre-layout'
 import graphlib from 'graphlibrary'
-import * as d3 from 'd3'
-
-import classDb from './classDb'
 import { logger } from '../../logger'
+import classDb from './classDb'
 import { parser } from './parser/classDiagram'

 parser.yy = classDb
@@ -34,7 +33,9 @@ const getGraphId = function (label) {
 * Setup arrow head and define the marker. The result is appended to the svg.
 */
 const insertMarkers = function (elem) {
-  elem.append('defs').append('marker')
+  elem
+    .append('defs')
+    .append('marker')
    .attr('id', 'extensionStart')
    .attr('class', 'extension')
    .attr('refX', 0)
@@ -45,7 +46,9 @@ const insertMarkers = function (elem) {
    .append('path')
    .attr('d', 'M 1,7 L18,13 V 1 Z')

-  elem.append('defs').append('marker')
+  elem
+    .append('defs')
+    .append('marker')
    .attr('id', 'extensionEnd')
    .attr('refX', 19)
    .attr('refY', 7)
@@ -55,7 +58,9 @@ const insertMarkers = function (elem) {
    .append('path')
    .attr('d', 'M 1,1 V 13 L18,7 Z') // this is actual shape for arrowhead

-  elem.append('defs').append('marker')
+  elem
+    .append('defs')
+    .append('marker')
    .attr('id', 'compositionStart')
    .attr('class', 'extension')
    .attr('refX', 0)
@@ -66,7 +71,9 @@ const insertMarkers = function (elem) {
    .append('path')
    .attr('d', 'M 18,7 L9,13 L1,7 L9,1 Z')

-  elem.append('defs').append('marker')
+  elem
+    .append('defs')
+    .append('marker')
    .attr('id', 'compositionEnd')
    .attr('refX', 19)
    .attr('refY', 7)
@@ -76,7 +83,9 @@ const insertMarkers = function (elem) {
    .append('path')
    .attr('d', 'M 18,7 L9,13 L1,7 L9,1 Z')

-  elem.append('defs').append('marker')
+  elem
+    .append('defs')
+    .append('marker')
    .attr('id', 'aggregationStart')
    .attr('class', 'extension')
    .attr('refX', 0)
@@ -87,7 +96,9 @@ const insertMarkers = function (elem) {
    .append('path')
    .attr('d', 'M 18,7 L9,13 L1,7 L9,1 Z')

-  elem.append('defs').append('marker')
+  elem
+    .append('defs')
+    .append('marker')
    .attr('id', 'aggregationEnd')
    .attr('refX', 19)
    .attr('refY', 7)
@@ -97,7 +108,9 @@ const insertMarkers = function (elem) {
    .append('path')
    .attr('d', 'M 18,7 L9,13 L1,7 L9,1 Z')

-  elem.append('defs').append('marker')
+  elem
+    .append('defs')
+    .append('marker')
    .attr('id', 'dependencyStart')
    .attr('class', 'extension')
    .attr('refX', 0)
@@ -108,7 +121,9 @@ const insertMarkers = function (elem) {
    .append('path')
    .attr('d', 'M 5,7 L9,13 L1,7 L9,1 Z')

-  elem.append('defs').append('marker')
+  elem
+    .append('defs')
+    .append('marker')
    .attr('id', 'dependencyEnd')
    .attr('refX', 19)
    .attr('refY', 7)
@@ -120,6 +135,7 @@ const insertMarkers = function (elem) {
 }

 let edgeCount = 0
+let total = 0
 const drawEdge = function (elem, path, relation) {
  const getRelationType = function (type) {
    switch (type) {
@@ -134,11 +150,14 @@ const drawEdge = function (elem, path, relation) {
    }
  }

+  path.points = path.points.filter(p => !Number.isNaN(p.y))
+
  // The data for our line
  const lineData = path.points

  // This is the accessor function we talked about above
-  const lineFunction = d3.line()
+  const lineFunction = d3
+    .line()
    .x(function (d) {
      return d.x
    })
@@ -147,27 +166,49 @@ const drawEdge = function (elem, path, relation) {
    })
    .curve(d3.curveBasis)

-  const svgPath = elem.append('path')
+  const svgPath = elem
+    .append('path')
    .attr('d', lineFunction(lineData))
    .attr('id', 'edge' + edgeCount)
    .attr('class', 'relation')
  let url = ''
  if (conf.arrowMarkerAbsolute) {
-    url = window.location.protocol + '//' + window.location.host + window.location.pathname + window.location.search
+    url =
+      window.location.protocol +
+      '//' +
+      window.location.host +
+      window.location.pathname +
+      window.location.search
    url = url.replace(/\(/g, '\\(')
    url = url.replace(/\)/g, '\\)')
  }

  if (relation.relation.type1 !== 'none') {
-    svgPath.attr('marker-start', 'url(' + url + '#' + getRelationType(relation.relation.type1) + 'Start' + ')')
+    svgPath.attr(
+      'marker-start',
+      'url(' +
+        url +
+        '#' +
+        getRelationType(relation.relation.type1) +
+        'Start' +
+        ')'
+    )
  }
  if (relation.relation.type2 !== 'none') {
-    svgPath.attr('marker-end', 'url(' + url + '#' + getRelationType(relation.relation.type2) + 'End' + ')')
+    svgPath.attr(
+      'marker-end',
+      'url(' +
+        url +
+        '#' +
+        getRelationType(relation.relation.type2) +
+        'End' +
+        ')'
+    )
  }

  let x, y
  const l = path.points.length
-  if ((l % 2) !== 0) {
+  if (l % 2 !== 0 && l > 1) {
    const p1 = path.points[Math.floor(l / 2)]
    const p2 = path.points[Math.ceil(l / 2)]
    x = (p1.x + p2.x) / 2
@@ -179,9 +220,9 @@ const drawEdge = function (elem, path, relation) {
  }

  if (typeof relation.title !== 'undefined') {
-    const g = elem.append('g')
-      .attr('class', 'classLabel')
-    const label = g.append('text')
+    const g = elem.append('g').attr('class', 'classLabel')
+    const label = g
+      .append('text')
      .attr('class', 'label')
      .attr('x', x)
      .attr('y', y)
@@ -207,7 +248,8 @@ const drawClass = function (elem, classDef) {
  logger.info('Rendering class ' + classDef)

  const addTspan = function (textEl, txt, isFirst) {
-    const tSpan = textEl.append('tspan')
+    const tSpan = textEl
+      .append('tspan')
      .attr('x', conf.padding)
      .text(txt)
    if (!isFirst) {
@@ -215,7 +257,7 @@ const drawClass = function (elem, classDef) {
    }
  }

-  const id = 'classId' + classCnt
+  const id = 'classId' + (classCnt % total)
  const classInfo = {
    id: id,
    label: classDef.id,
@@ -223,24 +265,28 @@ const drawClass = function (elem, classDef) {
    height: 0
  }

-  const g = elem.append('g')
+  const g = elem
+    .append('g')
    .attr('id', id)
    .attr('class', 'classGroup')
-  const title = g.append('text')
+  const title = g
+    .append('text')
    .attr('x', conf.padding)
    .attr('y', conf.textHeight + conf.padding)
    .text(classDef.id)

  const titleHeight = title.node().getBBox().height

-  const membersLine = g.append('line') // text label for the x axis
+  const membersLine = g
+    .append('line') // text label for the x axis
    .attr('x1', 0)
    .attr('y1', conf.padding + titleHeight + conf.dividerMargin / 2)
    .attr('y2', conf.padding + titleHeight + conf.dividerMargin / 2)

-  const members = g.append('text') // text label for the x axis
+  const members = g
+    .append('text') // text label for the x axis
    .attr('x', conf.padding)
-    .attr('y', titleHeight + (conf.dividerMargin) + conf.textHeight)
+    .attr('y', titleHeight + conf.dividerMargin + conf.textHeight)
    .attr('fill', 'white')
    .attr('class', 'classText')

@@ -252,14 +298,25 @@ const drawClass = function (elem, classDef) {

  const membersBox = members.node().getBBox()

-  const methodsLine = g.append('line') // text label for the x axis
+  const methodsLine = g
+    .append('line') // text label for the x axis
    .attr('x1', 0)
-    .attr('y1', conf.padding + titleHeight + conf.dividerMargin + membersBox.height)
-    .attr('y2', conf.padding + titleHeight + conf.dividerMargin + membersBox.height)
+    .attr(
+      'y1',
+      conf.padding + titleHeight + conf.dividerMargin + membersBox.height
+    )
+    .attr(
+      'y2',
+      conf.padding + titleHeight + conf.dividerMargin + membersBox.height
+    )

-  const methods = g.append('text') // text label for the x axis
+  const methods = g
+    .append('text') // text label for the x axis
    .attr('x', conf.padding)
-    .attr('y', titleHeight + 2 * conf.dividerMargin + membersBox.height + conf.textHeight)
+    .attr(
+      'y',
+      titleHeight + 2 * conf.dividerMargin + membersBox.height + conf.textHeight
+    )
    .attr('fill', 'white')
    .attr('class', 'classText')

@@ -307,7 +364,7 @@ export const draw = function (text, id) {
  logger.info('Rendering diagram ' + text)

  /// / Fetch the default direction, use TD if none was found
-  const diagram = d3.select(`[id="${id}"]`)
+  const diagram = d3.select(`[id='${id}']`)
  insertMarkers(diagram)

  // Layout graph, Create a new directed graph
@@ -327,6 +384,7 @@ export const draw = function (text, id) {

  const classes = classDb.getClasses()
  const keys = Object.keys(classes)
+  total = keys.length
  for (let i = 0; i < keys.length; i++) {
    const classDef = classes[keys[i]]
    const node = drawClass(diagram, classDef)
@@ -339,24 +397,45 @@ export const draw = function (text, id) {

  const relations = classDb.getRelations()
  relations.forEach(function (relation) {
-    logger.info('tjoho' + getGraphId(relation.id1) + getGraphId(relation.id2) + JSON.stringify(relation))
-    g.setEdge(getGraphId(relation.id1), getGraphId(relation.id2), { relation: relation })
+    logger.info(
+      'tjoho' +
+        getGraphId(relation.id1) +
+        getGraphId(relation.id2) +
+        JSON.stringify(relation)
+    )
+    g.setEdge(getGraphId(relation.id1), getGraphId(relation.id2), {
+      relation: relation
+    })
  })
  dagre.layout(g)
  g.nodes().forEach(function (v) {
-    if (typeof v !== 'undefined') {
+    if (typeof v !== 'undefined' && typeof g.node(v) !== 'undefined') {
      logger.debug('Node ' + v + ': ' + JSON.stringify(g.node(v)))
-      d3.select('#' + v).attr('transform', 'translate(' + (g.node(v).x - (g.node(v).width / 2)) + ',' + (g.node(v).y - (g.node(v).height / 2)) + ' )')
+      d3.select('#' + v).attr(
+        'transform',
+        'translate(' +
+          (g.node(v).x - g.node(v).width / 2) +
+          ',' +
+          (g.node(v).y - g.node(v).height / 2) +
+          ' )'
+      )
    }
  })
  g.edges().forEach(function (e) {
-    logger.debug('Edge ' + e.v + ' -> ' + e.w + ': ' + JSON.stringify(g.edge(e)))
-    drawEdge(diagram, g.edge(e), g.edge(e).relation)
+    if (typeof e !== 'undefined' && typeof g.edge(e) !== 'undefined') {
+      logger.debug(
+        'Edge ' + e.v + ' -> ' + e.w + ': ' + JSON.stringify(g.edge(e))
+      )
+      drawEdge(diagram, g.edge(e), g.edge(e).relation)
+    }
  })

  diagram.attr('height', '100%')
  diagram.attr('width', '100%')
-  diagram.attr('viewBox', '0 0 ' + (g.graph().width + 20) + ' ' + (g.graph().height + 20))
+  diagram.attr(
+    'viewBox',
+    '0 0 ' + (g.graph().width + 20) + ' ' + (g.graph().height + 20)
+  )
 }

 export default {
--- a/src/diagrams/class/parser/classDiagram.jison
+++ b/src/diagrams/class/parser/classDiagram.jison
@@ -127,6 +127,7 @@ graphConfig

 statements
    : statement
+    | statement NEWLINE
    | statement NEWLINE statements
    ;

@@ -144,8 +145,8 @@ statement
    ;

 classStatement
-    : CLASS className
-    | CLASS className STRUCT_START members STRUCT_STOP {/*console.log($2,JSON.stringify($4));*/yy.addMembers($2,$4);}
+    : CLASS className         {yy.addClass($2);}
+    | CLASS className STRUCT_START members STRUCT_STOP {/*console.log($2,JSON.stringify($4));*/yy.addClass($2);yy.addMembers($2,$4);}
    ;

 members
@@ -155,7 +156,7 @@ members

 methodStatement
    : className {/*console.log('Rel found',$1);*/}
-    | className LABEL {yy.addMembers($1,yy.cleanupLabel($2));}
+    | className LABEL {yy.addMember($1,yy.cleanupLabel($2));}
    | MEMBER {console.warn('Member',$1);}
    | SEPARATOR {/*console.log('sep found',$1);*/}
    ;
--- a/src/diagrams/class/parser/classDiagram.js
+++ b/src/diagrams/class/parser/classDiagram.js
@@ -77,91 +77,94 @@ var parser = {trace: function trace() { },
 yy: {},
 symbols_: {"error":2,"mermaidDoc":3,"graphConfig":4,"CLASS_DIAGRAM":5,"NEWLINE":6,"statements":7,"EOF":8,"statement":9,"className":10,"alphaNumToken":11,"relationStatement":12,"LABEL":13,"classStatement":14,"methodStatement":15,"CLASS":16,"STRUCT_START":17,"members":18,"STRUCT_STOP":19,"MEMBER":20,"SEPARATOR":21,"relation":22,"STR":23,"relationType":24,"lineType":25,"AGGREGATION":26,"EXTENSION":27,"COMPOSITION":28,"DEPENDENCY":29,"LINE":30,"DOTTED_LINE":31,"commentToken":32,"textToken":33,"graphCodeTokens":34,"textNoTagsToken":35,"TAGSTART":36,"TAGEND":37,"==":38,"--":39,"PCT":40,"DEFAULT":41,"SPACE":42,"MINUS":43,"keywords":44,"UNICODE_TEXT":45,"NUM":46,"ALPHA":47,"$accept":0,"$end":1},
 terminals_: {2:"error",5:"CLASS_DIAGRAM",6:"NEWLINE",8:"EOF",13:"LABEL",16:"CLASS",17:"STRUCT_START",19:"STRUCT_STOP",20:"MEMBER",21:"SEPARATOR",23:"STR",26:"AGGREGATION",27:"EXTENSION",28:"COMPOSITION",29:"DEPENDENCY",30:"LINE",31:"DOTTED_LINE",34:"graphCodeTokens",36:"TAGSTART",37:"TAGEND",38:"==",39:"--",40:"PCT",41:"DEFAULT",42:"SPACE",43:"MINUS",44:"keywords",45:"UNICODE_TEXT",46:"NUM",47:"ALPHA"},
-productions_: [0,[3,1],[4,4],[7,1],[7,3],[10,2],[10,1],[9,1],[9,2],[9,1],[9,1],[14,2],[14,5],[18,1],[18,2],[15,1],[15,2],[15,1],[15,1],[12,3],[12,4],[12,4],[12,5],[22,3],[22,2],[22,2],[22,1],[24,1],[24,1],[24,1],[24,1],[25,1],[25,1],[32,1],[32,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[35,1],[35,1],[35,1],[35,1],[11,1],[11,1],[11,1]],
+productions_: [0,[3,1],[4,4],[7,1],[7,2],[7,3],[10,2],[10,1],[9,1],[9,2],[9,1],[9,1],[14,2],[14,5],[18,1],[18,2],[15,1],[15,2],[15,1],[15,1],[12,3],[12,4],[12,4],[12,5],[22,3],[22,2],[22,2],[22,1],[24,1],[24,1],[24,1],[24,1],[25,1],[25,1],[32,1],[32,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[33,1],[35,1],[35,1],[35,1],[35,1],[11,1],[11,1],[11,1]],
 performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
 /* this == yyval */

 var $0 = $$.length - 1;
 switch (yystate) {
-case 5:
+case 6:
 this.$=$$[$0-1]+$$[$0]; 
 break;
-case 6:
+case 7:
 this.$=$$[$0]; 
 break;
-case 7:
+case 8:
 yy.addRelation($$[$0]); 
 break;
-case 8:
+case 9:
 $$[$0-1].title =  yy.cleanupLabel($$[$0]); yy.addRelation($$[$0-1]);        
 break;
 case 12:
-/*console.log($$[$0-3],JSON.stringify($$[$0-1]));*/yy.addMembers($$[$0-3],$$[$0-1]);
+yy.addClass($$[$0]);
 break;
 case 13:
- this.$ = [$$[$0]]; 
+/*console.log($$[$0-3],JSON.stringify($$[$0-1]));*/yy.addClass($$[$0-3]);yy.addMembers($$[$0-3],$$[$0-1]);
 break;
 case 14:
- $$[$0].push($$[$0-1]);this.$=$$[$0];
+ this.$ = [$$[$0]]; 
 break;
 case 15:
-/*console.log('Rel found',$$[$0]);*/
+ $$[$0].push($$[$0-1]);this.$=$$[$0];
 break;
 case 16:
-yy.addMembers($$[$0-1],yy.cleanupLabel($$[$0]));
+/*console.log('Rel found',$$[$0]);*/
 break;
 case 17:
-console.warn('Member',$$[$0]);
+yy.addMember($$[$0-1],yy.cleanupLabel($$[$0]));
 break;
 case 18:
-/*console.log('sep found',$$[$0]);*/
+console.warn('Member',$$[$0]);
 break;
 case 19:
- this.$ = {'id1':$$[$0-2],'id2':$$[$0], relation:$$[$0-1], relationTitle1:'none', relationTitle2:'none'}; 
+/*console.log('sep found',$$[$0]);*/
 break;
 case 20:
- this.$ = {id1:$$[$0-3], id2:$$[$0], relation:$$[$0-1], relationTitle1:$$[$0-2], relationTitle2:'none'}
+ this.$ = {'id1':$$[$0-2],'id2':$$[$0], relation:$$[$0-1], relationTitle1:'none', relationTitle2:'none'}; 
 break;
 case 21:
- this.$ = {id1:$$[$0-3], id2:$$[$0], relation:$$[$0-2], relationTitle1:'none', relationTitle2:$$[$0-1]}; 
+ this.$ = {id1:$$[$0-3], id2:$$[$0], relation:$$[$0-1], relationTitle1:$$[$0-2], relationTitle2:'none'}
 break;
 case 22:
- this.$ = {id1:$$[$0-4], id2:$$[$0], relation:$$[$0-2], relationTitle1:$$[$0-3], relationTitle2:$$[$0-1]} 
+ this.$ = {id1:$$[$0-3], id2:$$[$0], relation:$$[$0-2], relationTitle1:'none', relationTitle2:$$[$0-1]}; 
 break;
 case 23:
- this.$={type1:$$[$0-2],type2:$$[$0],lineType:$$[$0-1]}; 
+ this.$ = {id1:$$[$0-4], id2:$$[$0], relation:$$[$0-2], relationTitle1:$$[$0-3], relationTitle2:$$[$0-1]} 
 break;
 case 24:
- this.$={type1:'none',type2:$$[$0],lineType:$$[$0-1]}; 
+ this.$={type1:$$[$0-2],type2:$$[$0],lineType:$$[$0-1]}; 
 break;
 case 25:
- this.$={type1:$$[$0-1],type2:'none',lineType:$$[$0]}; 
+ this.$={type1:'none',type2:$$[$0],lineType:$$[$0-1]}; 
 break;
 case 26:
- this.$={type1:'none',type2:'none',lineType:$$[$0]}; 
+ this.$={type1:$$[$0-1],type2:'none',lineType:$$[$0]}; 
 break;
 case 27:
- this.$=yy.relationType.AGGREGATION;
+ this.$={type1:'none',type2:'none',lineType:$$[$0]}; 
 break;
 case 28:
- this.$=yy.relationType.EXTENSION;
+ this.$=yy.relationType.AGGREGATION;
 break;
 case 29:
- this.$=yy.relationType.COMPOSITION;
+ this.$=yy.relationType.EXTENSION;
 break;
 case 30:
- this.$=yy.relationType.DEPENDENCY;
+ this.$=yy.relationType.COMPOSITION;
 break;
 case 31:
-this.$=yy.lineType.LINE;
+ this.$=yy.relationType.DEPENDENCY;
 break;
 case 32:
+this.$=yy.lineType.LINE;
+break;
+case 33:
 this.$=yy.lineType.DOTTED_LINE;
 break;
 }
 },
-table: [{3:1,4:2,5:[1,3]},{1:[3]},{1:[2,1]},{6:[1,4]},{7:5,9:6,10:10,11:14,12:7,14:8,15:9,16:$V0,20:$V1,21:$V2,45:$V3,46:$V4,47:$V5},{8:[1,18]},{6:[1,19],8:[2,3]},o($V6,[2,7],{13:[1,20]}),o($V6,[2,9]),o($V6,[2,10]),o($V6,[2,15],{22:21,24:24,25:25,13:[1,23],23:[1,22],26:$V7,27:$V8,28:$V9,29:$Va,30:$Vb,31:$Vc}),{10:32,11:14,45:$V3,46:$V4,47:$V5},o($V6,[2,17]),o($V6,[2,18]),o($Vd,[2,6],{11:14,10:33,45:$V3,46:$V4,47:$V5}),o($Ve,[2,46]),o($Ve,[2,47]),o($Ve,[2,48]),{1:[2,2]},{7:34,9:6,10:10,11:14,12:7,14:8,15:9,16:$V0,20:$V1,21:$V2,45:$V3,46:$V4,47:$V5},o($V6,[2,8]),{10:35,11:14,23:[1,36],45:$V3,46:$V4,47:$V5},{22:37,24:24,25:25,26:$V7,27:$V8,28:$V9,29:$Va,30:$Vb,31:$Vc},o($V6,[2,16]),{25:38,30:$Vb,31:$Vc},o($Vf,[2,26],{24:39,26:$V7,27:$V8,28:$V9,29:$Va}),o($Vg,[2,27]),o($Vg,[2,28]),o($Vg,[2,29]),o($Vg,[2,30]),o($Vh,[2,31]),o($Vh,[2,32]),o($V6,[2,11],{17:[1,40]}),o($Vd,[2,5]),{8:[2,4]},o($Vi,[2,19]),{10:41,11:14,45:$V3,46:$V4,47:$V5},{10:42,11:14,23:[1,43],45:$V3,46:$V4,47:$V5},o($Vf,[2,25],{24:44,26:$V7,27:$V8,28:$V9,29:$Va}),o($Vf,[2,24]),{18:45,20:$Vj},o($Vi,[2,21]),o($Vi,[2,20]),{10:47,11:14,45:$V3,46:$V4,47:$V5},o($Vf,[2,23]),{19:[1,48]},{18:49,19:[2,13],20:$Vj},o($Vi,[2,22]),o($V6,[2,12]),{19:[2,14]}],
-defaultActions: {2:[2,1],18:[2,2],34:[2,4],49:[2,14]},
+table: [{3:1,4:2,5:[1,3]},{1:[3]},{1:[2,1]},{6:[1,4]},{7:5,9:6,10:10,11:14,12:7,14:8,15:9,16:$V0,20:$V1,21:$V2,45:$V3,46:$V4,47:$V5},{8:[1,18]},{6:[1,19],8:[2,3]},o($V6,[2,8],{13:[1,20]}),o($V6,[2,10]),o($V6,[2,11]),o($V6,[2,16],{22:21,24:24,25:25,13:[1,23],23:[1,22],26:$V7,27:$V8,28:$V9,29:$Va,30:$Vb,31:$Vc}),{10:32,11:14,45:$V3,46:$V4,47:$V5},o($V6,[2,18]),o($V6,[2,19]),o($Vd,[2,7],{11:14,10:33,45:$V3,46:$V4,47:$V5}),o($Ve,[2,47]),o($Ve,[2,48]),o($Ve,[2,49]),{1:[2,2]},{7:34,8:[2,4],9:6,10:10,11:14,12:7,14:8,15:9,16:$V0,20:$V1,21:$V2,45:$V3,46:$V4,47:$V5},o($V6,[2,9]),{10:35,11:14,23:[1,36],45:$V3,46:$V4,47:$V5},{22:37,24:24,25:25,26:$V7,27:$V8,28:$V9,29:$Va,30:$Vb,31:$Vc},o($V6,[2,17]),{25:38,30:$Vb,31:$Vc},o($Vf,[2,27],{24:39,26:$V7,27:$V8,28:$V9,29:$Va}),o($Vg,[2,28]),o($Vg,[2,29]),o($Vg,[2,30]),o($Vg,[2,31]),o($Vh,[2,32]),o($Vh,[2,33]),o($V6,[2,12],{17:[1,40]}),o($Vd,[2,6]),{8:[2,5]},o($Vi,[2,20]),{10:41,11:14,45:$V3,46:$V4,47:$V5},{10:42,11:14,23:[1,43],45:$V3,46:$V4,47:$V5},o($Vf,[2,26],{24:44,26:$V7,27:$V8,28:$V9,29:$Va}),o($Vf,[2,25]),{18:45,20:$Vj},o($Vi,[2,22]),o($Vi,[2,21]),{10:47,11:14,45:$V3,46:$V4,47:$V5},o($Vf,[2,24]),{19:[1,48]},{18:49,19:[2,14],20:$Vj},o($Vi,[2,23]),o($V6,[2,13]),{19:[2,15]}],
+defaultActions: {2:[2,1],18:[2,2],34:[2,5],49:[2,15]},
 parseError: function parseError(str, hash) {
    if (hash.recoverable) {
        this.trace(str);