diff options
Diffstat (limited to 'lib/puppet')
-rw-r--r-- | lib/puppet/parser/grammar.ra | 3 | ||||
-rw-r--r-- | lib/puppet/parser/parser.rb | 958 |
2 files changed, 487 insertions, 474 deletions
diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra index 26ffb5410..fe4a08c57 100644 --- a/lib/puppet/parser/grammar.ra +++ b/lib/puppet/parser/grammar.ra @@ -90,6 +90,9 @@ namestrings: namestring namestring: name | variable | quotedtext + | CLASSNAME { + result = ast AST::Name, :value => val[0] + } resourcerefs: resourceref | resourcerefs COMMA resourceref { diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb index 2ea7aa365..414405302 100644 --- a/lib/puppet/parser/parser.rb +++ b/lib/puppet/parser/parser.rb @@ -29,7 +29,7 @@ module Puppet class Parser < Racc::Parser -module_eval <<'..end grammar.ra modeval..idcac66c31eb', 'grammar.ra', 630 +module_eval <<'..end grammar.ra modeval..id0df015d0a0', 'grammar.ra', 633 require 'puppet/parser/functions' attr_reader :file, :interp @@ -199,7 +199,7 @@ end # $Id$ -..end grammar.ra modeval..idcac66c31eb +..end grammar.ra modeval..id0df015d0a0 ##### racc 1.4.5 generates ### @@ -230,51 +230,52 @@ racc_reduce_table = [ 1, 70, :_reduce_none, 1, 70, :_reduce_none, 1, 70, :_reduce_none, + 1, 70, :_reduce_26, 1, 69, :_reduce_none, - 3, 69, :_reduce_27, - 5, 55, :_reduce_28, + 3, 69, :_reduce_28, 5, 55, :_reduce_29, 5, 55, :_reduce_30, - 5, 66, :_reduce_31, - 2, 56, :_reduce_32, - 1, 80, :_reduce_33, - 2, 80, :_reduce_34, - 2, 57, :_reduce_35, + 5, 55, :_reduce_31, + 5, 66, :_reduce_32, + 2, 56, :_reduce_33, + 1, 80, :_reduce_34, + 2, 80, :_reduce_35, + 2, 57, :_reduce_36, 1, 81, :_reduce_none, 1, 81, :_reduce_none, - 3, 82, :_reduce_38, 3, 82, :_reduce_39, + 3, 82, :_reduce_40, 1, 83, :_reduce_none, 1, 83, :_reduce_none, - 3, 83, :_reduce_42, + 3, 83, :_reduce_43, 1, 84, :_reduce_none, - 3, 84, :_reduce_44, + 3, 84, :_reduce_45, 1, 85, :_reduce_none, 1, 85, :_reduce_none, - 3, 86, :_reduce_47, 3, 86, :_reduce_48, + 3, 86, :_reduce_49, 1, 87, :_reduce_none, 1, 87, :_reduce_none, - 4, 89, :_reduce_51, + 4, 89, :_reduce_52, 1, 76, :_reduce_none, - 3, 76, :_reduce_53, + 3, 76, :_reduce_54, 0, 77, :_reduce_none, 1, 77, :_reduce_none, - 1, 71, :_reduce_56, - 1, 91, :_reduce_57, + 1, 71, :_reduce_57, + 1, 91, :_reduce_58, 1, 90, :_reduce_none, 1, 90, :_reduce_none, 1, 90, :_reduce_none, 1, 90, :_reduce_none, 1, 90, :_reduce_none, 1, 90, :_reduce_none, - 3, 58, :_reduce_64, - 0, 78, :_reduce_65, - 1, 78, :_reduce_66, - 3, 78, :_reduce_67, - 3, 95, :_reduce_68, + 3, 58, :_reduce_65, + 0, 78, :_reduce_66, + 1, 78, :_reduce_67, + 3, 78, :_reduce_68, + 3, 95, :_reduce_69, 1, 96, :_reduce_none, - 3, 96, :_reduce_70, + 3, 96, :_reduce_71, 1, 88, :_reduce_none, 1, 88, :_reduce_none, 1, 88, :_reduce_none, @@ -290,341 +291,343 @@ racc_reduce_table = [ 1, 94, :_reduce_none, 1, 94, :_reduce_none, 1, 94, :_reduce_none, - 4, 99, :_reduce_86, - 1, 73, :_reduce_87, + 4, 99, :_reduce_87, 1, 73, :_reduce_88, - 1, 98, :_reduce_89, - 4, 74, :_reduce_90, + 1, 73, :_reduce_89, + 1, 98, :_reduce_90, 4, 74, :_reduce_91, - 6, 60, :_reduce_92, + 4, 74, :_reduce_92, + 6, 60, :_reduce_93, 0, 101, :_reduce_none, - 4, 101, :_reduce_94, + 4, 101, :_reduce_95, 1, 100, :_reduce_none, - 5, 59, :_reduce_96, + 5, 59, :_reduce_97, 1, 102, :_reduce_none, - 2, 102, :_reduce_98, - 5, 103, :_reduce_99, - 4, 103, :_reduce_100, + 2, 102, :_reduce_99, + 5, 103, :_reduce_100, + 4, 103, :_reduce_101, 1, 104, :_reduce_none, - 3, 104, :_reduce_102, - 3, 92, :_reduce_103, + 3, 104, :_reduce_103, + 3, 92, :_reduce_104, 1, 106, :_reduce_none, - 3, 106, :_reduce_105, + 3, 106, :_reduce_106, 1, 108, :_reduce_none, - 3, 108, :_reduce_107, - 3, 107, :_reduce_108, + 3, 108, :_reduce_108, + 3, 107, :_reduce_109, 1, 105, :_reduce_none, 1, 105, :_reduce_none, 1, 105, :_reduce_none, 1, 105, :_reduce_none, 1, 105, :_reduce_none, 1, 105, :_reduce_none, - 1, 105, :_reduce_115, - 2, 61, :_reduce_116, - 6, 63, :_reduce_117, - 5, 63, :_reduce_118, - 6, 64, :_reduce_119, - 5, 64, :_reduce_120, - 6, 65, :_reduce_121, - 5, 65, :_reduce_122, + 1, 105, :_reduce_116, + 2, 61, :_reduce_117, + 6, 63, :_reduce_118, + 5, 63, :_reduce_119, + 6, 64, :_reduce_120, + 5, 64, :_reduce_121, + 6, 65, :_reduce_122, + 5, 65, :_reduce_123, 1, 75, :_reduce_none, 1, 75, :_reduce_none, 1, 111, :_reduce_none, - 3, 111, :_reduce_126, + 3, 111, :_reduce_127, 1, 113, :_reduce_none, 1, 113, :_reduce_none, 1, 113, :_reduce_none, - 0, 53, :_reduce_130, - 0, 114, :_reduce_131, + 0, 53, :_reduce_131, + 0, 114, :_reduce_132, 1, 109, :_reduce_none, - 3, 109, :_reduce_133, 3, 109, :_reduce_134, + 3, 109, :_reduce_135, 1, 115, :_reduce_none, - 3, 115, :_reduce_136, - 3, 116, :_reduce_137, - 1, 116, :_reduce_138, - 3, 116, :_reduce_139, - 1, 116, :_reduce_140, + 3, 115, :_reduce_137, + 3, 116, :_reduce_138, + 1, 116, :_reduce_139, + 3, 116, :_reduce_140, + 1, 116, :_reduce_141, 1, 112, :_reduce_none, - 2, 112, :_reduce_142, + 2, 112, :_reduce_143, 1, 110, :_reduce_none, - 2, 110, :_reduce_144, + 2, 110, :_reduce_145, 1, 117, :_reduce_none, 1, 117, :_reduce_none, 1, 118, :_reduce_none, 1, 118, :_reduce_none, - 1, 72, :_reduce_149, - 3, 93, :_reduce_150, - 2, 93, :_reduce_151, + 1, 72, :_reduce_150, + 3, 93, :_reduce_151, + 2, 93, :_reduce_152, 1, 97, :_reduce_none, 1, 97, :_reduce_none, 0, 79, :_reduce_none, - 1, 79, :_reduce_155 ] + 1, 79, :_reduce_156 ] -racc_reduce_n = 156 +racc_reduce_n = 157 -racc_shift_n = 255 +racc_shift_n = 256 racc_action_table = [ - 62, 50, 52, 50, 52, 94, 62, 50, 52, 110, - 183, 78, 62, 50, 52, 79, 73, 89, 62, 50, - 52, 183, 73, 113, 62, 50, 52, 190, 73, 182, - 91, 45, 43, 45, 73, 64, 68, 45, 96, 74, - 73, 64, 68, 45, 192, 74, 152, 64, 68, 45, - -110, 74, -109, 64, 68, 45, 44, 74, 182, 64, - 68, 50, 52, 74, 62, 50, 52, 41, 227, -112, - 62, 50, 52, 48, 149, 150, 62, 50, 52, -111, - 73, 226, 62, 50, 52, 194, 136, 33, 62, 50, - 52, 45, 73, 113, 4, 45, 96, 107, 73, 64, - 68, 45, -109, 74, 73, 64, 169, 45, -110, 74, - 211, 64, 68, 45, 180, 74, 154, 64, 68, 45, - 114, 74, 254, 64, 68, 153, 185, 74, 62, 50, - 52, 187, 33, 18, 62, 50, 52, 109, 57, 4, - 62, 50, 52, 15, 73, 21, 25, 37, 1, 5, - 73, 8, 37, 13, 218, 17, 136, 26, 159, 45, - 4, 217, 199, 64, 68, 45, -113, 74, 48, 64, - 68, 45, 78, 74, 95, 64, 133, 50, 52, 74, - 48, 38, -112, 95, 39, 45, 38, 149, 150, 39, - 96, 33, 136, 246, 45, 50, 52, 95, 4, 96, - 143, 185, 33, 145, 18, 140, 187, 45, 45, 4, - 57, 64, 169, 96, 15, 74, 21, 25, 235, 1, - 5, 95, 8, 113, 13, 45, 17, 212, 26, 18, - 54, 4, 45, 50, 52, 50, 52, 96, 108, 15, - 107, 21, 25, -111, 1, 5, 219, 8, 136, 13, - 118, 17, 78, 26, 234, 155, 4, 157, 223, 149, - 150, 50, 52, 45, 172, 18, 224, 64, 169, 162, - 225, 74, 156, 163, 165, 15, 136, 21, 25, 228, - 1, 5, 79, 8, 230, 13, 118, 17, 232, 26, - 18, 45, 4, -114, 182, 64, 169, 86, 250, 74, - 15, -110, 21, 25, -109, 1, 5, -112, 8, 18, - 13, -111, 17, -114, 26, 50, 52, 4, 237, 15, - 85, 21, 25, 115, 1, 5, 241, 8, 146, 13, - 136, 17, 82, 26, 120, 195, 4, 239, 139, 163, - 165, 80, 182, 248, 118, 45, 18, 122, 118, 64, - 169, 32, 222, 74, 197, nil, 15, nil, 21, 25, - nil, 1, 5, nil, 8, 18, 13, nil, 17, nil, - 26, 50, 52, 4, nil, 15, nil, 21, 25, nil, - 1, 5, nil, 8, nil, 13, 136, 17, nil, 26, - nil, 253, 4, 50, 52, nil, nil, nil, nil, nil, - nil, 45, 18, nil, nil, 64, 169, nil, 136, 74, - nil, nil, 15, nil, 21, 25, nil, 1, 5, 209, - 8, nil, 13, 45, 17, nil, 26, 64, 169, 4, - 18, 74, 50, 52, 50, 52, nil, nil, 216, nil, - 15, nil, 21, 25, nil, 1, 5, 136, 8, 136, - 13, nil, 17, nil, 26, nil, nil, 4, nil, 48, - 50, 52, 45, -123, 45, nil, 64, 169, 64, 169, - 74, nil, 74, nil, nil, 57, 18, nil, nil, 46, - nil, nil, nil, nil, nil, nil, 15, nil, 21, 25, - 45, 1, 5, nil, 8, 54, 13, 18, 17, nil, - 26, nil, nil, 4, nil, nil, nil, 15, nil, 21, - 25, nil, 1, 5, nil, 8, 18, 13, nil, 17, - nil, 26, nil, nil, 4, nil, 15, nil, 21, 25, - nil, 1, 5, nil, 8, 18, 13, nil, 17, nil, - 26, nil, nil, 4, nil, 15, nil, 21, 25, nil, - 1, 5, nil, 8, nil, 13, nil, 17, nil, 26, - nil, nil, 4 ] + 49, 51, 53, 41, -124, 51, 53, 51, 53, 51, + 53, 184, 49, 95, 58, 228, 58, 63, 51, 53, + 46, 43, 58, 33, 114, 79, 153, 90, 227, 80, + 4, 45, 114, 74, 160, 45, 55, 45, 92, 45, + 97, 186, 55, 47, 97, 44, 188, 47, 45, 47, + 37, 47, 65, 69, 150, 151, 75, 63, 51, 53, + 33, 108, 184, 63, 51, 53, 111, 4, 191, 63, + 51, 53, 183, 74, 212, 63, 51, 53, 193, 74, + 155, 63, 51, 53, 38, 74, -111, 39, 45, 154, + 186, 74, 65, 69, 45, 188, 75, 74, 65, 69, + 45, -110, 75, 183, 65, 69, 45, -113, 75, -112, + 65, 69, 45, 195, 75, 96, 65, 69, 51, 53, + 75, 63, 51, 53, -110, 200, 45, 63, 51, 53, + -111, 97, 181, 63, 51, 53, 115, 74, 110, 63, + 51, 53, -114, 74, 49, 63, 51, 53, 79, 74, + 150, 151, 45, 49, -113, 74, 65, 69, 45, 114, + 75, 137, 65, 69, 45, 213, 75, 109, 65, 69, + 45, 108, 75, -112, 65, 69, 45, 220, 75, 236, + 65, 170, 219, 119, 75, 63, 51, 53, 33, 218, + 18, 63, 51, 53, 79, 4, 158, 37, 51, 53, + 15, 74, 21, 25, 224, 1, 5, 137, 8, 225, + 13, 226, 17, 137, 26, 157, 45, 4, 235, 80, + 65, 69, 45, 231, 75, 119, 65, 134, 45, 18, + 75, 38, 65, 170, 39, 144, 75, 229, 146, 15, + 233, 21, 25, 96, 1, 5, -115, 8, 18, 13, + 183, 17, 87, 26, 45, -111, 4, -110, 15, 97, + 21, 25, 255, 1, 5, -113, 8, -112, 13, -115, + 17, 96, 26, 18, 156, 4, 238, 33, 150, 151, + 141, 247, 45, 15, 4, 21, 25, 97, 1, 5, + 96, 8, 18, 13, 86, 17, 116, 26, 51, 53, + 4, 45, 15, 242, 21, 25, 97, 1, 5, 147, + 8, 83, 13, 137, 17, 121, 26, 140, 251, 4, + 51, 53, 163, 81, 217, 183, 164, 166, 45, 18, + 249, 119, 65, 170, 123, 137, 75, 51, 53, 15, + 119, 21, 25, 32, 1, 5, 223, 8, nil, 13, + 45, 17, 137, 26, 65, 170, 4, 254, 75, 240, + nil, 164, 166, nil, nil, nil, nil, 45, 18, nil, + nil, 65, 170, nil, nil, 75, 210, nil, 15, nil, + 21, 25, nil, 1, 5, nil, 8, 18, 13, nil, + 17, nil, 26, 51, 53, 4, nil, 15, nil, 21, + 25, nil, 1, 5, nil, 8, nil, 13, 137, 17, + nil, 26, nil, nil, 4, 51, 53, 51, 53, nil, + 173, nil, nil, 45, nil, nil, nil, 65, 170, nil, + 137, 75, 137, 198, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, 18, 45, nil, 45, nil, 65, + 170, 65, 170, 75, 15, 75, 21, 25, 196, 1, + 5, nil, 8, nil, 13, nil, 17, nil, 26, 18, + nil, 4, nil, 51, 53, nil, nil, nil, nil, 15, + nil, 21, 25, nil, 1, 5, nil, 8, 137, 13, + nil, 17, nil, 26, nil, nil, 4, nil, nil, nil, + 18, nil, nil, 45, nil, nil, nil, 65, 170, nil, + 15, 75, 21, 25, nil, 1, 5, nil, 8, 18, + 13, nil, 17, nil, 26, nil, nil, 4, nil, 15, + nil, 21, 25, nil, 1, 5, nil, 8, 18, 13, + nil, 17, nil, 26, nil, nil, 4, nil, 15, nil, + 21, 25, nil, 1, 5, nil, 8, 18, 13, nil, + 17, nil, 26, nil, nil, 4, nil, 15, nil, 21, + 25, nil, 1, 5, nil, 8, nil, 13, nil, 17, + nil, 26, nil, nil, 4 ] racc_action_check = [ - 78, 78, 78, 113, 113, 35, 62, 62, 62, 62, - 133, 18, 164, 164, 164, 18, 78, 34, 48, 48, - 48, 118, 62, 133, 183, 183, 183, 124, 164, 127, - 35, 78, 11, 113, 48, 78, 78, 62, 113, 78, - 183, 62, 62, 164, 128, 62, 99, 164, 164, 48, - 129, 164, 132, 48, 48, 183, 11, 48, 117, 183, - 183, 107, 107, 183, 223, 223, 223, 9, 188, 134, - 194, 194, 194, 68, 99, 99, 15, 15, 15, 135, - 223, 188, 17, 17, 17, 138, 194, 9, 32, 32, - 32, 107, 15, 68, 9, 223, 107, 166, 17, 223, - 223, 194, 67, 223, 32, 194, 194, 15, 63, 194, - 166, 15, 15, 17, 116, 15, 103, 17, 17, 32, - 69, 17, 252, 32, 32, 103, 227, 32, 212, 212, - 212, 227, 25, 252, 225, 225, 225, 61, 108, 25, - 86, 86, 86, 252, 212, 252, 252, 94, 252, 252, - 225, 252, 8, 252, 178, 252, 86, 252, 108, 212, - 252, 178, 148, 212, 212, 225, 60, 212, 159, 225, - 225, 86, 57, 225, 43, 86, 86, 218, 218, 86, - 54, 94, 71, 151, 94, 43, 8, 148, 148, 8, - 43, 5, 218, 229, 151, 46, 46, 95, 5, 151, - 91, 122, 89, 91, 229, 89, 122, 218, 95, 89, - 46, 218, 218, 95, 229, 218, 229, 229, 198, 229, - 229, 44, 229, 169, 229, 46, 229, 171, 229, 198, - 46, 229, 44, 240, 240, 21, 21, 44, 51, 198, - 49, 198, 198, 72, 198, 198, 181, 198, 240, 198, - 182, 198, 73, 198, 196, 104, 198, 106, 185, 104, - 104, 114, 114, 240, 114, 196, 186, 240, 240, 112, - 187, 240, 105, 112, 112, 196, 114, 196, 196, 190, - 196, 196, 41, 196, 191, 196, 192, 196, 193, 196, - 190, 114, 196, 76, 121, 114, 114, 27, 241, 114, - 190, 202, 190, 190, 204, 190, 190, 205, 190, 241, - 190, 206, 190, 207, 190, 115, 115, 190, 209, 241, - 26, 241, 241, 77, 241, 241, 217, 241, 92, 241, - 115, 241, 22, 241, 80, 139, 241, 214, 88, 214, - 214, 20, 231, 237, 79, 115, 139, 84, 82, 115, - 115, 1, 184, 115, 146, nil, 139, nil, 139, 139, - nil, 139, 139, nil, 139, 146, 139, nil, 139, nil, - 139, 153, 153, 139, nil, 146, nil, 146, 146, nil, - 146, 146, nil, 146, nil, 146, 153, 146, nil, 146, - nil, 251, 146, 172, 172, nil, nil, nil, nil, nil, - nil, 153, 251, nil, nil, 153, 153, nil, 172, 153, - nil, nil, 251, nil, 251, 251, nil, 251, 251, 161, - 251, nil, 251, 172, 251, nil, 251, 172, 172, 251, - 161, 172, 154, 154, 176, 176, nil, nil, 176, nil, - 161, nil, 161, 161, nil, 161, 161, 154, 161, 176, - 161, nil, 161, nil, 161, nil, nil, 161, nil, 13, - 13, 13, 154, 13, 176, nil, 154, 154, 176, 176, - 154, nil, 176, nil, nil, 13, 248, nil, nil, 13, - nil, nil, nil, nil, nil, nil, 248, nil, 248, 248, - 13, 248, 248, nil, 248, 13, 248, 109, 248, nil, - 248, nil, nil, 248, nil, nil, nil, 109, nil, 109, - 109, nil, 109, 109, nil, 109, 24, 109, nil, 109, - nil, 109, nil, nil, 109, nil, 24, nil, 24, 24, - nil, 24, 24, nil, 24, 0, 24, nil, 24, nil, - 24, nil, nil, 24, nil, 0, nil, 0, 0, nil, - 0, 0, nil, 0, nil, 0, nil, 0, nil, 0, - nil, nil, 0 ] + 13, 13, 13, 9, 13, 114, 114, 46, 46, 108, + 108, 134, 69, 35, 109, 189, 13, 17, 17, 17, + 13, 11, 46, 9, 134, 18, 100, 34, 189, 18, + 9, 13, 69, 17, 109, 114, 13, 46, 35, 108, + 114, 228, 46, 13, 108, 11, 228, 114, 17, 46, + 8, 108, 17, 17, 100, 100, 17, 49, 49, 49, + 25, 167, 119, 63, 63, 63, 63, 25, 125, 15, + 15, 15, 128, 49, 167, 165, 165, 165, 129, 63, + 104, 79, 79, 79, 8, 15, 130, 8, 49, 104, + 123, 165, 49, 49, 63, 123, 49, 79, 63, 63, + 15, 133, 63, 118, 15, 15, 165, 135, 15, 136, + 165, 165, 79, 139, 165, 43, 79, 79, 21, 21, + 79, 184, 184, 184, 68, 149, 43, 226, 226, 226, + 64, 43, 117, 224, 224, 224, 70, 184, 62, 32, + 32, 32, 61, 226, 160, 195, 195, 195, 58, 224, + 149, 149, 184, 55, 72, 32, 184, 184, 226, 170, + 184, 195, 226, 226, 224, 172, 226, 52, 224, 224, + 32, 50, 224, 73, 32, 32, 195, 182, 32, 199, + 195, 195, 179, 183, 195, 213, 213, 213, 5, 179, + 199, 87, 87, 87, 74, 5, 107, 95, 219, 219, + 199, 213, 199, 199, 186, 199, 199, 87, 199, 187, + 199, 188, 199, 219, 199, 106, 213, 199, 197, 41, + 213, 213, 87, 192, 213, 193, 87, 87, 219, 197, + 87, 95, 219, 219, 95, 92, 219, 191, 92, 197, + 194, 197, 197, 152, 197, 197, 77, 197, 191, 197, + 122, 197, 27, 197, 152, 203, 197, 205, 191, 152, + 191, 191, 253, 191, 191, 206, 191, 207, 191, 208, + 191, 96, 191, 253, 105, 191, 210, 90, 105, 105, + 90, 230, 96, 253, 90, 253, 253, 96, 253, 253, + 44, 253, 230, 253, 26, 253, 78, 253, 241, 241, + 253, 44, 230, 218, 230, 230, 44, 230, 230, 93, + 230, 22, 230, 241, 230, 81, 230, 89, 242, 230, + 177, 177, 113, 20, 177, 232, 113, 113, 241, 242, + 238, 80, 241, 241, 85, 177, 241, 173, 173, 242, + 83, 242, 242, 1, 242, 242, 185, 242, nil, 242, + 177, 242, 173, 242, 177, 177, 242, 252, 177, 215, + nil, 215, 215, nil, nil, nil, nil, 173, 252, nil, + nil, 173, 173, nil, nil, 173, 162, nil, 252, nil, + 252, 252, nil, 252, 252, nil, 252, 162, 252, nil, + 252, nil, 252, 116, 116, 252, nil, 162, nil, 162, + 162, nil, 162, 162, nil, 162, nil, 162, 116, 162, + nil, 162, nil, nil, 162, 154, 154, 115, 115, nil, + 115, nil, nil, 116, nil, nil, nil, 116, 116, nil, + 154, 116, 115, 147, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, 147, 154, nil, 115, nil, 154, + 154, 115, 115, 154, 147, 115, 147, 147, 140, 147, + 147, nil, 147, nil, 147, nil, 147, nil, 147, 140, + nil, 147, nil, 155, 155, nil, nil, nil, nil, 140, + nil, 140, 140, nil, 140, 140, nil, 140, 155, 140, + nil, 140, nil, 140, nil, nil, 140, nil, nil, nil, + 110, nil, nil, 155, nil, nil, nil, 155, 155, nil, + 110, 155, 110, 110, nil, 110, 110, nil, 110, 249, + 110, nil, 110, nil, 110, nil, nil, 110, nil, 249, + nil, 249, 249, nil, 249, 249, nil, 249, 24, 249, + nil, 249, nil, 249, nil, nil, 249, nil, 24, nil, + 24, 24, nil, 24, 24, nil, 24, 0, 24, nil, + 24, nil, 24, nil, nil, 24, nil, 0, nil, 0, + 0, nil, 0, 0, nil, 0, nil, 0, nil, 0, + nil, 0, nil, nil, 0 ] racc_action_pointer = [ - 517, 338, nil, nil, nil, 153, nil, nil, 148, 49, - nil, 13, nil, 457, nil, 74, nil, 80, 9, nil, - 341, 232, 326, nil, 498, 94, 278, 291, nil, nil, - nil, nil, 86, nil, -18, -5, nil, nil, nil, nil, - nil, 276, nil, 152, 199, nil, 192, nil, 16, 230, - nil, 228, nil, nil, 178, nil, nil, 170, nil, nil, - 145, 131, 4, 87, nil, nil, nil, 81, 71, 99, - nil, 161, 222, 250, nil, nil, 272, 317, -2, 306, - 334, nil, 310, nil, 325, nil, 138, nil, 332, 164, - nil, 162, 322, nil, 143, 175, nil, nil, nil, 26, - nil, nil, nil, 101, 211, 249, 252, 58, 120, 479, - nil, nil, 264, 0, 258, 312, 109, 48, 12, nil, - nil, 284, 168, nil, 21, nil, nil, 19, 27, 29, - nil, nil, 31, 1, 48, 58, nil, nil, 46, 328, - nil, nil, nil, nil, nil, nil, 347, nil, 139, nil, - nil, 161, nil, 368, 429, nil, nil, nil, nil, 166, - nil, 412, nil, nil, 10, nil, 87, nil, nil, 201, - nil, 218, 390, nil, nil, nil, 431, nil, 144, nil, - nil, 239, 212, 22, 345, 245, 243, 257, 58, nil, - 272, 277, 248, 281, 68, nil, 247, nil, 211, nil, - nil, nil, 280, nil, 283, 286, 290, 292, nil, 289, - nil, nil, 126, nil, 330, nil, nil, 320, 174, nil, - nil, nil, nil, 62, nil, 132, nil, 93, nil, 186, - nil, 332, nil, nil, nil, nil, nil, 337, nil, nil, - 230, 291, nil, nil, nil, nil, nil, nil, 458, nil, - nil, 384, 115, nil, nil ] + 539, 330, nil, nil, nil, 150, nil, nil, 46, -15, + nil, 2, nil, -2, nil, 67, nil, 15, 23, nil, + 323, 115, 305, nil, 520, 22, 252, 246, nil, nil, + nil, nil, 137, nil, -8, 3, nil, nil, nil, nil, + nil, 213, nil, 93, 268, nil, 4, nil, nil, 55, + 161, nil, 157, nil, nil, 151, nil, nil, 146, nil, + nil, 121, 132, 61, 109, nil, nil, nil, 103, 10, + 115, nil, 133, 152, 192, nil, nil, 225, 290, 79, + 293, 315, nil, 302, nil, 312, nil, 189, nil, 311, + 239, nil, 197, 303, nil, 193, 249, nil, nil, nil, + 6, nil, nil, nil, 65, 230, 192, 191, 6, -4, + 482, nil, nil, 317, 2, 414, 390, 127, 93, 53, + nil, nil, 240, 57, nil, 62, nil, nil, 62, 61, + 65, nil, nil, 80, 2, 86, 88, nil, nil, 74, + 451, nil, nil, nil, nil, nil, nil, 426, nil, 102, + nil, nil, 221, nil, 412, 470, nil, nil, nil, nil, + 142, nil, 369, nil, nil, 73, nil, 51, nil, nil, + 137, nil, 156, 334, nil, nil, nil, 317, nil, 172, + nil, nil, 170, 145, 119, 339, 191, 186, 198, 5, + nil, 230, 216, 187, 233, 143, nil, 211, nil, 172, + nil, nil, nil, 234, nil, 236, 244, 246, 248, nil, + 247, nil, nil, 183, nil, 352, nil, nil, 297, 195, + nil, nil, nil, nil, 131, nil, 125, nil, 8, nil, + 274, nil, 315, nil, nil, nil, nil, nil, 324, nil, + nil, 295, 311, nil, nil, nil, nil, nil, nil, 501, + nil, nil, 350, 255, nil, nil ] racc_action_default = [ - -130, -156, -16, -5, -124, -156, -6, -7, -156, -156, - -8, -156, -9, -37, -10, -156, -11, -156, -36, -12, - -156, -156, -156, -13, -1, -156, -33, -156, -14, -2, - -15, -3, -156, -123, -130, -130, -125, -128, -127, -129, - -32, -156, -35, -130, -130, -149, -156, -18, -156, -19, - -87, -20, -88, -21, -56, -23, -24, -156, -25, -26, - -85, -156, -156, -79, -89, -81, -83, -78, -56, -156, - -95, -82, -77, -57, -115, -84, -80, -156, -156, -65, - -156, -116, -65, -4, -130, -34, -65, -64, -156, -156, - -143, -156, -156, -141, -156, -130, -56, -50, -49, -156, - -41, -43, -40, -156, -156, -156, -156, -156, -156, -156, - -151, -69, -156, -156, -156, -156, -156, -154, -156, -66, - 255, -154, -131, -132, -156, -113, -52, -154, -156, -60, - -61, -63, -59, -56, -62, -58, -57, -114, -54, -156, - -148, -144, -147, -145, -142, -146, -156, -126, -156, -46, - -45, -156, -39, -156, -156, -38, -17, -90, -22, -156, - -27, -156, -150, -152, -156, -153, -156, -110, -109, -56, - -112, -156, -156, -111, -103, -104, -156, -97, -156, -101, - -91, -156, -155, -156, -156, -140, -156, -138, -156, -135, - -156, -156, -65, -156, -55, -120, -156, -122, -156, -44, - -42, -47, -73, -75, -72, -76, -71, -74, -48, -93, - -70, -86, -156, -106, -156, -98, -96, -156, -156, -30, - -67, -68, -31, -156, -133, -156, -134, -156, -118, -156, - -29, -154, -28, -53, -119, -121, -92, -156, -108, -105, - -156, -156, -102, -139, -137, -136, -117, -51, -156, -107, - -100, -156, -156, -99, -94 ] + -131, -157, -16, -5, -125, -157, -6, -7, -157, -157, + -8, -157, -9, -38, -10, -157, -11, -157, -37, -12, + -157, -157, -157, -13, -1, -157, -34, -157, -14, -2, + -15, -3, -157, -124, -131, -131, -126, -129, -128, -130, + -33, -157, -36, -131, -131, -150, -157, -26, -18, -157, + -19, -88, -20, -89, -21, -57, -23, -24, -157, -25, + -27, -86, -157, -157, -80, -90, -82, -84, -79, -57, + -157, -96, -83, -78, -58, -116, -85, -81, -157, -157, + -66, -157, -117, -66, -4, -131, -35, -66, -65, -157, + -157, -144, -157, -157, -142, -157, -131, -57, -51, -50, + -157, -42, -44, -41, -157, -157, -157, -157, -157, -157, + -157, -152, -70, -157, -157, -157, -157, -157, -155, -157, + -67, 256, -155, -132, -133, -157, -114, -53, -155, -157, + -61, -62, -64, -60, -57, -63, -59, -58, -115, -55, + -157, -149, -145, -148, -146, -143, -147, -157, -127, -157, + -47, -46, -157, -40, -157, -157, -39, -17, -91, -22, + -157, -28, -157, -151, -153, -157, -154, -157, -111, -110, + -57, -113, -157, -157, -112, -104, -105, -157, -98, -157, + -102, -92, -157, -156, -157, -157, -141, -157, -139, -157, + -136, -157, -157, -66, -157, -56, -121, -157, -123, -157, + -45, -43, -48, -74, -76, -73, -77, -72, -75, -49, + -94, -71, -87, -157, -107, -157, -99, -97, -157, -157, + -31, -68, -69, -32, -157, -134, -157, -135, -157, -119, + -157, -30, -155, -29, -54, -120, -122, -93, -157, -109, + -106, -157, -157, -103, -140, -138, -137, -118, -52, -157, + -108, -101, -157, -157, -100, -95 ] racc_goto_table = [ - 24, 83, 175, 58, 59, 189, 75, 36, 75, 126, - 177, 81, 70, 56, 77, 20, 130, 131, 55, 171, - 179, 181, 34, 75, 164, 184, 112, 117, 47, 87, - 121, 191, 29, 220, 127, 200, 58, 59, 42, 75, - 99, 104, 84, 98, 98, 106, 56, 61, 97, 97, - 236, 55, 176, 75, 201, 208, 193, 138, 174, 111, - 213, 105, 158, 214, 124, 88, 90, 93, 35, 75, - 92, 215, 166, 186, 188, 116, 135, 171, 40, 144, - 141, 179, nil, 203, 203, nil, 134, nil, nil, nil, - nil, 132, 148, 147, nil, 98, nil, 58, nil, 160, - 97, nil, 125, 58, 173, 173, 142, 56, nil, 161, - 245, nil, 55, 56, 170, 170, 123, 233, 55, 168, - 168, nil, nil, 242, 130, 131, 240, nil, 249, nil, - 125, 125, nil, nil, nil, 247, nil, nil, 83, 196, - 231, nil, nil, 206, 206, 171, 198, nil, nil, nil, - nil, 98, nil, 205, 205, 75, 97, 137, 204, 204, - nil, 210, 173, nil, nil, nil, 173, nil, 129, 125, - 125, nil, 170, 83, 75, 83, 170, 168, nil, nil, - 221, 168, nil, nil, 135, 137, 137, nil, 125, nil, - 229, nil, 125, nil, 134, nil, 167, 167, nil, 132, - nil, nil, nil, 75, nil, nil, 83, nil, 173, 238, - 125, nil, nil, nil, 75, nil, 75, nil, 170, nil, - 243, nil, 244, 168, 207, 207, nil, nil, 83, 83, - 173, nil, nil, nil, 125, 202, 202, nil, nil, nil, - 170, 251, nil, 137, nil, 168, nil, 137, 252, nil, - nil, nil, nil, nil, 167, nil, 125, nil, 167, nil, - nil, nil, nil, nil, nil, 137, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, 129, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, nil, nil, 137, + 24, 84, 176, 59, 60, 165, 76, 190, 76, 118, + 127, 82, 122, 57, 34, 182, 128, 132, 56, 185, + 178, 20, 36, 76, 48, 192, 131, 202, 209, 100, + 105, 113, 29, 221, 85, 201, 59, 60, 42, 62, + 76, 237, 177, 99, 99, 194, 57, 139, 98, 98, + 175, 56, 159, 215, 76, 125, 126, 106, 89, 35, + 214, 93, 167, 71, 187, 78, 91, 94, 172, 180, + 76, 189, 40, 145, 142, nil, nil, 136, nil, nil, + 88, 216, 149, nil, 126, 126, nil, 135, nil, nil, + nil, nil, 133, 204, 204, nil, 99, 107, 59, 143, + 161, 98, nil, 138, 59, 174, 174, 241, 57, 148, + 162, 112, 246, 56, 57, 171, 171, 124, 234, 56, + 169, 169, 232, 126, 126, 132, 172, 117, 250, 248, + 180, 138, 138, nil, 131, nil, nil, nil, nil, 84, + 197, nil, 126, nil, 207, 207, 126, 199, nil, nil, + nil, nil, 99, nil, 206, 206, 76, 98, 130, 205, + 205, nil, nil, 174, 126, nil, nil, 174, nil, nil, + 208, 208, 243, 171, 84, 76, 84, 171, 169, nil, + nil, nil, 169, nil, nil, 136, 168, 168, 126, 138, + nil, 230, nil, 138, 172, 135, nil, nil, nil, nil, + 133, nil, nil, nil, 76, nil, nil, 84, nil, 174, + 126, 138, nil, 211, nil, 76, nil, 76, nil, 171, + nil, nil, nil, nil, 169, 203, 203, nil, nil, 84, + 84, 174, 222, nil, nil, 138, nil, nil, nil, nil, + nil, 171, 252, nil, 168, nil, 169, nil, 168, 253, + nil, nil, nil, nil, nil, nil, nil, 138, nil, nil, + nil, 239, nil, nil, nil, nil, 130, nil, nil, nil, + nil, nil, 244, nil, 245, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - 167, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, 137, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, 167 ] + 168, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, 168 ] racc_goto_check = [ - 2, 4, 57, 23, 24, 66, 24, 63, 24, 39, - 53, 23, 44, 22, 44, 1, 42, 43, 21, 55, - 55, 29, 25, 24, 47, 29, 46, 28, 17, 44, - 28, 29, 3, 45, 28, 34, 23, 24, 32, 24, - 33, 33, 25, 22, 22, 44, 22, 50, 21, 21, - 51, 21, 52, 24, 38, 38, 27, 26, 56, 44, - 57, 17, 20, 58, 59, 60, 3, 3, 61, 24, - 62, 53, 18, 64, 65, 44, 23, 55, 5, 67, - 68, 55, nil, 42, 42, nil, 22, nil, nil, nil, - nil, 21, 33, 63, nil, 22, nil, 23, nil, 24, - 21, nil, 49, 23, 23, 23, 25, 22, nil, 2, - 66, nil, 21, 22, 22, 22, 3, 39, 21, 21, - 21, nil, nil, 55, 42, 43, 47, nil, 57, nil, - 49, 49, nil, nil, nil, 29, nil, nil, 4, 2, - 28, nil, nil, 23, 23, 55, 2, nil, nil, nil, - nil, 22, nil, 22, 22, 24, 21, 48, 21, 21, - nil, 44, 23, nil, nil, nil, 23, nil, 41, 49, - 49, nil, 22, 4, 24, 4, 22, 21, nil, nil, - 44, 21, nil, nil, 23, 48, 48, nil, 49, nil, - 2, nil, 49, nil, 22, nil, 41, 41, nil, 21, - nil, nil, nil, 24, nil, nil, 4, nil, 23, 44, - 49, nil, nil, nil, 24, nil, 24, nil, 22, nil, - 44, nil, 44, 21, 48, 48, nil, nil, 4, 4, - 23, nil, nil, nil, 49, 41, 41, nil, nil, nil, - 22, 2, nil, 48, nil, 21, nil, 48, 2, nil, - nil, nil, nil, nil, 41, nil, 49, nil, 41, nil, - nil, nil, nil, nil, nil, 48, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, 41, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, nil, nil, 48, + 2, 4, 57, 23, 24, 47, 24, 66, 24, 28, + 39, 23, 28, 22, 25, 29, 28, 43, 21, 29, + 53, 1, 63, 24, 17, 29, 42, 38, 38, 33, + 33, 46, 3, 45, 25, 34, 23, 24, 32, 50, + 24, 51, 52, 22, 22, 27, 22, 26, 21, 21, + 56, 21, 20, 58, 24, 59, 49, 17, 60, 61, + 57, 62, 18, 44, 64, 44, 3, 3, 55, 55, + 24, 65, 5, 67, 68, nil, nil, 23, nil, nil, + 44, 53, 33, nil, 49, 49, nil, 22, nil, nil, + nil, nil, 21, 42, 42, nil, 22, 44, 23, 25, + 24, 21, nil, 48, 23, 23, 23, 47, 22, 63, + 2, 44, 66, 21, 22, 22, 22, 3, 39, 21, + 21, 21, 28, 49, 49, 43, 55, 44, 57, 29, + 55, 48, 48, nil, 42, nil, nil, nil, nil, 4, + 2, nil, 49, nil, 23, 23, 49, 2, nil, nil, + nil, nil, 22, nil, 22, 22, 24, 21, 41, 21, + 21, nil, nil, 23, 49, nil, nil, 23, nil, nil, + 48, 48, 55, 22, 4, 24, 4, 22, 21, nil, + nil, nil, 21, nil, nil, 23, 41, 41, 49, 48, + nil, 2, nil, 48, 55, 22, nil, nil, nil, nil, + 21, nil, nil, nil, 24, nil, nil, 4, nil, 23, + 49, 48, nil, 44, nil, 24, nil, 24, nil, 22, + nil, nil, nil, nil, 21, 41, 41, nil, nil, 4, + 4, 23, 44, nil, nil, 48, nil, nil, nil, nil, + nil, 22, 2, nil, 41, nil, 21, nil, 41, 2, + nil, nil, nil, nil, nil, nil, nil, 48, nil, nil, + nil, 44, nil, nil, nil, nil, 41, nil, nil, nil, + nil, nil, 44, nil, 44, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 41, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, 48, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 41 ] racc_goto_pointer = [ - nil, 15, 0, 32, -23, 69, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, 15, -41, nil, - -45, 5, 0, -10, -9, 17, -29, -82, -52, -96, - nil, nil, 27, -3, -116, nil, nil, nil, -99, -77, - nil, 82, -70, -69, -3, -149, -36, -88, 71, 16, - 32, -159, -63, -105, nil, -95, -56, -112, -109, -20, - 31, 60, 35, -1, -49, -48, -117, -12, -9 ] + nil, 21, 0, 32, -23, 63, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, 11, -52, nil, + -56, 5, 0, -10, -9, 9, -40, -94, -71, -103, + nil, nil, 27, -14, -117, nil, nil, nil, -127, -77, + nil, 71, -61, -70, 48, -150, -32, -108, 16, -31, + 24, -169, -74, -96, nil, -47, -65, -113, -120, -30, + 24, 51, 26, 14, -59, -52, -116, -19, -16 ] racc_goto_default = [ - nil, nil, nil, 102, 31, 3, 6, 7, 10, 12, - 14, 16, 19, 23, 28, 30, 2, nil, 49, 51, - 53, 67, 71, 72, 22, 27, nil, nil, nil, nil, - 9, 11, nil, nil, 100, 151, 101, 103, nil, nil, - 128, 63, 65, 66, nil, 119, nil, nil, 76, 60, - nil, nil, nil, nil, 178, 69, nil, nil, nil, nil, + nil, nil, nil, 103, 31, 3, 6, 7, 10, 12, + 14, 16, 19, 23, 28, 30, 2, nil, 50, 52, + 54, 68, 72, 73, 22, 27, nil, nil, nil, nil, + 9, 11, nil, nil, 101, 152, 102, 104, nil, nil, + 129, 64, 66, 67, nil, 120, nil, nil, 77, 61, + nil, nil, nil, nil, 179, 70, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil ] racc_token_table = { @@ -934,10 +937,17 @@ module_eval <<'.,.,', 'grammar.ra', 88 # reduce 25 omitted - # reduce 26 omitted +module_eval <<'.,.,', 'grammar.ra', 95 + def _reduce_26( val, _values, result ) + result = ast AST::Name, :value => val[0] + result + end +.,., + + # reduce 27 omitted -module_eval <<'.,.,', 'grammar.ra', 103 - def _reduce_27( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 106 + def _reduce_28( val, _values, result ) unless val[0].is_a?(AST::ASTArray) val[0] = aryfy(val[0]) end @@ -949,8 +959,8 @@ module_eval <<'.,.,', 'grammar.ra', 103 end .,., -module_eval <<'.,.,', 'grammar.ra', 124 - def _reduce_28( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 127 + def _reduce_29( val, _values, result ) array = val[2] if array.instance_of?(AST::ResourceInst) array = [array] @@ -973,31 +983,31 @@ module_eval <<'.,.,', 'grammar.ra', 124 end .,., -module_eval <<'.,.,', 'grammar.ra', 127 - def _reduce_29( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 130 + def _reduce_30( val, _values, result ) # This is a deprecated syntax. error "All resource specifications require names" result end .,., -module_eval <<'.,.,', 'grammar.ra', 130 - def _reduce_30( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 133 + def _reduce_31( val, _values, result ) # a defaults setting for a type result = ast(AST::ResourceDefaults, :type => val[0], :params => val[2]) result end .,., -module_eval <<'.,.,', 'grammar.ra', 135 - def _reduce_31( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 138 + def _reduce_32( val, _values, result ) result = ast AST::ResourceOverride, :object => val[0], :params => val[2] result end .,., -module_eval <<'.,.,', 'grammar.ra', 162 - def _reduce_32( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 165 + def _reduce_33( val, _values, result ) type = val[0] if type == :exported and ! Puppet[:storeconfigs] @@ -1024,22 +1034,22 @@ module_eval <<'.,.,', 'grammar.ra', 162 end .,., -module_eval <<'.,.,', 'grammar.ra', 163 - def _reduce_33( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 166 + def _reduce_34( val, _values, result ) result = :virtual result end .,., -module_eval <<'.,.,', 'grammar.ra', 164 - def _reduce_34( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 167 + def _reduce_35( val, _values, result ) result = :exported result end .,., -module_eval <<'.,.,', 'grammar.ra', 187 - def _reduce_35( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 190 + def _reduce_36( val, _values, result ) if val[0] =~ /^[a-z]/ Puppet.warning addcontext("Collection names must now be capitalized") end @@ -1061,12 +1071,12 @@ module_eval <<'.,.,', 'grammar.ra', 187 end .,., - # reduce 36 omitted - # reduce 37 omitted -module_eval <<'.,.,', 'grammar.ra', 198 - def _reduce_38( val, _values, result ) + # reduce 38 omitted + +module_eval <<'.,.,', 'grammar.ra', 201 + def _reduce_39( val, _values, result ) if val[1] result = val[1] result.form = :virtual @@ -1077,8 +1087,8 @@ module_eval <<'.,.,', 'grammar.ra', 198 end .,., -module_eval <<'.,.,', 'grammar.ra', 206 - def _reduce_39( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 209 + def _reduce_40( val, _values, result ) if val[1] result = val[1] result.form = :exported @@ -1089,33 +1099,33 @@ module_eval <<'.,.,', 'grammar.ra', 206 end .,., - # reduce 40 omitted - # reduce 41 omitted -module_eval <<'.,.,', 'grammar.ra', 214 - def _reduce_42( val, _values, result ) + # reduce 42 omitted + +module_eval <<'.,.,', 'grammar.ra', 217 + def _reduce_43( val, _values, result ) result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2] result end .,., - # reduce 43 omitted + # reduce 44 omitted -module_eval <<'.,.,', 'grammar.ra', 220 - def _reduce_44( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 223 + def _reduce_45( val, _values, result ) result = val[1] result.parens = true result end .,., - # reduce 45 omitted - # reduce 46 omitted -module_eval <<'.,.,', 'grammar.ra', 228 - def _reduce_47( val, _values, result ) + # reduce 47 omitted + +module_eval <<'.,.,', 'grammar.ra', 231 + def _reduce_48( val, _values, result ) result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2] #result = ast AST::CollExpr #result.push *val @@ -1123,8 +1133,8 @@ module_eval <<'.,.,', 'grammar.ra', 228 end .,., -module_eval <<'.,.,', 'grammar.ra', 233 - def _reduce_48( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 236 + def _reduce_49( val, _values, result ) result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2] #result = ast AST::CollExpr #result.push *val @@ -1132,21 +1142,21 @@ module_eval <<'.,.,', 'grammar.ra', 233 end .,., - # reduce 49 omitted - # reduce 50 omitted -module_eval <<'.,.,', 'grammar.ra', 240 - def _reduce_51( val, _values, result ) + # reduce 51 omitted + +module_eval <<'.,.,', 'grammar.ra', 243 + def _reduce_52( val, _values, result ) result = ast AST::ResourceInst, :children => [val[0],val[2]] result end .,., - # reduce 52 omitted + # reduce 53 omitted -module_eval <<'.,.,', 'grammar.ra', 250 - def _reduce_53( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 253 + def _reduce_54( val, _values, result ) if val[0].instance_of?(AST::ResourceInst) result = ast AST::ASTArray, :children => [val[0],val[2]] else @@ -1157,26 +1167,24 @@ module_eval <<'.,.,', 'grammar.ra', 250 end .,., - # reduce 54 omitted - # reduce 55 omitted -module_eval <<'.,.,', 'grammar.ra', 257 - def _reduce_56( val, _values, result ) + # reduce 56 omitted + +module_eval <<'.,.,', 'grammar.ra', 260 + def _reduce_57( val, _values, result ) result = ast AST::Name, :value => val[0] result end .,., -module_eval <<'.,.,', 'grammar.ra', 261 - def _reduce_57( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 264 + def _reduce_58( val, _values, result ) result = ast AST::Type, :value => val[0] result end .,., - # reduce 58 omitted - # reduce 59 omitted # reduce 60 omitted @@ -1187,8 +1195,10 @@ module_eval <<'.,.,', 'grammar.ra', 261 # reduce 63 omitted -module_eval <<'.,.,', 'grammar.ra', 274 - def _reduce_64( val, _values, result ) + # reduce 64 omitted + +module_eval <<'.,.,', 'grammar.ra', 277 + def _reduce_65( val, _values, result ) # this is distinct from referencing a variable variable = ast AST::Name, :value => val[0] result = ast AST::VarDef, :name => variable, :value => val[2] @@ -1196,22 +1206,22 @@ module_eval <<'.,.,', 'grammar.ra', 274 end .,., -module_eval <<'.,.,', 'grammar.ra', 279 - def _reduce_65( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 282 + def _reduce_66( val, _values, result ) result = ast AST::ASTArray result end .,., -module_eval <<'.,.,', 'grammar.ra', 279 - def _reduce_66( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 282 + def _reduce_67( val, _values, result ) result = val[0] result end .,., -module_eval <<'.,.,', 'grammar.ra', 288 - def _reduce_67( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 291 + def _reduce_68( val, _values, result ) if val[0].instance_of?(AST::ASTArray) val[0].push(val[2]) result = val[0] @@ -1222,17 +1232,17 @@ module_eval <<'.,.,', 'grammar.ra', 288 end .,., -module_eval <<'.,.,', 'grammar.ra', 292 - def _reduce_68( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 295 + def _reduce_69( val, _values, result ) result = ast AST::ResourceParam, :param => val[0], :value => val[2] result end .,., - # reduce 69 omitted + # reduce 70 omitted -module_eval <<'.,.,', 'grammar.ra', 301 - def _reduce_70( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 304 + def _reduce_71( val, _values, result ) if val[0].instance_of?(AST::ASTArray) result = val[0].push(val[2]) else @@ -1242,8 +1252,6 @@ module_eval <<'.,.,', 'grammar.ra', 301 end .,., - # reduce 71 omitted - # reduce 72 omitted # reduce 73 omitted @@ -1272,8 +1280,10 @@ module_eval <<'.,.,', 'grammar.ra', 301 # reduce 85 omitted -module_eval <<'.,.,', 'grammar.ra', 327 - def _reduce_86( val, _values, result ) + # reduce 86 omitted + +module_eval <<'.,.,', 'grammar.ra', 330 + def _reduce_87( val, _values, result ) args = aryfy(val[2]) result = ast AST::Function, :name => val[0], @@ -1283,44 +1293,44 @@ module_eval <<'.,.,', 'grammar.ra', 327 end .,., -module_eval <<'.,.,', 'grammar.ra', 331 - def _reduce_87( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 334 + def _reduce_88( val, _values, result ) result = ast AST::String, :value => val[0] result end .,., -module_eval <<'.,.,', 'grammar.ra', 333 - def _reduce_88( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 336 + def _reduce_89( val, _values, result ) result = ast AST::FlatString, :value => val[0] result end .,., -module_eval <<'.,.,', 'grammar.ra', 337 - def _reduce_89( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 340 + def _reduce_90( val, _values, result ) result = ast AST::Boolean, :value => val[0] result end .,., -module_eval <<'.,.,', 'grammar.ra', 342 - def _reduce_90( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 345 + def _reduce_91( val, _values, result ) Puppet.warning addcontext("Deprecation notice: Resource references should now be capitalized") result = ast AST::ResourceRef, :type => val[0], :title => val[2] result end .,., -module_eval <<'.,.,', 'grammar.ra', 344 - def _reduce_91( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 347 + def _reduce_92( val, _values, result ) result = ast AST::ResourceRef, :type => val[0], :title => val[2] result end .,., -module_eval <<'.,.,', 'grammar.ra', 357 - def _reduce_92( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 360 + def _reduce_93( val, _values, result ) args = { :test => val[1], :statements => val[3] @@ -1335,19 +1345,19 @@ module_eval <<'.,.,', 'grammar.ra', 357 end .,., - # reduce 93 omitted + # reduce 94 omitted -module_eval <<'.,.,', 'grammar.ra', 362 - def _reduce_94( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 365 + def _reduce_95( val, _values, result ) result = ast AST::Else, :statements => val[2] result end .,., - # reduce 95 omitted + # reduce 96 omitted -module_eval <<'.,.,', 'grammar.ra', 374 - def _reduce_96( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 377 + def _reduce_97( val, _values, result ) options = val[3] unless options.instance_of?(AST::ASTArray) options = ast AST::ASTArray, :children => [val[3]] @@ -1357,10 +1367,10 @@ module_eval <<'.,.,', 'grammar.ra', 374 end .,., - # reduce 97 omitted + # reduce 98 omitted -module_eval <<'.,.,', 'grammar.ra', 384 - def _reduce_98( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 387 + def _reduce_99( val, _values, result ) if val[0].instance_of?(AST::ASTArray) val[0].push val[1] result = val[0] @@ -1371,15 +1381,15 @@ module_eval <<'.,.,', 'grammar.ra', 384 end .,., -module_eval <<'.,.,', 'grammar.ra', 388 - def _reduce_99( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 391 + def _reduce_100( val, _values, result ) result = ast AST::CaseOpt, :value => val[0], :statements => val[3] result end .,., -module_eval <<'.,.,', 'grammar.ra', 393 - def _reduce_100( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 396 + def _reduce_101( val, _values, result ) result = ast(AST::CaseOpt, :value => val[0], :statements => ast(AST::ASTArray) @@ -1388,10 +1398,10 @@ module_eval <<'.,.,', 'grammar.ra', 393 end .,., - # reduce 101 omitted + # reduce 102 omitted -module_eval <<'.,.,', 'grammar.ra', 403 - def _reduce_102( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 406 + def _reduce_103( val, _values, result ) if val[0].instance_of?(AST::ASTArray) val[0].push(val[2]) result = val[0] @@ -1402,26 +1412,26 @@ module_eval <<'.,.,', 'grammar.ra', 403 end .,., -module_eval <<'.,.,', 'grammar.ra', 407 - def _reduce_103( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 410 + def _reduce_104( val, _values, result ) result = ast AST::Selector, :param => val[0], :values => val[2] result end .,., - # reduce 104 omitted + # reduce 105 omitted -module_eval <<'.,.,', 'grammar.ra', 409 - def _reduce_105( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 412 + def _reduce_106( val, _values, result ) result = val[1] result end .,., - # reduce 106 omitted + # reduce 107 omitted -module_eval <<'.,.,', 'grammar.ra', 420 - def _reduce_107( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 423 + def _reduce_108( val, _values, result ) if val[0].instance_of?(AST::ASTArray) val[0].push(val[2]) result = val[0] @@ -1432,15 +1442,13 @@ module_eval <<'.,.,', 'grammar.ra', 420 end .,., -module_eval <<'.,.,', 'grammar.ra', 424 - def _reduce_108( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 427 + def _reduce_109( val, _values, result ) result = ast AST::ResourceParam, :param => val[0], :value => val[2] result end .,., - # reduce 109 omitted - # reduce 110 omitted # reduce 111 omitted @@ -1451,15 +1459,17 @@ module_eval <<'.,.,', 'grammar.ra', 424 # reduce 114 omitted -module_eval <<'.,.,', 'grammar.ra', 434 - def _reduce_115( val, _values, result ) + # reduce 115 omitted + +module_eval <<'.,.,', 'grammar.ra', 437 + def _reduce_116( val, _values, result ) result = ast AST::Default, :value => val[0] result end .,., -module_eval <<'.,.,', 'grammar.ra', 489 - def _reduce_116( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 492 + def _reduce_117( val, _values, result ) # importing files # yuk, i hate keywords # we'll probably have to have some kind of search path eventually @@ -1516,8 +1526,8 @@ module_eval <<'.,.,', 'grammar.ra', 489 end .,., -module_eval <<'.,.,', 'grammar.ra', 499 - def _reduce_117( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 502 + def _reduce_118( val, _values, result ) interp.newdefine fqname(val[1]), :arguments => val[2], :code => val[4] @lexer.indefine = false result = nil @@ -1527,8 +1537,8 @@ module_eval <<'.,.,', 'grammar.ra', 499 end .,., -module_eval <<'.,.,', 'grammar.ra', 503 - def _reduce_118( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 506 + def _reduce_119( val, _values, result ) interp.newdefine fqname(val[1]), :arguments => val[2] @lexer.indefine = false result = nil @@ -1536,8 +1546,8 @@ module_eval <<'.,.,', 'grammar.ra', 503 end .,., -module_eval <<'.,.,', 'grammar.ra', 511 - def _reduce_119( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 514 + def _reduce_120( val, _values, result ) # Our class gets defined in the parent namespace, not our own. @lexer.namepop interp.newclass fqname(val[1]), :code => val[4], :parent => val[2] @@ -1546,8 +1556,8 @@ module_eval <<'.,.,', 'grammar.ra', 511 end .,., -module_eval <<'.,.,', 'grammar.ra', 516 - def _reduce_120( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 519 + def _reduce_121( val, _values, result ) # Our class gets defined in the parent namespace, not our own. @lexer.namepop interp.newclass fqname(val[1]), :parent => val[2] @@ -1556,30 +1566,30 @@ module_eval <<'.,.,', 'grammar.ra', 516 end .,., -module_eval <<'.,.,', 'grammar.ra', 521 - def _reduce_121( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 524 + def _reduce_122( val, _values, result ) interp.newnode val[1], :parent => val[2], :code => val[4] result = nil result end .,., -module_eval <<'.,.,', 'grammar.ra', 524 - def _reduce_122( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 527 + def _reduce_123( val, _values, result ) interp.newnode val[1], :parent => val[2] result = nil result end .,., - # reduce 123 omitted - # reduce 124 omitted # reduce 125 omitted -module_eval <<'.,.,', 'grammar.ra', 536 - def _reduce_126( val, _values, result ) + # reduce 126 omitted + +module_eval <<'.,.,', 'grammar.ra', 539 + def _reduce_127( val, _values, result ) result = val[0] result = [result] unless result.is_a?(Array) result << val[2] @@ -1587,47 +1597,47 @@ module_eval <<'.,.,', 'grammar.ra', 536 end .,., - # reduce 127 omitted - # reduce 128 omitted # reduce 129 omitted -module_eval <<'.,.,', 'grammar.ra', 544 - def _reduce_130( val, _values, result ) + # reduce 130 omitted + +module_eval <<'.,.,', 'grammar.ra', 547 + def _reduce_131( val, _values, result ) result = nil result end .,., -module_eval <<'.,.,', 'grammar.ra', 548 - def _reduce_131( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 551 + def _reduce_132( val, _values, result ) result = ast AST::ASTArray, :children => [] result end .,., - # reduce 132 omitted + # reduce 133 omitted -module_eval <<'.,.,', 'grammar.ra', 553 - def _reduce_133( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 556 + def _reduce_134( val, _values, result ) result = nil result end .,., -module_eval <<'.,.,', 'grammar.ra', 557 - def _reduce_134( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 560 + def _reduce_135( val, _values, result ) result = val[1] result = [result] unless result[0].is_a?(Array) result end .,., - # reduce 135 omitted + # reduce 136 omitted -module_eval <<'.,.,', 'grammar.ra', 564 - def _reduce_136( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 567 + def _reduce_137( val, _values, result ) result = val[0] result = [result] unless result[0].is_a?(Array) result << val[2] @@ -1635,71 +1645,71 @@ module_eval <<'.,.,', 'grammar.ra', 564 end .,., -module_eval <<'.,.,', 'grammar.ra', 569 - def _reduce_137( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 572 + def _reduce_138( val, _values, result ) Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype") result = [val[0], val[2]] result end .,., -module_eval <<'.,.,', 'grammar.ra', 573 - def _reduce_138( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 576 + def _reduce_139( val, _values, result ) Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype") result = [val[0]] result end .,., -module_eval <<'.,.,', 'grammar.ra', 575 - def _reduce_139( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 578 + def _reduce_140( val, _values, result ) result = [val[0], val[2]] result end .,., -module_eval <<'.,.,', 'grammar.ra', 577 - def _reduce_140( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 580 + def _reduce_141( val, _values, result ) result = [val[0]] result end .,., - # reduce 141 omitted + # reduce 142 omitted -module_eval <<'.,.,', 'grammar.ra', 582 - def _reduce_142( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 585 + def _reduce_143( val, _values, result ) result = val[1] result end .,., - # reduce 143 omitted + # reduce 144 omitted -module_eval <<'.,.,', 'grammar.ra', 587 - def _reduce_144( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 590 + def _reduce_145( val, _values, result ) result = val[1] result end .,., - # reduce 145 omitted - # reduce 146 omitted # reduce 147 omitted # reduce 148 omitted -module_eval <<'.,.,', 'grammar.ra', 594 - def _reduce_149( val, _values, result ) + # reduce 149 omitted + +module_eval <<'.,.,', 'grammar.ra', 597 + def _reduce_150( val, _values, result ) result = ast AST::Variable, :value => val[0] result end .,., -module_eval <<'.,.,', 'grammar.ra', 602 - def _reduce_150( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 605 + def _reduce_151( val, _values, result ) if val[1].instance_of?(AST::ASTArray) result = val[1] else @@ -1709,21 +1719,21 @@ module_eval <<'.,.,', 'grammar.ra', 602 end .,., -module_eval <<'.,.,', 'grammar.ra', 604 - def _reduce_151( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 607 + def _reduce_152( val, _values, result ) result = ast AST::ASTArray result end .,., - # reduce 152 omitted - # reduce 153 omitted # reduce 154 omitted -module_eval <<'.,.,', 'grammar.ra', 609 - def _reduce_155( val, _values, result ) + # reduce 155 omitted + +module_eval <<'.,.,', 'grammar.ra', 612 + def _reduce_156( val, _values, result ) result = nil result end |