aesthetic changes
parent
ef62bc6c50
commit
f400f02432
|
@ -64,11 +64,11 @@ using namespace macro;
|
||||||
%token FOR ENDFOR IF IFDEF IFNDEF ELSE ENDIF TRUE FALSE
|
%token FOR ENDFOR IF IFDEF IFNDEF ELSE ENDIF TRUE FALSE
|
||||||
%token INCLUDE INCLUDEPATH DEFINE EQUAL D_ECHO ERROR
|
%token INCLUDE INCLUDEPATH DEFINE EQUAL D_ECHO ERROR
|
||||||
%token COMMA LPAREN RPAREN LBRACKET RBRACKET WHEN
|
%token COMMA LPAREN RPAREN LBRACKET RBRACKET WHEN
|
||||||
%token BEGIN_EVAL END_EVAL LENGTH ECHOMACROVARS
|
%token BEGIN_EVAL END_EVAL ECHOMACROVARS
|
||||||
|
|
||||||
%token EXP LOG LN LOG10 SIN COS TAN ASIN ACOS ATAN
|
%token EXP LOG LN LOG10 SIN COS TAN ASIN ACOS ATAN
|
||||||
%token SQRT CBRT SIGN MAX MIN FLOOR CEIL TRUNC SUM MOD
|
%token SQRT CBRT SIGN MAX MIN FLOOR CEIL TRUNC SUM MOD
|
||||||
%token ERF ERFC GAMMA LGAMMA ROUND NORMPDF NORMCDF
|
%token ERF ERFC GAMMA LGAMMA ROUND NORMPDF NORMCDF LENGTH
|
||||||
|
|
||||||
%left OR
|
%left OR
|
||||||
%left AND
|
%left AND
|
||||||
|
|
|
@ -110,9 +110,8 @@ CONT \\\\{SPC}*
|
||||||
<expr,eval>\) { return token::RPAREN; }
|
<expr,eval>\) { return token::RPAREN; }
|
||||||
<expr,eval>\[ { return token::LBRACKET; }
|
<expr,eval>\[ { return token::LBRACKET; }
|
||||||
<expr,eval>\] { return token::RBRACKET; }
|
<expr,eval>\] { return token::RBRACKET; }
|
||||||
<expr,eval>IN { return token::IN; }
|
<expr,eval>in { return token::IN; }
|
||||||
<expr,eval>WHEN { return token::WHEN; }
|
<expr,eval>when { return token::WHEN; }
|
||||||
<expr,eval>LENGTH { return token::LENGTH; }
|
|
||||||
|
|
||||||
<expr,eval>true { return token::TRUE; }
|
<expr,eval>true { return token::TRUE; }
|
||||||
<expr,eval>false { return token::FALSE; }
|
<expr,eval>false { return token::FALSE; }
|
||||||
|
@ -142,6 +141,7 @@ CONT \\\\{SPC}*
|
||||||
<expr,eval>gamma { return token::GAMMA; }
|
<expr,eval>gamma { return token::GAMMA; }
|
||||||
<expr,eval>lgamma { return token::LGAMMA; }
|
<expr,eval>lgamma { return token::LGAMMA; }
|
||||||
<expr,eval>round { return token::ROUND; }
|
<expr,eval>round { return token::ROUND; }
|
||||||
|
<expr,eval>length { return token::LENGTH; }
|
||||||
<expr,eval>normpdf { return token::NORMPDF; }
|
<expr,eval>normpdf { return token::NORMPDF; }
|
||||||
<expr,eval>normcdf { return token::NORMCDF; }
|
<expr,eval>normcdf { return token::NORMCDF; }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue