tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement the "globals" and "locals" keyword 

fixes #8244
This commit is contained in:
Gunnar Beutner 2015-01-16 13:04:34 +01:00
parent b4c74efde0
commit 848d076090
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/config/config_lexer.ll
View File

@ -190,6 +190,8 @@ false { yylval->boolean = 0; return T_BOOLEAN; }
const return T_CONST; const return T_CONST;
var return T_VAR; var return T_VAR;
this return T_THIS; this return T_THIS;
globals return T_GLOBALS;
locals return T_LOCALS;
use return T_USE; use return T_USE;
apply return T_APPLY; apply return T_APPLY;
to return T_TO; to return T_TO;

12
lib/config/config_parser.yy
View File

@ -142,6 +142,8 @@ static void MakeRBinaryOp(Expression** result, Expression *left, Expression *rig
%token T_GREATER_THAN "> (T_GREATER_THAN)" %token T_GREATER_THAN "> (T_GREATER_THAN)"
%token T_VAR "var (T_VAR)" %token T_VAR "var (T_VAR)"
%token T_GLOBALS "globals (T_GLOBALS)"
%token T_LOCALS "locals (T_LOCALS)"
%token T_CONST "const (T_CONST)" %token T_CONST "const (T_CONST)"
%token T_USE "use (T_USE)" %token T_USE "use (T_USE)"
%token <type> T_TYPE_DICTIONARY "dictionary (T_TYPE_DICTIONARY)" %token <type> T_TYPE_DICTIONARY "dictionary (T_TYPE_DICTIONARY)"
@ -221,7 +223,7 @@ static void MakeRBinaryOp(Expression** result, Expression *left, Expression *rig
%left UNARY_MINUS UNARY_PLUS %left UNARY_MINUS UNARY_PLUS
%right '!' '~' %right '!' '~'
%left '.' '(' '[' %left '.' '(' '['
%left T_VAR T_THIS %left T_VAR T_THIS T_GLOBALS T_LOCALS
%right ';' ',' %right ';' ','
%right T_NEWLINE %right T_NEWLINE
%{ %{
@ -807,6 +809,14 @@ rterm_no_side_effect: T_STRING
{ {
$$ = new GetScopeExpression(ScopeThis); $$ = new GetScopeExpression(ScopeThis);
} }
| T_GLOBALS
{
$$ = new GetScopeExpression(ScopeGlobal);
}
| T_LOCALS
{
$$ = new GetScopeExpression(ScopeLocal);
}
| rterm_array | rterm_array
| rterm_scope_require_side_effect | rterm_scope_require_side_effect
{ {