[#2713] Enable ELSIF

1 files changed, 17 insertions, 10 deletions

diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index 545137e50..a6e64a38f 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -67,7 +67,7 @@ statement:    resource
             | collection
             | assignment
             | casestatement
-            | ifstatement
+            | ifstatement_begin
             | import
             | fstatement
             | definition
@@ -463,34 +463,41 @@ resourceref: NAME LBRACK rvalues RBRACK {
     result = ast AST::ResourceReference, :type => val[0], :title => val[2]
 }
 
-ifstatement:      IF expression LBRACE statements RBRACE else {
+ifstatement_begin: IF ifstatement {
+    result = val[1]
+}
+
+ifstatement:      expression LBRACE statements RBRACE else {
     @lexer.commentpop
     args = {
-        :test => val[1],
-        :statements => val[3]
+        :test => val[0],
+        :statements => val[2]
     }
 
-    if val[5]
-        args[:else] = val[5]
+    if val[4]
+        args[:else] = val[4]
     end
 
     result = ast AST::IfStatement, args
 }
-                | IF expression LBRACE RBRACE else {
+                | expression LBRACE RBRACE else {
     @lexer.commentpop
     args = {
-        :test => val[1],
+        :test => val[0],
         :statements => ast(AST::Nop)
     }
 
-    if val[4]
-        args[:else] = val[4]
+    if val[3]
+        args[:else] = val[3]
     end
 
     result = ast AST::IfStatement, args
 }
 
 else:             # nothing
+                | ELSIF ifstatement {
+    result = ast AST::Else, :statements => val[1]
+}
                 | ELSE LBRACE statements RBRACE {
     @lexer.commentpop
     result = ast AST::Else, :statements => val[2]