diff --git a/Units/parser-puppetManifest.r/puppet-classname.d/args.ctags b/Units/parser-puppetManifest.r/puppet-classname.d/args.ctags new file mode 100644 index 0000000000..fb884c1049 --- /dev/null +++ b/Units/parser-puppetManifest.r/puppet-classname.d/args.ctags @@ -0,0 +1,2 @@ +--sort=no +--fields=+KZlne diff --git a/Units/parser-puppetManifest.r/puppet-classname.d/expected.tags b/Units/parser-puppetManifest.r/puppet-classname.d/expected.tags new file mode 100644 index 0000000000..5324d83536 --- /dev/null +++ b/Units/parser-puppetManifest.r/puppet-classname.d/expected.tags @@ -0,0 +1,10 @@ +t input.pp /^class t {$/;" class line:1 language:PuppetManifest end:3 +/tmp/multipleclasst input.pp /^ file { "\/tmp\/multipleclasst": content => "one" }$/;" resource line:2 language:PuppetManifest scope:class:t end:2 +one_ input.pp /^class one_ {$/;" class line:5 language:PuppetManifest end:7 +/tmp/multipleclassone_ input.pp /^ file { "\/tmp\/multipleclassone_": content => "one" }$/;" resource line:6 language:PuppetManifest scope:class:one_ end:6 +on_e input.pp /^class on_e {$/;" class line:9 language:PuppetManifest end:11 +/tmp/multipleclasson_e input.pp /^ file { "\/tmp\/multipleclasson_e": content => "one" }$/;" resource line:10 language:PuppetManifest scope:class:on_e end:10 +o_ne::tw_o input.pp /^class o_ne::tw_o {$/;" class line:14 language:PuppetManifest end:16 +/tmp/multipleclasso_netw_o input.pp /^ file { "\/tmp\/multipleclasso_netw_o": content => "two" }$/;" resource line:15 language:PuppetManifest scope:class:o_ne::tw_o end:15 +o_ne::two_ input.pp /^class o_ne::two_ {$/;" class line:18 language:PuppetManifest end:20 +/tmp/multipleclasso_netwo_ input.pp /^ file { "\/tmp\/multipleclasso_netwo_": content => "two" }$/;" resource line:19 language:PuppetManifest scope:class:o_ne::two_ end:19 diff --git a/Units/parser-puppetManifest.r/puppet-classname.d/input.pp b/Units/parser-puppetManifest.r/puppet-classname.d/input.pp new file mode 100644 index 0000000000..258157111c --- /dev/null +++ b/Units/parser-puppetManifest.r/puppet-classname.d/input.pp @@ -0,0 +1,26 @@ +class t { + file { "/tmp/multipleclasst": content => "one" } +} + +class one_ { + file { "/tmp/multipleclassone_": content => "one" } +} + +class on_e { + file { "/tmp/multipleclasson_e": content => "one" } +} + + +class o_ne::tw_o { + file { "/tmp/multipleclasso_netw_o": content => "two" } +} + +class o_ne::two_ { + file { "/tmp/multipleclasso_netwo_": content => "two" } +} + +include t +include one_ +include on_e +include o_ne::tw_o +include o_ne::two_ diff --git a/Units/parser-puppetManifest.r/puppet-definitionname.d/args.ctags b/Units/parser-puppetManifest.r/puppet-definitionname.d/args.ctags new file mode 100644 index 0000000000..fb884c1049 --- /dev/null +++ b/Units/parser-puppetManifest.r/puppet-definitionname.d/args.ctags @@ -0,0 +1,2 @@ +--sort=no +--fields=+KZlne diff --git a/Units/parser-puppetManifest.r/puppet-definitionname.d/expected.tags b/Units/parser-puppetManifest.r/puppet-definitionname.d/expected.tags new file mode 100644 index 0000000000..6961693833 --- /dev/null +++ b/Units/parser-puppetManifest.r/puppet-definitionname.d/expected.tags @@ -0,0 +1,15 @@ +t input.pp /^define t {$/;" definition line:2 language:PuppetManifest end:4 +/tmp/multipledefinet input.pp /^ file { "\/tmp\/multipledefinet": content => "one" }$/;" resource line:3 language:PuppetManifest scope:definition:t end:3 +one_ input.pp /^define one_ {$/;" definition line:6 language:PuppetManifest end:8 +/tmp/multipledefineone_ input.pp /^ file { "\/tmp\/multipledefineone_": content => "one" }$/;" resource line:7 language:PuppetManifest scope:definition:one_ end:7 +on_e input.pp /^define on_e {$/;" definition line:10 language:PuppetManifest end:12 +/tmp/multipledefineon_e input.pp /^ file { "\/tmp\/multipledefineon_e": content => "one" }$/;" resource line:11 language:PuppetManifest scope:definition:on_e end:11 +o_ne::tw_o input.pp /^define o_ne::tw_o {$/;" definition line:15 language:PuppetManifest end:17 +/tmp/multipledefineo_netw_o input.pp /^ file { "\/tmp\/multipledefineo_netw_o": content => "two" }$/;" resource line:16 language:PuppetManifest scope:definition:o_ne::tw_o end:16 +o_ne::two_ input.pp /^define o_ne::two_ {$/;" definition line:19 language:PuppetManifest end:21 +/tmp/multipledefineo_netwo_ input.pp /^ file { "\/tmp\/multipledefineo_netwo_": content => "two" }$/;" resource line:20 language:PuppetManifest scope:definition:o_ne::two_ end:20 +t input.pp /^t { 't': }$/;" resource line:23 language:PuppetManifest end:23 +one_ input.pp /^one_ { 'one_': }$/;" resource line:24 language:PuppetManifest end:24 +on_e input.pp /^on_e { 'on_e': }$/;" resource line:25 language:PuppetManifest end:25 +o_ne::tw_o input.pp /^o_ne::tw_o { 'o_ne::tw_o': }$/;" resource line:26 language:PuppetManifest end:26 +o_ne::two_ input.pp /^o_ne::two_ { 'o_ne::two_': }$/;" resource line:27 language:PuppetManifest end:27 diff --git a/Units/parser-puppetManifest.r/puppet-definitionname.d/input.pp b/Units/parser-puppetManifest.r/puppet-definitionname.d/input.pp new file mode 100644 index 0000000000..79648acae5 --- /dev/null +++ b/Units/parser-puppetManifest.r/puppet-definitionname.d/input.pp @@ -0,0 +1,27 @@ + +define t { + file { "/tmp/multipledefinet": content => "one" } +} + +define one_ { + file { "/tmp/multipledefineone_": content => "one" } +} + +define on_e { + file { "/tmp/multipledefineon_e": content => "one" } +} + + +define o_ne::tw_o { + file { "/tmp/multipledefineo_netw_o": content => "two" } +} + +define o_ne::two_ { + file { "/tmp/multipledefineo_netwo_": content => "two" } +} + +t { 't': } +one_ { 'one_': } +on_e { 'on_e': } +o_ne::tw_o { 'o_ne::tw_o': } +o_ne::two_ { 'o_ne::two_': } diff --git a/optlib/puppetManifest.c b/optlib/puppetManifest.c index 0e06555189..e04e04cf78 100644 --- a/optlib/puppetManifest.c +++ b/optlib/puppetManifest.c @@ -66,10 +66,10 @@ static void initializePuppetManifestParser (const langType language CTAGS_ATTR_U "^\\$", "", "", "{tenter=var}", NULL); addLanguageTagMultiTableRegex (language, "main", - "^@?::[a-zA-Z0-9:]+[ \t\n]*\\{", + "^@?::[a-zA-Z0-9:_]+[ \t\n]*\\{", "", "", "{tenter=resourceBlock}", NULL); addLanguageTagMultiTableRegex (language, "main", - "^@?[a-zA-Z][a-zA-Z0-9:]*[ \t\n]*\\{", + "^@?[a-zA-Z][a-zA-Z0-9:_]*[ \t\n]*\\{", "", "", "{tenter=resourceBlock}", NULL); addLanguageTagMultiTableRegex (language, "main", "^class[ \t\n]+", @@ -132,10 +132,10 @@ static void initializePuppetManifestParser (const langType language CTAGS_ATTR_U "^\\#", "", "", "{tenter=comment_oneline}", NULL); addLanguageTagMultiTableRegex (language, "blockStart", - "^@?::[a-zA-Z0-9:]+[ \t\n]*\\{", + "^@?::[a-zA-Z0-9:_]+[ \t\n]*\\{", "", "", "{tenter=resourceBlock}", NULL); addLanguageTagMultiTableRegex (language, "blockStart", - "^@?[a-zA-Z][a-zA-Z0-9:]*[ \t\n]*\\{", + "^@?[a-zA-Z][a-zA-Z0-9:_]*[ \t\n]*\\{", "", "", "{tenter=resourceBlock}", NULL); addLanguageTagMultiTableRegex (language, "blockStart", "^class[ \t\n]+", @@ -195,10 +195,10 @@ static void initializePuppetManifestParser (const langType language CTAGS_ATTR_U "^<