From b4fc8c579ff2cf39c9ecbbd9b3af66ea4af09284 Mon Sep 17 00:00:00 2001 From: Tracy Li Date: Tue, 27 Mar 2018 13:52:34 -0500 Subject: [PATCH] Support boolean for expression and regenerate parser code --- .../exprmapper/expression/gocc/flogo.bnf | 1 + .../expression/gocc/parser/actiontable.go | 1074 ++++++++++------- .../expression/gocc/parser/gototable.go | 702 ++++++----- .../expression/gocc/parser/parser.go | 4 +- .../gocc/parser/productionstable.go | 38 +- 5 files changed, 1086 insertions(+), 733 deletions(-) diff --git a/core/mapper/exprmapper/expression/gocc/flogo.bnf b/core/mapper/exprmapper/expression/gocc/flogo.bnf index c341ed9..cbb4ea8 100644 --- a/core/mapper/exprmapper/expression/gocc/flogo.bnf +++ b/core/mapper/exprmapper/expression/gocc/flogo.bnf @@ -125,6 +125,7 @@ Expr | Float <> | DoubleQString <> | SingleQString <> + | Bool <> | MappingRef <> | Func1 <> | Expr Operator Expr <> diff --git a/core/mapper/exprmapper/expression/gocc/parser/actiontable.go b/core/mapper/exprmapper/expression/gocc/parser/actiontable.go index 74b5ad9..7a00d3c 100644 --- a/core/mapper/exprmapper/expression/gocc/parser/actiontable.go +++ b/core/mapper/exprmapper/expression/gocc/parser/actiontable.go @@ -21,13 +21,13 @@ var actionTab = actionTable{ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(11), /* doublequotes_string */ - shift(12), /* singlequote_string */ - shift(13), /* number */ - shift(14), /* argument */ - nil, /* true */ - nil, /* false */ - shift(15), /* float */ + shift(12), /* doublequotes_string */ + shift(13), /* singlequote_string */ + shift(14), /* number */ + shift(15), /* argument */ + shift(16), /* true */ + shift(17), /* false */ + shift(18), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ @@ -72,8 +72,8 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(25), /* operator_charactor, reduce: Expr */ - reduce(25), /* ?, reduce: Expr */ + reduce(26), /* operator_charactor, reduce: Expr */ + reduce(26), /* ?, reduce: Expr */ nil, /* : */ }, }, @@ -94,8 +94,8 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - shift(18), /* operator_charactor */ - reduce(30), /* ?, reduce: TernaryExp */ + shift(21), /* operator_charactor */ + reduce(31), /* ?, reduce: TernaryExp */ nil, /* : */ }, }, @@ -105,9 +105,9 @@ var actionTab = actionTable{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ - shift(19), /* ( */ + shift(22), /* ( */ nil, /* ) */ - shift(20), /* () */ + shift(23), /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ nil, /* singlequote_string */ @@ -126,18 +126,18 @@ var actionTab = actionTable{ actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(23), /* function_name */ - shift(24), /* ( */ + shift(26), /* function_name */ + shift(27), /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(30), /* doublequotes_string */ - shift(31), /* singlequote_string */ - shift(32), /* number */ - shift(33), /* argument */ - nil, /* true */ - nil, /* false */ - shift(34), /* float */ + shift(34), /* doublequotes_string */ + shift(35), /* singlequote_string */ + shift(36), /* number */ + shift(37), /* argument */ + shift(38), /* true */ + shift(39), /* false */ + shift(40), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ @@ -254,6 +254,28 @@ var actionTab = actionTable{ }, }, actionRow{ // S11 + canRecover: false, + actions: [numSymbols]action{ + nil, /* INVALID */ + reduce(25), /* $, reduce: Expr */ + nil, /* function_name */ + nil, /* ( */ + nil, /* ) */ + nil, /* () */ + nil, /* delimitor_param */ + nil, /* doublequotes_string */ + nil, /* singlequote_string */ + nil, /* number */ + nil, /* argument */ + nil, /* true */ + nil, /* false */ + nil, /* float */ + reduce(25), /* operator_charactor, reduce: Expr */ + reduce(25), /* ?, reduce: Expr */ + nil, /* : */ + }, + }, + actionRow{ // S12 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -275,7 +297,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S12 + actionRow{ // S13 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -297,7 +319,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S13 + actionRow{ // S14 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -319,7 +341,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S14 + actionRow{ // S15 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -341,7 +363,51 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S15 + actionRow{ // S16 + canRecover: false, + actions: [numSymbols]action{ + nil, /* INVALID */ + reduce(17), /* $, reduce: Bool */ + nil, /* function_name */ + nil, /* ( */ + nil, /* ) */ + nil, /* () */ + nil, /* delimitor_param */ + nil, /* doublequotes_string */ + nil, /* singlequote_string */ + nil, /* number */ + nil, /* argument */ + nil, /* true */ + nil, /* false */ + nil, /* float */ + reduce(17), /* operator_charactor, reduce: Bool */ + reduce(17), /* ?, reduce: Bool */ + nil, /* : */ + }, + }, + actionRow{ // S17 + canRecover: false, + actions: [numSymbols]action{ + nil, /* INVALID */ + reduce(18), /* $, reduce: Bool */ + nil, /* function_name */ + nil, /* ( */ + nil, /* ) */ + nil, /* () */ + nil, /* delimitor_param */ + nil, /* doublequotes_string */ + nil, /* singlequote_string */ + nil, /* number */ + nil, /* argument */ + nil, /* true */ + nil, /* false */ + nil, /* float */ + reduce(18), /* operator_charactor, reduce: Bool */ + reduce(18), /* ?, reduce: Bool */ + nil, /* : */ + }, + }, + actionRow{ // S18 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -363,11 +429,11 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S16 + actionRow{ // S19 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ - reduce(27), /* $, reduce: Expr */ + reduce(28), /* $, reduce: Expr */ nil, /* function_name */ nil, /* ( */ nil, /* ) */ @@ -380,12 +446,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(27), /* operator_charactor, reduce: Expr */ - shift(36), /* ? */ + reduce(28), /* operator_charactor, reduce: Expr */ + shift(42), /* ? */ nil, /* : */ }, }, - actionRow{ // S17 + actionRow{ // S20 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -395,63 +461,63 @@ var actionTab = actionTable{ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(11), /* doublequotes_string */ - shift(12), /* singlequote_string */ - shift(13), /* number */ - shift(14), /* argument */ - nil, /* true */ - nil, /* false */ - shift(15), /* float */ + shift(12), /* doublequotes_string */ + shift(13), /* singlequote_string */ + shift(14), /* number */ + shift(15), /* argument */ + shift(16), /* true */ + shift(17), /* false */ + shift(18), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S18 + actionRow{ // S21 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - reduce(29), /* function_name, reduce: Operator */ - reduce(29), /* (, reduce: Operator */ + reduce(30), /* function_name, reduce: Operator */ + reduce(30), /* (, reduce: Operator */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - reduce(29), /* doublequotes_string, reduce: Operator */ - reduce(29), /* singlequote_string, reduce: Operator */ - reduce(29), /* number, reduce: Operator */ - reduce(29), /* argument, reduce: Operator */ - nil, /* true */ - nil, /* false */ - reduce(29), /* float, reduce: Operator */ + reduce(30), /* doublequotes_string, reduce: Operator */ + reduce(30), /* singlequote_string, reduce: Operator */ + reduce(30), /* number, reduce: Operator */ + reduce(30), /* argument, reduce: Operator */ + reduce(30), /* true, reduce: Operator */ + reduce(30), /* false, reduce: Operator */ + reduce(30), /* float, reduce: Operator */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S19 + actionRow{ // S22 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(40), /* function_name */ + shift(46), /* function_name */ nil, /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(48), /* doublequotes_string */ - shift(49), /* singlequote_string */ - shift(50), /* number */ - shift(51), /* argument */ - shift(52), /* true */ - shift(53), /* false */ - shift(54), /* float */ + shift(54), /* doublequotes_string */ + shift(55), /* singlequote_string */ + shift(56), /* number */ + shift(57), /* argument */ + shift(58), /* true */ + shift(59), /* false */ + shift(60), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S20 + actionRow{ // S23 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -473,14 +539,14 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S21 + actionRow{ // S24 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ nil, /* ( */ - reduce(25), /* ), reduce: Expr */ + reduce(26), /* ), reduce: Expr */ nil, /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ @@ -490,19 +556,19 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(25), /* operator_charactor, reduce: Expr */ - reduce(25), /* ?, reduce: Expr */ + reduce(26), /* operator_charactor, reduce: Expr */ + reduce(26), /* ?, reduce: Expr */ nil, /* : */ }, }, - actionRow{ // S22 + actionRow{ // S25 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ nil, /* ( */ - shift(55), /* ) */ + shift(61), /* ) */ nil, /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ @@ -512,20 +578,20 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - shift(18), /* operator_charactor */ - reduce(30), /* ?, reduce: TernaryExp */ + shift(21), /* operator_charactor */ + reduce(31), /* ?, reduce: TernaryExp */ nil, /* : */ }, }, - actionRow{ // S23 + actionRow{ // S26 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ - shift(57), /* ( */ + shift(63), /* ( */ nil, /* ) */ - shift(58), /* () */ + shift(64), /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ nil, /* singlequote_string */ @@ -539,29 +605,29 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S24 + actionRow{ // S27 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(23), /* function_name */ - shift(24), /* ( */ + shift(26), /* function_name */ + shift(27), /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(30), /* doublequotes_string */ - shift(31), /* singlequote_string */ - shift(32), /* number */ - shift(33), /* argument */ - nil, /* true */ - nil, /* false */ - shift(34), /* float */ + shift(34), /* doublequotes_string */ + shift(35), /* singlequote_string */ + shift(36), /* number */ + shift(37), /* argument */ + shift(38), /* true */ + shift(39), /* false */ + shift(40), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S25 + actionRow{ // S28 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -583,7 +649,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S26 + actionRow{ // S29 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -605,7 +671,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S27 + actionRow{ // S30 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -627,7 +693,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S28 + actionRow{ // S31 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -649,7 +715,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S29 + actionRow{ // S32 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -671,7 +737,29 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S30 + actionRow{ // S33 + canRecover: false, + actions: [numSymbols]action{ + nil, /* INVALID */ + nil, /* $ */ + nil, /* function_name */ + nil, /* ( */ + reduce(25), /* ), reduce: Expr */ + nil, /* () */ + nil, /* delimitor_param */ + nil, /* doublequotes_string */ + nil, /* singlequote_string */ + nil, /* number */ + nil, /* argument */ + nil, /* true */ + nil, /* false */ + nil, /* float */ + reduce(25), /* operator_charactor, reduce: Expr */ + reduce(25), /* ?, reduce: Expr */ + nil, /* : */ + }, + }, + actionRow{ // S34 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -693,7 +781,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S31 + actionRow{ // S35 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -715,7 +803,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S32 + actionRow{ // S36 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -737,7 +825,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S33 + actionRow{ // S37 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -759,7 +847,51 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S34 + actionRow{ // S38 + canRecover: false, + actions: [numSymbols]action{ + nil, /* INVALID */ + nil, /* $ */ + nil, /* function_name */ + nil, /* ( */ + reduce(17), /* ), reduce: Bool */ + nil, /* () */ + nil, /* delimitor_param */ + nil, /* doublequotes_string */ + nil, /* singlequote_string */ + nil, /* number */ + nil, /* argument */ + nil, /* true */ + nil, /* false */ + nil, /* float */ + reduce(17), /* operator_charactor, reduce: Bool */ + reduce(17), /* ?, reduce: Bool */ + nil, /* : */ + }, + }, + actionRow{ // S39 + canRecover: false, + actions: [numSymbols]action{ + nil, /* INVALID */ + nil, /* $ */ + nil, /* function_name */ + nil, /* ( */ + reduce(18), /* ), reduce: Bool */ + nil, /* () */ + nil, /* delimitor_param */ + nil, /* doublequotes_string */ + nil, /* singlequote_string */ + nil, /* number */ + nil, /* argument */ + nil, /* true */ + nil, /* false */ + nil, /* float */ + reduce(18), /* operator_charactor, reduce: Bool */ + reduce(18), /* ?, reduce: Bool */ + nil, /* : */ + }, + }, + actionRow{ // S40 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -781,14 +913,14 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S35 + actionRow{ // S41 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ nil, /* ( */ - reduce(27), /* ), reduce: Expr */ + reduce(28), /* ), reduce: Expr */ nil, /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ @@ -798,38 +930,38 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(27), /* operator_charactor, reduce: Expr */ - shift(60), /* ? */ + reduce(28), /* operator_charactor, reduce: Expr */ + shift(66), /* ? */ nil, /* : */ }, }, - actionRow{ // S36 + actionRow{ // S42 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(64), /* function_name */ - shift(65), /* ( */ + shift(70), /* function_name */ + shift(71), /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(71), /* doublequotes_string */ - shift(72), /* singlequote_string */ - shift(73), /* number */ - shift(74), /* argument */ - nil, /* true */ - nil, /* false */ - shift(75), /* float */ + shift(78), /* doublequotes_string */ + shift(79), /* singlequote_string */ + shift(80), /* number */ + shift(81), /* argument */ + shift(82), /* true */ + shift(83), /* false */ + shift(84), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S37 + actionRow{ // S43 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ - reduce(25), /* $, reduce: Expr */ + reduce(26), /* $, reduce: Expr */ nil, /* function_name */ nil, /* ( */ nil, /* ) */ @@ -842,16 +974,16 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(25), /* operator_charactor, reduce: Expr */ - reduce(25), /* ?, reduce: Expr */ + reduce(26), /* operator_charactor, reduce: Expr */ + reduce(26), /* ?, reduce: Expr */ nil, /* : */ }, }, - actionRow{ // S38 + actionRow{ // S44 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ - reduce(26), /* $, reduce: Expr */ + reduce(27), /* $, reduce: Expr */ nil, /* function_name */ nil, /* ( */ nil, /* ) */ @@ -864,12 +996,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - shift(18), /* operator_charactor */ - reduce(26), /* ?, reduce: Expr */ + shift(21), /* operator_charactor */ + reduce(27), /* ?, reduce: Expr */ nil, /* : */ }, }, - actionRow{ // S39 + actionRow{ // S45 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -891,15 +1023,15 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S40 + actionRow{ // S46 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ - shift(78), /* ( */ + shift(87), /* ( */ nil, /* ) */ - shift(79), /* () */ + shift(88), /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ nil, /* singlequote_string */ @@ -913,16 +1045,16 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S41 + actionRow{ // S47 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ nil, /* ( */ - shift(80), /* ) */ + shift(89), /* ) */ nil, /* () */ - shift(81), /* delimitor_param */ + shift(90), /* delimitor_param */ nil, /* doublequotes_string */ nil, /* singlequote_string */ nil, /* number */ @@ -935,7 +1067,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S42 + actionRow{ // S48 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -957,7 +1089,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S43 + actionRow{ // S49 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -979,7 +1111,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S44 + actionRow{ // S50 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1001,7 +1133,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S45 + actionRow{ // S51 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1023,7 +1155,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S46 + actionRow{ // S52 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1045,7 +1177,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S47 + actionRow{ // S53 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1067,7 +1199,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S48 + actionRow{ // S54 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1089,7 +1221,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S49 + actionRow{ // S55 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1111,7 +1243,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S50 + actionRow{ // S56 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1133,7 +1265,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S51 + actionRow{ // S57 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1155,7 +1287,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S52 + actionRow{ // S58 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1177,7 +1309,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S53 + actionRow{ // S59 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1199,7 +1331,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S54 + actionRow{ // S60 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1221,11 +1353,11 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S55 + actionRow{ // S61 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ - reduce(28), /* $, reduce: Expr */ + reduce(29), /* $, reduce: Expr */ nil, /* function_name */ nil, /* ( */ nil, /* ) */ @@ -1238,56 +1370,56 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(28), /* operator_charactor, reduce: Expr */ - reduce(28), /* ?, reduce: Expr */ + reduce(29), /* operator_charactor, reduce: Expr */ + reduce(29), /* ?, reduce: Expr */ nil, /* : */ }, }, - actionRow{ // S56 + actionRow{ // S62 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(23), /* function_name */ - shift(24), /* ( */ + shift(26), /* function_name */ + shift(27), /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(30), /* doublequotes_string */ - shift(31), /* singlequote_string */ - shift(32), /* number */ - shift(33), /* argument */ - nil, /* true */ - nil, /* false */ - shift(34), /* float */ + shift(34), /* doublequotes_string */ + shift(35), /* singlequote_string */ + shift(36), /* number */ + shift(37), /* argument */ + shift(38), /* true */ + shift(39), /* false */ + shift(40), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S57 + actionRow{ // S63 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(40), /* function_name */ + shift(46), /* function_name */ nil, /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(48), /* doublequotes_string */ - shift(49), /* singlequote_string */ - shift(50), /* number */ - shift(51), /* argument */ - shift(52), /* true */ - shift(53), /* false */ - shift(54), /* float */ + shift(54), /* doublequotes_string */ + shift(55), /* singlequote_string */ + shift(56), /* number */ + shift(57), /* argument */ + shift(58), /* true */ + shift(59), /* false */ + shift(60), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S58 + actionRow{ // S64 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1309,14 +1441,14 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S59 + actionRow{ // S65 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ nil, /* ( */ - shift(84), /* ) */ + shift(93), /* ) */ nil, /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ @@ -1326,34 +1458,34 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - shift(18), /* operator_charactor */ - reduce(30), /* ?, reduce: TernaryExp */ + shift(21), /* operator_charactor */ + reduce(31), /* ?, reduce: TernaryExp */ nil, /* : */ }, }, - actionRow{ // S60 + actionRow{ // S66 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(64), /* function_name */ - shift(65), /* ( */ + shift(70), /* function_name */ + shift(71), /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(71), /* doublequotes_string */ - shift(72), /* singlequote_string */ - shift(73), /* number */ - shift(74), /* argument */ - nil, /* true */ - nil, /* false */ - shift(75), /* float */ + shift(78), /* doublequotes_string */ + shift(79), /* singlequote_string */ + shift(80), /* number */ + shift(81), /* argument */ + shift(82), /* true */ + shift(83), /* false */ + shift(84), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S61 + actionRow{ // S67 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1372,10 +1504,10 @@ var actionTab = actionTable{ nil, /* float */ nil, /* operator_charactor */ nil, /* ? */ - reduce(37), /* :, reduce: TernaryParam */ + reduce(38), /* :, reduce: TernaryParam */ }, }, - actionRow{ // S62 + actionRow{ // S68 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1392,12 +1524,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(25), /* operator_charactor, reduce: Expr */ - reduce(25), /* ?, reduce: Expr */ + reduce(26), /* operator_charactor, reduce: Expr */ + reduce(26), /* ?, reduce: Expr */ reduce(1), /* :, reduce: Func */ }, }, - actionRow{ // S63 + actionRow{ // S69 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1414,20 +1546,20 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - shift(18), /* operator_charactor */ - reduce(30), /* ?, reduce: TernaryExp */ + shift(21), /* operator_charactor */ + reduce(31), /* ?, reduce: TernaryExp */ reduce(2), /* :, reduce: Func */ }, }, - actionRow{ // S64 + actionRow{ // S70 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ - shift(87), /* ( */ + shift(96), /* ( */ nil, /* ) */ - shift(88), /* () */ + shift(97), /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ nil, /* singlequote_string */ @@ -1441,29 +1573,29 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S65 + actionRow{ // S71 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(23), /* function_name */ - shift(24), /* ( */ + shift(26), /* function_name */ + shift(27), /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(30), /* doublequotes_string */ - shift(31), /* singlequote_string */ - shift(32), /* number */ - shift(33), /* argument */ - nil, /* true */ - nil, /* false */ - shift(34), /* float */ + shift(34), /* doublequotes_string */ + shift(35), /* singlequote_string */ + shift(36), /* number */ + shift(37), /* argument */ + shift(38), /* true */ + shift(39), /* false */ + shift(40), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S66 + actionRow{ // S72 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1485,7 +1617,7 @@ var actionTab = actionTable{ reduce(22), /* :, reduce: Expr */ }, }, - actionRow{ // S67 + actionRow{ // S73 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1507,7 +1639,7 @@ var actionTab = actionTable{ reduce(23), /* :, reduce: Expr */ }, }, - actionRow{ // S68 + actionRow{ // S74 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1529,7 +1661,7 @@ var actionTab = actionTable{ reduce(20), /* :, reduce: Expr */ }, }, - actionRow{ // S69 + actionRow{ // S75 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1551,7 +1683,7 @@ var actionTab = actionTable{ reduce(21), /* :, reduce: Expr */ }, }, - actionRow{ // S70 + actionRow{ // S76 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1573,7 +1705,29 @@ var actionTab = actionTable{ reduce(24), /* :, reduce: Expr */ }, }, - actionRow{ // S71 + actionRow{ // S77 + canRecover: false, + actions: [numSymbols]action{ + nil, /* INVALID */ + nil, /* $ */ + nil, /* function_name */ + nil, /* ( */ + nil, /* ) */ + nil, /* () */ + nil, /* delimitor_param */ + nil, /* doublequotes_string */ + nil, /* singlequote_string */ + nil, /* number */ + nil, /* argument */ + nil, /* true */ + nil, /* false */ + nil, /* float */ + reduce(25), /* operator_charactor, reduce: Expr */ + reduce(25), /* ?, reduce: Expr */ + reduce(25), /* :, reduce: Expr */ + }, + }, + actionRow{ // S78 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1595,7 +1749,7 @@ var actionTab = actionTable{ reduce(13), /* :, reduce: DoubleQString */ }, }, - actionRow{ // S72 + actionRow{ // S79 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1617,7 +1771,7 @@ var actionTab = actionTable{ reduce(14), /* :, reduce: SingleQString */ }, }, - actionRow{ // S73 + actionRow{ // S80 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1639,7 +1793,7 @@ var actionTab = actionTable{ reduce(15), /* :, reduce: Int */ }, }, - actionRow{ // S74 + actionRow{ // S81 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1661,7 +1815,51 @@ var actionTab = actionTable{ reduce(16), /* :, reduce: MappingRef */ }, }, - actionRow{ // S75 + actionRow{ // S82 + canRecover: false, + actions: [numSymbols]action{ + nil, /* INVALID */ + nil, /* $ */ + nil, /* function_name */ + nil, /* ( */ + nil, /* ) */ + nil, /* () */ + nil, /* delimitor_param */ + nil, /* doublequotes_string */ + nil, /* singlequote_string */ + nil, /* number */ + nil, /* argument */ + nil, /* true */ + nil, /* false */ + nil, /* float */ + reduce(17), /* operator_charactor, reduce: Bool */ + reduce(17), /* ?, reduce: Bool */ + reduce(17), /* :, reduce: Bool */ + }, + }, + actionRow{ // S83 + canRecover: false, + actions: [numSymbols]action{ + nil, /* INVALID */ + nil, /* $ */ + nil, /* function_name */ + nil, /* ( */ + nil, /* ) */ + nil, /* () */ + nil, /* delimitor_param */ + nil, /* doublequotes_string */ + nil, /* singlequote_string */ + nil, /* number */ + nil, /* argument */ + nil, /* true */ + nil, /* false */ + nil, /* float */ + reduce(18), /* operator_charactor, reduce: Bool */ + reduce(18), /* ?, reduce: Bool */ + reduce(18), /* :, reduce: Bool */ + }, + }, + actionRow{ // S84 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1683,7 +1881,7 @@ var actionTab = actionTable{ reduce(19), /* :, reduce: Float */ }, }, - actionRow{ // S76 + actionRow{ // S85 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1700,56 +1898,56 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(27), /* operator_charactor, reduce: Expr */ - shift(90), /* ? */ - reduce(27), /* :, reduce: Expr */ + reduce(28), /* operator_charactor, reduce: Expr */ + shift(99), /* ? */ + reduce(28), /* :, reduce: Expr */ }, }, - actionRow{ // S77 + actionRow{ // S86 canRecover: false, actions: [numSymbols]action{ - nil, /* INVALID */ - nil, /* $ */ - nil, /* function_name */ - nil, /* ( */ - nil, /* ) */ - nil, /* () */ - nil, /* delimitor_param */ - nil, /* doublequotes_string */ - nil, /* singlequote_string */ - nil, /* number */ - nil, /* argument */ - nil, /* true */ - nil, /* false */ - nil, /* float */ - nil, /* operator_charactor */ - nil, /* ? */ - shift(91), /* : */ + nil, /* INVALID */ + nil, /* $ */ + nil, /* function_name */ + nil, /* ( */ + nil, /* ) */ + nil, /* () */ + nil, /* delimitor_param */ + nil, /* doublequotes_string */ + nil, /* singlequote_string */ + nil, /* number */ + nil, /* argument */ + nil, /* true */ + nil, /* false */ + nil, /* float */ + nil, /* operator_charactor */ + nil, /* ? */ + shift(100), /* : */ }, }, - actionRow{ // S78 + actionRow{ // S87 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(40), /* function_name */ + shift(46), /* function_name */ nil, /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(48), /* doublequotes_string */ - shift(49), /* singlequote_string */ - shift(50), /* number */ - shift(51), /* argument */ - shift(52), /* true */ - shift(53), /* false */ - shift(54), /* float */ + shift(54), /* doublequotes_string */ + shift(55), /* singlequote_string */ + shift(56), /* number */ + shift(57), /* argument */ + shift(58), /* true */ + shift(59), /* false */ + shift(60), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S79 + actionRow{ // S88 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1771,7 +1969,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S80 + actionRow{ // S89 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1793,36 +1991,36 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S81 + actionRow{ // S90 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(40), /* function_name */ + shift(46), /* function_name */ nil, /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(48), /* doublequotes_string */ - shift(49), /* singlequote_string */ - shift(50), /* number */ - shift(51), /* argument */ - shift(52), /* true */ - shift(53), /* false */ - shift(54), /* float */ + shift(54), /* doublequotes_string */ + shift(55), /* singlequote_string */ + shift(56), /* number */ + shift(57), /* argument */ + shift(58), /* true */ + shift(59), /* false */ + shift(60), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S82 + actionRow{ // S91 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ nil, /* ( */ - reduce(26), /* ), reduce: Expr */ + reduce(27), /* ), reduce: Expr */ nil, /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ @@ -1832,41 +2030,41 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - shift(18), /* operator_charactor */ - reduce(26), /* ?, reduce: Expr */ + shift(21), /* operator_charactor */ + reduce(27), /* ?, reduce: Expr */ nil, /* : */ }, }, - actionRow{ // S83 + actionRow{ // S92 canRecover: false, actions: [numSymbols]action{ - nil, /* INVALID */ - nil, /* $ */ - nil, /* function_name */ - nil, /* ( */ - shift(94), /* ) */ - nil, /* () */ - shift(81), /* delimitor_param */ - nil, /* doublequotes_string */ - nil, /* singlequote_string */ - nil, /* number */ - nil, /* argument */ - nil, /* true */ - nil, /* false */ - nil, /* float */ - nil, /* operator_charactor */ - nil, /* ? */ - nil, /* : */ + nil, /* INVALID */ + nil, /* $ */ + nil, /* function_name */ + nil, /* ( */ + shift(103), /* ) */ + nil, /* () */ + shift(90), /* delimitor_param */ + nil, /* doublequotes_string */ + nil, /* singlequote_string */ + nil, /* number */ + nil, /* argument */ + nil, /* true */ + nil, /* false */ + nil, /* float */ + nil, /* operator_charactor */ + nil, /* ? */ + nil, /* : */ }, }, - actionRow{ // S84 + actionRow{ // S93 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ nil, /* ( */ - reduce(28), /* ), reduce: Expr */ + reduce(29), /* ), reduce: Expr */ nil, /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ @@ -1876,78 +2074,78 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(28), /* operator_charactor, reduce: Expr */ - reduce(28), /* ?, reduce: Expr */ + reduce(29), /* operator_charactor, reduce: Expr */ + reduce(29), /* ?, reduce: Expr */ nil, /* : */ }, }, - actionRow{ // S85 + actionRow{ // S94 canRecover: false, actions: [numSymbols]action{ - nil, /* INVALID */ - nil, /* $ */ - nil, /* function_name */ - nil, /* ( */ - nil, /* ) */ - nil, /* () */ - nil, /* delimitor_param */ - nil, /* doublequotes_string */ - nil, /* singlequote_string */ - nil, /* number */ - nil, /* argument */ - nil, /* true */ - nil, /* false */ - nil, /* float */ - nil, /* operator_charactor */ - nil, /* ? */ - shift(95), /* : */ + nil, /* INVALID */ + nil, /* $ */ + nil, /* function_name */ + nil, /* ( */ + nil, /* ) */ + nil, /* () */ + nil, /* delimitor_param */ + nil, /* doublequotes_string */ + nil, /* singlequote_string */ + nil, /* number */ + nil, /* argument */ + nil, /* true */ + nil, /* false */ + nil, /* float */ + nil, /* operator_charactor */ + nil, /* ? */ + shift(104), /* : */ }, }, - actionRow{ // S86 + actionRow{ // S95 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(64), /* function_name */ - shift(65), /* ( */ + shift(70), /* function_name */ + shift(71), /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(71), /* doublequotes_string */ - shift(72), /* singlequote_string */ - shift(73), /* number */ - shift(74), /* argument */ - nil, /* true */ - nil, /* false */ - shift(75), /* float */ + shift(78), /* doublequotes_string */ + shift(79), /* singlequote_string */ + shift(80), /* number */ + shift(81), /* argument */ + shift(82), /* true */ + shift(83), /* false */ + shift(84), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S87 + actionRow{ // S96 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(40), /* function_name */ + shift(46), /* function_name */ nil, /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(48), /* doublequotes_string */ - shift(49), /* singlequote_string */ - shift(50), /* number */ - shift(51), /* argument */ - shift(52), /* true */ - shift(53), /* false */ - shift(54), /* float */ + shift(54), /* doublequotes_string */ + shift(55), /* singlequote_string */ + shift(56), /* number */ + shift(57), /* argument */ + shift(58), /* true */ + shift(59), /* false */ + shift(60), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S88 + actionRow{ // S97 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -1969,14 +2167,14 @@ var actionTab = actionTable{ reduce(4), /* :, reduce: Func1 */ }, }, - actionRow{ // S89 + actionRow{ // S98 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ nil, /* ( */ - shift(104), /* ) */ + shift(113), /* ) */ nil, /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ @@ -1986,34 +2184,34 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - shift(18), /* operator_charactor */ - reduce(30), /* ?, reduce: TernaryExp */ + shift(21), /* operator_charactor */ + reduce(31), /* ?, reduce: TernaryExp */ nil, /* : */ }, }, - actionRow{ // S90 + actionRow{ // S99 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(64), /* function_name */ - shift(65), /* ( */ + shift(70), /* function_name */ + shift(71), /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(71), /* doublequotes_string */ - shift(72), /* singlequote_string */ - shift(73), /* number */ - shift(74), /* argument */ - nil, /* true */ - nil, /* false */ - shift(75), /* float */ + shift(78), /* doublequotes_string */ + shift(79), /* singlequote_string */ + shift(80), /* number */ + shift(81), /* argument */ + shift(82), /* true */ + shift(83), /* false */ + shift(84), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S91 + actionRow{ // S100 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2023,28 +2221,28 @@ var actionTab = actionTable{ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(11), /* doublequotes_string */ - shift(12), /* singlequote_string */ - shift(13), /* number */ - shift(14), /* argument */ - nil, /* true */ - nil, /* false */ - shift(15), /* float */ + shift(12), /* doublequotes_string */ + shift(13), /* singlequote_string */ + shift(14), /* number */ + shift(15), /* argument */ + shift(16), /* true */ + shift(17), /* false */ + shift(18), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S92 + actionRow{ // S101 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ nil, /* ( */ - shift(115), /* ) */ + shift(124), /* ) */ nil, /* () */ - shift(81), /* delimitor_param */ + shift(90), /* delimitor_param */ nil, /* doublequotes_string */ nil, /* singlequote_string */ nil, /* number */ @@ -2057,7 +2255,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S93 + actionRow{ // S102 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2066,7 +2264,7 @@ var actionTab = actionTable{ nil, /* ( */ reduce(12), /* ), reduce: Args */ nil, /* () */ - shift(81), /* delimitor_param */ + shift(90), /* delimitor_param */ nil, /* doublequotes_string */ nil, /* singlequote_string */ nil, /* number */ @@ -2079,7 +2277,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S94 + actionRow{ // S103 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2101,29 +2299,29 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S95 + actionRow{ // S104 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(23), /* function_name */ - shift(24), /* ( */ + shift(26), /* function_name */ + shift(27), /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(30), /* doublequotes_string */ - shift(31), /* singlequote_string */ - shift(32), /* number */ - shift(33), /* argument */ - nil, /* true */ - nil, /* false */ - shift(34), /* float */ + shift(34), /* doublequotes_string */ + shift(35), /* singlequote_string */ + shift(36), /* number */ + shift(37), /* argument */ + shift(38), /* true */ + shift(39), /* false */ + shift(40), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S96 + actionRow{ // S105 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2140,12 +2338,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(25), /* operator_charactor, reduce: Expr */ - reduce(25), /* ?, reduce: Expr */ - reduce(25), /* :, reduce: Expr */ + reduce(26), /* operator_charactor, reduce: Expr */ + reduce(26), /* ?, reduce: Expr */ + reduce(26), /* :, reduce: Expr */ }, }, - actionRow{ // S97 + actionRow{ // S106 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2162,12 +2360,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - shift(18), /* operator_charactor */ - reduce(26), /* ?, reduce: Expr */ - reduce(26), /* :, reduce: Expr */ + shift(21), /* operator_charactor */ + reduce(27), /* ?, reduce: Expr */ + reduce(27), /* :, reduce: Expr */ }, }, - actionRow{ // S98 + actionRow{ // S107 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2189,7 +2387,7 @@ var actionTab = actionTable{ reduce(22), /* :, reduce: Expr */ }, }, - actionRow{ // S99 + actionRow{ // S108 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2211,7 +2409,7 @@ var actionTab = actionTable{ reduce(23), /* :, reduce: Expr */ }, }, - actionRow{ // S100 + actionRow{ // S109 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2233,7 +2431,7 @@ var actionTab = actionTable{ reduce(20), /* :, reduce: Expr */ }, }, - actionRow{ // S101 + actionRow{ // S110 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2255,7 +2453,7 @@ var actionTab = actionTable{ reduce(21), /* :, reduce: Expr */ }, }, - actionRow{ // S102 + actionRow{ // S111 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2272,21 +2470,21 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(24), /* operator_charactor, reduce: Expr */ - reduce(24), /* ?, reduce: Expr */ - reduce(24), /* :, reduce: Expr */ + reduce(25), /* operator_charactor, reduce: Expr */ + reduce(25), /* ?, reduce: Expr */ + reduce(25), /* :, reduce: Expr */ }, }, - actionRow{ // S103 + actionRow{ // S112 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ nil, /* ( */ - shift(125), /* ) */ + shift(134), /* ) */ nil, /* () */ - shift(81), /* delimitor_param */ + shift(90), /* delimitor_param */ nil, /* doublequotes_string */ nil, /* singlequote_string */ nil, /* number */ @@ -2299,7 +2497,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S104 + actionRow{ // S113 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2316,12 +2514,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(28), /* operator_charactor, reduce: Expr */ - reduce(28), /* ?, reduce: Expr */ - reduce(28), /* :, reduce: Expr */ + reduce(29), /* operator_charactor, reduce: Expr */ + reduce(29), /* ?, reduce: Expr */ + reduce(29), /* :, reduce: Expr */ }, }, - actionRow{ // S105 + actionRow{ // S114 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2340,14 +2538,14 @@ var actionTab = actionTable{ nil, /* float */ nil, /* operator_charactor */ nil, /* ? */ - shift(126), /* : */ + shift(135), /* : */ }, }, - actionRow{ // S106 + actionRow{ // S115 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ - reduce(37), /* $, reduce: TernaryParam */ + reduce(38), /* $, reduce: TernaryParam */ nil, /* function_name */ nil, /* ( */ nil, /* ) */ @@ -2360,12 +2558,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(37), /* operator_charactor, reduce: TernaryParam */ - reduce(37), /* ?, reduce: TernaryParam */ + reduce(38), /* operator_charactor, reduce: TernaryParam */ + reduce(38), /* ?, reduce: TernaryParam */ nil, /* : */ }, }, - actionRow{ // S107 + actionRow{ // S116 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2387,7 +2585,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S108 + actionRow{ // S117 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2404,12 +2602,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - shift(18), /* operator_charactor */ + shift(21), /* operator_charactor */ reduce(2), /* ?, reduce: Func */ nil, /* : */ }, }, - actionRow{ // S109 + actionRow{ // S118 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2431,7 +2629,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S110 + actionRow{ // S119 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2453,7 +2651,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S111 + actionRow{ // S120 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2475,7 +2673,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S112 + actionRow{ // S121 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2497,11 +2695,11 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S113 + actionRow{ // S122 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ - reduce(24), /* $, reduce: Expr */ + reduce(25), /* $, reduce: Expr */ nil, /* function_name */ nil, /* ( */ nil, /* ) */ @@ -2514,16 +2712,16 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(24), /* operator_charactor, reduce: Expr */ - reduce(24), /* ?, reduce: Expr */ + reduce(25), /* operator_charactor, reduce: Expr */ + reduce(25), /* ?, reduce: Expr */ nil, /* : */ }, }, - actionRow{ // S114 + actionRow{ // S123 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ - reduce(31), /* $, reduce: TernaryExp */ + reduce(32), /* $, reduce: TernaryExp */ nil, /* function_name */ nil, /* ( */ nil, /* ) */ @@ -2536,12 +2734,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(31), /* operator_charactor, reduce: TernaryExp */ - reduce(31), /* ?, reduce: TernaryExp */ + reduce(32), /* operator_charactor, reduce: TernaryExp */ + reduce(32), /* ?, reduce: TernaryExp */ nil, /* : */ }, }, - actionRow{ // S115 + actionRow{ // S124 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2563,14 +2761,14 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S116 + actionRow{ // S125 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ nil, /* ( */ - reduce(37), /* ), reduce: TernaryParam */ + reduce(38), /* ), reduce: TernaryParam */ nil, /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ @@ -2580,12 +2778,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(37), /* operator_charactor, reduce: TernaryParam */ - reduce(37), /* ?, reduce: TernaryParam */ + reduce(38), /* operator_charactor, reduce: TernaryParam */ + reduce(38), /* ?, reduce: TernaryParam */ nil, /* : */ }, }, - actionRow{ // S117 + actionRow{ // S126 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2607,7 +2805,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S118 + actionRow{ // S127 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2624,12 +2822,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - shift(18), /* operator_charactor */ + shift(21), /* operator_charactor */ reduce(2), /* ?, reduce: Func */ nil, /* : */ }, }, - actionRow{ // S119 + actionRow{ // S128 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2651,7 +2849,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S120 + actionRow{ // S129 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2673,7 +2871,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S121 + actionRow{ // S130 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2695,7 +2893,7 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S122 + actionRow{ // S131 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2717,14 +2915,14 @@ var actionTab = actionTable{ nil, /* : */ }, }, - actionRow{ // S123 + actionRow{ // S132 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ nil, /* ( */ - reduce(24), /* ), reduce: Expr */ + reduce(25), /* ), reduce: Expr */ nil, /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ @@ -2734,19 +2932,19 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(24), /* operator_charactor, reduce: Expr */ - reduce(24), /* ?, reduce: Expr */ + reduce(25), /* operator_charactor, reduce: Expr */ + reduce(25), /* ?, reduce: Expr */ nil, /* : */ }, }, - actionRow{ // S124 + actionRow{ // S133 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ nil, /* function_name */ nil, /* ( */ - reduce(31), /* ), reduce: TernaryExp */ + reduce(32), /* ), reduce: TernaryExp */ nil, /* () */ nil, /* delimitor_param */ nil, /* doublequotes_string */ @@ -2756,12 +2954,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(31), /* operator_charactor, reduce: TernaryExp */ - reduce(31), /* ?, reduce: TernaryExp */ + reduce(32), /* operator_charactor, reduce: TernaryExp */ + reduce(32), /* ?, reduce: TernaryExp */ nil, /* : */ }, }, - actionRow{ // S125 + actionRow{ // S134 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2783,29 +2981,29 @@ var actionTab = actionTable{ reduce(3), /* :, reduce: Func1 */ }, }, - actionRow{ // S126 + actionRow{ // S135 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ nil, /* $ */ - shift(64), /* function_name */ - shift(65), /* ( */ + shift(70), /* function_name */ + shift(71), /* ( */ nil, /* ) */ nil, /* () */ nil, /* delimitor_param */ - shift(71), /* doublequotes_string */ - shift(72), /* singlequote_string */ - shift(73), /* number */ - shift(74), /* argument */ - nil, /* true */ - nil, /* false */ - shift(75), /* float */ + shift(78), /* doublequotes_string */ + shift(79), /* singlequote_string */ + shift(80), /* number */ + shift(81), /* argument */ + shift(82), /* true */ + shift(83), /* false */ + shift(84), /* float */ nil, /* operator_charactor */ nil, /* ? */ nil, /* : */ }, }, - actionRow{ // S127 + actionRow{ // S136 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2822,12 +3020,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(37), /* operator_charactor, reduce: TernaryParam */ - reduce(37), /* ?, reduce: TernaryParam */ - reduce(37), /* :, reduce: TernaryParam */ + reduce(38), /* operator_charactor, reduce: TernaryParam */ + reduce(38), /* ?, reduce: TernaryParam */ + reduce(38), /* :, reduce: TernaryParam */ }, }, - actionRow{ // S128 + actionRow{ // S137 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2849,7 +3047,7 @@ var actionTab = actionTable{ reduce(1), /* :, reduce: Func */ }, }, - actionRow{ // S129 + actionRow{ // S138 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2866,12 +3064,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - shift(18), /* operator_charactor */ + shift(21), /* operator_charactor */ reduce(2), /* ?, reduce: Func */ reduce(2), /* :, reduce: Func */ }, }, - actionRow{ // S130 + actionRow{ // S139 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2893,7 +3091,7 @@ var actionTab = actionTable{ reduce(22), /* :, reduce: Expr */ }, }, - actionRow{ // S131 + actionRow{ // S140 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2915,7 +3113,7 @@ var actionTab = actionTable{ reduce(23), /* :, reduce: Expr */ }, }, - actionRow{ // S132 + actionRow{ // S141 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2937,7 +3135,7 @@ var actionTab = actionTable{ reduce(20), /* :, reduce: Expr */ }, }, - actionRow{ // S133 + actionRow{ // S142 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2959,7 +3157,7 @@ var actionTab = actionTable{ reduce(21), /* :, reduce: Expr */ }, }, - actionRow{ // S134 + actionRow{ // S143 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2976,12 +3174,12 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(24), /* operator_charactor, reduce: Expr */ - reduce(24), /* ?, reduce: Expr */ - reduce(24), /* :, reduce: Expr */ + reduce(25), /* operator_charactor, reduce: Expr */ + reduce(25), /* ?, reduce: Expr */ + reduce(25), /* :, reduce: Expr */ }, }, - actionRow{ // S135 + actionRow{ // S144 canRecover: false, actions: [numSymbols]action{ nil, /* INVALID */ @@ -2998,9 +3196,9 @@ var actionTab = actionTable{ nil, /* true */ nil, /* false */ nil, /* float */ - reduce(31), /* operator_charactor, reduce: TernaryExp */ - reduce(31), /* ?, reduce: TernaryExp */ - reduce(31), /* :, reduce: TernaryExp */ + reduce(32), /* operator_charactor, reduce: TernaryExp */ + reduce(32), /* ?, reduce: TernaryExp */ + reduce(32), /* :, reduce: TernaryExp */ }, }, } diff --git a/core/mapper/exprmapper/expression/gocc/parser/gototable.go b/core/mapper/exprmapper/expression/gocc/parser/gototable.go index dfa52c9..d73b633 100644 --- a/core/mapper/exprmapper/expression/gocc/parser/gototable.go +++ b/core/mapper/exprmapper/expression/gocc/parser/gototable.go @@ -18,12 +18,12 @@ var gotoTab = gotoTable{ 6, // DoubleQString 7, // SingleQString 8, // Int - 10, // MappingRef - -1, // Bool + 11, // MappingRef + 10, // Bool 9, // Float 3, // Expr -1, // Operator - 16, // TernaryExp + 19, // TernaryExp -1, // TernaryParam }, gotoRow{ // S1 @@ -70,7 +70,7 @@ var gotoTab = gotoTable{ -1, // Bool -1, // Float -1, // Expr - 17, // Operator + 20, // Operator -1, // TernaryExp -1, // TernaryParam }, @@ -93,17 +93,17 @@ var gotoTab = gotoTable{ gotoRow{ // S5 -1, // S' -1, // Func - 21, // Func1 + 24, // Func1 -1, // Args - 25, // DoubleQString - 26, // SingleQString - 27, // Int - 29, // MappingRef - -1, // Bool - 28, // Float - 22, // Expr + 28, // DoubleQString + 29, // SingleQString + 30, // Int + 33, // MappingRef + 32, // Bool + 31, // Float + 25, // Expr -1, // Operator - 35, // TernaryExp + 41, // TernaryExp -1, // TernaryParam }, gotoRow{ // S6 @@ -285,17 +285,17 @@ var gotoTab = gotoTable{ gotoRow{ // S17 -1, // S' -1, // Func - 37, // Func1 + -1, // Func1 -1, // Args - 6, // DoubleQString - 7, // SingleQString - 8, // Int - 10, // MappingRef + -1, // DoubleQString + -1, // SingleQString + -1, // Int + -1, // MappingRef -1, // Bool - 9, // Float - 38, // Expr + -1, // Float + -1, // Expr -1, // Operator - 16, // TernaryExp + -1, // TernaryExp -1, // TernaryParam }, gotoRow{ // S18 @@ -315,22 +315,6 @@ var gotoTab = gotoTable{ -1, // TernaryParam }, gotoRow{ // S19 - -1, // S' - -1, // Func - 39, // Func1 - 41, // Args - 42, // DoubleQString - 43, // SingleQString - 44, // Int - 47, // MappingRef - 46, // Bool - 45, // Float - -1, // Expr - -1, // Operator - -1, // TernaryExp - -1, // TernaryParam - }, - gotoRow{ // S20 -1, // S' -1, // Func -1, // Func1 @@ -346,6 +330,22 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, + gotoRow{ // S20 + -1, // S' + -1, // Func + 43, // Func1 + -1, // Args + 6, // DoubleQString + 7, // SingleQString + 8, // Int + 11, // MappingRef + 10, // Bool + 9, // Float + 44, // Expr + -1, // Operator + 19, // TernaryExp + -1, // TernaryParam + }, gotoRow{ // S21 -1, // S' -1, // Func @@ -365,16 +365,16 @@ var gotoTab = gotoTable{ gotoRow{ // S22 -1, // S' -1, // Func - -1, // Func1 - -1, // Args - -1, // DoubleQString - -1, // SingleQString - -1, // Int - -1, // MappingRef - -1, // Bool - -1, // Float + 45, // Func1 + 47, // Args + 48, // DoubleQString + 49, // SingleQString + 50, // Int + 53, // MappingRef + 52, // Bool + 51, // Float -1, // Expr - 56, // Operator + -1, // Operator -1, // TernaryExp -1, // TernaryParam }, @@ -397,17 +397,17 @@ var gotoTab = gotoTable{ gotoRow{ // S24 -1, // S' -1, // Func - 21, // Func1 + -1, // Func1 -1, // Args - 25, // DoubleQString - 26, // SingleQString - 27, // Int - 29, // MappingRef + -1, // DoubleQString + -1, // SingleQString + -1, // Int + -1, // MappingRef -1, // Bool - 28, // Float - 59, // Expr + -1, // Float + -1, // Expr -1, // Operator - 35, // TernaryExp + -1, // TernaryExp -1, // TernaryParam }, gotoRow{ // S25 @@ -422,7 +422,7 @@ var gotoTab = gotoTable{ -1, // Bool -1, // Float -1, // Expr - -1, // Operator + 62, // Operator -1, // TernaryExp -1, // TernaryParam }, @@ -445,17 +445,17 @@ var gotoTab = gotoTable{ gotoRow{ // S27 -1, // S' -1, // Func - -1, // Func1 + 24, // Func1 -1, // Args - -1, // DoubleQString - -1, // SingleQString - -1, // Int - -1, // MappingRef - -1, // Bool - -1, // Float - -1, // Expr + 28, // DoubleQString + 29, // SingleQString + 30, // Int + 33, // MappingRef + 32, // Bool + 31, // Float + 65, // Expr -1, // Operator - -1, // TernaryExp + 41, // TernaryExp -1, // TernaryParam }, gotoRow{ // S28 @@ -587,22 +587,6 @@ var gotoTab = gotoTable{ -1, // TernaryParam }, gotoRow{ // S36 - -1, // S' - 61, // Func - 62, // Func1 - -1, // Args - 66, // DoubleQString - 67, // SingleQString - 68, // Int - 70, // MappingRef - -1, // Bool - 69, // Float - 63, // Expr - -1, // Operator - 76, // TernaryExp - 77, // TernaryParam - }, - gotoRow{ // S37 -1, // S' -1, // Func -1, // Func1 @@ -618,7 +602,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S38 + gotoRow{ // S37 -1, // S' -1, // Func -1, // Func1 @@ -630,11 +614,11 @@ var gotoTab = gotoTable{ -1, // Bool -1, // Float -1, // Expr - 17, // Operator + -1, // Operator -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S39 + gotoRow{ // S38 -1, // S' -1, // Func -1, // Func1 @@ -650,7 +634,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S40 + gotoRow{ // S39 -1, // S' -1, // Func -1, // Func1 @@ -666,7 +650,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S41 + gotoRow{ // S40 -1, // S' -1, // Func -1, // Func1 @@ -682,7 +666,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S42 + gotoRow{ // S41 -1, // S' -1, // Func -1, // Func1 @@ -698,6 +682,22 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, + gotoRow{ // S42 + -1, // S' + 67, // Func + 68, // Func1 + -1, // Args + 72, // DoubleQString + 73, // SingleQString + 74, // Int + 77, // MappingRef + 76, // Bool + 75, // Float + 69, // Expr + -1, // Operator + 85, // TernaryExp + 86, // TernaryParam + }, gotoRow{ // S43 -1, // S' -1, // Func @@ -726,7 +726,7 @@ var gotoTab = gotoTable{ -1, // Bool -1, // Float -1, // Expr - -1, // Operator + 20, // Operator -1, // TernaryExp -1, // TernaryParam }, @@ -909,30 +909,30 @@ var gotoTab = gotoTable{ gotoRow{ // S56 -1, // S' -1, // Func - 21, // Func1 + -1, // Func1 -1, // Args - 25, // DoubleQString - 26, // SingleQString - 27, // Int - 29, // MappingRef + -1, // DoubleQString + -1, // SingleQString + -1, // Int + -1, // MappingRef -1, // Bool - 28, // Float - 82, // Expr + -1, // Float + -1, // Expr -1, // Operator - 35, // TernaryExp + -1, // TernaryExp -1, // TernaryParam }, gotoRow{ // S57 -1, // S' -1, // Func - 39, // Func1 - 83, // Args - 42, // DoubleQString - 43, // SingleQString - 44, // Int - 47, // MappingRef - 46, // Bool - 45, // Float + -1, // Func1 + -1, // Args + -1, // DoubleQString + -1, // SingleQString + -1, // Int + -1, // MappingRef + -1, // Bool + -1, // Float -1, // Expr -1, // Operator -1, // TernaryExp @@ -966,25 +966,25 @@ var gotoTab = gotoTable{ -1, // Bool -1, // Float -1, // Expr - 56, // Operator + -1, // Operator -1, // TernaryExp -1, // TernaryParam }, gotoRow{ // S60 -1, // S' - 61, // Func - 62, // Func1 + -1, // Func + -1, // Func1 -1, // Args - 66, // DoubleQString - 67, // SingleQString - 68, // Int - 70, // MappingRef + -1, // DoubleQString + -1, // SingleQString + -1, // Int + -1, // MappingRef -1, // Bool - 69, // Float - 63, // Expr + -1, // Float + -1, // Expr -1, // Operator - 76, // TernaryExp - 85, // TernaryParam + -1, // TernaryExp + -1, // TernaryParam }, gotoRow{ // S61 -1, // S' @@ -1003,6 +1003,38 @@ var gotoTab = gotoTable{ -1, // TernaryParam }, gotoRow{ // S62 + -1, // S' + -1, // Func + 24, // Func1 + -1, // Args + 28, // DoubleQString + 29, // SingleQString + 30, // Int + 33, // MappingRef + 32, // Bool + 31, // Float + 91, // Expr + -1, // Operator + 41, // TernaryExp + -1, // TernaryParam + }, + gotoRow{ // S63 + -1, // S' + -1, // Func + 45, // Func1 + 92, // Args + 48, // DoubleQString + 49, // SingleQString + 50, // Int + 53, // MappingRef + 52, // Bool + 51, // Float + -1, // Expr + -1, // Operator + -1, // TernaryExp + -1, // TernaryParam + }, + gotoRow{ // S64 -1, // S' -1, // Func -1, // Func1 @@ -1018,7 +1050,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S63 + gotoRow{ // S65 -1, // S' -1, // Func -1, // Func1 @@ -1030,11 +1062,27 @@ var gotoTab = gotoTable{ -1, // Bool -1, // Float -1, // Expr - 86, // Operator + 62, // Operator -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S64 + gotoRow{ // S66 + -1, // S' + 67, // Func + 68, // Func1 + -1, // Args + 72, // DoubleQString + 73, // SingleQString + 74, // Int + 77, // MappingRef + 76, // Bool + 75, // Float + 69, // Expr + -1, // Operator + 85, // TernaryExp + 94, // TernaryParam + }, + gotoRow{ // S67 -1, // S' -1, // Func -1, // Func1 @@ -1050,23 +1098,39 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S65 + gotoRow{ // S68 -1, // S' -1, // Func - 21, // Func1 + -1, // Func1 -1, // Args - 25, // DoubleQString - 26, // SingleQString - 27, // Int - 29, // MappingRef + -1, // DoubleQString + -1, // SingleQString + -1, // Int + -1, // MappingRef -1, // Bool - 28, // Float - 89, // Expr + -1, // Float + -1, // Expr -1, // Operator - 35, // TernaryExp + -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S66 + gotoRow{ // S69 + -1, // S' + -1, // Func + -1, // Func1 + -1, // Args + -1, // DoubleQString + -1, // SingleQString + -1, // Int + -1, // MappingRef + -1, // Bool + -1, // Float + -1, // Expr + 95, // Operator + -1, // TernaryExp + -1, // TernaryParam + }, + gotoRow{ // S70 -1, // S' -1, // Func -1, // Func1 @@ -1082,7 +1146,23 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S67 + gotoRow{ // S71 + -1, // S' + -1, // Func + 24, // Func1 + -1, // Args + 28, // DoubleQString + 29, // SingleQString + 30, // Int + 33, // MappingRef + 32, // Bool + 31, // Float + 98, // Expr + -1, // Operator + 41, // TernaryExp + -1, // TernaryParam + }, + gotoRow{ // S72 -1, // S' -1, // Func -1, // Func1 @@ -1098,7 +1178,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S68 + gotoRow{ // S73 -1, // S' -1, // Func -1, // Func1 @@ -1114,7 +1194,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S69 + gotoRow{ // S74 -1, // S' -1, // Func -1, // Func1 @@ -1130,7 +1210,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S70 + gotoRow{ // S75 -1, // S' -1, // Func -1, // Func1 @@ -1146,7 +1226,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S71 + gotoRow{ // S76 -1, // S' -1, // Func -1, // Func1 @@ -1162,7 +1242,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S72 + gotoRow{ // S77 -1, // S' -1, // Func -1, // Func1 @@ -1178,7 +1258,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S73 + gotoRow{ // S78 -1, // S' -1, // Func -1, // Func1 @@ -1194,7 +1274,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S74 + gotoRow{ // S79 -1, // S' -1, // Func -1, // Func1 @@ -1210,7 +1290,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S75 + gotoRow{ // S80 -1, // S' -1, // Func -1, // Func1 @@ -1226,7 +1306,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S76 + gotoRow{ // S81 -1, // S' -1, // Func -1, // Func1 @@ -1242,7 +1322,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S77 + gotoRow{ // S82 -1, // S' -1, // Func -1, // Func1 @@ -1258,23 +1338,23 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S78 + gotoRow{ // S83 -1, // S' -1, // Func - 39, // Func1 - 92, // Args - 42, // DoubleQString - 43, // SingleQString - 44, // Int - 47, // MappingRef - 46, // Bool - 45, // Float + -1, // Func1 + -1, // Args + -1, // DoubleQString + -1, // SingleQString + -1, // Int + -1, // MappingRef + -1, // Bool + -1, // Float -1, // Expr -1, // Operator -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S79 + gotoRow{ // S84 -1, // S' -1, // Func -1, // Func1 @@ -1290,7 +1370,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S80 + gotoRow{ // S85 -1, // S' -1, // Func -1, // Func1 @@ -1306,23 +1386,39 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S81 + gotoRow{ // S86 -1, // S' -1, // Func - 39, // Func1 - 93, // Args - 42, // DoubleQString - 43, // SingleQString - 44, // Int - 47, // MappingRef - 46, // Bool - 45, // Float + -1, // Func1 + -1, // Args + -1, // DoubleQString + -1, // SingleQString + -1, // Int + -1, // MappingRef + -1, // Bool + -1, // Float -1, // Expr -1, // Operator -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S82 + gotoRow{ // S87 + -1, // S' + -1, // Func + 45, // Func1 + 101, // Args + 48, // DoubleQString + 49, // SingleQString + 50, // Int + 53, // MappingRef + 52, // Bool + 51, // Float + -1, // Expr + -1, // Operator + -1, // TernaryExp + -1, // TernaryParam + }, + gotoRow{ // S88 -1, // S' -1, // Func -1, // Func1 @@ -1334,11 +1430,11 @@ var gotoTab = gotoTable{ -1, // Bool -1, // Float -1, // Expr - 56, // Operator + -1, // Operator -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S83 + gotoRow{ // S89 -1, // S' -1, // Func -1, // Func1 @@ -1354,7 +1450,39 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S84 + gotoRow{ // S90 + -1, // S' + -1, // Func + 45, // Func1 + 102, // Args + 48, // DoubleQString + 49, // SingleQString + 50, // Int + 53, // MappingRef + 52, // Bool + 51, // Float + -1, // Expr + -1, // Operator + -1, // TernaryExp + -1, // TernaryParam + }, + gotoRow{ // S91 + -1, // S' + -1, // Func + -1, // Func1 + -1, // Args + -1, // DoubleQString + -1, // SingleQString + -1, // Int + -1, // MappingRef + -1, // Bool + -1, // Float + -1, // Expr + 62, // Operator + -1, // TernaryExp + -1, // TernaryParam + }, + gotoRow{ // S92 -1, // S' -1, // Func -1, // Func1 @@ -1370,7 +1498,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S85 + gotoRow{ // S93 -1, // S' -1, // Func -1, // Func1 @@ -1386,39 +1514,55 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S86 + gotoRow{ // S94 + -1, // S' + -1, // Func + -1, // Func1 + -1, // Args + -1, // DoubleQString + -1, // SingleQString + -1, // Int + -1, // MappingRef + -1, // Bool + -1, // Float + -1, // Expr + -1, // Operator + -1, // TernaryExp + -1, // TernaryParam + }, + gotoRow{ // S95 -1, // S' -1, // Func - 96, // Func1 + 105, // Func1 -1, // Args - 98, // DoubleQString - 99, // SingleQString - 100, // Int - 102, // MappingRef - -1, // Bool - 101, // Float - 97, // Expr + 107, // DoubleQString + 108, // SingleQString + 109, // Int + 111, // MappingRef + 76, // Bool + 110, // Float + 106, // Expr -1, // Operator - 76, // TernaryExp + 85, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S87 + gotoRow{ // S96 -1, // S' -1, // Func - 39, // Func1 - 103, // Args - 42, // DoubleQString - 43, // SingleQString - 44, // Int - 47, // MappingRef - 46, // Bool - 45, // Float + 45, // Func1 + 112, // Args + 48, // DoubleQString + 49, // SingleQString + 50, // Int + 53, // MappingRef + 52, // Bool + 51, // Float -1, // Expr -1, // Operator -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S88 + gotoRow{ // S97 -1, // S' -1, // Func -1, // Func1 @@ -1434,7 +1578,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S89 + gotoRow{ // S98 -1, // S' -1, // Func -1, // Func1 @@ -1446,43 +1590,43 @@ var gotoTab = gotoTable{ -1, // Bool -1, // Float -1, // Expr - 56, // Operator + 62, // Operator -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S90 + gotoRow{ // S99 -1, // S' - 61, // Func - 62, // Func1 + 67, // Func + 68, // Func1 -1, // Args - 66, // DoubleQString - 67, // SingleQString - 68, // Int - 70, // MappingRef - -1, // Bool - 69, // Float - 63, // Expr + 72, // DoubleQString + 73, // SingleQString + 74, // Int + 77, // MappingRef + 76, // Bool + 75, // Float + 69, // Expr -1, // Operator - 76, // TernaryExp - 105, // TernaryParam + 85, // TernaryExp + 114, // TernaryParam }, - gotoRow{ // S91 + gotoRow{ // S100 -1, // S' - 106, // Func - 107, // Func1 + 115, // Func + 116, // Func1 -1, // Args - 109, // DoubleQString - 110, // SingleQString - 111, // Int - 113, // MappingRef - -1, // Bool - 112, // Float - 108, // Expr + 118, // DoubleQString + 119, // SingleQString + 120, // Int + 122, // MappingRef + 10, // Bool + 121, // Float + 117, // Expr -1, // Operator - 16, // TernaryExp - 114, // TernaryParam + 19, // TernaryExp + 123, // TernaryParam }, - gotoRow{ // S92 + gotoRow{ // S101 -1, // S' -1, // Func -1, // Func1 @@ -1498,7 +1642,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S93 + gotoRow{ // S102 -1, // S' -1, // Func -1, // Func1 @@ -1514,7 +1658,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S94 + gotoRow{ // S103 -1, // S' -1, // Func -1, // Func1 @@ -1530,23 +1674,23 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S95 + gotoRow{ // S104 -1, // S' - 116, // Func - 117, // Func1 + 125, // Func + 126, // Func1 -1, // Args - 119, // DoubleQString - 120, // SingleQString - 121, // Int - 123, // MappingRef - -1, // Bool - 122, // Float - 118, // Expr + 128, // DoubleQString + 129, // SingleQString + 130, // Int + 132, // MappingRef + 32, // Bool + 131, // Float + 127, // Expr -1, // Operator - 35, // TernaryExp - 124, // TernaryParam + 41, // TernaryExp + 133, // TernaryParam }, - gotoRow{ // S96 + gotoRow{ // S105 -1, // S' -1, // Func -1, // Func1 @@ -1562,7 +1706,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S97 + gotoRow{ // S106 -1, // S' -1, // Func -1, // Func1 @@ -1574,11 +1718,11 @@ var gotoTab = gotoTable{ -1, // Bool -1, // Float -1, // Expr - 86, // Operator + 95, // Operator -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S98 + gotoRow{ // S107 -1, // S' -1, // Func -1, // Func1 @@ -1594,7 +1738,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S99 + gotoRow{ // S108 -1, // S' -1, // Func -1, // Func1 @@ -1610,7 +1754,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S100 + gotoRow{ // S109 -1, // S' -1, // Func -1, // Func1 @@ -1626,7 +1770,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S101 + gotoRow{ // S110 -1, // S' -1, // Func -1, // Func1 @@ -1642,7 +1786,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S102 + gotoRow{ // S111 -1, // S' -1, // Func -1, // Func1 @@ -1658,7 +1802,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S103 + gotoRow{ // S112 -1, // S' -1, // Func -1, // Func1 @@ -1674,7 +1818,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S104 + gotoRow{ // S113 -1, // S' -1, // Func -1, // Func1 @@ -1690,7 +1834,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S105 + gotoRow{ // S114 -1, // S' -1, // Func -1, // Func1 @@ -1706,7 +1850,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S106 + gotoRow{ // S115 -1, // S' -1, // Func -1, // Func1 @@ -1722,7 +1866,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S107 + gotoRow{ // S116 -1, // S' -1, // Func -1, // Func1 @@ -1738,7 +1882,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S108 + gotoRow{ // S117 -1, // S' -1, // Func -1, // Func1 @@ -1750,11 +1894,11 @@ var gotoTab = gotoTable{ -1, // Bool -1, // Float -1, // Expr - 17, // Operator + 20, // Operator -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S109 + gotoRow{ // S118 -1, // S' -1, // Func -1, // Func1 @@ -1770,7 +1914,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S110 + gotoRow{ // S119 -1, // S' -1, // Func -1, // Func1 @@ -1786,7 +1930,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S111 + gotoRow{ // S120 -1, // S' -1, // Func -1, // Func1 @@ -1802,7 +1946,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S112 + gotoRow{ // S121 -1, // S' -1, // Func -1, // Func1 @@ -1818,7 +1962,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S113 + gotoRow{ // S122 -1, // S' -1, // Func -1, // Func1 @@ -1834,7 +1978,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S114 + gotoRow{ // S123 -1, // S' -1, // Func -1, // Func1 @@ -1850,7 +1994,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S115 + gotoRow{ // S124 -1, // S' -1, // Func -1, // Func1 @@ -1866,7 +2010,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S116 + gotoRow{ // S125 -1, // S' -1, // Func -1, // Func1 @@ -1882,7 +2026,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S117 + gotoRow{ // S126 -1, // S' -1, // Func -1, // Func1 @@ -1898,7 +2042,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S118 + gotoRow{ // S127 -1, // S' -1, // Func -1, // Func1 @@ -1910,11 +2054,11 @@ var gotoTab = gotoTable{ -1, // Bool -1, // Float -1, // Expr - 56, // Operator + 62, // Operator -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S119 + gotoRow{ // S128 -1, // S' -1, // Func -1, // Func1 @@ -1930,7 +2074,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S120 + gotoRow{ // S129 -1, // S' -1, // Func -1, // Func1 @@ -1946,7 +2090,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S121 + gotoRow{ // S130 -1, // S' -1, // Func -1, // Func1 @@ -1962,7 +2106,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S122 + gotoRow{ // S131 -1, // S' -1, // Func -1, // Func1 @@ -1978,7 +2122,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S123 + gotoRow{ // S132 -1, // S' -1, // Func -1, // Func1 @@ -1994,7 +2138,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S124 + gotoRow{ // S133 -1, // S' -1, // Func -1, // Func1 @@ -2010,7 +2154,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S125 + gotoRow{ // S134 -1, // S' -1, // Func -1, // Func1 @@ -2026,23 +2170,23 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S126 + gotoRow{ // S135 -1, // S' - 127, // Func - 128, // Func1 + 136, // Func + 137, // Func1 -1, // Args - 130, // DoubleQString - 131, // SingleQString - 132, // Int - 134, // MappingRef - -1, // Bool - 133, // Float - 129, // Expr + 139, // DoubleQString + 140, // SingleQString + 141, // Int + 143, // MappingRef + 76, // Bool + 142, // Float + 138, // Expr -1, // Operator - 76, // TernaryExp - 135, // TernaryParam + 85, // TernaryExp + 144, // TernaryParam }, - gotoRow{ // S127 + gotoRow{ // S136 -1, // S' -1, // Func -1, // Func1 @@ -2058,7 +2202,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S128 + gotoRow{ // S137 -1, // S' -1, // Func -1, // Func1 @@ -2074,7 +2218,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S129 + gotoRow{ // S138 -1, // S' -1, // Func -1, // Func1 @@ -2086,11 +2230,11 @@ var gotoTab = gotoTable{ -1, // Bool -1, // Float -1, // Expr - 86, // Operator + 95, // Operator -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S130 + gotoRow{ // S139 -1, // S' -1, // Func -1, // Func1 @@ -2106,7 +2250,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S131 + gotoRow{ // S140 -1, // S' -1, // Func -1, // Func1 @@ -2122,7 +2266,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S132 + gotoRow{ // S141 -1, // S' -1, // Func -1, // Func1 @@ -2138,7 +2282,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S133 + gotoRow{ // S142 -1, // S' -1, // Func -1, // Func1 @@ -2154,7 +2298,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S134 + gotoRow{ // S143 -1, // S' -1, // Func -1, // Func1 @@ -2170,7 +2314,7 @@ var gotoTab = gotoTable{ -1, // TernaryExp -1, // TernaryParam }, - gotoRow{ // S135 + gotoRow{ // S144 -1, // S' -1, // Func -1, // Func1 diff --git a/core/mapper/exprmapper/expression/gocc/parser/parser.go b/core/mapper/exprmapper/expression/gocc/parser/parser.go index 62e398a..1bc1f0e 100644 --- a/core/mapper/exprmapper/expression/gocc/parser/parser.go +++ b/core/mapper/exprmapper/expression/gocc/parser/parser.go @@ -11,8 +11,8 @@ import ( ) const ( - numProductions = 38 - numStates = 136 + numProductions = 39 + numStates = 145 numSymbols = 31 ) diff --git a/core/mapper/exprmapper/expression/gocc/parser/productionstable.go b/core/mapper/exprmapper/expression/gocc/parser/productionstable.go index 81893af..4147954 100644 --- a/core/mapper/exprmapper/expression/gocc/parser/productionstable.go +++ b/core/mapper/exprmapper/expression/gocc/parser/productionstable.go @@ -261,7 +261,7 @@ var productionsTable = ProdTab{ }, }, ProdTabEntry{ - String: `Expr : MappingRef << direction.NewExpressionField(X[0]) >>`, + String: `Expr : Bool << direction.NewExpressionField(X[0]) >>`, Id: "Expr", NTType: 10, Index: 24, @@ -271,7 +271,7 @@ var productionsTable = ProdTab{ }, }, ProdTabEntry{ - String: `Expr : Func1 << direction.NewExpressionField(X[0]) >>`, + String: `Expr : MappingRef << direction.NewExpressionField(X[0]) >>`, Id: "Expr", NTType: 10, Index: 25, @@ -281,10 +281,20 @@ var productionsTable = ProdTab{ }, }, ProdTabEntry{ - String: `Expr : Expr Operator Expr << direction.NewExpression(X[0], X[1], X[2]) >>`, + String: `Expr : Func1 << direction.NewExpressionField(X[0]) >>`, Id: "Expr", NTType: 10, Index: 26, + NumSymbols: 1, + ReduceFunc: func(X []Attrib) (Attrib, error) { + return direction.NewExpressionField(X[0]) + }, + }, + ProdTabEntry{ + String: `Expr : Expr Operator Expr << direction.NewExpression(X[0], X[1], X[2]) >>`, + Id: "Expr", + NTType: 10, + Index: 27, NumSymbols: 3, ReduceFunc: func(X []Attrib) (Attrib, error) { return direction.NewExpression(X[0], X[1], X[2]) @@ -294,7 +304,7 @@ var productionsTable = ProdTab{ String: `Expr : TernaryExp << >>`, Id: "Expr", NTType: 10, - Index: 27, + Index: 28, NumSymbols: 1, ReduceFunc: func(X []Attrib) (Attrib, error) { return X[0], nil @@ -304,7 +314,7 @@ var productionsTable = ProdTab{ String: `Expr : "(" Expr ")" << direction.NewExpressionField(X[1]) >>`, Id: "Expr", NTType: 10, - Index: 28, + Index: 29, NumSymbols: 3, ReduceFunc: func(X []Attrib) (Attrib, error) { return direction.NewExpressionField(X[1]) @@ -314,7 +324,7 @@ var productionsTable = ProdTab{ String: `Operator : operator_charactor << >>`, Id: "Operator", NTType: 11, - Index: 29, + Index: 30, NumSymbols: 1, ReduceFunc: func(X []Attrib) (Attrib, error) { return X[0], nil @@ -324,7 +334,7 @@ var productionsTable = ProdTab{ String: `TernaryExp : Expr << direction.NewExpressionField(X[0]) >>`, Id: "TernaryExp", NTType: 12, - Index: 30, + Index: 31, NumSymbols: 1, ReduceFunc: func(X []Attrib) (Attrib, error) { return direction.NewExpressionField(X[0]) @@ -334,7 +344,7 @@ var productionsTable = ProdTab{ String: `TernaryExp : TernaryExp "?" TernaryParam ":" TernaryParam << direction.NewTernaryExpression(X[0], X[2], X[4]) >>`, Id: "TernaryExp", NTType: 12, - Index: 31, + Index: 32, NumSymbols: 5, ReduceFunc: func(X []Attrib) (Attrib, error) { return direction.NewTernaryExpression(X[0], X[2], X[4]) @@ -344,7 +354,7 @@ var productionsTable = ProdTab{ String: `TernaryParam : Int << direction.NewExpressionField(X[0]) >>`, Id: "TernaryParam", NTType: 13, - Index: 32, + Index: 33, NumSymbols: 1, ReduceFunc: func(X []Attrib) (Attrib, error) { return direction.NewExpressionField(X[0]) @@ -354,7 +364,7 @@ var productionsTable = ProdTab{ String: `TernaryParam : Float << direction.NewExpressionField(X[0]) >>`, Id: "TernaryParam", NTType: 13, - Index: 33, + Index: 34, NumSymbols: 1, ReduceFunc: func(X []Attrib) (Attrib, error) { return direction.NewExpressionField(X[0]) @@ -364,7 +374,7 @@ var productionsTable = ProdTab{ String: `TernaryParam : DoubleQString << direction.NewExpressionField(X[0]) >>`, Id: "TernaryParam", NTType: 13, - Index: 34, + Index: 35, NumSymbols: 1, ReduceFunc: func(X []Attrib) (Attrib, error) { return direction.NewExpressionField(X[0]) @@ -374,7 +384,7 @@ var productionsTable = ProdTab{ String: `TernaryParam : SingleQString << direction.NewExpressionField(X[0]) >>`, Id: "TernaryParam", NTType: 13, - Index: 35, + Index: 36, NumSymbols: 1, ReduceFunc: func(X []Attrib) (Attrib, error) { return direction.NewExpressionField(X[0]) @@ -384,7 +394,7 @@ var productionsTable = ProdTab{ String: `TernaryParam : MappingRef << direction.NewExpressionField(X[0]) >>`, Id: "TernaryParam", NTType: 13, - Index: 36, + Index: 37, NumSymbols: 1, ReduceFunc: func(X []Attrib) (Attrib, error) { return direction.NewExpressionField(X[0]) @@ -394,7 +404,7 @@ var productionsTable = ProdTab{ String: `TernaryParam : Func << >>`, Id: "TernaryParam", NTType: 13, - Index: 37, + Index: 38, NumSymbols: 1, ReduceFunc: func(X []Attrib) (Attrib, error) { return X[0], nil