puppet 3.1.1 → 3.2.0.rc1

data/spec/unit/pops/parser/parse_basic_expressions_spec.rb

@@ -0,0 +1,248 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/pops'
+
+# relative to this spec file (./) does not work as this file is loaded by rspec
+require File.join(File.dirname(__FILE__), '/parser_rspec_helper')
+
+describe "egrammar parsing basic expressions" do
+  include ParserRspecHelper
+
+  context "When the parser parses arithmetic" do
+    context "with Integers" do
+      it "$a = 2 + 2"   do; dump(parse("$a = 2 + 2")).should == "(= $a (+ 2 2))"      ; end
+      it "$a = 7 - 3"   do; dump(parse("$a = 7 - 3")).should == "(= $a (- 7 3))"      ; end
+      it "$a = 6 * 3"   do; dump(parse("$a = 6 * 3")).should == "(= $a (* 6 3))"      ; end
+      it "$a = 6 / 3"   do; dump(parse("$a = 6 / 3")).should == "(= $a (/ 6 3))"      ; end
+      it "$a = 6 % 3"   do; dump(parse("$a = 6 % 3")).should == "(= $a (% 6 3))"      ; end
+      it "$a = -(6/3)"  do; dump(parse("$a = -(6/3)")).should == "(= $a (- (/ 6 3)))" ; end
+      it "$a = -6/3"    do; dump(parse("$a = -6/3")).should == "(= $a (/ (- 6) 3))"   ; end
+      it "$a = 8 >> 1 " do; dump(parse("$a = 8 >> 1")).should == "(= $a (>> 8 1))"    ; end
+      it "$a = 8 << 1 " do; dump(parse("$a = 8 << 1")).should == "(= $a (<< 8 1))"    ; end
+    end
+
+    context "with Floats" do
+      it "$a = 2.2 + 2.2"  do; dump(parse("$a = 2.2 + 2.2")).should == "(= $a (+ 2.2 2.2))"      ; end
+      it "$a = 7.7 - 3.3"  do; dump(parse("$a = 7.7 - 3.3")).should == "(= $a (- 7.7 3.3))"      ; end
+      it "$a = 6.1 * 3.1"  do; dump(parse("$a = 6.1 - 3.1")).should == "(= $a (- 6.1 3.1))"      ; end
+      it "$a = 6.6 / 3.3"  do; dump(parse("$a = 6.6 / 3.3")).should == "(= $a (/ 6.6 3.3))"      ; end
+      it "$a = -(6.0/3.0)" do; dump(parse("$a = -(6.0/3.0)")).should == "(= $a (- (/ 6.0 3.0)))" ; end
+      it "$a = -6.0/3.0"   do; dump(parse("$a = -6.0/3.0")).should == "(= $a (/ (- 6.0) 3.0))"   ; end
+      it "$a = 3.14 << 2"  do; dump(parse("$a = 3.14 << 2")).should == "(= $a (<< 3.14 2))"      ; end
+      it "$a = 3.14 >> 2"  do; dump(parse("$a = 3.14 >> 2")).should == "(= $a (>> 3.14 2))"      ; end
+    end
+
+    context "with hex and octal Integer values" do
+      it "$a = 0xAB + 0xCD" do; dump(parse("$a = 0xAB + 0xCD")).should == "(= $a (+ 0xAB 0xCD))"  ; end
+      it "$a = 0777 - 0333" do; dump(parse("$a = 0777 - 0333")).should == "(= $a (- 0777 0333))"  ; end
+    end
+
+    context "with strings requiring boxing to Numeric" do
+      # Test that numbers in string form does not turn into numbers
+      it "$a = '2' + '2'"       do; dump(parse("$a = '2' + '2'")).should == "(= $a (+ '2' '2'))"             ; end
+      it "$a = '2.2' + '0.2'"   do; dump(parse("$a = '2.2' + '0.2'")).should == "(= $a (+ '2.2' '0.2'))"     ; end
+      it "$a = '0xab' + '0xcd'" do; dump(parse("$a = '0xab' + '0xcd'")).should == "(= $a (+ '0xab' '0xcd'))" ; end
+      it "$a = '0777' + '0333'" do; dump(parse("$a = '0777' + '0333'")).should == "(= $a (+ '0777' '0333'))" ; end
+    end
+
+    context "precedence should be correct" do
+      it "$a = 1 + 2 * 3" do; dump(parse("$a = 1 + 2 * 3")).should == "(= $a (+ 1 (* 2 3)))"; end
+      it "$a = 1 + 2 % 3" do; dump(parse("$a = 1 + 2 % 3")).should == "(= $a (+ 1 (% 2 3)))"; end
+      it "$a = 1 + 2 / 3" do; dump(parse("$a = 1 + 2 / 3")).should == "(= $a (+ 1 (/ 2 3)))"; end
+      it "$a = 1 + 2 << 3" do; dump(parse("$a = 1 + 2 << 3")).should == "(= $a (<< (+ 1 2) 3))"; end
+      it "$a = 1 + 2 >> 3" do; dump(parse("$a = 1 + 2 >> 3")).should == "(= $a (>> (+ 1 2) 3))"; end
+    end
+
+    context "parentheses alter precedence" do
+      it "$a = (1 + 2) * 3" do; dump(parse("$a = (1 + 2) * 3")).should == "(= $a (* (+ 1 2) 3))"; end
+      it "$a = (1 + 2) / 3" do; dump(parse("$a = (1 + 2) / 3")).should == "(= $a (/ (+ 1 2) 3))"; end
+    end
+  end
+
+  context "When the evaluator performs boolean operations" do
+    context "using operators AND OR NOT" do
+      it "$a = true  and true" do; dump(parse("$a = true and true")).should == "(= $a (&& true true))"; end
+      it "$a = true  or true"  do; dump(parse("$a = true or true")).should == "(= $a (|| true true))" ; end
+      it "$a = !true"          do; dump(parse("$a = !true")).should == "(= $a (! true))"              ; end
+    end
+
+    context "precedence should be correct" do
+      it "$a = false or true and true" do
+        dump(parse("$a = false or true and true")).should == "(= $a (|| false (&& true true)))"
+      end
+
+      it "$a = (false or true) and true" do
+        dump(parse("$a = (false or true) and true")).should == "(= $a (&& (|| false true) true))"
+      end
+
+      it "$a = !true or true and true" do
+        dump(parse("$a = !false or true and true")).should == "(= $a (|| (! false) (&& true true)))"
+      end
+    end
+
+    # Possibly change to check of literal expressions
+    context "on values requiring boxing to Boolean" do
+      it "'x'            == true" do
+        dump(parse("! 'x'")).should == "(! 'x')"
+      end
+
+      it "''             == false" do
+        dump(parse("! ''")).should == "(! '')"
+      end
+
+      it ":undef         == false" do
+        dump(parse("! undef")).should == "(! :undef)"
+      end
+    end
+  end
+
+  context "When parsing comparisons" do
+    context "of string values" do
+      it "$a = 'a' == 'a'"  do; dump(parse("$a = 'a' == 'a'")).should == "(= $a (== 'a' 'a'))"   ; end
+      it "$a = 'a' != 'a'"  do; dump(parse("$a = 'a' != 'a'")).should == "(= $a (!= 'a' 'a'))"   ; end
+      it "$a = 'a' < 'b'"   do; dump(parse("$a = 'a' < 'b'")).should == "(= $a (< 'a' 'b'))"     ; end
+      it "$a = 'a' > 'b'"   do; dump(parse("$a = 'a' > 'b'")).should == "(= $a (> 'a' 'b'))"     ; end
+      it "$a = 'a' <= 'b'"  do; dump(parse("$a = 'a' <= 'b'")).should == "(= $a (<= 'a' 'b'))"   ; end
+      it "$a = 'a' >= 'b'"  do; dump(parse("$a = 'a' >= 'b'")).should == "(= $a (>= 'a' 'b'))"   ; end
+    end
+
+    context "of integer values" do
+      it "$a = 1 == 1"  do; dump(parse("$a = 1 == 1")).should == "(= $a (== 1 1))"   ; end
+      it "$a = 1 != 1"  do; dump(parse("$a = 1 != 1")).should == "(= $a (!= 1 1))"   ; end
+      it "$a = 1 < 2"   do; dump(parse("$a = 1 < 2")).should == "(= $a (< 1 2))"     ; end
+      it "$a = 1 > 2"   do; dump(parse("$a = 1 > 2")).should == "(= $a (> 1 2))"     ; end
+      it "$a = 1 <= 2"  do; dump(parse("$a = 1 <= 2")).should == "(= $a (<= 1 2))"   ; end
+      it "$a = 1 >= 2"  do; dump(parse("$a = 1 >= 2")).should == "(= $a (>= 1 2))"   ; end
+    end
+
+    context "of regular expressions (parse errors)" do
+      # Not supported in concrete syntax
+      it "$a = /.*/ == /.*/" do
+        expect {  parse("$a = /.*/ == /.*/") }.to raise_error(Puppet::ParseError)
+      end
+
+      it "$a = /.*/ != /a.*/" do
+        expect {  parse("$a = /.*/ != /.*/") }.to raise_error(Puppet::ParseError)
+      end
+    end
+  end
+
+  context "When parsing Regular Expression matching" do
+    it "$a = 'a' =~ /.*/"    do; dump(parse("$a = 'a' =~ /.*/")).should == "(= $a (=~ 'a' /.*/))"      ; end
+    it "$a = 'a' =~ '.*'"    do; dump(parse("$a = 'a' =~ '.*'")).should == "(= $a (=~ 'a' '.*'))"      ; end
+    it "$a = 'a' !~ /b.*/"   do; dump(parse("$a = 'a' !~ /b.*/")).should == "(= $a (!~ 'a' /b.*/))"    ; end
+    it "$a = 'a' !~ 'b.*'"   do; dump(parse("$a = 'a' !~ 'b.*'")).should == "(= $a (!~ 'a' 'b.*'))"    ; end
+  end
+
+  context "When parsing Lists" do
+    it "$a = []" do
+      dump(parse("$a = []")).should == "(= $a ([]))"
+    end
+
+    it "$a = [1]" do
+      dump(parse("$a = [1]")).should == "(= $a ([] 1))"
+    end
+
+    it "$a = [1,2,3]" do
+      dump(parse("$a = [1,2,3]")).should == "(= $a ([] 1 2 3))"
+    end
+
+    it "[...[...[]]] should create nested arrays without trouble" do
+      dump(parse("$a = [1,[2.0, 2.1, [2.2]],[3.0, 3.1]]")).should == "(= $a ([] 1 ([] 2.0 2.1 ([] 2.2)) ([] 3.0 3.1)))"
+    end
+
+    it "$a = [2 + 2]" do
+      dump(parse("$a = [2+2]")).should == "(= $a ([] (+ 2 2)))"
+    end
+
+    it "$a [1,2,3] == [1,2,3]" do
+      dump(parse("$a = [1,2,3] == [1,2,3]")).should == "(= $a (== ([] 1 2 3) ([] 1 2 3)))"
+    end
+  end
+
+  context "When parsing indexed access" do
+    it "$a = $b[2]" do
+      dump(parse("$a = $b[2]")).should == "(= $a (slice $b 2))"
+    end
+
+    it "$a = [1, 2, 3][2]" do
+      dump(parse("$a = [1,2,3][2]")).should == "(= $a (slice ([] 1 2 3) 2))"
+    end
+
+    it "$a = {'a' => 1, 'b' => 2}['b']" do
+      dump(parse("$a = {'a'=>1,'b' =>2}[b]")).should == "(= $a (slice ({} ('a' 1) ('b' 2)) b))"
+    end
+  end
+
+  context "When parsing assignments" do
+    it "Should allow simple assignment" do
+      dump(parse("$a = 10")).should == "(= $a 10)"
+    end
+
+    it "Should allow chained assignment" do
+      dump(parse("$a = $b = 10")).should == "(= $a (= $b 10))"
+    end
+
+    it "Should allow chained assignment with expressions" do
+      dump(parse("$a = 1 + ($b = 10)")).should == "(= $a (+ 1 (= $b 10)))"
+    end
+  end
+
+  context "When parsing Hashes" do
+    it "should create a  Hash when evaluating a LiteralHash" do
+      dump(parse("$a = {'a'=>1,'b'=>2}")).should == "(= $a ({} ('a' 1) ('b' 2)))"
+    end
+
+    it "$a = {...{...{}}} should create nested hashes without trouble" do
+      dump(parse("$a = {'a'=>1,'b'=>{'x'=>2.1,'y'=>2.2}}")).should == "(= $a ({} ('a' 1) ('b' ({} ('x' 2.1) ('y' 2.2)))))"
+    end
+
+    it "$a = {'a'=> 2 + 2} should evaluate values in entries" do
+      dump(parse("$a = {'a'=>2+2}")).should == "(= $a ({} ('a' (+ 2 2))))"
+    end
+
+    it "$a = {'a'=> 1, 'b'=>2} == {'a'=> 1, 'b'=>2}" do
+      dump(parse("$a = {'a'=>1,'b'=>2} == {'a'=>1,'b'=>2}")).should == "(= $a (== ({} ('a' 1) ('b' 2)) ({} ('a' 1) ('b' 2))))"
+    end
+
+    it "$a = {'a'=> 1, 'b'=>2} != {'x'=> 1, 'y'=>3}" do
+      dump(parse("$a = {'a'=>1,'b'=>2} != {'a'=>1,'b'=>2}")).should == "(= $a (!= ({} ('a' 1) ('b' 2)) ({} ('a' 1) ('b' 2))))"
+    end
+  end
+
+  context "When parsing the 'in' operator" do
+    it "with integer in a list" do
+      dump(parse("$a = 1 in [1,2,3]")).should == "(= $a (in 1 ([] 1 2 3)))"
+    end
+
+    it "with string key in a hash" do
+      dump(parse("$a = 'a' in {'x'=>1, 'a'=>2, 'y'=> 3}")).should == "(= $a (in 'a' ({} ('x' 1) ('a' 2) ('y' 3))))"
+    end
+
+    it "with substrings of a string" do
+      dump(parse("$a = 'ana' in 'bananas'")).should == "(= $a (in 'ana' 'bananas'))"
+    end
+
+    it "with sublist in a list" do
+      dump(parse("$a = [2,3] in [1,2,3]")).should == "(= $a (in ([] 2 3) ([] 1 2 3)))"
+    end
+  end
+
+  context "When parsing string interpolation" do
+    it "should interpolate a bare word as a variable name, \"${var}\"" do
+      dump(parse("$a = \"$var\"")).should == "(= $a (cat '' (str $var) ''))"
+    end
+
+    it "should interpolate a variable in a text expression, \"${$var}\"" do
+      dump(parse("$a = \"${$var}\"")).should == "(= $a (cat '' (str $var) ''))"
+    end
+
+    it "should interpolate a variable, \"yo${var}yo\"" do
+      dump(parse("$a = \"yo${var}yo\"")).should == "(= $a (cat 'yo' (str $var) 'yo'))"
+    end
+
+    it "should interpolate any expression in a text expression, \"${var*2}\"" do
+      dump(parse("$a = \"yo${var+2}yo\"")).should == "(= $a (cat 'yo' (str (+ $var 2)) 'yo'))"
+    end
+  end
+end

data/spec/unit/pops/parser/parse_calls_spec.rb

@@ -0,0 +1,93 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/pops'
+
+# relative to this spec file (./) does not work as this file is loaded by rspec
+require File.join(File.dirname(__FILE__), '/parser_rspec_helper')
+
+describe "egrammar parsing function calls" do
+  include ParserRspecHelper
+
+  context "When parsing calls as statements" do
+    context "in top level scope" do
+      it "foo()" do
+        dump(parse("foo()")).should == "(invoke foo)"
+      end
+
+      it "foo bar" do
+        dump(parse("foo bar")).should == "(invoke foo bar)"
+      end
+
+      it "foo(bar)" do
+        dump(parse("foo(bar)")).should == "(invoke foo bar)"
+      end
+
+      it "foo(bar,)" do
+        dump(parse("foo(bar,)")).should == "(invoke foo bar)"
+      end
+
+      it "foo(bar, fum,)" do
+        dump(parse("foo(bar,fum,)")).should == "(invoke foo bar fum)"
+      end
+    end
+
+    context "in nested scopes" do
+      it "if true { foo() }" do
+        dump(parse("if true {foo()}")).should == "(if true\n  (then (invoke foo)))"
+      end
+
+      it "if true { foo bar}" do
+        dump(parse("if true {foo bar}")).should == "(if true\n  (then (invoke foo bar)))"
+      end
+    end
+  end
+
+  context "When parsing calls as expressions" do
+    it "$a = foo()" do
+      dump(parse("$a = foo()")).should == "(= $a (call foo))"
+    end
+
+    it "$a = foo(bar)" do
+      dump(parse("$a = foo()")).should == "(= $a (call foo))"
+    end
+
+    #    # For regular grammar where a bare word can not be a "statement"
+    #    it "$a = foo bar # illegal, must have parentheses" do
+    #      expect { dump(parse("$a = foo bar"))}.to raise_error(Puppet::ParseError)
+    #    end
+
+    # For egrammar where a bare word can be a "statement"
+    it "$a = foo bar # illegal, must have parentheses" do
+      dump(parse("$a = foo bar")).should == "(block (= $a foo) bar)"
+    end
+
+    context "in nested scopes" do
+      it "if true { $a = foo() }" do
+        dump(parse("if true { $a = foo()}")).should == "(if true\n  (then (= $a (call foo))))"
+      end
+
+      it "if true { $a= foo(bar)}" do
+        dump(parse("if true {$a = foo(bar)}")).should == "(if true\n  (then (= $a (call foo bar))))"
+      end
+    end
+  end
+
+  context "When parsing method calls" do
+    it "$a.foo" do
+      dump(parse("$a.foo")).should == "(call-method (. $a foo))"
+    end
+
+    it "$a.foo {|| }" do
+      dump(parse("$a.foo || { }")).should == "(call-method (. $a foo) (lambda ()))"
+    end
+
+    it "$a.foo {|$x| }" do
+      dump(parse("$a.foo {|$x| }")).should == "(call-method (. $a foo) (lambda (parameters x) ()))"
+    end
+
+    it "$a.foo {|$x| }" do
+      dump(parse("$a.foo {|$x| $b = $x}")).should ==
+      "(call-method (. $a foo) (lambda (parameters x) (block (= $b $x))))"
+    end
+  end
+end

data/spec/unit/pops/parser/parse_conditionals_spec.rb

@@ -0,0 +1,159 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/pops'
+
+# relative to this spec file (./) does not work as this file is loaded by rspec
+require File.join(File.dirname(__FILE__), '/parser_rspec_helper')
+
+describe "egrammar parsing conditionals" do
+  include ParserRspecHelper
+
+  context "When parsing if statements" do
+    it "if true { $a = 10 }" do
+      dump(parse("if true { $a = 10 }")).should == "(if true\n  (then (= $a 10)))"
+    end
+
+    it "if true { $a = 10 } else {$a = 20}" do
+      dump(parse("if true { $a = 10 } else {$a = 20}")).should ==
+      ["(if true",
+        "  (then (= $a 10))",
+        "  (else (= $a 20)))"].join("\n")
+    end
+
+    it "if true { $a = 10 } elsif false { $a = 15} else {$a = 20}" do
+      dump(parse("if true { $a = 10 } elsif false { $a = 15} else {$a = 20}")).should ==
+      ["(if true",
+        "  (then (= $a 10))",
+        "  (else (if false",
+        "      (then (= $a 15))",
+        "      (else (= $a 20)))))"].join("\n")
+    end
+
+    it "if true { $a = 10 $b = 10 } else {$a = 20}" do
+      dump(parse("if true { $a = 10 $b = 20} else {$a = 20}")).should ==
+      ["(if true",
+        "  (then (block (= $a 10) (= $b 20)))",
+        "  (else (= $a 20)))"].join("\n")
+    end
+
+    it "allows a parenthesized conditional expression" do
+      dump(parse("if (true) { 10 }")).should == "(if true\n  (then 10))"
+    end
+
+    it "allows a parenthesized elsif conditional expression" do
+      dump(parse("if true { 10 } elsif (false) { 20 }")).should ==
+        ["(if true",
+         "  (then 10)",
+         "  (else (if false",
+         "      (then 20))))"].join("\n")
+    end
+  end
+
+  context "When parsing unless statements" do
+    it "unless true { $a = 10 }" do
+      dump(parse("unless true { $a = 10 }")).should == "(unless true\n  (then (= $a 10)))"
+    end
+
+    it "unless true { $a = 10 } else {$a = 20}" do
+      dump(parse("unless true { $a = 10 } else {$a = 20}")).should ==
+      ["(unless true",
+        "  (then (= $a 10))",
+        "  (else (= $a 20)))"].join("\n")
+    end
+
+    it "allows a parenthesized conditional expression" do
+      dump(parse("unless (true) { 10 }")).should == "(unless true\n  (then 10))"
+    end
+
+    it "unless true { $a = 10 } elsif false { $a = 15} else {$a = 20} # is illegal" do
+      expect { parse("unless true { $a = 10 } elsif false { $a = 15} else {$a = 20}")}.to raise_error(Puppet::ParseError)
+    end
+  end
+
+  context "When parsing selector expressions" do
+    it "$a = $b ? banana => fruit " do
+      dump(parse("$a = $b ? banana => fruit")).should ==
+      "(= $a (? $b (banana => fruit)))"
+    end
+
+    it "$a = $b ? { banana => fruit}" do
+      dump(parse("$a = $b ? { banana => fruit }")).should ==
+      "(= $a (? $b (banana => fruit)))"
+    end
+
+    it "does not fail on a trailing blank line" do
+      dump(parse("$a = $b ? { banana => fruit }\n\n")).should ==
+      "(= $a (? $b (banana => fruit)))"
+    end
+
+    it "$a = $b ? { banana => fruit, grape => berry }" do
+      dump(parse("$a = $b ? {banana => fruit, grape => berry}")).should ==
+      "(= $a (? $b (banana => fruit) (grape => berry)))"
+    end
+
+    it "$a = $b ? { banana => fruit, grape => berry, default => wat }" do
+      dump(parse("$a = $b ? {banana => fruit, grape => berry, default => wat}")).should ==
+      "(= $a (? $b (banana => fruit) (grape => berry) (:default => wat)))"
+    end
+
+    it "$a = $b ? { default => wat, banana => fruit, grape => berry,  }" do
+      dump(parse("$a = $b ? {default => wat, banana => fruit, grape => berry}")).should ==
+      "(= $a (? $b (:default => wat) (banana => fruit) (grape => berry)))"
+    end
+  end
+
+  context "When parsing case statements" do
+    it "case $a { a : {}}" do
+      dump(parse("case $a { a : {}}")).should ==
+      ["(case $a",
+        "  (when (a) (then ())))"
+      ].join("\n")
+    end
+
+    it "allows a parenthesized value expression" do
+      dump(parse("case ($a) { a : {}}")).should ==
+      ["(case $a",
+        "  (when (a) (then ())))"
+      ].join("\n")
+    end
+
+    it "case $a { /.*/ : {}}" do
+      dump(parse("case $a { /.*/ : {}}")).should ==
+      ["(case $a",
+        "  (when (/.*/) (then ())))"
+      ].join("\n")
+    end
+
+    it "case $a { a, b : {}}" do
+      dump(parse("case $a { a, b : {}}")).should ==
+      ["(case $a",
+        "  (when (a b) (then ())))"
+      ].join("\n")
+    end
+
+    it "case $a { a, b : {} default : {}}" do
+      dump(parse("case $a { a, b : {} default : {}}")).should ==
+      ["(case $a",
+        "  (when (a b) (then ()))",
+        "  (when (:default) (then ())))"
+      ].join("\n")
+    end
+
+    it "case $a { a : {$b = 10 $c = 20}}" do
+      dump(parse("case $a { a : {$b = 10 $c = 20}}")).should ==
+      ["(case $a",
+        "  (when (a) (then (block (= $b 10) (= $c 20)))))"
+      ].join("\n")
+    end
+  end
+
+  context "When parsing imports" do
+    it "import 'foo'" do
+      dump(parse("import 'foo'")).should == "(import 'foo')"
+    end
+
+    it "import 'foo', 'bar'" do
+      dump(parse("import 'foo', 'bar'")).should == "(import 'foo' 'bar')"
+    end
+  end
+end