diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2013-01-03 13:38:36 -0800 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2013-01-03 13:38:36 -0800 |
| commit | d7aea0f0be659223452ba2d65e799d2b7dbfd823 (patch) | |
| tree | 12d5f80efdcf54f1d3e1731b20777d3b1097c43c /lib/puppet/parser | |
| parent | e1f2a932883c71038d78938efd46cdb30c01da6d (diff) | |
| parent | bc4abce86b07a97ec9d17ee105266c1260a9a1c8 (diff) | |
| download | puppet-stdlib-d7aea0f0be659223452ba2d65e799d2b7dbfd823.tar.gz puppet-stdlib-d7aea0f0be659223452ba2d65e799d2b7dbfd823.tar.bz2 | |
Merge branch '3.2.x' into 3.x
* 3.2.x:
Add test/validation for is_float if created from an arithmetical operation
Add test/validation for is_integer if created from an arithmetical operation
Add test/validation for is_numeric if created from an arithmetical operation
Diffstat (limited to 'lib/puppet/parser')
| -rw-r--r-- | lib/puppet/parser/functions/is_float.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/is_integer.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/is_numeric.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/parser/functions/is_float.rb b/lib/puppet/parser/functions/is_float.rb index 2fc05ba..911f3c2 100644 --- a/lib/puppet/parser/functions/is_float.rb +++ b/lib/puppet/parser/functions/is_float.rb @@ -15,7 +15,7 @@ Returns true if the variable passed to this function is a float. value = arguments[0] - if value != value.to_f.to_s then + if value != value.to_f.to_s and !value.is_a? Float then return false else return true diff --git a/lib/puppet/parser/functions/is_integer.rb b/lib/puppet/parser/functions/is_integer.rb index 8ee34f6..6b29e98 100644 --- a/lib/puppet/parser/functions/is_integer.rb +++ b/lib/puppet/parser/functions/is_integer.rb @@ -15,7 +15,7 @@ Returns true if the variable returned to this string is an integer. value = arguments[0] - if value != value.to_i.to_s then + if value != value.to_i.to_s and !value.is_a? Fixnum then return false else return true diff --git a/lib/puppet/parser/functions/is_numeric.rb b/lib/puppet/parser/functions/is_numeric.rb index ce13ece..abf0321 100644 --- a/lib/puppet/parser/functions/is_numeric.rb +++ b/lib/puppet/parser/functions/is_numeric.rb @@ -15,7 +15,7 @@ Returns true if the variable passed to this function is a number. value = arguments[0] - if value == value.to_f.to_s or value == value.to_i.to_s then + if value == value.to_f.to_s or value == value.to_i.to_s or value.is_a? Numeric then return true else return false |