diff options
author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-07-21 19:38:29 +0000 |
---|---|---|
committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-07-21 19:38:29 +0000 |
commit | c8537a51c61290c9ba32d57fed31b389dbbdeb29 (patch) | |
tree | 92e615bfd2d9858e417a10e3942885a2da39aa70 | |
parent | 21ae8fbdcef5b31f4794869b075e344606446555 (diff) | |
download | puppet-c8537a51c61290c9ba32d57fed31b389dbbdeb29.tar.gz |
Apparently objects were legal rvalues, which does not make any sense. Fixed this, and added a test verify.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1418 980ebf18-57e1-0310-9a29-db15c13687c0
-rw-r--r-- | examples/code/failers/noobjectrvalue | 1 | ||||
-rw-r--r-- | lib/puppet/parser/grammar.ra | 1 | ||||
-rw-r--r-- | lib/puppet/parser/parser.rb | 593 |
3 files changed, 293 insertions, 302 deletions
diff --git a/examples/code/failers/noobjectrvalue b/examples/code/failers/noobjectrvalue new file mode 100644 index 000000000..ef6064740 --- /dev/null +++ b/examples/code/failers/noobjectrvalue @@ -0,0 +1 @@ +$variable = file { "/etc/passwd": owner => root } diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra index 289310665..d648d2cf7 100644 --- a/lib/puppet/parser/grammar.ra +++ b/lib/puppet/parser/grammar.ra @@ -308,7 +308,6 @@ rvalue: quotedtext | type | boolean | selector - | object | variable | array | objectref diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb index bb141d8e0..82388aa0b 100644 --- a/lib/puppet/parser/parser.rb +++ b/lib/puppet/parser/parser.rb @@ -1,6 +1,6 @@ # # DO NOT MODIFY!!!! -# This file is automatically generated by racc 1.4.4 +# This file is automatically generated by racc 1.4.5 # from racc grammer file "grammar.ra". # @@ -29,7 +29,7 @@ module Puppet class Parser < Racc::Parser -module_eval <<'..end grammar.ra modeval..idced991013a', 'grammar.ra', 788 +module_eval <<'..end grammar.ra modeval..id99c9ad765d', 'grammar.ra', 787 require 'puppet/parser/functions' attr_reader :file @@ -157,9 +157,9 @@ end # $Id$ -..end grammar.ra modeval..idced991013a +..end grammar.ra modeval..id99c9ad765d -##### racc 1.4.4 generates ### +##### racc 1.4.5 generates ### racc_reduce_table = [ 0, 0, :racc_error, @@ -218,101 +218,100 @@ racc_reduce_table = [ 1, 72, :_reduce_none, 1, 72, :_reduce_none, 1, 72, :_reduce_none, - 1, 72, :_reduce_none, - 4, 78, :_reduce_57, + 4, 78, :_reduce_56, + 1, 62, :_reduce_57, 1, 62, :_reduce_58, - 1, 62, :_reduce_59, - 1, 76, :_reduce_60, - 4, 77, :_reduce_61, - 5, 52, :_reduce_62, + 1, 76, :_reduce_59, + 4, 77, :_reduce_60, + 5, 52, :_reduce_61, 1, 79, :_reduce_none, - 2, 79, :_reduce_64, - 5, 80, :_reduce_65, - 4, 80, :_reduce_66, + 2, 79, :_reduce_63, + 5, 80, :_reduce_64, + 4, 80, :_reduce_65, 1, 81, :_reduce_none, - 3, 81, :_reduce_68, - 3, 70, :_reduce_69, + 3, 81, :_reduce_67, + 3, 70, :_reduce_68, 1, 83, :_reduce_none, - 3, 83, :_reduce_71, + 3, 83, :_reduce_70, 1, 85, :_reduce_none, - 3, 85, :_reduce_73, - 3, 84, :_reduce_74, + 3, 85, :_reduce_72, + 3, 84, :_reduce_73, 1, 82, :_reduce_none, 1, 82, :_reduce_none, 1, 82, :_reduce_none, 1, 82, :_reduce_none, 1, 82, :_reduce_none, 1, 82, :_reduce_none, - 1, 82, :_reduce_81, - 2, 53, :_reduce_82, - 6, 55, :_reduce_83, - 5, 55, :_reduce_84, - 6, 56, :_reduce_85, - 5, 56, :_reduce_86, - 6, 57, :_reduce_87, - 5, 57, :_reduce_88, + 1, 82, :_reduce_80, + 2, 53, :_reduce_81, + 6, 55, :_reduce_82, + 5, 55, :_reduce_83, + 6, 56, :_reduce_84, + 5, 56, :_reduce_85, + 6, 57, :_reduce_86, + 5, 57, :_reduce_87, 1, 88, :_reduce_none, - 3, 88, :_reduce_90, + 3, 88, :_reduce_89, + 1, 89, :_reduce_90, 1, 89, :_reduce_91, 1, 89, :_reduce_92, - 1, 89, :_reduce_93, - 0, 46, :_reduce_94, + 0, 46, :_reduce_93, 1, 86, :_reduce_none, + 3, 86, :_reduce_95, 3, 86, :_reduce_96, - 3, 86, :_reduce_97, 1, 90, :_reduce_none, - 3, 90, :_reduce_99, - 3, 91, :_reduce_100, - 1, 91, :_reduce_101, + 3, 90, :_reduce_98, + 3, 91, :_reduce_99, + 1, 91, :_reduce_100, 1, 87, :_reduce_none, - 2, 87, :_reduce_103, - 1, 61, :_reduce_104, - 3, 71, :_reduce_105, - 2, 71, :_reduce_106, + 2, 87, :_reduce_102, + 1, 61, :_reduce_103, + 3, 71, :_reduce_104, + 2, 71, :_reduce_105, 1, 75, :_reduce_none, 1, 75, :_reduce_none, 0, 66, :_reduce_none, - 1, 66, :_reduce_110 ] + 1, 66, :_reduce_109 ] -racc_reduce_n = 111 +racc_reduce_n = 110 -racc_shift_n = 182 +racc_shift_n = 181 racc_action_table = [ - 47, 34, 37, 154, 32, 18, 47, 34, 37, 60, - 153, 81, 47, 34, 37, 78, 18, -76, -76, 71, - 34, 37, 18, 35, 34, 37, 34, 37, 18, 42, - 100, 130, -75, 48, 49, 42, 30, 55, 30, 48, - 49, 42, 69, 55, 61, 48, 49, -78, 42, 55, + 47, 34, 37, 153, 149, 18, 47, 34, 37, 59, + 152, -76, 47, 34, 37, 77, 18, 34, 37, 70, + 34, 37, 18, 35, -75, 59, 34, 37, 18, 42, + 82, 129, -74, 48, 49, 42, 30, 54, 30, 48, + 49, 42, 68, 54, 60, 48, 49, -74, 42, 54, 47, 34, 37, 35, 42, -77, 47, 34, 37, 35, - 131, 109, 47, 34, 37, 83, 18, 35, 29, 60, - 29, 31, 18, 31, 138, 76, 139, 107, 18, 42, - -78, 159, -75, 48, 49, 42, 146, 55, 81, 48, - 88, 42, 160, 55, 76, 48, 49, 34, 37, 55, - 47, 34, 37, 34, 37, 111, 47, 34, 37, 84, - 143, 73, 47, 34, 37, 169, 18, 113, 115, 112, - 43, 60, 18, 113, 115, 42, 109, 147, 18, 42, - 35, 42, 82, 48, 49, 42, 35, 55, 150, 48, - 49, 42, -77, 55, 107, 48, 49, 73, -79, 55, - 47, 34, 37, 34, 37, 157, 158, 106, 161, 162, - 34, 37, 34, 37, 76, 121, 18, 73, 18, 68, - 67, -80, 171, 66, 109, 18, 35, 18, 69, 42, - 63, 42, 98, 48, 49, 48, 49, 55, 42, 55, - 42, 32, 48, 49, 48, 49, 55, 26, 55, 34, - 37, 34, 37, 104, nil, 152, nil, nil, 34, 37, + -76, 130, 47, 34, 37, 75, 18, 108, 29, 158, + 29, 31, 18, 31, 35, 75, 110, 106, 18, 42, + 159, 137, 138, 48, 49, 42, 145, 54, 80, 48, + 87, 42, -77, 54, 83, 48, 49, 34, 37, 54, + 47, 34, 37, 34, 37, 111, 47, 34, 37, 112, + 114, 142, 47, 34, 37, 168, 18, 112, 114, 72, + 43, 108, 18, 106, 146, 42, 81, -79, 18, 42, + 35, 42, 80, 48, 49, 42, 35, 54, -75, 48, + 49, 42, 72, 54, -78, 48, 49, 156, 157, 54, + 47, 34, 37, 34, 37, 105, 160, 161, 75, 72, + 34, 37, 34, 37, 67, 120, 18, 66, 18, 97, + 170, 65, 108, 35, 68, 18, 62, 18, 99, 42, + 32, 42, 26, 48, 49, 48, 49, 54, 42, 54, + 42, 103, 48, 49, 48, 49, 54, nil, 54, 34, + 37, 34, 37, nil, nil, 151, nil, nil, 34, 37, nil, nil, nil, nil, 18, nil, 18, nil, nil, nil, - nil, nil, nil, 18, nil, nil, nil, 42, 164, 42, - nil, 48, 49, 48, 49, 55, 42, 55, nil, 18, - 48, 49, nil, 166, 55, nil, nil, nil, nil, 15, - 17, nil, 22, 24, 18, 3, nil, 9, 181, 12, + nil, nil, nil, 18, nil, nil, nil, 42, 163, 42, + nil, 48, 49, 48, 49, 54, 42, 54, nil, 18, + 48, 49, nil, 165, 54, nil, nil, nil, nil, 15, + 17, nil, 22, 24, 18, 3, nil, 9, 180, 12, nil, 19, nil, nil, 15, 17, nil, 22, 24, 18, - 3, nil, 9, 167, 12, nil, 19, nil, nil, 15, - 17, nil, 22, 24, 18, 3, nil, 9, 176, 12, + 3, nil, 9, 166, 12, nil, 19, nil, nil, 15, + 17, nil, 22, 24, 18, 3, nil, 9, 175, 12, nil, 19, nil, nil, 15, 17, nil, 22, 24, 18, - 3, nil, 9, 141, 12, nil, 19, nil, nil, 15, - 17, nil, 22, 24, 18, 3, nil, 9, 180, 12, + 3, nil, 9, 140, 12, nil, 19, nil, nil, 15, + 17, nil, 22, 24, 18, 3, nil, 9, 179, 12, nil, 19, nil, nil, 15, 17, nil, 22, 24, 18, - 3, nil, 9, 177, 12, nil, 19, nil, nil, 15, + 3, nil, 9, 176, 12, nil, 19, nil, nil, 15, 17, nil, 22, 24, 18, 3, nil, 9, nil, 12, nil, 19, nil, nil, 15, 17, nil, 22, 24, 18, 3, nil, 9, nil, 12, nil, 19, nil, nil, 15, @@ -321,165 +320,159 @@ racc_action_table = [ 3, nil, 9, nil, 12, nil, 19 ] racc_action_check = [ - 66, 66, 66, 128, 46, 19, 131, 131, 131, 13, - 128, 49, 47, 47, 47, 47, 66, 46, 86, 27, - 43, 43, 131, 19, 15, 15, 81, 81, 47, 66, - 63, 89, 92, 66, 66, 131, 3, 66, 71, 131, - 131, 47, 27, 131, 13, 47, 47, 93, 43, 47, - 114, 114, 114, 43, 81, 94, 60, 60, 60, 81, - 95, 97, 83, 83, 83, 54, 114, 100, 3, 54, - 71, 3, 60, 71, 101, 116, 103, 88, 83, 114, - 57, 134, 54, 114, 114, 60, 116, 114, 88, 60, - 60, 83, 134, 60, 77, 83, 83, 76, 76, 83, - 12, 12, 12, 9, 9, 77, 147, 147, 147, 56, - 108, 109, 162, 162, 162, 149, 12, 149, 149, 80, - 9, 65, 147, 80, 80, 76, 75, 119, 162, 12, - 76, 9, 52, 12, 12, 147, 9, 12, 125, 147, - 147, 162, 58, 147, 73, 162, 162, 130, 45, 162, - 107, 107, 107, 84, 84, 132, 133, 72, 135, 137, - 154, 154, 82, 82, 36, 82, 107, 32, 84, 26, - 24, 59, 153, 22, 155, 154, 159, 82, 67, 107, - 17, 84, 61, 107, 107, 84, 84, 107, 154, 84, - 82, 4, 154, 154, 82, 82, 154, 2, 82, 170, - 170, 126, 126, 69, nil, 126, nil, nil, 121, 121, - nil, nil, nil, nil, 170, nil, 126, nil, nil, nil, - nil, nil, nil, 121, nil, nil, nil, 170, 138, 126, - nil, 170, 170, 126, 126, 170, 121, 126, nil, 138, - 121, 121, nil, 139, 121, nil, nil, nil, nil, 138, - 138, nil, 138, 138, 139, 138, nil, 138, 179, 138, - nil, 138, nil, nil, 139, 139, nil, 139, 139, 179, - 139, nil, 139, 140, 139, nil, 139, nil, nil, 179, - 179, nil, 179, 179, 140, 179, nil, 179, 163, 179, - nil, 179, nil, nil, 140, 140, nil, 140, 140, 163, - 140, nil, 140, 106, 140, nil, 140, nil, nil, 163, - 163, nil, 163, 163, 106, 163, nil, 163, 171, 163, - nil, 163, nil, nil, 106, 106, nil, 106, 106, 171, - 106, nil, 106, 165, 106, nil, 106, nil, nil, 171, - 171, nil, 171, 171, 165, 171, nil, 171, nil, 171, - nil, 171, nil, nil, 165, 165, nil, 165, 165, 6, - 165, nil, 165, nil, 165, nil, 165, nil, nil, 6, + 65, 65, 65, 127, 124, 19, 130, 130, 130, 13, + 127, 57, 47, 47, 47, 47, 65, 15, 15, 27, + 43, 43, 130, 19, 85, 64, 80, 80, 47, 65, + 53, 88, 91, 65, 65, 130, 3, 65, 70, 130, + 130, 47, 27, 130, 13, 47, 47, 53, 43, 47, + 113, 113, 113, 43, 80, 92, 59, 59, 59, 80, + 93, 94, 82, 82, 82, 76, 113, 96, 3, 133, + 70, 3, 59, 70, 99, 115, 76, 87, 82, 113, + 133, 100, 102, 113, 113, 59, 115, 113, 87, 59, + 59, 82, 56, 59, 55, 82, 82, 75, 75, 82, + 12, 12, 12, 9, 9, 79, 146, 146, 146, 79, + 79, 107, 161, 161, 161, 148, 12, 148, 148, 108, + 9, 74, 146, 72, 118, 75, 51, 58, 161, 12, + 75, 9, 49, 12, 12, 146, 9, 12, 46, 146, + 146, 161, 129, 146, 45, 161, 161, 131, 132, 161, + 106, 106, 106, 83, 83, 71, 134, 136, 36, 32, + 153, 153, 81, 81, 26, 81, 106, 24, 83, 60, + 152, 22, 154, 158, 66, 153, 17, 81, 62, 106, + 4, 83, 2, 106, 106, 83, 83, 106, 153, 83, + 81, 68, 153, 153, 81, 81, 153, nil, 81, 169, + 169, 125, 125, nil, nil, 125, nil, nil, 120, 120, + nil, nil, nil, nil, 169, nil, 125, nil, nil, nil, + nil, nil, nil, 120, nil, nil, nil, 169, 137, 125, + nil, 169, 169, 125, 125, 169, 120, 125, nil, 137, + 120, 120, nil, 138, 120, nil, nil, nil, nil, 137, + 137, nil, 137, 137, 138, 137, nil, 137, 178, 137, + nil, 137, nil, nil, 138, 138, nil, 138, 138, 178, + 138, nil, 138, 139, 138, nil, 138, nil, nil, 178, + 178, nil, 178, 178, 139, 178, nil, 178, 162, 178, + nil, 178, nil, nil, 139, 139, nil, 139, 139, 162, + 139, nil, 139, 105, 139, nil, 139, nil, nil, 162, + 162, nil, 162, 162, 105, 162, nil, 162, 170, 162, + nil, 162, nil, nil, 105, 105, nil, 105, 105, 170, + 105, nil, 105, 164, 105, nil, 105, nil, nil, 170, + 170, nil, 170, 170, 164, 170, nil, 170, nil, 170, + nil, 170, nil, nil, 164, 164, nil, 164, 164, 6, + 164, nil, 164, nil, 164, nil, 164, nil, nil, 6, 6, nil, 6, 6, 0, 6, nil, 6, nil, 6, nil, 6, nil, nil, 0, 0, nil, 0, 0, nil, 0, nil, 0, nil, 0, nil, 0 ] racc_action_pointer = [ - 356, nil, 197, 32, 185, nil, 341, nil, nil, 100, - nil, nil, 98, 3, nil, 21, nil, 144, nil, -13, - nil, nil, 160, nil, 134, nil, 169, 9, nil, nil, - nil, nil, 131, nil, nil, nil, 154, nil, nil, nil, - nil, nil, nil, 17, nil, 129, -2, 10, nil, -9, - nil, nil, 113, nil, 63, nil, 103, 61, 123, 152, - 54, 140, nil, 10, nil, 115, -2, 145, nil, 167, - nil, 34, 151, 135, nil, 116, 94, 84, nil, nil, - 114, 23, 159, 60, 150, nil, -1, nil, 68, 14, - nil, nil, 13, 28, 36, 23, nil, 51, nil, nil, - 31, 68, nil, 70, nil, nil, 296, 148, 103, 75, - nil, nil, nil, nil, 48, nil, 65, nil, nil, 118, - nil, 205, nil, nil, nil, 133, 198, nil, -7, nil, - 111, 4, 148, 149, 71, 137, nil, 146, 221, 236, - 266, nil, nil, nil, nil, nil, nil, 104, nil, 108, - nil, nil, nil, 166, 157, 164, nil, nil, nil, 140, - nil, nil, 110, 281, nil, 326, nil, nil, nil, nil, - 196, 311, nil, nil, nil, nil, nil, nil, nil, 251, - nil, nil ] + 356, nil, 182, 32, 174, nil, 341, nil, nil, 100, + nil, nil, 98, 3, nil, 14, nil, 140, nil, -13, + nil, nil, 158, nil, 131, nil, 164, 9, nil, nil, + nil, nil, 123, nil, nil, nil, 148, nil, nil, nil, + nil, nil, nil, 17, nil, 125, 119, 10, nil, 112, + nil, 107, nil, 28, nil, 88, 73, -8, 108, 54, + 127, nil, 158, nil, 19, -2, 141, nil, 155, nil, + 34, 149, 114, nil, 111, 94, 55, nil, nil, 100, + 23, 159, 60, 150, nil, 5, nil, 68, 14, nil, + nil, 13, 36, 41, 24, nil, 57, nil, nil, 38, + 75, nil, 76, nil, nil, 296, 148, 104, 83, nil, + nil, nil, nil, 48, nil, 65, nil, nil, 115, nil, + 205, nil, nil, nil, -1, 198, nil, -7, nil, 106, + 4, 140, 141, 59, 135, nil, 144, 221, 236, 266, + nil, nil, nil, nil, nil, nil, 104, nil, 108, nil, + nil, nil, 164, 157, 162, nil, nil, nil, 137, nil, + nil, 110, 281, nil, 326, nil, nil, nil, nil, 196, + 311, nil, nil, nil, nil, nil, nil, nil, 251, nil, + nil ] racc_action_default = [ - -94, -12, -111, -111, -111, -13, -1, -14, -2, -32, - -3, -5, -111, -111, -6, -111, -7, -111, -33, -111, - -8, -9, -111, -10, -111, -11, -111, -94, -89, -91, - -92, -93, -41, -4, -58, -32, -16, -59, -17, -19, - -20, -21, -104, -111, -55, -56, -49, -111, -60, -32, - -52, -51, -111, -54, -48, -81, -111, -53, -47, -50, - -41, -111, -82, -94, -25, -111, -111, -94, 182, -111, - -102, -111, -111, -111, -42, -109, -111, -111, -106, -45, - -111, -111, -111, -111, -111, -79, -36, -28, -32, -111, - -37, -39, -35, -38, -34, -30, -80, -109, -26, -95, - -94, -111, -40, -111, -103, -90, -111, -111, -111, -110, - -18, -15, -105, -107, -111, -108, -111, -76, -75, -111, - -78, -111, -69, -77, -70, -111, -111, -63, -111, -67, - -41, -31, -111, -111, -111, -111, -98, -101, -111, -111, - -111, -88, -44, -24, -43, -46, -57, -111, -72, -111, - -61, -64, -62, -111, -111, -109, -29, -22, -23, -111, - -97, -96, -111, -111, -84, -111, -86, -87, -74, -71, - -111, -111, -68, -27, -99, -100, -83, -85, -73, -111, - -66, -65 ] + -93, -12, -110, -110, -110, -13, -1, -14, -2, -32, + -3, -5, -110, -110, -6, -110, -7, -110, -33, -110, + -8, -9, -110, -10, -110, -11, -110, -93, -88, -90, + -91, -92, -41, -4, -57, -32, -16, -58, -17, -19, + -20, -21, -103, -110, -54, -55, -49, -110, -59, -32, + -51, -110, -53, -48, -80, -110, -52, -47, -50, -41, + -110, -81, -93, -25, -110, -110, -93, 181, -110, -101, + -110, -110, -110, -42, -108, -110, -110, -105, -45, -110, + -110, -110, -110, -110, -78, -36, -28, -32, -110, -37, + -39, -35, -38, -34, -30, -79, -108, -26, -94, -93, + -110, -40, -110, -102, -89, -110, -110, -110, -109, -18, + -15, -104, -106, -110, -107, -110, -75, -74, -110, -77, + -110, -68, -76, -69, -110, -110, -62, -110, -66, -41, + -31, -110, -110, -110, -110, -97, -100, -110, -110, -110, + -87, -44, -24, -43, -46, -56, -110, -71, -110, -60, + -63, -61, -110, -110, -108, -29, -22, -23, -110, -96, + -95, -110, -110, -83, -110, -85, -86, -73, -70, -110, + -110, -67, -27, -98, -99, -82, -84, -72, -110, -65, + -64 ] racc_goto_table = [ - 33, 6, 40, 8, 75, 124, 41, 108, 119, 127, - 129, 36, 62, 114, 50, 90, 72, 91, 149, 87, - 80, 64, 132, 28, 122, 95, 126, 101, 144, 133, - 56, 27, 97, 136, 110, 134, 40, 2, 39, nil, - 41, 54, nil, nil, 148, 77, nil, 119, 65, 50, - nil, 151, 129, 93, nil, nil, 103, 94, nil, nil, - nil, nil, nil, nil, nil, 79, 99, nil, 50, 40, - nil, nil, 39, 41, 40, 120, 54, 120, 41, 123, - 172, 123, 170, 116, 102, 50, 90, 173, 91, 92, - 156, 105, 174, 178, nil, 54, 119, nil, 46, nil, - nil, 125, 155, 135, nil, 39, nil, 140, nil, 50, - 39, 118, 54, 118, 120, nil, 50, nil, 123, 120, - nil, nil, nil, 123, 93, 142, nil, nil, 94, 137, - nil, nil, 145, 46, 33, nil, 54, nil, nil, 163, - 165, nil, nil, 54, nil, nil, 86, 120, nil, 50, - 118, 123, 46, 85, nil, 118, nil, 33, nil, 33, - 92, nil, nil, 120, 50, 168, nil, 123, 117, 46, - 117, nil, 179, 33, nil, 85, 54, 85, nil, nil, - 175, nil, nil, 118, 96, nil, nil, nil, 137, nil, - nil, 54, nil, 46, nil, nil, nil, nil, nil, 118, - 46, nil, nil, nil, nil, nil, 96, 117, 96, nil, - nil, nil, 117, nil, 85, nil, nil, 86, nil, 85, - nil, nil, nil, nil, 85, nil, nil, nil, nil, nil, - nil, nil, nil, 46, nil, nil, nil, nil, nil, nil, - 117, nil, nil, nil, nil, 96, nil, 85, 46, nil, - 96, nil, nil, nil, nil, 96, 117, nil, nil, nil, - nil, nil, nil, 85, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, nil, 96, nil, - nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, 96 ] + 33, 6, 74, 39, 8, 107, 53, 89, 135, 123, + 126, 86, 36, 64, 109, 40, 71, 90, 125, 79, + 94, 121, 113, 131, 148, 28, 100, 132, 143, 96, + 41, 27, 63, 133, 2, nil, 61, 39, nil, nil, + 118, 53, 128, nil, nil, nil, 76, nil, 147, 40, + nil, nil, 150, 91, nil, 102, nil, nil, nil, 53, + nil, nil, nil, nil, 41, 92, 98, 173, nil, 39, + nil, nil, nil, nil, 39, 117, 53, 117, 89, 118, + 93, 40, 155, 115, 128, 172, 40, 119, 90, 119, + 55, 169, 104, 136, nil, 46, 41, 177, nil, 154, + 53, 41, 122, 134, 122, nil, 139, 53, nil, nil, + nil, nil, 171, nil, 117, nil, nil, nil, nil, 117, + nil, nil, nil, nil, 91, 78, 119, nil, 118, nil, + 46, 119, nil, 33, nil, nil, 92, nil, 162, 164, + 53, 122, 85, 101, nil, nil, 122, 117, 46, nil, + nil, 93, 136, nil, 84, 53, 33, 95, 33, 119, + 124, nil, nil, 117, 116, 46, 116, nil, nil, nil, + nil, 178, 33, nil, 122, 119, 84, nil, 84, 95, + nil, 95, nil, nil, 141, nil, nil, nil, nil, 46, + 122, 144, nil, nil, nil, nil, 46, nil, nil, nil, + nil, nil, nil, 116, nil, nil, nil, nil, 116, nil, + nil, nil, nil, 85, nil, 84, nil, nil, 95, nil, + 84, nil, nil, 95, 167, 84, nil, nil, 95, 46, + nil, nil, nil, nil, nil, nil, 116, nil, nil, 174, + nil, nil, nil, nil, 46, nil, nil, nil, 84, nil, + nil, 95, 116, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, 84, nil, nil, 95 ] racc_goto_check = [ - 4, 2, 18, 3, 22, 41, 19, 23, 39, 37, - 39, 15, 19, 32, 5, 27, 44, 28, 42, 25, - 31, 5, 21, 46, 40, 20, 36, 43, 30, 23, - 29, 45, 22, 48, 16, 47, 18, 1, 17, nil, - 19, 17, nil, nil, 41, 15, nil, 39, 17, 5, - nil, 37, 39, 18, nil, nil, 44, 19, nil, nil, - nil, nil, nil, nil, nil, 29, 3, nil, 5, 18, - nil, nil, 17, 19, 18, 18, 17, 18, 19, 19, - 39, 19, 32, 15, 29, 5, 27, 23, 28, 17, - 25, 46, 48, 41, nil, 17, 39, nil, 24, nil, - nil, 29, 22, 3, nil, 17, nil, 2, nil, 5, - 17, 17, 17, 17, 18, nil, 5, nil, 19, 18, - nil, nil, nil, 19, 18, 29, nil, nil, 19, 17, - nil, nil, 29, 24, 4, nil, 17, nil, nil, 2, - 2, nil, nil, 17, nil, nil, 24, 18, nil, 5, - 17, 19, 24, 35, nil, 17, nil, 4, nil, 4, - 17, nil, nil, 18, 5, 29, nil, 19, 24, 24, - 24, nil, 2, 4, nil, 35, 17, 35, nil, nil, - 29, nil, nil, 17, 33, nil, nil, nil, 17, nil, - nil, 17, nil, 24, nil, nil, nil, nil, nil, 17, - 24, nil, nil, nil, nil, nil, 33, 24, 33, nil, - nil, nil, 24, nil, 35, nil, nil, 24, nil, 35, - nil, nil, nil, nil, 35, nil, nil, nil, nil, nil, - nil, nil, nil, 24, nil, nil, nil, nil, nil, nil, - 24, nil, nil, nil, nil, 33, nil, 35, 24, nil, - 33, nil, nil, nil, nil, 33, 24, nil, nil, nil, - nil, nil, nil, 35, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, nil, 33, nil, - nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, - nil, nil, nil, nil, 33 ] + 4, 2, 22, 17, 3, 23, 17, 27, 48, 41, + 37, 25, 15, 17, 16, 18, 44, 28, 36, 31, + 20, 40, 32, 21, 42, 46, 43, 23, 30, 22, + 19, 45, 5, 47, 1, nil, 19, 17, nil, nil, + 39, 17, 39, nil, nil, nil, 15, nil, 41, 18, + nil, nil, 37, 17, nil, 44, nil, nil, nil, 17, + nil, nil, nil, nil, 19, 18, 3, 48, nil, 17, + nil, nil, nil, nil, 17, 17, 17, 17, 27, 39, + 19, 18, 25, 15, 39, 23, 18, 18, 28, 18, + 29, 32, 46, 17, nil, 24, 19, 41, nil, 22, + 17, 19, 19, 3, 19, nil, 2, 17, nil, nil, + nil, nil, 39, nil, 17, nil, nil, nil, nil, 17, + nil, nil, nil, nil, 17, 29, 18, nil, 39, nil, + 24, 18, nil, 4, nil, nil, 18, nil, 2, 2, + 17, 19, 24, 29, nil, nil, 19, 17, 24, nil, + nil, 19, 17, nil, 35, 17, 4, 33, 4, 18, + 29, nil, nil, 17, 24, 24, 24, nil, nil, nil, + nil, 2, 4, nil, 19, 18, 35, nil, 35, 33, + nil, 33, nil, nil, 29, nil, nil, nil, nil, 24, + 19, 29, nil, nil, nil, nil, 24, nil, nil, nil, + nil, nil, nil, 24, nil, nil, nil, nil, 24, nil, + nil, nil, nil, 24, nil, 35, nil, nil, 33, nil, + 35, nil, nil, 33, 29, 35, nil, nil, 33, 24, + nil, nil, nil, nil, nil, nil, 24, nil, nil, 29, + nil, nil, nil, nil, 24, nil, nil, nil, 35, nil, + nil, 33, 24, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, 35, nil, nil, 33 ] racc_goto_pointer = [ - nil, 37, 1, 3, -6, 2, nil, nil, nil, nil, - nil, nil, nil, nil, nil, 2, -42, 29, -7, -3, - -35, -73, -28, -68, 86, -41, nil, -45, -43, 18, - -81, -27, -67, 124, nil, 93, -58, -75, nil, -74, - -58, -77, -103, -36, -11, 28, 20, -65, -67 ] + nil, 34, 1, 4, -6, 13, nil, nil, nil, nil, + nil, nil, nil, nil, nil, 3, -61, -6, 6, 21, + -39, -71, -30, -69, 83, -48, nil, -52, -42, 78, + -80, -28, -57, 98, nil, 95, -65, -73, nil, -41, + -60, -72, -96, -36, -11, 28, 22, -66, -91 ] racc_goto_default = [ - nil, nil, nil, 70, 10, 11, 14, 16, 20, 21, - 23, 25, 1, 5, 7, nil, 38, 13, 57, 58, - nil, nil, nil, nil, 4, nil, 89, 51, 53, nil, - 74, nil, nil, 59, 44, 45, nil, nil, 128, 52, + nil, nil, nil, 69, 10, 11, 14, 16, 20, 21, + 23, 25, 1, 5, 7, nil, 38, 13, 56, 57, + nil, nil, nil, nil, 4, nil, 88, 50, 52, nil, + 73, nil, nil, 58, 44, 45, nil, nil, 127, 51, nil, nil, nil, nil, nil, nil, nil, nil, nil ] racc_token_table = { @@ -1026,10 +1019,8 @@ module_eval <<'.,.,', 'grammar.ra', 304 # reduce 55 omitted - # reduce 56 omitted - -module_eval <<'.,.,', 'grammar.ra', 327 - def _reduce_57( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 326 + def _reduce_56( val, _values, result ) args = aryfy(val[2]) result = AST::Function.new( :line => @lexer.line, @@ -1042,8 +1033,8 @@ module_eval <<'.,.,', 'grammar.ra', 327 end .,., -module_eval <<'.,.,', 'grammar.ra', 335 - def _reduce_58( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 334 + def _reduce_57( val, _values, result ) result = AST::String.new( :line => @lexer.line, :file => @lexer.file, @@ -1053,8 +1044,8 @@ module_eval <<'.,.,', 'grammar.ra', 335 end .,., -module_eval <<'.,.,', 'grammar.ra', 341 - def _reduce_59( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 340 + def _reduce_58( val, _values, result ) result = AST::FlatString.new( :line => @lexer.line, :file => @lexer.file, @@ -1064,8 +1055,8 @@ module_eval <<'.,.,', 'grammar.ra', 341 end .,., -module_eval <<'.,.,', 'grammar.ra', 349 - def _reduce_60( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 348 + def _reduce_59( val, _values, result ) result = AST::Boolean.new( :line => @lexer.line, :file => @lexer.file, @@ -1075,8 +1066,8 @@ module_eval <<'.,.,', 'grammar.ra', 349 end .,., -module_eval <<'.,.,', 'grammar.ra', 359 - def _reduce_61( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 358 + def _reduce_60( val, _values, result ) result = AST::ObjectRef.new( :pin => '[]', :line => @lexer.line, @@ -1088,8 +1079,8 @@ module_eval <<'.,.,', 'grammar.ra', 359 end .,., -module_eval <<'.,.,', 'grammar.ra', 376 - def _reduce_62( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 375 + def _reduce_61( val, _values, result ) options = val[3] unless options.instance_of?(AST::ASTArray) options = AST::ASTArray.new( @@ -1108,10 +1099,10 @@ module_eval <<'.,.,', 'grammar.ra', 376 end .,., - # reduce 63 omitted + # reduce 62 omitted -module_eval <<'.,.,', 'grammar.ra', 390 - def _reduce_64( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 389 + def _reduce_63( val, _values, result ) if val[0].instance_of?(AST::ASTArray) val[0].push val[1] result = val[0] @@ -1126,8 +1117,8 @@ module_eval <<'.,.,', 'grammar.ra', 390 end .,., -module_eval <<'.,.,', 'grammar.ra', 400 - def _reduce_65( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 399 + def _reduce_64( val, _values, result ) result = AST::CaseOpt.new( :pin => ":", :value => val[0], @@ -1139,8 +1130,8 @@ module_eval <<'.,.,', 'grammar.ra', 400 end .,., -module_eval <<'.,.,', 'grammar.ra', 412 - def _reduce_66( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 411 + def _reduce_65( val, _values, result ) result = AST::CaseOpt.new( :pin => ":", :value => val[0], @@ -1156,10 +1147,10 @@ module_eval <<'.,.,', 'grammar.ra', 412 end .,., - # reduce 67 omitted + # reduce 66 omitted -module_eval <<'.,.,', 'grammar.ra', 426 - def _reduce_68( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 425 + def _reduce_67( val, _values, result ) if val[0].instance_of?(AST::ASTArray) val[0].push(val[2]) result = val[0] @@ -1174,8 +1165,8 @@ module_eval <<'.,.,', 'grammar.ra', 426 end .,., -module_eval <<'.,.,', 'grammar.ra', 436 - def _reduce_69( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 435 + def _reduce_68( val, _values, result ) result = AST::Selector.new( :pin => "?", :line => @lexer.line, @@ -1187,19 +1178,19 @@ module_eval <<'.,.,', 'grammar.ra', 436 end .,., - # reduce 70 omitted + # reduce 69 omitted -module_eval <<'.,.,', 'grammar.ra', 438 - def _reduce_71( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 437 + def _reduce_70( val, _values, result ) result = val[1] result end .,., - # reduce 72 omitted + # reduce 71 omitted -module_eval <<'.,.,', 'grammar.ra', 453 - def _reduce_73( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 452 + def _reduce_72( val, _values, result ) if val[0].instance_of?(AST::ASTArray) val[0].push(val[2]) result = val[0] @@ -1214,8 +1205,8 @@ module_eval <<'.,.,', 'grammar.ra', 453 end .,., -module_eval <<'.,.,', 'grammar.ra', 463 - def _reduce_74( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 462 + def _reduce_73( val, _values, result ) result = AST::ObjectParam.new( :pin => "=>", :line => @lexer.line, @@ -1227,6 +1218,8 @@ module_eval <<'.,.,', 'grammar.ra', 463 end .,., + # reduce 74 omitted + # reduce 75 omitted # reduce 76 omitted @@ -1237,10 +1230,8 @@ module_eval <<'.,.,', 'grammar.ra', 463 # reduce 79 omitted - # reduce 80 omitted - -module_eval <<'.,.,', 'grammar.ra', 477 - def _reduce_81( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 476 + def _reduce_80( val, _values, result ) result = AST::Default.new( :line => @lexer.line, :file => @lexer.file, @@ -1250,8 +1241,8 @@ module_eval <<'.,.,', 'grammar.ra', 477 end .,., -module_eval <<'.,.,', 'grammar.ra', 536 - def _reduce_82( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 535 + def _reduce_81( val, _values, result ) # importing files # yuk, i hate keywords # we'll probably have to have some kind of search path eventually @@ -1312,8 +1303,8 @@ module_eval <<'.,.,', 'grammar.ra', 536 end .,., -module_eval <<'.,.,', 'grammar.ra', 547 - def _reduce_83( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 546 + def _reduce_82( val, _values, result ) result = AST::CompDef.new( :type => AST::Name.new(:value => val[1], :line => @lexer.line), :args => val[2], @@ -1326,8 +1317,8 @@ module_eval <<'.,.,', 'grammar.ra', 547 end .,., -module_eval <<'.,.,', 'grammar.ra', 560 - def _reduce_84( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 559 + def _reduce_83( val, _values, result ) result = AST::CompDef.new( :type => AST::Name.new(:value => val[1], :line => @lexer.line), :args => val[2], @@ -1344,8 +1335,8 @@ module_eval <<'.,.,', 'grammar.ra', 560 end .,., -module_eval <<'.,.,', 'grammar.ra', 577 - def _reduce_85( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 576 + def _reduce_84( val, _values, result ) #:args => val[2], args = { :type => AST::Name.new(:value => val[1], :line => @lexer.line), @@ -1363,8 +1354,8 @@ module_eval <<'.,.,', 'grammar.ra', 577 end .,., -module_eval <<'.,.,', 'grammar.ra', 594 - def _reduce_86( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 593 + def _reduce_85( val, _values, result ) args = { :type => AST::Name.new(:value => val[1], :line => @lexer.line), :file => @lexer.file, @@ -1385,8 +1376,8 @@ module_eval <<'.,.,', 'grammar.ra', 594 end .,., -module_eval <<'.,.,', 'grammar.ra', 615 - def _reduce_87( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 614 + def _reduce_86( val, _values, result ) unless val[1].instance_of?(AST::ASTArray) val[1] = AST::ASTArray.new( :line => val[1].line, @@ -1409,8 +1400,8 @@ module_eval <<'.,.,', 'grammar.ra', 615 end .,., -module_eval <<'.,.,', 'grammar.ra', 638 - def _reduce_88( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 637 + def _reduce_87( val, _values, result ) unless val[1].instance_of?(AST::ASTArray) val[1] = AST::ASTArray.new( :line => val[1].line, @@ -1437,10 +1428,10 @@ module_eval <<'.,.,', 'grammar.ra', 638 end .,., - # reduce 89 omitted + # reduce 88 omitted -module_eval <<'.,.,', 'grammar.ra', 653 - def _reduce_90( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 652 + def _reduce_89( val, _values, result ) if val[0].instance_of?(AST::ASTArray) result = val[0] result.push val[2] @@ -1455,8 +1446,8 @@ module_eval <<'.,.,', 'grammar.ra', 653 end .,., -module_eval <<'.,.,', 'grammar.ra', 661 - def _reduce_91( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 660 + def _reduce_90( val, _values, result ) result = AST::HostName.new( :line => @lexer.line, :file => @lexer.file, @@ -1466,8 +1457,8 @@ module_eval <<'.,.,', 'grammar.ra', 661 end .,., -module_eval <<'.,.,', 'grammar.ra', 667 - def _reduce_92( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 666 + def _reduce_91( val, _values, result ) result = AST::HostName.new( :line => @lexer.line, :file => @lexer.file, @@ -1477,8 +1468,8 @@ module_eval <<'.,.,', 'grammar.ra', 667 end .,., -module_eval <<'.,.,', 'grammar.ra', 673 - def _reduce_93( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 672 + def _reduce_92( val, _values, result ) result = AST::Default.new( :line => @lexer.line, :file => @lexer.file, @@ -1488,8 +1479,8 @@ module_eval <<'.,.,', 'grammar.ra', 673 end .,., -module_eval <<'.,.,', 'grammar.ra', 681 - def _reduce_94( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 680 + def _reduce_93( val, _values, result ) result = AST::ASTArray.new( :line => @lexer.line, :file => @lexer.file, @@ -1499,17 +1490,17 @@ module_eval <<'.,.,', 'grammar.ra', 681 end .,., - # reduce 95 omitted + # reduce 94 omitted -module_eval <<'.,.,', 'grammar.ra', 686 - def _reduce_96( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 685 + def _reduce_95( val, _values, result ) result = val[1] result end .,., -module_eval <<'.,.,', 'grammar.ra', 697 - def _reduce_97( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 696 + def _reduce_96( val, _values, result ) if val[1].instance_of?(AST::ASTArray) result = val[1] else @@ -1523,10 +1514,10 @@ module_eval <<'.,.,', 'grammar.ra', 697 end .,., - # reduce 98 omitted + # reduce 97 omitted -module_eval <<'.,.,', 'grammar.ra', 711 - def _reduce_99( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 710 + def _reduce_98( val, _values, result ) if val[0].instance_of?(AST::ASTArray) val[0].push(val[2]) result = val[0] @@ -1541,8 +1532,8 @@ module_eval <<'.,.,', 'grammar.ra', 711 end .,., -module_eval <<'.,.,', 'grammar.ra', 719 - def _reduce_100( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 718 + def _reduce_99( val, _values, result ) result = AST::CompArgument.new( :line => @lexer.line, :file => @lexer.file, @@ -1552,8 +1543,8 @@ module_eval <<'.,.,', 'grammar.ra', 719 end .,., -module_eval <<'.,.,', 'grammar.ra', 726 - def _reduce_101( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 725 + def _reduce_100( val, _values, result ) result = AST::CompArgument.new( :line => @lexer.line, :file => @lexer.file, @@ -1563,10 +1554,10 @@ module_eval <<'.,.,', 'grammar.ra', 726 end .,., - # reduce 102 omitted + # reduce 101 omitted -module_eval <<'.,.,', 'grammar.ra', 735 - def _reduce_103( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 734 + def _reduce_102( val, _values, result ) result = AST::Name.new( :value => val[1], :file => @lexer.file, @@ -1576,8 +1567,8 @@ module_eval <<'.,.,', 'grammar.ra', 735 end .,., -module_eval <<'.,.,', 'grammar.ra', 744 - def _reduce_104( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 743 + def _reduce_103( val, _values, result ) name = val[0].sub(/^\$/,'') result = AST::Variable.new( :line => @lexer.line, @@ -1588,8 +1579,8 @@ module_eval <<'.,.,', 'grammar.ra', 744 end .,., -module_eval <<'.,.,', 'grammar.ra', 756 - def _reduce_105( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 755 + def _reduce_104( val, _values, result ) if val[1].instance_of?(AST::ASTArray) result = val[1] else @@ -1603,8 +1594,8 @@ module_eval <<'.,.,', 'grammar.ra', 756 end .,., -module_eval <<'.,.,', 'grammar.ra', 762 - def _reduce_106( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 761 + def _reduce_105( val, _values, result ) result = AST::ASTArray.new( :line => @lexer.line, :file => @lexer.file, @@ -1614,14 +1605,14 @@ module_eval <<'.,.,', 'grammar.ra', 762 end .,., + # reduce 106 omitted + # reduce 107 omitted # reduce 108 omitted - # reduce 109 omitted - -module_eval <<'.,.,', 'grammar.ra', 767 - def _reduce_110( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 766 + def _reduce_109( val, _values, result ) result = nil result end |