@@ -10,16 +10,16 @@ const Parser = (function() {
1010 function parseData ( data ) {
1111 /* first get string tokens from the syntaxData */
1212 _text = data . syntaxData . text ;
13-
1413 _tokens = data . syntaxData . entities
15- . map ( x => x [ 2 ] [ 0 ] )
16- . sort ( ( a , b ) => a [ 0 ] - b [ 0 ] )
17- . map ( ( interval , i ) => {
14+ . sort ( ( a , b ) => a [ 2 ] [ 0 ] [ 0 ] - b [ 2 ] [ 0 ] [ 0 ] )
15+ . map ( x => {
1816 return {
19- text : _text . substring ( interval [ 0 ] , interval [ 1 ] ) ,
20- startIndex : interval [ 0 ] ,
21- endIndex : interval [ 1 ]
22- } ;
17+ text : _text . substring ( x [ 2 ] [ 0 ] [ 0 ] , x [ 2 ] [ 0 ] [ 1 ] ) ,
18+ id : x [ 0 ] ,
19+ type : x [ 1 ] ,
20+ startIndex : x [ 2 ] [ 0 ] [ 0 ] ,
21+ endIndex : x [ 2 ] [ 0 ] [ 1 ]
22+ }
2323 } ) ;
2424
2525 function findTokenByIndex ( [ i1 , i2 ] ) {
@@ -28,6 +28,19 @@ const Parser = (function() {
2828 return [ startToken , endToken ] ;
2929 }
3030
31+ const syntax = data . syntaxData . relations . map ( arr => {
32+ return {
33+ id : arr [ 0 ] ,
34+ trigger : arr [ 2 ] [ 0 ] [ 1 ] ,
35+ arguments : [
36+ {
37+ id : arr [ 2 ] [ 1 ] [ 1 ] ,
38+ type : arr [ 1 ]
39+ }
40+ ]
41+ } ;
42+ } ) ;
43+
3144 /* parse the event data: entities, triggers, events, and relations */
3245 const e = data . eventData ;
3346 const entities = e . entities . map ( arr => {
@@ -78,9 +91,9 @@ const Parser = (function() {
7891 entities,
7992 triggers,
8093 events,
81- relations
94+ relations,
95+ syntax
8296 } ;
83- _tokens = _tokens . map ( token => token . text ) ;
8497 }
8598
8699 class Parser {
0 commit comments