summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/parser.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/parser/parser.rb')
-rw-r--r--lib/puppet/parser/parser.rb242
1 files changed, 119 insertions, 123 deletions
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index 94fd83cfb..df92e9c2e 100644
--- a/lib/puppet/parser/parser.rb
+++ b/lib/puppet/parser/parser.rb
@@ -32,7 +32,7 @@ module Puppet
class Parser < Racc::Parser
-module_eval <<'..end grammar.ra modeval..id9e2c7fc335', 'grammar.ra', 638
+module_eval <<'..end grammar.ra modeval..id4705e629f1', 'grammar.ra', 638
attr_reader :file, :files
# Create an AST array out of all of the args
@@ -144,7 +144,7 @@ end
def string=(string)
@lexer.string = string
end
-..end grammar.ra modeval..id9e2c7fc335
+..end grammar.ra modeval..id4705e629f1
##### racc 1.4.4 generates ###
@@ -221,7 +221,7 @@ racc_reduce_table = [
2, 47, :_reduce_69,
6, 49, :_reduce_70,
6, 50, :_reduce_71,
- 5, 51, :_reduce_72,
+ 6, 51, :_reduce_72,
1, 81, :_reduce_none,
2, 81, :_reduce_74,
0, 82, :_reduce_75,
@@ -243,159 +243,155 @@ racc_reduce_table = [
racc_reduce_n = 91
-racc_shift_n = 151
+racc_shift_n = 152
racc_action_table = [
- 88, 123, 88, 118, 96, 31, 31, 52, 88, 117,
- 88, 120, 107, 5, 5, 100, 88, 106, 88, 101,
- 102, 55, 112, 58, 67, 122, 50, 104, 35, 106,
- 35, 86, 87, 86, 87, 90, 35, 90, 35, 86,
- 87, 86, 87, 90, 35, 90, 35, 86, 87, 86,
- 87, 90, 133, 90, 5, 144, 114, 101, 102, 104,
- 116, 40, 119, 55, 54, 108, 126, 50, 138, 128,
- 4, 7, 61, 11, 14, 130, 18, 28, 29, 61,
- 2, 5, 66, 9, 48, 15, 4, 7, 134, 11,
- 14, 5, 18, 28, 29, 136, 2, 5, 61, 9,
- 5, 15, 31, 28, 29, 28, 29, 5, 41, 2,
- 5, 141, 40, 81, 28, 29, 28, 29, 31, 39,
- 24, 147, 35, 65, 23, 2, 5, 61, 31, 69,
- 31, nil, 35, 146, 35, 2, 5, 2, 5, 31,
- nil, 31, nil, 35, 28, 29, 2, 5, 2, 72,
- nil, 4, 7, nil, 11, 14, nil, 18, 28, 29,
- nil, 2, 5, nil, 9, nil, 15, nil, nil, 31,
- nil, nil, nil, 35, 150, nil, 2, 5, nil, 28,
- 29, 28, 29, 31, nil, nil, nil, 35, nil, nil,
- 2, 5, 4, 7, nil, 11, 14, nil, 18, nil,
- nil, nil, 2, 5, 31, 9, 31, 15, 35, nil,
- 35, 2, 5, 2, 5, 4, 7, nil, 11, 14,
- nil, 18, nil, nil, nil, 2, 5, nil, 9, nil,
- 15, 4, 7, nil, 11, 14, nil, 18, nil, nil,
- nil, 2, 5, nil, 9, nil, 15, 4, 7, nil,
- 11, 14, nil, 18, nil, nil, nil, 2, 5, nil,
- 9, nil, 15, 4, 7, nil, 11, 14, nil, 18,
+ 88, 123, 88, 118, 144, 130, 101, 102, 88, 117,
+ 96, 4, 7, 88, 11, 14, 120, 18, 88, 31,
+ 40, 2, 5, 88, 9, 122, 15, 5, 35, 110,
+ 35, 86, 87, 86, 87, 90, 35, 90, 55, 86,
+ 87, 35, 112, 90, 86, 87, 35, 138, 90, 86,
+ 87, 35, 104, 90, 86, 87, 28, 29, 90, 28,
+ 29, 28, 29, 106, 65, 4, 7, 114, 11, 14,
+ 5, 18, 28, 29, 58, 2, 5, 50, 9, 31,
+ 15, 31, 28, 29, 31, 35, 31, 5, 2, 5,
+ 35, 2, 5, 2, 5, 100, 104, 31, 146, 101,
+ 102, 35, 116, 107, 2, 5, 119, 31, 28, 29,
+ 55, 35, 54, 61, 2, 5, 4, 7, 126, 11,
+ 14, 50, 18, 128, 151, 5, 2, 5, 108, 9,
+ 61, 15, 66, 31, 28, 29, 28, 29, 81, 134,
+ 2, 72, 4, 7, 48, 11, 14, 136, 18, 61,
+ 5, 5, 2, 5, 147, 9, 65, 15, 141, 31,
+ 41, 31, 106, 35, 40, 35, 2, 5, 2, 5,
+ 28, 29, 4, 7, 39, 11, 14, 24, 18, 28,
+ 29, 148, 2, 5, 69, 9, 23, 15, 61, 52,
+ nil, nil, nil, nil, nil, 31, nil, nil, nil, 35,
+ nil, nil, 2, 5, 31, nil, nil, nil, 35, nil,
+ nil, 2, 5, 4, 7, nil, 11, 14, nil, 18,
nil, nil, nil, 2, 5, nil, 9, nil, 15, 4,
7, nil, 11, 14, nil, 18, nil, nil, nil, 2,
5, nil, 9, nil, 15, 4, 7, nil, 11, 14,
nil, 18, nil, nil, nil, 2, 5, nil, 9, nil,
- 15 ]
+ 15, 4, 7, nil, 11, 14, nil, 18, nil, nil,
+ nil, 2, 5, nil, 9, nil, 15, 4, 7, nil,
+ 11, 14, nil, 18, nil, nil, nil, 2, 5, nil,
+ 9, nil, 15 ]
racc_action_check = [
- 143, 93, 55, 83, 55, 15, 66, 24, 91, 83,
- 96, 91, 63, 15, 66, 57, 54, 62, 123, 57,
- 57, 70, 71, 38, 46, 93, 38, 72, 143, 73,
- 55, 143, 143, 55, 55, 143, 91, 55, 96, 91,
- 91, 96, 96, 91, 54, 96, 123, 54, 54, 123,
- 123, 54, 110, 123, 46, 125, 76, 125, 125, 61,
- 82, 33, 85, 26, 25, 65, 97, 21, 115, 103,
- 110, 110, 40, 110, 110, 105, 110, 112, 112, 106,
- 110, 110, 43, 110, 19, 110, 115, 115, 111, 115,
- 115, 18, 115, 119, 119, 113, 115, 115, 114, 115,
- 52, 115, 112, 104, 104, 126, 126, 118, 14, 112,
- 112, 122, 12, 51, 9, 9, 50, 50, 119, 11,
- 7, 137, 119, 41, 4, 119, 119, 147, 104, 48,
- 126, nil, 104, 132, 126, 104, 104, 126, 126, 9,
- nil, 50, nil, 9, 28, 28, 9, 9, 50, 50,
- nil, 132, 132, nil, 132, 132, nil, 132, 58, 58,
- nil, 132, 132, nil, 132, nil, 132, nil, nil, 28,
- nil, nil, nil, 28, 148, nil, 28, 28, nil, 39,
- 39, 99, 99, 58, nil, nil, nil, 58, nil, nil,
- 58, 58, 148, 148, nil, 148, 148, nil, 148, nil,
- nil, nil, 148, 148, 39, 148, 99, 148, 39, nil,
- 99, 39, 39, 99, 99, 107, 107, nil, 107, 107,
- nil, 107, nil, nil, nil, 107, 107, nil, 107, nil,
- 107, 0, 0, nil, 0, 0, nil, 0, nil, nil,
- nil, 0, 0, nil, 0, nil, 0, 141, 141, nil,
- 141, 141, nil, 141, nil, nil, nil, 141, 141, nil,
- 141, nil, 141, 67, 67, nil, 67, 67, nil, 67,
- nil, nil, nil, 67, 67, nil, 67, nil, 67, 20,
- 20, nil, 20, 20, nil, 20, nil, nil, nil, 20,
- 20, nil, 20, nil, 20, 81, 81, nil, 81, 81,
+ 143, 93, 54, 83, 125, 105, 125, 125, 55, 83,
+ 55, 107, 107, 91, 107, 107, 91, 107, 96, 66,
+ 33, 107, 107, 123, 107, 93, 107, 66, 143, 67,
+ 54, 143, 143, 54, 54, 143, 55, 54, 70, 55,
+ 55, 91, 71, 55, 91, 91, 96, 115, 91, 96,
+ 96, 123, 72, 96, 123, 123, 104, 104, 123, 112,
+ 112, 119, 119, 73, 46, 115, 115, 76, 115, 115,
+ 46, 115, 126, 126, 38, 115, 115, 38, 115, 15,
+ 115, 104, 99, 99, 112, 104, 119, 15, 104, 104,
+ 119, 112, 112, 119, 119, 57, 61, 126, 132, 57,
+ 57, 126, 82, 63, 126, 126, 85, 99, 50, 50,
+ 26, 99, 25, 40, 99, 99, 132, 132, 97, 132,
+ 132, 21, 132, 103, 149, 52, 132, 132, 65, 132,
+ 106, 132, 43, 50, 28, 28, 58, 58, 51, 111,
+ 50, 50, 149, 149, 19, 149, 149, 113, 149, 114,
+ 18, 118, 149, 149, 133, 149, 41, 149, 122, 28,
+ 14, 58, 62, 28, 12, 58, 28, 28, 58, 58,
+ 39, 39, 133, 133, 11, 133, 133, 7, 133, 9,
+ 9, 137, 133, 133, 48, 133, 4, 133, 148, 24,
+ nil, nil, nil, nil, nil, 39, nil, nil, nil, 39,
+ nil, nil, 39, 39, 9, nil, nil, nil, 9, nil,
+ nil, 9, 9, 0, 0, nil, 0, 0, nil, 0,
+ nil, nil, nil, 0, 0, nil, 0, nil, 0, 141,
+ 141, nil, 141, 141, nil, 141, nil, nil, nil, 141,
+ 141, nil, 141, nil, 141, 81, 81, nil, 81, 81,
nil, 81, nil, nil, nil, 81, 81, nil, 81, nil,
- 81 ]
+ 81, 110, 110, nil, 110, 110, nil, 110, nil, nil,
+ nil, 110, 110, nil, 110, nil, 110, 20, 20, nil,
+ 20, 20, nil, 20, nil, nil, nil, 20, 20, nil,
+ 20, nil, 20 ]
racc_action_pointer = [
- 207, nil, nil, nil, 121, nil, nil, 85, nil, 112,
- nil, 107, 107, nil, 73, -22, nil, nil, 56, 84,
- 255, 62, nil, nil, -7, 59, 50, nil, 142, nil,
- nil, nil, nil, 56, nil, nil, nil, nil, 21, 177,
- 37, 94, nil, 73, nil, nil, 19, nil, 129, nil,
- 114, 108, 65, nil, 13, -1, nil, 11, 156, nil,
- nil, 51, 8, 7, nil, 30, -21, 239, nil, nil,
- 8, -14, 19, 20, nil, nil, 23, nil, nil, nil,
- nil, 271, 45, -6, nil, 50, nil, nil, nil, nil,
- nil, 5, nil, -8, nil, nil, 7, 58, nil, 179,
- nil, nil, nil, 65, 101, 69, 44, 191, nil, nil,
- 46, 82, 75, 89, 63, 62, nil, nil, 72, 91,
- nil, nil, 106, 15, nil, 49, 103, nil, nil, nil,
- nil, nil, 127, nil, nil, nil, nil, 112, nil, nil,
- nil, 223, nil, -3, nil, nil, nil, 92, 168, nil,
- nil ]
+ 189, nil, nil, nil, 183, nil, nil, 142, nil, 177,
+ nil, 162, 159, nil, 125, 52, nil, nil, 115, 144,
+ 253, 116, nil, nil, 175, 107, 97, nil, 132, nil,
+ nil, nil, nil, 15, nil, nil, nil, nil, 72, 168,
+ 78, 127, nil, 123, nil, nil, 35, nil, 184, nil,
+ 106, 133, 90, nil, -1, 5, nil, 91, 134, nil,
+ nil, 88, 153, 98, nil, 93, -8, 24, nil, nil,
+ 25, 6, 44, 54, nil, nil, 34, nil, nil, nil,
+ nil, 221, 87, -6, nil, 94, nil, nil, nil, nil,
+ nil, 10, nil, -8, nil, nil, 15, 110, nil, 80,
+ nil, nil, nil, 119, 54, -1, 95, -13, nil, nil,
+ 237, 133, 57, 141, 114, 41, nil, nil, 116, 59,
+ nil, nil, 153, 20, nil, -2, 70, nil, nil, nil,
+ nil, nil, 92, 148, nil, nil, nil, 172, nil, nil,
+ nil, 205, nil, -3, nil, nil, nil, nil, 153, 118,
+ nil, nil ]
racc_action_default = [
-91, -4, -26, -5, -91, -25, -6, -91, -7, -91,
-8, -91, -91, -9, -91, -91, -10, -11, -91, -91,
-1, -91, -2, -69, -75, -91, -46, -45, -91, -49,
-43, -85, -48, -42, -40, -50, -44, -47, -41, -91,
- -34, -75, -16, -12, -13, -15, -91, -73, -91, -3,
+ -34, -75, -16, -12, -13, -15, -75, -73, -91, -3,
-34, -91, -75, -76, -91, -91, -38, -91, -91, -33,
- -35, -91, -89, -91, -83, -91, -91, -91, -74, 151,
+ -35, -91, -89, -91, -83, -91, -91, -91, -74, 152,
-31, -23, -25, -89, -29, -21, -91, -27, -30, -32,
-28, -91, -91, -91, -79, -82, -65, -64, -66, -68,
-67, -91, -53, -91, -56, -59, -91, -91, -58, -91,
-86, -87, -88, -91, -91, -91, -90, -91, -84, -14,
-91, -91, -24, -91, -34, -91, -77, -78, -91, -91,
-52, -54, -91, -91, -61, -91, -91, -39, -51, -37,
- -19, -36, -91, -72, -17, -22, -18, -20, -70, -80,
- -81, -91, -57, -91, -60, -63, -71, -91, -91, -62,
- -55 ]
+ -19, -36, -91, -91, -17, -22, -18, -20, -70, -80,
+ -81, -91, -57, -91, -60, -63, -71, -72, -91, -91,
+ -62, -55 ]
racc_goto_table = [
- 20, 49, 38, 62, 27, 25, 42, 99, 45, 94,
- 84, 47, 75, 73, 33, 44, 125, 77, 78, 89,
- 89, 38, 79, 27, 56, 92, 105, 131, 95, 57,
- 53, 111, 38, 33, 27, 59, 98, 113, 43, 68,
- 91, 70, 51, 80, 33, 85, 94, 64, 63, 46,
- 71, 38, 83, 27, 103, 74, 89, 42, 82, 45,
- 19, 89, 121, 33, nil, nil, 109, 110, 131, 124,
- nil, nil, nil, nil, 135, 143, 139, 137, 142, 77,
- 78, 115, nil, nil, 79, nil, nil, nil, 89, nil,
- nil, 49, 38, nil, 27, 127, 49, 38, nil, 27,
- 129, nil, nil, 70, 33, 80, nil, 132, 89, 33,
- nil, 85, 38, 49, 27, 140, 149, 74, nil, 38,
- nil, 27, 145, nil, 33, nil, nil, nil, nil, 49,
- nil, 33, nil, nil, nil, nil, nil, nil, nil, nil,
- nil, 148 ]
+ 20, 49, 38, 62, 99, 27, 42, 84, 45, 94,
+ 131, 47, 75, 73, 25, 44, 92, 125, 77, 89,
+ 89, 38, 78, 79, 27, 105, 63, 53, 95, 111,
+ 33, 67, 38, 56, 98, 27, 113, 43, 57, 68,
+ 51, 70, 91, 80, 59, 85, 94, 46, 71, 33,
+ 83, 38, 131, 121, 27, 82, 89, 42, 19, 45,
+ 33, 89, nil, 103, nil, nil, 109, nil, nil, 124,
+ nil, 74, 143, 139, 135, nil, nil, 137, 142, 33,
+ 77, 115, nil, nil, 78, 79, nil, nil, 89, nil,
+ nil, nil, 38, nil, nil, 27, 49, 38, nil, nil,
+ 27, nil, nil, 70, 127, 80, nil, 132, 89, 129,
+ 133, 85, 38, 49, 49, 27, 150, nil, nil, 38,
+ 33, nil, 27, nil, 140, 33, nil, nil, nil, nil,
+ 49, 145, nil, 74, nil, nil, nil, nil, nil, nil,
+ 33, 149, nil, nil, nil, nil, nil, 33 ]
racc_goto_check = [
- 2, 3, 14, 18, 4, 26, 15, 29, 14, 35,
- 44, 14, 21, 18, 20, 13, 38, 23, 24, 30,
- 30, 14, 25, 4, 26, 33, 19, 27, 37, 28,
- 42, 17, 14, 20, 4, 26, 36, 19, 12, 14,
- 32, 15, 39, 14, 20, 14, 35, 42, 40, 41,
- 16, 14, 43, 4, 26, 20, 30, 15, 42, 14,
- 1, 30, 33, 20, nil, nil, 13, 2, 27, 37,
- nil, nil, nil, nil, 21, 29, 44, 18, 35, 23,
- 24, 2, nil, nil, 25, nil, nil, nil, 30, nil,
- nil, 3, 14, nil, 4, 26, 3, 14, nil, 4,
- 26, nil, nil, 15, 20, 14, nil, 2, 30, 20,
- nil, 14, 14, 3, 4, 26, 37, 20, nil, 14,
- nil, 4, 26, nil, 20, nil, nil, nil, nil, 3,
- nil, 20, nil, nil, nil, nil, nil, nil, nil, nil,
- nil, 2 ]
+ 2, 3, 14, 18, 29, 4, 15, 44, 14, 35,
+ 27, 14, 21, 18, 26, 13, 33, 38, 23, 30,
+ 30, 14, 24, 25, 4, 19, 40, 42, 37, 17,
+ 20, 40, 14, 26, 36, 4, 19, 12, 28, 14,
+ 39, 15, 32, 14, 26, 14, 35, 41, 16, 20,
+ 43, 14, 27, 33, 4, 42, 30, 15, 1, 14,
+ 20, 30, nil, 26, nil, nil, 13, nil, nil, 37,
+ nil, 20, 29, 44, 21, nil, nil, 18, 35, 20,
+ 23, 2, nil, nil, 24, 25, nil, nil, 30, nil,
+ nil, nil, 14, nil, nil, 4, 3, 14, nil, nil,
+ 4, nil, nil, 15, 26, 14, nil, 2, 30, 26,
+ 2, 14, 14, 3, 3, 4, 37, nil, nil, 14,
+ 20, nil, 4, nil, 26, 20, nil, nil, nil, nil,
+ 3, 26, nil, 20, nil, nil, nil, nil, nil, nil,
+ 20, 2, nil, nil, nil, nil, nil, 20 ]
racc_goto_pointer = [
- nil, 60, 0, -19, -5, nil, nil, nil, nil, nil,
- nil, nil, 23, 0, -7, -9, 0, -40, -37, -36,
- 5, -38, nil, -33, -32, -28, -4, -79, 1, -50,
- -35, nil, -14, -29, nil, -45, -19, -27, -80, 18,
- 7, 31, 6, 0, -42 ]
+ nil, 58, 0, -19, -4, nil, nil, nil, nil, nil,
+ nil, nil, 22, 0, -7, -9, -2, -42, -37, -37,
+ 21, -38, nil, -32, -28, -27, 5, -96, 10, -53,
+ -35, nil, -12, -38, nil, -45, -21, -27, -79, 16,
+ -15, 29, 3, -2, -45 ]
racc_goto_default = [
nil, nil, nil, 22, 1, 3, 6, 8, 10, 13,
16, 17, nil, nil, 21, 26, nil, nil, nil, nil,
12, nil, 76, 34, 36, 37, nil, 60, nil, nil,
30, 32, nil, nil, 93, 97, nil, nil, nil, nil,
- nil, nil, nil, nil, nil ]
+ nil, nil, 64, nil, nil ]
racc_token_table = {
false => 0,
@@ -1191,9 +1187,9 @@ module_eval <<'.,.,', 'grammar.ra', 515
:names => val[1],
:code => val[4]
}
- #if val[3].is_a?(AST::Name)
- # args[:parentclass] = val[2]
- #end
+ if val[2].is_a?(AST::Name)
+ args[:parentclass] = val[2]
+ end
result = AST::NodeDef.new(args)
result
end