From 0c297be5dad784e305ef194cee29b11a92d31b6b Mon Sep 17 00:00:00 2001 From: Brice Figureau Date: Sat, 4 Oct 2008 16:11:03 +0200 Subject: Fix #1109 - allow empty if or else branches This changesets allow empty if or else branches: if true { } else { } It works by emitting on the parser stack an AST node that doesn't do anything (a no-op). This allows the less intrusive code as no part of the if evaluation code has been touched. --- spec/unit/parser/parser.rb | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'spec/unit/parser/parser.rb') diff --git a/spec/unit/parser/parser.rb b/spec/unit/parser/parser.rb index 0092a9970..c0d22a2cc 100755 --- a/spec/unit/parser/parser.rb +++ b/spec/unit/parser/parser.rb @@ -116,4 +116,30 @@ describe Puppet::Parser do end + describe Puppet::Parser, "when parsing if statements" do + + it "should not raise errors with empty if" do + lambda { @parser.parse("if true { }") }.should_not raise_error + end + + it "should not raise errors with empty else" do + lambda { @parser.parse("if false { notice('if') } else { }") }.should_not raise_error + end + + it "should not raise errors with empty if and else" do + lambda { @parser.parse("if false { } else { }") }.should_not raise_error + end + + it "should create a nop node for empty branch" do + AST::Nop.expects(:new) + @parser.parse("if true { }") + end + + it "should create a nop node for empty else branch" do + AST::Nop.expects(:new) + @parser.parse("if true { notice('test') } else { }") + end + + end + end -- cgit