Implement 'else if'

fixes #8548

diff --git a/doc/16-language-reference.md b/doc/16-language-reference.md
index 393a004a83fc6a82a970b9ff3e2f48a33117d9b1..0a5be4a2f63523cb6a9f331849239c79823c30ab 100644 (file)
--- a/doc/16-language-reference.md
+++ b/doc/16-language-reference.md
@@ -668,11 +668,13 @@ Example:
 
     a = 3
 
-       if (a < 5) {
+    if (a < 5) {
       a *= 7
-       } else {
-         a *= 2
-       }
+    } else if (a > 10) {
+      a *= 5
+    } else {
+      a *= 2
+    }
 
 An if/else construct can also be used in place of any other value. The value of an if/else statement
 is the value of the last statement which was evaluated for the branch which was taken:

diff --git a/lib/config/config_parser.yy b/lib/config/config_parser.yy
index 23a1803dcbb77962322178b0db4774536ea9ea6d..9d52912e18aa3c01b48bedcf354c464e863ce124 100644 (file)
--- a/lib/config/config_parser.yy
+++ b/lib/config/config_parser.yy
@@ -97,6 +97,8 @@ static void MakeRBinaryOp(Expression** result, Expression *left, Expression *rig
        std::vector<String> *slist;
        std::vector<std::pair<Expression *, EItemInfo> > *llist;
        std::vector<Expression *> *elist;
+       std::vector<std::pair<Expression *, Expression *> > *ebranchlist;
+       std::pair<Expression *, Expression *> *ebranch;
        std::pair<String, Expression *> *cvitem;
        std::map<String, Expression *> *cvlist;
        icinga::ScopeSpecifier scope;
@@ -197,6 +199,8 @@ static void MakeRBinaryOp(Expression** result, Expression *left, Expression *rig
 %type <expr> rterm_array
 %type <expr> rterm_scope_require_side_effect
 %type <expr> rterm_scope
+%type <ebranchlist> else_if_branches
+%type <ebranch> else_if_branch
 %type <expr> rterm_side_effect
 %type <expr> rterm_no_side_effect
 %type <expr> lterm
@@ -757,6 +761,27 @@ rterm_scope: '{'
        }
        ;
 
+else_if_branch: T_ELSE T_IF '(' rterm ')' rterm_scope
+       {
+               DictExpression *atrue = dynamic_cast<DictExpression *>($6);
+               atrue->MakeInline();
+
+               $$ = new std::pair<Expression *, Expression *>($4, atrue);
+       }
+       ;
+
+else_if_branches: /* empty */
+       {
+               $$ = new std::vector<std::pair<Expression *, Expression *> >();
+       }
+       | else_if_branches else_if_branch
+       {
+               $$ = $1;
+               $$->push_back(*$2);
+               delete $2;
+       }
+       ;
+
 rterm_side_effect: rterm '(' rterm_items ')'
        {
                $$ = new FunctionCallExpression($1, *$3, @$);
@@ -790,13 +815,23 @@ rterm_side_effect: rterm '(' rterm_items ')'
 
                $$ = new ConditionalExpression($3, atrue, NULL, @$);
        }
-       | T_IF '(' rterm ')' rterm_scope T_ELSE rterm_scope
+       | T_IF '(' rterm ')' rterm_scope else_if_branches T_ELSE rterm_scope
        {
                DictExpression *atrue = dynamic_cast<DictExpression *>($5);
                atrue->MakeInline();
 
-               DictExpression *afalse = dynamic_cast<DictExpression *>($7);
-               afalse->MakeInline();
+               std::vector<std::pair<Expression *, Expression *> > ebranches = *$6;
+               delete $6;
+
+               DictExpression *afalsedict = dynamic_cast<DictExpression *>($8);
+               afalsedict->MakeInline();
+
+               Expression *afalse = afalsedict;
+
+               for (int i = ebranches.size() - 1; i >= 0; i--) {
+                       const std::pair<Expression *, Expression *>& ebranch = ebranches[i];
+                       afalse = new ConditionalExpression(ebranch.first, ebranch.second, afalse, @6);
+               }
 
                $$ = new ConditionalExpression($3, atrue, afalse, @$);
        }