Improve syntax

Alexander Salmin · Alexander Salmin · commit fedc008b8e78 · 2017-11-28T21:50:53.000+01:00
diff --git a/spec/fixtures/test/manifests/absolute_path.pp b/spec/fixtures/test/manifests/absolute_path.pp
@@ -2,5 +2,5 @@
 class test::absolute_path(
   Stdlib::Compat::Absolute_path $value,
   ) {
-    notice("Success")
+    notice('Success')
 }
diff --git a/spec/fixtures/test/manifests/absolutepath.pp b/spec/fixtures/test/manifests/absolutepath.pp
@@ -1,6 +1,6 @@
-# Class to test the Stdlib::Absolutepath type. Not to be confused with Stdlib::Compat::Absolute_path.
+# Class to test the Stdlib::Absolutepath type. Not to be confused with Stdlib::Compat::Absolute_path
 class test::absolutepath(
     Stdlib::Absolutepath $value,
     ) {
-  notice("Success")
+  notice('Success')
 }
diff --git a/spec/fixtures/test/manifests/array.pp b/spec/fixtures/test/manifests/array.pp
@@ -3,6 +3,6 @@
   Stdlib::Compat::Array $value,
   ) {
 
-    notice("Success")
+    notice('Success')
 
 }
diff --git a/spec/fixtures/test/manifests/bool.pp b/spec/fixtures/test/manifests/bool.pp
@@ -3,6 +3,6 @@
   Stdlib::Compat::Bool $value,
   ) {
 
-    notice("Success")
+    notice('Success')
 
 }
diff --git a/spec/fixtures/test/manifests/deftype.pp b/spec/fixtures/test/manifests/deftype.pp
@@ -1,3 +1,4 @@
+# Class to test deftype
 define test::deftype($param = 'foo') {
-  notify { "deftype: $title": }
+  notify { "deftype: ${title}": }
 }
diff --git a/spec/fixtures/test/manifests/filemode.pp b/spec/fixtures/test/manifests/filemode.pp
@@ -2,5 +2,5 @@
 class test::filemode (
   Stdlib::Filemode $value,
 ) {
-  notice("Success")
+  notice('Success')
 }
diff --git a/spec/fixtures/test/manifests/float.pp b/spec/fixtures/test/manifests/float.pp
@@ -3,6 +3,6 @@
   Stdlib::Compat::Float $value,
   ) {
 
-    notice("Success")
+    notice('Success')
 
 }
diff --git a/spec/fixtures/test/manifests/hash.pp b/spec/fixtures/test/manifests/hash.pp
@@ -3,6 +3,6 @@
     Stdlib::Compat::Hash $value,
     ) {
 
-  notice("Success")
+  notice('Success')
 
 }
diff --git a/spec/fixtures/test/manifests/httpsurl.pp b/spec/fixtures/test/manifests/httpsurl.pp
@@ -2,5 +2,5 @@
 class test::httpsurl(
     Stdlib::HTTPSUrl $value,
     ) {
-  notice("Success")
+  notice('Success')
 }
diff --git a/spec/fixtures/test/manifests/httpurl.pp b/spec/fixtures/test/manifests/httpurl.pp
@@ -2,5 +2,5 @@
 class test::httpurl(
     Stdlib::HTTPUrl $value,
     ) {
-  notice("Success")
+  notice('Success')
 }
diff --git a/spec/fixtures/test/manifests/integer.pp b/spec/fixtures/test/manifests/integer.pp
@@ -3,6 +3,6 @@
   Stdlib::Compat::Integer $value,
   ) {
 
-    notice("Success")
+    notice('Success')
 
 }
diff --git a/spec/fixtures/test/manifests/ip_address.pp b/spec/fixtures/test/manifests/ip_address.pp
@@ -2,5 +2,5 @@
 class test::ip_address(
   Stdlib::Compat::Ip_address $value,
   ) {
-    notice("Success")
+    notice('Success')
   }
diff --git a/spec/fixtures/test/manifests/ipv4.pp b/spec/fixtures/test/manifests/ipv4.pp
@@ -2,5 +2,5 @@
 class test::ipv4(
   Stdlib::Compat::Ipv4 $value,
   ) {
-    notice("Success")
+    notice('Success')
   }
diff --git a/spec/fixtures/test/manifests/ipv6.pp b/spec/fixtures/test/manifests/ipv6.pp
@@ -2,5 +2,5 @@
 class test::ipv6(
   Stdlib::Compat::Ipv6 $value,
   ) {
-  notice("Success")
+  notice('Success')
 }
diff --git a/spec/fixtures/test/manifests/numeric.pp b/spec/fixtures/test/manifests/numeric.pp
@@ -3,6 +3,6 @@
   Stdlib::Compat::Numeric $value,
   ) {
 
-    notice("Success")
+    notice('Success')
 
 }
diff --git a/spec/fixtures/test/manifests/string.pp b/spec/fixtures/test/manifests/string.pp
@@ -3,6 +3,6 @@
   Stdlib::Compat::String $value,
   ) {
 
-    notice("Success")
+    notice('Success')
 
 }
diff --git a/spec/fixtures/test/manifests/unixpath.pp b/spec/fixtures/test/manifests/unixpath.pp
@@ -2,5 +2,5 @@
 class test::unixpath(
     Stdlib::Unixpath $value,
     ) {
-  notice("Success")
+  notice('Success')
 }
diff --git a/spec/fixtures/test/manifests/windowspath.pp b/spec/fixtures/test/manifests/windowspath.pp
@@ -2,5 +2,5 @@
 class test::windowspath(
     Stdlib::Windowspath $value,
     ) {
-  notice("Success")
+  notice('Success')
 }
diff --git a/types/compat/absolute_path.pp b/types/compat/absolute_path.pp
@@ -4,4 +4,4 @@
 # slash = '[\\\\/]'
 # name = '[^\\\\/]+'
 # %r!^(([A-Z]:#{slash})|(#{slash}#{slash}#{name}#{slash}#{name})|(#{slash}#{slash}\?#{slash}#{name}))!i,
-type Stdlib::Compat::Absolute_path = Variant[Pattern[/^(([a-zA-Z]:[\\\/])|([\\\/][\\\/][^\\\/]+[\\\/][^\\\/]+)|([\\\/][\\\/]\?[\\\/][^\\\/]+))/], Pattern[/^\//]]
+type Stdlib::Compat::Absolute_path = Variant[Pattern[/^(([a-zA-Z]:[\\\/])|([\\\/][\\\/][^\\\/]+[\\\/][^\\\/]+)|([\\\/][\\\/]\?[\\\/][^\\\/]+))/], Pattern[/^\//]] # lint:ignore:140chars
diff --git a/types/compat/integer.pp b/types/compat/integer.pp
@@ -20,4 +20,4 @@
 # > Note that you need to use Variant[Integer[0, 10], Float[0, 10]] if you want to match both integers and floating point numbers.
 #
 # This allows you to find all places where a consumers of your code call it with unexpected values.
-type Stdlib::Compat::Integer = Variant[Integer, Pattern[/^-?(?:(?:[1-9]\d*)|0)$/], Array[Variant[Integer, Pattern[/^-?(?:(?:[1-9]\d*)|0)$/]]]]
+type Stdlib::Compat::Integer = Variant[Integer, Pattern[/^-?(?:(?:[1-9]\d*)|0)$/], Array[Variant[Integer, Pattern[/^-?(?:(?:[1-9]\d*)|0)$/]]]] # lint:ignore:140chars
diff --git a/types/compat/ipv4.pp b/types/compat/ipv4.pp
@@ -1,2 +1,2 @@
 # Emulate the validate_ipv4_address and is_ipv4_address functions
-type Stdlib::Compat::Ipv4 = Pattern[/^((([0-9](?!\d)|[1-9][0-9](?!\d)|1[0-9]{2}(?!\d)|2[0-4][0-9](?!\d)|25[0-5](?!\d))[.]){3}([0-9](?!\d)|[1-9][0-9](?!\d)|1[0-9]{2}(?!\d)|2[0-4][0-9](?!\d)|25[0-5](?!\d)))(\/((([0-9](?!\d)|[1-9][0-9](?!\d)|1[0-9]{2}(?!\d)|2[0-4][0-9](?!\d)|25[0-5](?!\d))[.]){3}([0-9](?!\d)|[1-9][0-9](?!\d)|1[0-9]{2}(?!\d)|2[0-4][0-9](?!\d)|25[0-5](?!\d))|[0-9]+))?$/]
+type Stdlib::Compat::Ipv4 = Pattern[/^((([0-9](?!\d)|[1-9][0-9](?!\d)|1[0-9]{2}(?!\d)|2[0-4][0-9](?!\d)|25[0-5](?!\d))[.]){3}([0-9](?!\d)|[1-9][0-9](?!\d)|1[0-9]{2}(?!\d)|2[0-4][0-9](?!\d)|25[0-5](?!\d)))(\/((([0-9](?!\d)|[1-9][0-9](?!\d)|1[0-9]{2}(?!\d)|2[0-4][0-9](?!\d)|25[0-5](?!\d))[.]){3}([0-9](?!\d)|[1-9][0-9](?!\d)|1[0-9]{2}(?!\d)|2[0-4][0-9](?!\d)|25[0-5](?!\d))|[0-9]+))?$/] # lint:ignore:140chars
diff --git a/types/compat/ipv6.pp b/types/compat/ipv6.pp
@@ -1 +1 @@
-type Stdlib::Compat::Ipv6 = Pattern[/\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/]
+type Stdlib::Compat::Ipv6 = Pattern[/\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/] # lint:ignore:140chars
diff --git a/types/compat/numeric.pp b/types/compat/numeric.pp
@@ -20,4 +20,4 @@
 # > Note that you need to use Variant[Integer[0, 10], Float[0, 10]] if you want to match both integers and floating point numbers.
 #
 # This allows you to find all places where a consumers of your code call it with unexpected values.
-type Stdlib::Compat::Numeric = Variant[Numeric, Pattern[/^-?(?:(?:[1-9]\d*)|0)(?:\.\d+)?(?:[eE]-?\d+)?$/], Array[Variant[Numeric, Pattern[/^-?(?:(?:[1-9]\d*)|0)(?:\.\d+)?(?:[eE]-?\d+)?$/]]]]
+type Stdlib::Compat::Numeric = Variant[Numeric, Pattern[/^-?(?:(?:[1-9]\d*)|0)(?:\.\d+)?(?:[eE]-?\d+)?$/], Array[Variant[Numeric, Pattern[/^-?(?:(?:[1-9]\d*)|0)(?:\.\d+)?(?:[eE]-?\d+)?$/]]]] # lint:ignore:140chars

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`class test::absolute_path(`
`3`	`3`	`Stdlib::Compat::Absolute_path $value,`
`4`	`4`	`) {`
`5`		`- notice("Success")`
	`5`	`+ notice('Success')`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-# Class to test the Stdlib::Absolutepath type. Not to be confused with Stdlib::Compat::Absolute_path.`
	`1`	`+# Class to test the Stdlib::Absolutepath type. Not to be confused with Stdlib::Compat::Absolute_path`
`2`	`2`	`class test::absolutepath(`
`3`	`3`	`Stdlib::Absolutepath $value,`
`4`	`4`	`) {`
`5`		`- notice("Success")`
	`5`	`+ notice('Success')`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`Stdlib::Compat::Array $value,`
`4`	`4`	`) {`
`5`	`5`
`6`		`- notice("Success")`
	`6`	`+ notice('Success')`
`7`	`7`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`Stdlib::Compat::Bool $value,`
`4`	`4`	`) {`
`5`	`5`
`6`		`- notice("Success")`
	`6`	`+ notice('Success')`
`7`	`7`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# Class to test deftype`
`1`	`2`	`define test::deftype($param = 'foo') {`
`2`		`- notify { "deftype: $title": }`
	`3`	`+ notify { "deftype: ${title}": }`
`3`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`class test::filemode (`
`3`	`3`	`Stdlib::Filemode $value,`
`4`	`4`	`) {`
`5`		`- notice("Success")`
	`5`	`+ notice('Success')`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`Stdlib::Compat::Float $value,`
`4`	`4`	`) {`
`5`	`5`
`6`		`- notice("Success")`
	`6`	`+ notice('Success')`
`7`	`7`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`Stdlib::Compat::Hash $value,`
`4`	`4`	`) {`
`5`	`5`
`6`		`- notice("Success")`
	`6`	`+ notice('Success')`
`7`	`7`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`class test::httpsurl(`
`3`	`3`	`Stdlib::HTTPSUrl $value,`
`4`	`4`	`) {`
`5`		`- notice("Success")`
	`5`	`+ notice('Success')`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`class test::httpurl(`
`3`	`3`	`Stdlib::HTTPUrl $value,`
`4`	`4`	`) {`
`5`		`- notice("Success")`
	`5`	`+ notice('Success')`
`6`	`6`	`}`