diff options
author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-04-11 17:33:36 +0000 |
---|---|---|
committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-04-11 17:33:36 +0000 |
commit | 8df349c61314d5bf0acc0402f90bb5399014d442 (patch) | |
tree | d01c57482630bfb6372455bd1fa4d9d13269f09a /lib/puppet/parser | |
parent | de0d1ddf13a8486ee6fe253e8c5a242aeca38c6a (diff) | |
download | puppet-8df349c61314d5bf0acc0402f90bb5399014d442.tar.gz puppet-8df349c61314d5bf0acc0402f90bb5399014d442.tar.xz puppet-8df349c61314d5bf0acc0402f90bb5399014d442.zip |
Fixing the language side of #109. Added a "set" keyword.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1103 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser')
-rw-r--r-- | lib/puppet/parser/ast.rb | 8 | ||||
-rw-r--r-- | lib/puppet/parser/grammar.ra | 13 | ||||
-rw-r--r-- | lib/puppet/parser/interpreter.rb | 2 | ||||
-rw-r--r-- | lib/puppet/parser/lexer.rb | 1 | ||||
-rw-r--r-- | lib/puppet/parser/parser.rb | 810 |
5 files changed, 435 insertions, 399 deletions
diff --git a/lib/puppet/parser/ast.rb b/lib/puppet/parser/ast.rb index 03f390fa9..ea494dc6d 100644 --- a/lib/puppet/parser/ast.rb +++ b/lib/puppet/parser/ast.rb @@ -69,15 +69,16 @@ module Puppet except.file ||= @file raise rescue => detail - if Puppet[:debug] - puts detail.backtrace - end + #if Puppet[:debug] + # puts detail.backtrace + #end error = Puppet::DevError.new( "Child of type %s failed with error %s: %s" % [self.class, detail.class, detail.to_s] ) error.line ||= @line error.file ||= @file + error.backtrace = detail.backtrace raise error end end @@ -145,5 +146,6 @@ require 'puppet/parser/ast/objectref' require 'puppet/parser/ast/selector' require 'puppet/parser/ast/typedefaults' require 'puppet/parser/ast/vardef' +require 'puppet/parser/ast/set' # $Id$ diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra index 2421382f7..c59d36809 100644 --- a/lib/puppet/parser/grammar.ra +++ b/lib/puppet/parser/grammar.ra @@ -7,7 +7,7 @@ class Puppet::Parser::Parser token LBRACK DQTEXT SQTEXT RBRACK LBRACE RBRACE SYMBOL FARROW COMMA TRUE FALSE EQUALS token QMARK LPAREN RPAREN ISEQUAL GREATEREQUAL GREATERTHAN LESSTHAN LESSEQUAL NOTEQUAL token IF ELSE IMPORT DEFINE ELSIF VARIABLE CLASS INHERITS NODE BOOLEAN DOT COLON TYPE -token NAME SEMIC CASE DEFAULT INCLUDE +token NAME SEMIC CASE DEFAULT INCLUDE SET # We have 2 shift/reduce conflicts expect 2 @@ -59,6 +59,7 @@ statement: object | casestatement | import | include + | set | definition | hostclass | nodedef @@ -90,6 +91,16 @@ include: INCLUDE classnames { ) } +set: SET classnames { + classnames = aryfy(val[1]) + + result = AST::Set.new( + :line => @lexer.line, + :file => @lexer.file, + :type => val[1] + ) +} + classnames: classname | classnames COMMA classname { result = aryfy(val[0], val[2]) diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index f443ee3cd..ee89433f3 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -295,7 +295,7 @@ module Puppet end if @local - @parser.parse + @ast = @parser.parse else @ast = benchmark(:info, "Parsed manifest") do @parser.parse diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb index 238651519..f5d2bde78 100644 --- a/lib/puppet/parser/lexer.rb +++ b/lib/puppet/parser/lexer.rb @@ -54,6 +54,7 @@ module Puppet "include" => :INCLUDE, "inherits" => :INHERITS, "node" => :NODE, + "set" => :SET, "true" => :BOOLEAN } diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb index 103dd3a0a..fb0a08338 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.5 +# This file is automatically generated by racc 1.4.4 # from racc grammer file "grammar.ra". # @@ -29,7 +29,7 @@ module Puppet class Parser < Racc::Parser -module_eval <<'..end grammar.ra modeval..ide98fa59463', 'grammar.ra', 734 +module_eval <<'..end grammar.ra modeval..idaa75576a17', 'grammar.ra', 745 attr_reader :file attr_accessor :files @@ -150,292 +150,296 @@ end # $Id$ -..end grammar.ra modeval..ide98fa59463 +..end grammar.ra modeval..idaa75576a17 -##### racc 1.4.5 generates ### +##### racc 1.4.4 generates ### racc_reduce_table = [ 0, 0, :racc_error, - 1, 42, :_reduce_1, - 1, 43, :_reduce_none, - 2, 43, :_reduce_3, + 1, 43, :_reduce_1, 1, 44, :_reduce_none, - 1, 44, :_reduce_none, - 1, 44, :_reduce_none, - 1, 44, :_reduce_none, - 1, 44, :_reduce_none, - 1, 44, :_reduce_none, - 1, 44, :_reduce_none, - 1, 44, :_reduce_none, - 2, 49, :_reduce_12, - 1, 53, :_reduce_none, - 3, 53, :_reduce_14, - 1, 54, :_reduce_none, - 1, 54, :_reduce_none, - 5, 45, :_reduce_17, - 5, 45, :_reduce_18, - 5, 45, :_reduce_19, - 4, 62, :_reduce_20, - 1, 57, :_reduce_none, - 3, 57, :_reduce_22, - 0, 58, :_reduce_none, - 1, 58, :_reduce_none, - 1, 55, :_reduce_25, - 1, 61, :_reduce_26, - 1, 63, :_reduce_none, - 1, 63, :_reduce_none, - 1, 63, :_reduce_none, - 1, 63, :_reduce_none, - 1, 63, :_reduce_none, - 1, 63, :_reduce_none, - 3, 46, :_reduce_33, - 0, 59, :_reduce_34, - 1, 59, :_reduce_35, - 3, 59, :_reduce_36, - 3, 68, :_reduce_37, + 2, 44, :_reduce_3, + 1, 45, :_reduce_none, + 1, 45, :_reduce_none, + 1, 45, :_reduce_none, + 1, 45, :_reduce_none, + 1, 45, :_reduce_none, + 1, 45, :_reduce_none, + 1, 45, :_reduce_none, + 1, 45, :_reduce_none, + 1, 45, :_reduce_none, + 2, 50, :_reduce_13, + 2, 51, :_reduce_14, + 1, 55, :_reduce_none, + 3, 55, :_reduce_16, + 1, 56, :_reduce_none, + 1, 56, :_reduce_none, + 5, 46, :_reduce_19, + 5, 46, :_reduce_20, + 5, 46, :_reduce_21, + 4, 64, :_reduce_22, + 1, 59, :_reduce_none, + 3, 59, :_reduce_24, + 0, 60, :_reduce_none, + 1, 60, :_reduce_none, + 1, 57, :_reduce_27, + 1, 63, :_reduce_28, + 1, 65, :_reduce_none, + 1, 65, :_reduce_none, + 1, 65, :_reduce_none, + 1, 65, :_reduce_none, + 1, 65, :_reduce_none, + 1, 65, :_reduce_none, + 3, 47, :_reduce_35, + 0, 61, :_reduce_36, + 1, 61, :_reduce_37, + 3, 61, :_reduce_38, + 3, 70, :_reduce_39, + 1, 71, :_reduce_none, + 3, 71, :_reduce_41, + 1, 69, :_reduce_none, + 1, 69, :_reduce_none, + 1, 69, :_reduce_none, + 1, 69, :_reduce_none, + 1, 69, :_reduce_none, + 1, 69, :_reduce_none, + 1, 69, :_reduce_none, + 1, 69, :_reduce_none, 1, 69, :_reduce_none, - 3, 69, :_reduce_39, - 1, 67, :_reduce_none, - 1, 67, :_reduce_none, - 1, 67, :_reduce_none, - 1, 67, :_reduce_none, - 1, 67, :_reduce_none, - 1, 67, :_reduce_none, - 1, 67, :_reduce_none, - 1, 67, :_reduce_none, - 1, 67, :_reduce_none, - 1, 64, :_reduce_49, - 1, 64, :_reduce_50, - 1, 71, :_reduce_51, - 4, 72, :_reduce_52, - 5, 47, :_reduce_53, - 1, 73, :_reduce_none, - 2, 73, :_reduce_55, - 5, 74, :_reduce_56, - 4, 74, :_reduce_57, + 1, 66, :_reduce_51, + 1, 66, :_reduce_52, + 1, 73, :_reduce_53, + 4, 74, :_reduce_54, + 5, 48, :_reduce_55, 1, 75, :_reduce_none, - 3, 75, :_reduce_59, - 3, 65, :_reduce_60, + 2, 75, :_reduce_57, + 5, 76, :_reduce_58, + 4, 76, :_reduce_59, 1, 77, :_reduce_none, - 3, 77, :_reduce_62, + 3, 77, :_reduce_61, + 3, 67, :_reduce_62, 1, 79, :_reduce_none, 3, 79, :_reduce_64, - 3, 78, :_reduce_65, - 1, 76, :_reduce_66, - 1, 76, :_reduce_67, - 1, 76, :_reduce_none, - 1, 76, :_reduce_none, - 1, 76, :_reduce_70, - 1, 76, :_reduce_none, - 2, 48, :_reduce_72, - 6, 50, :_reduce_73, - 5, 50, :_reduce_74, - 6, 51, :_reduce_75, - 5, 51, :_reduce_76, - 6, 52, :_reduce_77, - 5, 52, :_reduce_78, - 1, 82, :_reduce_none, - 2, 82, :_reduce_80, - 1, 83, :_reduce_81, - 1, 83, :_reduce_82, - 0, 84, :_reduce_83, - 1, 80, :_reduce_none, - 3, 80, :_reduce_85, - 3, 80, :_reduce_86, - 1, 85, :_reduce_none, - 3, 85, :_reduce_88, - 3, 86, :_reduce_89, - 1, 86, :_reduce_90, 1, 81, :_reduce_none, - 2, 81, :_reduce_92, - 1, 56, :_reduce_93, - 3, 66, :_reduce_94, - 1, 70, :_reduce_none, - 1, 70, :_reduce_none, - 0, 60, :_reduce_none, - 1, 60, :_reduce_98 ] - -racc_reduce_n = 99 - -racc_shift_n = 163 + 3, 81, :_reduce_66, + 3, 80, :_reduce_67, + 1, 78, :_reduce_68, + 1, 78, :_reduce_69, + 1, 78, :_reduce_none, + 1, 78, :_reduce_none, + 1, 78, :_reduce_72, + 1, 78, :_reduce_none, + 2, 49, :_reduce_74, + 6, 52, :_reduce_75, + 5, 52, :_reduce_76, + 6, 53, :_reduce_77, + 5, 53, :_reduce_78, + 6, 54, :_reduce_79, + 5, 54, :_reduce_80, + 1, 84, :_reduce_none, + 2, 84, :_reduce_82, + 1, 85, :_reduce_83, + 1, 85, :_reduce_84, + 0, 86, :_reduce_85, + 1, 82, :_reduce_none, + 3, 82, :_reduce_87, + 3, 82, :_reduce_88, + 1, 87, :_reduce_none, + 3, 87, :_reduce_90, + 3, 88, :_reduce_91, + 1, 88, :_reduce_92, + 1, 83, :_reduce_none, + 2, 83, :_reduce_94, + 1, 58, :_reduce_95, + 3, 68, :_reduce_96, + 1, 72, :_reduce_none, + 1, 72, :_reduce_none, + 0, 62, :_reduce_none, + 1, 62, :_reduce_100 ] + +racc_reduce_n = 101 + +racc_shift_n = 166 racc_action_table = [ - 33, 24, 25, 138, 91, 33, 24, 25, 133, -66, - 33, 24, 25, -71, 132, 33, 24, 25, 85, 53, - 33, 24, 25, 84, 37, 80, 37, 137, 78, 53, - 43, 37, 7, 34, 35, 43, 37, 38, 34, 35, - 43, 37, 38, 34, 35, 43, 37, 38, 34, 35, - 43, 52, 38, 34, 35, 84, 91, 38, 33, 24, - 25, 52, 110, 33, 24, 25, 111, 112, 33, 24, - 25, 93, 74, 33, 24, 25, 23, 37, 33, 24, - 25, 24, 25, 118, 37, 7, 119, 95, 43, 37, - 121, 34, 63, 43, 37, 38, 34, 35, 43, 37, - 38, 34, 35, 43, 37, 38, 34, 35, 43, 122, - 38, 34, 35, 24, 25, 38, -68, 46, 24, 25, - 125, 80, 135, 24, 25, 80, 115, 7, 24, 25, - 130, 131, -68, 24, 25, 134, -66, 155, 37, 111, - 112, -67, 43, 37, -69, 102, 103, 43, 37, 38, - 102, 103, 43, 37, 38, 102, 103, 43, 37, 38, - 102, 103, 43, 75, 38, 102, 103, 24, 25, 38, - 142, 6, 9, 143, 13, 16, 94, 20, 72, 93, - 56, 4, 7, 144, 11, 93, 17, 7, 152, 47, - 90, 46, 37, 45, 27, -69, 43, 23, 88, 102, - 103, 6, 9, 38, 13, 16, 146, 20, nil, nil, - nil, 4, 7, nil, 11, nil, 17, nil, nil, nil, - nil, nil, 159, nil, 6, 9, nil, 13, 16, nil, - 20, nil, nil, nil, 4, 7, nil, 11, 158, 17, - 6, 9, nil, 13, 16, nil, 20, nil, nil, nil, - 4, 7, nil, 11, 128, 17, 6, 9, nil, 13, - 16, nil, 20, nil, nil, nil, 4, 7, nil, 11, - 149, 17, 6, 9, nil, 13, 16, nil, 20, nil, - nil, nil, 4, 7, nil, 11, 157, 17, 6, 9, - nil, 13, 16, nil, 20, nil, nil, nil, 4, 7, - nil, 11, 162, 17, 6, 9, nil, 13, 16, nil, - 20, nil, nil, nil, 4, 7, nil, 11, nil, 17, - 6, 9, nil, 13, 16, nil, 20, nil, nil, nil, - 4, 7, nil, 11, nil, 17, 6, 9, nil, 13, - 16, nil, 20, nil, nil, nil, 4, 7, nil, 11, - nil, 17 ] + 34, 28, 29, 143, 92, 34, 28, 29, 134, -68, + 34, 28, 29, 87, 133, 34, 28, 29, 102, 57, + 34, 28, 29, 86, 42, 84, 42, 142, 54, 57, + 47, 42, 7, 37, 41, 47, 42, 43, 37, 41, + 47, 42, 43, 37, 41, 47, 42, 43, 37, 41, + 47, 56, 43, 37, 66, 84, -73, 43, 34, 28, + 29, 56, 111, 34, 28, 29, 113, 114, 34, 28, + 29, 120, 80, 34, 28, 29, 26, 42, 34, 28, + 29, 121, 42, 97, 42, 7, 28, 29, 47, 42, + 7, 37, 41, 47, 42, 43, 37, 41, 47, 42, + 43, 37, 41, 47, 42, 43, 37, 41, 47, 92, + 43, 37, 41, 28, 29, 43, 110, 96, 28, 29, + 124, -68, -71, 28, 29, 127, 128, 87, 28, 29, + 7, 131, 132, 28, 29, 96, 81, 157, 42, 113, + 114, 137, 47, 42, 93, 105, 108, 47, 42, 43, + 105, 108, 47, 42, 43, 105, 108, 47, 42, 43, + 105, 108, 47, -69, 43, 105, 108, 28, 29, 43, + 141, 144, 77, -70, 6, 9, 74, 13, 15, 148, + 21, 60, 96, 147, 3, 7, -71, 11, 7, 16, + 19, 54, 42, -70, 91, 158, 47, 49, 48, 105, + 108, 6, 9, 43, 13, 15, 165, 21, 30, 87, + 26, 3, 7, 86, 11, nil, 16, 19, nil, nil, + nil, nil, nil, 150, 6, 9, nil, 13, 15, nil, + 21, nil, nil, nil, 3, 7, nil, 11, nil, 16, + 19, 6, 9, 164, 13, 15, nil, 21, nil, nil, + nil, 3, 7, nil, 11, nil, 16, 19, nil, nil, + 136, 6, 9, nil, 13, 15, nil, 21, nil, nil, + nil, 3, 7, nil, 11, nil, 16, 19, 6, 9, + 154, 13, 15, nil, 21, nil, nil, nil, 3, 7, + nil, 11, nil, 16, 19, nil, nil, 161, 6, 9, + nil, 13, 15, nil, 21, nil, nil, nil, 3, 7, + nil, 11, nil, 16, 19, 6, 9, 160, 13, 15, + nil, 21, nil, nil, nil, 3, 7, nil, 11, nil, + 16, 19, nil, nil, nil, 6, 9, nil, 13, 15, + nil, 21, nil, nil, nil, 3, 7, nil, 11, nil, + 16, 19, 6, 9, nil, 13, 15, nil, 21, nil, + nil, nil, 3, 7, nil, 11, nil, 16, 19 ] racc_action_check = [ - 74, 74, 74, 107, 63, 109, 109, 109, 98, 63, - 33, 33, 33, 36, 98, 45, 45, 45, 50, 20, - 11, 11, 11, 47, 85, 46, 74, 107, 42, 54, - 74, 109, 85, 74, 74, 109, 33, 74, 109, 109, - 33, 45, 109, 33, 33, 45, 11, 33, 45, 45, - 11, 20, 45, 11, 11, 54, 80, 11, 23, 23, - 23, 54, 77, 142, 142, 142, 77, 77, 91, 91, - 91, 81, 29, 90, 90, 90, 29, 17, 130, 130, - 130, 6, 6, 82, 23, 17, 84, 71, 23, 142, - 86, 23, 23, 142, 91, 23, 142, 142, 91, 90, - 142, 91, 91, 90, 130, 91, 90, 90, 130, 89, - 90, 130, 130, 138, 138, 130, 41, 40, 104, 104, - 92, 93, 104, 78, 78, 94, 78, 72, 75, 75, - 96, 97, 69, 154, 154, 100, 35, 141, 138, 141, - 141, 34, 138, 104, 31, 138, 138, 104, 78, 138, - 104, 104, 78, 75, 104, 78, 78, 75, 154, 78, - 75, 75, 154, 30, 75, 154, 154, 115, 115, 154, - 116, 22, 22, 117, 22, 22, 68, 22, 27, 127, - 21, 22, 22, 118, 22, 64, 22, 133, 137, 16, - 62, 14, 115, 13, 9, 60, 115, 1, 56, 115, - 115, 118, 118, 115, 118, 118, 121, 118, nil, nil, - nil, 118, 118, nil, 118, nil, 118, nil, nil, nil, - nil, nil, 152, nil, 121, 121, nil, 121, 121, nil, - 121, nil, nil, nil, 121, 121, nil, 121, 147, 121, - 152, 152, nil, 152, 152, nil, 152, nil, nil, nil, - 152, 152, nil, 152, 95, 152, 147, 147, nil, 147, - 147, nil, 147, nil, nil, nil, 147, 147, nil, 147, - 129, 147, 95, 95, nil, 95, 95, nil, 95, nil, - nil, nil, 95, 95, nil, 95, 145, 95, 129, 129, - nil, 129, 129, nil, 129, nil, nil, nil, 129, 129, - nil, 129, 160, 129, 145, 145, nil, 145, 145, nil, - 145, nil, nil, nil, 145, 145, nil, 145, nil, 145, - 160, 160, nil, 160, 160, nil, 160, nil, nil, nil, - 160, 160, nil, 160, nil, 160, 0, 0, nil, 0, - 0, nil, 0, nil, nil, nil, 0, 0, nil, 0, - nil, 0 ] + 137, 137, 137, 116, 66, 48, 48, 48, 101, 66, + 80, 80, 80, 97, 101, 34, 34, 34, 75, 21, + 26, 26, 26, 50, 86, 49, 137, 116, 46, 58, + 137, 48, 86, 137, 137, 48, 80, 137, 48, 48, + 80, 34, 48, 80, 80, 34, 26, 80, 34, 34, + 26, 21, 34, 26, 26, 58, 44, 26, 11, 11, + 11, 58, 79, 92, 92, 92, 79, 79, 112, 112, + 112, 83, 38, 131, 131, 131, 38, 16, 93, 93, + 93, 84, 19, 73, 11, 16, 6, 6, 11, 92, + 19, 11, 11, 92, 112, 11, 92, 92, 112, 131, + 92, 112, 112, 131, 93, 112, 131, 131, 93, 87, + 131, 93, 93, 77, 77, 93, 77, 88, 110, 110, + 89, 41, 40, 143, 143, 94, 95, 96, 81, 81, + 74, 99, 100, 156, 156, 69, 39, 139, 77, 139, + 139, 104, 77, 110, 68, 77, 77, 110, 143, 77, + 110, 110, 143, 81, 110, 143, 143, 81, 156, 143, + 81, 81, 156, 37, 81, 156, 156, 118, 118, 156, + 115, 118, 32, 31, 1, 1, 30, 1, 1, 123, + 1, 24, 130, 120, 1, 1, 65, 1, 134, 1, + 1, 18, 118, 61, 60, 142, 118, 15, 13, 118, + 118, 120, 120, 118, 120, 120, 163, 120, 9, 54, + 4, 120, 120, 55, 120, nil, 120, 120, nil, nil, + nil, nil, nil, 124, 163, 163, nil, 163, 163, nil, + 163, nil, nil, nil, 163, 163, nil, 163, nil, 163, + 163, 124, 124, 158, 124, 124, nil, 124, nil, nil, + nil, 124, 124, nil, 124, nil, 124, 124, nil, nil, + 102, 158, 158, nil, 158, 158, nil, 158, nil, nil, + nil, 158, 158, nil, 158, nil, 158, 158, 102, 102, + 135, 102, 102, nil, 102, nil, nil, nil, 102, 102, + nil, 102, nil, 102, 102, nil, nil, 149, 135, 135, + nil, 135, 135, nil, 135, nil, nil, nil, 135, 135, + nil, 135, nil, 135, 135, 149, 149, 146, 149, 149, + nil, 149, nil, nil, nil, 149, 149, nil, 149, nil, + 149, 149, nil, nil, nil, 146, 146, nil, 146, 146, + nil, 146, nil, nil, nil, 146, 146, nil, 146, nil, + 146, 146, 0, 0, nil, 0, 0, nil, 0, nil, + nil, nil, 0, 0, nil, 0, nil, 0, 0 ] racc_action_pointer = [ - 311, 191, nil, nil, nil, nil, 78, nil, nil, 158, - nil, 18, nil, 180, 185, nil, 153, 49, nil, nil, - 15, 180, 146, 56, nil, nil, nil, 163, nil, 70, - 157, 130, nil, 8, 127, 122, -1, nil, nil, nil, - 111, 102, 14, nil, nil, 13, -11, -7, nil, nil, - 8, nil, nil, nil, 25, nil, 198, nil, nil, nil, - 181, nil, 153, -5, 175, nil, nil, nil, 142, 118, - nil, 81, 91, nil, -2, 125, nil, 57, 120, nil, - 47, 61, 77, nil, 50, -4, 84, nil, nil, 102, - 71, 66, 113, 85, 89, 247, 117, 115, -2, nil, - 130, nil, nil, nil, 115, nil, nil, -7, nil, 3, - nil, nil, nil, nil, nil, 164, 161, 166, 176, nil, - nil, 199, nil, nil, nil, nil, nil, 169, nil, 263, - 76, nil, nil, 151, nil, nil, nil, 182, 110, nil, - nil, 130, 61, nil, nil, 279, nil, 231, nil, nil, - nil, nil, 215, nil, 130, nil, nil, nil, nil, nil, - 295, nil, nil ] + 327, 149, nil, nil, 204, nil, 83, nil, nil, 172, + nil, 56, nil, 185, nil, 161, 49, nil, 185, 54, + nil, 15, nil, nil, 181, nil, 18, nil, nil, nil, + 161, 159, 158, nil, 13, nil, nil, 149, 70, 130, + 108, 107, nil, nil, 42, nil, 22, nil, 3, -5, + 13, nil, nil, nil, 173, 203, nil, nil, 25, nil, + 194, 179, nil, nil, nil, 172, -5, nil, 107, 125, + nil, nil, nil, 49, 94, 12, nil, 110, nil, 57, + 8, 125, nil, 65, 45, nil, -4, 100, 107, 114, + nil, nil, 61, 76, 118, 119, 91, -23, nil, 118, + 116, -2, 253, nil, 132, nil, nil, nil, nil, nil, + 115, nil, 66, nil, nil, 165, -7, nil, 164, nil, + 176, nil, nil, 172, 216, nil, nil, nil, nil, nil, + 172, 71, nil, nil, 152, 273, nil, -2, nil, 130, + nil, nil, 189, 120, nil, nil, 310, nil, nil, 290, + nil, nil, nil, nil, nil, nil, 130, nil, 236, nil, + nil, nil, nil, 199, nil, nil ] racc_action_default = [ - -99, -99, -2, -4, -26, -5, -99, -25, -6, -99, - -7, -99, -8, -99, -99, -9, -99, -99, -10, -11, - -99, -99, -1, -34, -49, -50, -72, -83, -47, -41, - -99, -46, -45, -99, -26, -25, -43, -93, -70, -48, - -42, -40, -99, -51, -44, -99, -34, -83, -15, -16, - -12, -13, -81, -82, -83, -79, -99, -3, -32, -28, - -31, -35, -23, -25, -97, -71, -29, -21, -99, -27, - -30, -99, -83, -84, -99, -99, -38, -99, -99, -33, - -99, -97, -99, -91, -99, -99, -99, -80, 163, -99, - -24, -99, -99, -98, -34, -99, -90, -99, -99, -87, - -99, -69, -67, -66, -99, -54, -68, -99, -58, -99, - -94, -95, -96, -60, -61, -99, -99, -99, -99, -92, - -14, -99, -17, -22, -37, -18, -36, -97, -74, -99, - -99, -85, -86, -99, -52, -53, -55, -99, -99, -39, - -63, -99, -99, -19, -76, -99, -78, -99, -20, -73, - -89, -88, -99, -59, -99, -62, -65, -75, -77, -57, - -99, -64, -56 ] + -101, -1, -2, -28, -101, -4, -101, -27, -5, -101, + -6, -101, -7, -101, -8, -101, -101, -9, -101, -101, + -10, -101, -11, -12, -101, -3, -36, -74, -51, -52, + -85, -42, -101, -46, -101, -49, -47, -28, -43, -101, + -48, -27, -95, -72, -45, -50, -44, -53, -101, -85, + -13, -15, -17, -18, -36, -14, -83, -84, -85, -81, + -101, -29, -32, -34, -30, -33, -27, -37, -25, -99, + -73, -31, -23, -101, -85, -101, -86, -101, -40, -101, + -101, -101, -35, -101, -101, -93, -101, -101, -99, -101, + -82, 166, -101, -26, -101, -101, -100, -36, -89, -92, + -101, -101, -101, -70, -101, -69, -62, -71, -68, -63, + -101, -96, -101, -97, -98, -101, -101, -60, -101, -56, + -101, -94, -16, -101, -101, -39, -24, -19, -20, -38, + -99, -101, -87, -88, -101, -101, -76, -101, -65, -101, + -41, -54, -101, -101, -55, -57, -101, -78, -21, -101, + -80, -22, -91, -90, -75, -67, -101, -64, -101, -61, + -77, -79, -66, -101, -59, -58 ] racc_goto_table = [ - 22, 26, 57, 32, 70, 114, 64, 49, 51, 108, - 73, 58, 116, 60, 55, 67, 92, 105, 69, 141, - 109, 62, 113, 82, 50, 32, 99, 77, 40, 81, - 86, 71, 104, 117, 54, 89, 126, 32, 108, 98, - 66, 21, 140, nil, nil, nil, 136, nil, 87, 116, - 40, nil, 30, nil, nil, 97, nil, nil, nil, nil, - nil, nil, 40, nil, 65, 101, 32, nil, 101, nil, - 106, 70, 153, 106, 76, 49, 120, 127, 58, 148, - 60, 161, 123, 32, 154, 69, 79, 151, 116, nil, - 29, 40, nil, nil, 101, 129, 48, nil, nil, 106, - nil, 32, 59, nil, nil, 101, nil, 66, 40, 57, - 106, nil, 29, nil, nil, 100, 65, nil, 145, 65, - nil, 147, 32, nil, 29, 57, 40, 57, 101, nil, - nil, 65, 124, 106, 32, nil, nil, nil, nil, nil, - 57, nil, nil, nil, 101, 65, nil, 40, nil, 106, - 139, 96, 160, 29, nil, nil, 65, nil, nil, 40, - nil, nil, nil, nil, 48, nil, nil, nil, nil, 59, - 29, 150, nil, nil, nil, nil, nil, nil, nil, 65, - nil, nil, nil, 156, nil, nil, nil, nil, 29, nil, - nil, nil, nil, nil, nil, 65, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, nil, nil, 29, - nil, nil, 96, nil, nil, nil, nil, nil, nil, nil, - nil, 29 ] + 25, 1, 27, 39, 95, 119, 53, 70, 69, 53, + 112, 62, 38, 109, 59, 129, 65, 52, 72, 63, + 52, 83, 61, 123, 76, 122, 78, 64, 98, 46, + 89, 50, 106, 118, 55, 38, 88, 139, 75, 68, + 82, 58, 145, 94, 71, 79, 138, 101, 24, 38, + nil, 90, 46, nil, nil, nil, nil, nil, 70, 36, + nil, nil, 70, nil, nil, 151, 46, 107, 100, nil, + 156, 107, 115, 103, 70, 99, 53, 103, 62, 130, + nil, 38, 36, 65, 125, 126, 63, 52, 153, 61, + nil, 70, 162, 38, 64, nil, 36, nil, 46, 70, + 107, nil, nil, 135, 140, nil, 103, nil, 107, nil, + 46, 71, nil, 38, 103, nil, nil, nil, nil, nil, + nil, 146, nil, 152, 70, 149, nil, nil, 36, 155, + 46, nil, 38, 107, 25, 99, nil, 70, 38, 103, + 36, nil, nil, 104, nil, 25, 107, 117, 25, 46, + nil, nil, 103, nil, nil, 46, nil, nil, nil, 163, + 36, nil, 25, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, 104, nil, nil, 36, + nil, nil, nil, nil, 117, 36, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, 159, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, 104 ] racc_goto_check = [ - 2, 23, 3, 4, 24, 37, 18, 15, 13, 35, - 43, 25, 35, 15, 42, 21, 19, 33, 23, 38, - 29, 16, 36, 40, 12, 4, 45, 28, 20, 18, - 40, 39, 32, 19, 41, 17, 27, 4, 35, 44, - 20, 1, 37, nil, nil, nil, 33, nil, 42, 35, - 20, nil, 26, nil, nil, 43, nil, nil, nil, nil, - nil, nil, 20, nil, 30, 15, 4, nil, 15, nil, - 23, 24, 35, 23, 26, 15, 13, 18, 25, 19, - 15, 37, 21, 4, 29, 23, 26, 45, 35, nil, - 14, 20, nil, nil, 15, 2, 14, nil, nil, 23, - nil, 4, 14, nil, nil, 15, nil, 20, 20, 3, - 23, nil, 14, nil, nil, 26, 30, nil, 2, 30, - nil, 2, 4, nil, 14, 3, 20, 3, 15, nil, - nil, 30, 26, 23, 4, nil, nil, nil, nil, nil, - 3, nil, nil, nil, 15, 30, nil, 20, nil, 23, - 26, 14, 2, 14, nil, nil, 30, nil, nil, 20, - nil, nil, nil, nil, 14, nil, nil, nil, nil, 14, - 14, 26, nil, nil, nil, nil, nil, nil, nil, 30, - nil, nil, nil, 26, nil, nil, nil, nil, 14, nil, - nil, nil, nil, nil, nil, 30, nil, nil, nil, nil, - nil, nil, nil, nil, nil, nil, nil, nil, nil, 14, - nil, nil, 14, nil, nil, nil, nil, nil, nil, nil, - nil, 14 ] + 3, 2, 24, 27, 20, 34, 16, 31, 19, 16, + 30, 25, 15, 38, 43, 28, 16, 15, 22, 26, + 15, 41, 24, 20, 44, 14, 27, 15, 46, 21, + 41, 13, 37, 33, 13, 15, 19, 39, 40, 17, + 27, 42, 34, 18, 21, 29, 38, 45, 1, 15, + nil, 43, 21, nil, nil, nil, nil, nil, 31, 4, + nil, nil, 31, nil, nil, 20, 21, 16, 44, nil, + 30, 16, 27, 24, 31, 15, 16, 24, 25, 19, + nil, 15, 4, 16, 27, 22, 26, 15, 46, 24, + nil, 31, 38, 15, 15, nil, 4, nil, 21, 31, + 16, nil, nil, 2, 27, nil, 24, nil, 16, nil, + 21, 21, nil, 15, 24, nil, nil, nil, nil, nil, + nil, 2, nil, 27, 31, 2, nil, nil, 4, 27, + 21, nil, 15, 16, 3, 15, nil, 31, 15, 24, + 4, nil, nil, 36, nil, 3, 16, 36, 3, 21, + nil, nil, 24, nil, nil, 21, nil, nil, nil, 2, + 4, nil, 3, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, 36, nil, nil, 4, + nil, nil, nil, nil, 36, 4, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, nil, nil, nil, nil, nil, nil, nil, 36, + nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, + nil, nil, 36 ] racc_goto_pointer = [ - nil, 41, 0, -20, -8, nil, nil, nil, nil, nil, - nil, nil, 7, -9, 79, -10, -2, -27, -17, -48, - 17, -8, nil, -5, -19, -12, 41, -57, -6, -57, - 41, nil, -43, -58, nil, -66, -56, -73, -96, 4, - -24, 14, -6, -17, -33, -46 ] + nil, 48, 1, -1, 48, nil, nil, nil, nil, nil, + nil, nil, nil, 15, -61, 1, -10, 13, -25, -18, + -65, 18, -8, nil, -4, -15, -7, -8, -81, 11, + -69, -19, nil, -48, -76, nil, 66, -45, -64, -73, + 8, -28, 20, -7, -6, -27, -46 ] racc_goto_default = [ - nil, nil, nil, 2, 3, 5, 8, 10, 12, 15, - 18, 19, nil, nil, 1, 31, nil, nil, nil, nil, - 14, nil, 68, 41, 44, 28, nil, 61, nil, nil, - 36, 39, nil, nil, 107, 42, nil, nil, nil, nil, - nil, nil, nil, 83, nil, nil ] + nil, nil, nil, 2, 5, 8, 10, 12, 14, 17, + 20, 22, 23, nil, 51, 4, 40, nil, nil, nil, + nil, 18, nil, 73, 31, 33, 35, nil, 67, nil, + nil, 44, 45, nil, nil, 116, 32, nil, nil, nil, + nil, nil, nil, nil, 85, nil, nil ] racc_token_table = { false => 0, @@ -478,11 +482,12 @@ racc_token_table = { :SEMIC => 37, :CASE => 38, :DEFAULT => 39, - :INCLUDE => 40 } + :INCLUDE => 40, + :SET => 41 } racc_use_result_var = true -racc_nt_base = 41 +racc_nt_base = 42 Racc_arg = [ racc_action_table, @@ -542,6 +547,7 @@ Racc_token_to_s_table = [ 'CASE', 'DEFAULT', 'INCLUDE', +'SET', '$start', 'program', 'statements', @@ -551,6 +557,7 @@ Racc_token_to_s_table = [ 'casestatement', 'import', 'include', +'set', 'definition', 'hostclass', 'nodedef', @@ -658,8 +665,10 @@ module_eval <<'.,.,', 'grammar.ra', 54 # reduce 11 omitted -module_eval <<'.,.,', 'grammar.ra', 91 - def _reduce_12( val, _values, result ) + # reduce 12 omitted + +module_eval <<'.,.,', 'grammar.ra', 92 + def _reduce_13( val, _values, result ) classnames = aryfy(val[1]) klasses = [] @@ -686,10 +695,23 @@ module_eval <<'.,.,', 'grammar.ra', 91 end .,., - # reduce 13 omitted - -module_eval <<'.,.,', 'grammar.ra', 98 +module_eval <<'.,.,', 'grammar.ra', 102 def _reduce_14( val, _values, result ) + classnames = aryfy(val[1]) + + result = AST::Set.new( + :line => @lexer.line, + :file => @lexer.file, + :type => val[1] + ) + result + end +.,., + + # reduce 15 omitted + +module_eval <<'.,.,', 'grammar.ra', 109 + def _reduce_16( val, _values, result ) result = aryfy(val[0], val[2]) result.line = @lexer.line result.file = @lexer.file @@ -697,12 +719,12 @@ module_eval <<'.,.,', 'grammar.ra', 98 end .,., - # reduce 15 omitted + # reduce 17 omitted - # reduce 16 omitted + # reduce 18 omitted -module_eval <<'.,.,', 'grammar.ra', 132 - def _reduce_17( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 143 + def _reduce_19( val, _values, result ) if val[0].instance_of?(AST::ASTArray) raise Puppet::ParseError, "Invalid name" end @@ -734,8 +756,8 @@ module_eval <<'.,.,', 'grammar.ra', 132 end .,., -module_eval <<'.,.,', 'grammar.ra', 146 - def _reduce_18( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 157 + def _reduce_20( val, _values, result ) if val[0].instance_of?(AST::ASTArray) Puppet.notice "invalid name" raise Puppet::ParseError, "Invalid name" @@ -753,8 +775,8 @@ module_eval <<'.,.,', 'grammar.ra', 146 end .,., -module_eval <<'.,.,', 'grammar.ra', 158 - def _reduce_19( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 169 + def _reduce_21( val, _values, result ) # a template setting for a type if val[0].instance_of?(AST::ASTArray) raise Puppet::ParseError, "Invalid type" @@ -770,8 +792,8 @@ module_eval <<'.,.,', 'grammar.ra', 158 end .,., -module_eval <<'.,.,', 'grammar.ra', 166 - def _reduce_20( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 177 + def _reduce_22( val, _values, result ) result = AST::ObjectInst.new( :line => @lexer.line, :file => @lexer.file, @@ -781,10 +803,10 @@ module_eval <<'.,.,', 'grammar.ra', 166 end .,., - # reduce 21 omitted + # reduce 23 omitted -module_eval <<'.,.,', 'grammar.ra', 180 - def _reduce_22( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 191 + def _reduce_24( val, _values, result ) if val[0].instance_of?(AST::ObjectInst) result = AST::ASTArray.new( :line => @lexer.line, @@ -799,12 +821,12 @@ module_eval <<'.,.,', 'grammar.ra', 180 end .,., - # reduce 23 omitted + # reduce 25 omitted - # reduce 24 omitted + # reduce 26 omitted -module_eval <<'.,.,', 'grammar.ra', 191 - def _reduce_25( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 202 + def _reduce_27( val, _values, result ) result = AST::Name.new( :line => @lexer.line, :file => @lexer.file, @@ -814,8 +836,8 @@ module_eval <<'.,.,', 'grammar.ra', 191 end .,., -module_eval <<'.,.,', 'grammar.ra', 199 - def _reduce_26( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 210 + def _reduce_28( val, _values, result ) result = AST::Type.new( :line => @lexer.line, :file => @lexer.file, @@ -825,10 +847,6 @@ module_eval <<'.,.,', 'grammar.ra', 199 end .,., - # reduce 27 omitted - - # reduce 28 omitted - # reduce 29 omitted # reduce 30 omitted @@ -837,8 +855,12 @@ module_eval <<'.,.,', 'grammar.ra', 199 # reduce 32 omitted -module_eval <<'.,.,', 'grammar.ra', 222 - def _reduce_33( val, _values, result ) + # reduce 33 omitted + + # reduce 34 omitted + +module_eval <<'.,.,', 'grammar.ra', 233 + def _reduce_35( val, _values, result ) # this is distinct from referencing a variable variable = AST::Name.new( :line => @lexer.line, @@ -856,8 +878,8 @@ module_eval <<'.,.,', 'grammar.ra', 222 end .,., -module_eval <<'.,.,', 'grammar.ra', 231 - def _reduce_34( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 242 + def _reduce_36( val, _values, result ) result = AST::ASTArray.new( :line => @lexer.line, :file => @lexer.file, @@ -867,15 +889,15 @@ module_eval <<'.,.,', 'grammar.ra', 231 end .,., -module_eval <<'.,.,', 'grammar.ra', 231 - def _reduce_35( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 242 + def _reduce_37( val, _values, result ) result = val[0] result end .,., -module_eval <<'.,.,', 'grammar.ra', 244 - def _reduce_36( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 255 + def _reduce_38( val, _values, result ) if val[0].instance_of?(AST::ASTArray) val[0].push(val[2]) result = val[0] @@ -890,8 +912,8 @@ module_eval <<'.,.,', 'grammar.ra', 244 end .,., -module_eval <<'.,.,', 'grammar.ra', 259 - def _reduce_37( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 270 + def _reduce_39( val, _values, result ) leaf = AST::String.new( :line => @lexer.line, :file => @lexer.file, @@ -908,10 +930,10 @@ module_eval <<'.,.,', 'grammar.ra', 259 end .,., - # reduce 38 omitted + # reduce 40 omitted -module_eval <<'.,.,', 'grammar.ra', 272 - def _reduce_39( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 283 + def _reduce_41( val, _values, result ) if val[0].instance_of?(AST::ASTArray) result = val[0].push(val[2]) else @@ -925,10 +947,6 @@ module_eval <<'.,.,', 'grammar.ra', 272 end .,., - # reduce 40 omitted - - # reduce 41 omitted - # reduce 42 omitted # reduce 43 omitted @@ -943,8 +961,12 @@ module_eval <<'.,.,', 'grammar.ra', 272 # reduce 48 omitted -module_eval <<'.,.,', 'grammar.ra', 290 - def _reduce_49( val, _values, result ) + # reduce 49 omitted + + # reduce 50 omitted + +module_eval <<'.,.,', 'grammar.ra', 301 + def _reduce_51( val, _values, result ) result = AST::String.new( :line => @lexer.line, :file => @lexer.file, @@ -954,8 +976,8 @@ module_eval <<'.,.,', 'grammar.ra', 290 end .,., -module_eval <<'.,.,', 'grammar.ra', 296 - def _reduce_50( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 307 + def _reduce_52( val, _values, result ) result = AST::FlatString.new( :line => @lexer.line, :file => @lexer.file, @@ -965,8 +987,8 @@ module_eval <<'.,.,', 'grammar.ra', 296 end .,., -module_eval <<'.,.,', 'grammar.ra', 304 - def _reduce_51( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 315 + def _reduce_53( val, _values, result ) result = AST::Boolean.new( :line => @lexer.line, :file => @lexer.file, @@ -976,8 +998,8 @@ module_eval <<'.,.,', 'grammar.ra', 304 end .,., -module_eval <<'.,.,', 'grammar.ra', 314 - def _reduce_52( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 325 + def _reduce_54( val, _values, result ) result = AST::ObjectRef.new( :pin => '[]', :line => @lexer.line, @@ -989,8 +1011,8 @@ module_eval <<'.,.,', 'grammar.ra', 314 end .,., -module_eval <<'.,.,', 'grammar.ra', 331 - def _reduce_53( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 342 + def _reduce_55( val, _values, result ) options = val[3] unless options.instance_of?(AST::ASTArray) options = AST::ASTArray.new( @@ -1009,10 +1031,10 @@ module_eval <<'.,.,', 'grammar.ra', 331 end .,., - # reduce 54 omitted + # reduce 56 omitted -module_eval <<'.,.,', 'grammar.ra', 345 - def _reduce_55( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 356 + def _reduce_57( val, _values, result ) if val[0].instance_of?(AST::ASTArray) val[0].push val[1] result = val[0] @@ -1027,8 +1049,8 @@ module_eval <<'.,.,', 'grammar.ra', 345 end .,., -module_eval <<'.,.,', 'grammar.ra', 355 - def _reduce_56( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 366 + def _reduce_58( val, _values, result ) result = AST::CaseOpt.new( :pin => ":", :value => val[0], @@ -1040,8 +1062,8 @@ module_eval <<'.,.,', 'grammar.ra', 355 end .,., -module_eval <<'.,.,', 'grammar.ra', 367 - def _reduce_57( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 378 + def _reduce_59( val, _values, result ) result = AST::CaseOpt.new( :pin => ":", :value => val[0], @@ -1057,10 +1079,10 @@ module_eval <<'.,.,', 'grammar.ra', 367 end .,., - # reduce 58 omitted + # reduce 60 omitted -module_eval <<'.,.,', 'grammar.ra', 381 - def _reduce_59( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 392 + def _reduce_61( val, _values, result ) if val[0].instance_of?(AST::ASTArray) val[0].push(val[2]) result = val[0] @@ -1075,8 +1097,8 @@ module_eval <<'.,.,', 'grammar.ra', 381 end .,., -module_eval <<'.,.,', 'grammar.ra', 391 - def _reduce_60( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 402 + def _reduce_62( val, _values, result ) result = AST::Selector.new( :pin => "?", :line => @lexer.line, @@ -1088,19 +1110,19 @@ module_eval <<'.,.,', 'grammar.ra', 391 end .,., - # reduce 61 omitted + # reduce 63 omitted -module_eval <<'.,.,', 'grammar.ra', 393 - def _reduce_62( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 404 + def _reduce_64( val, _values, result ) result = val[1] result end .,., - # reduce 63 omitted + # reduce 65 omitted -module_eval <<'.,.,', 'grammar.ra', 408 - def _reduce_64( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 419 + def _reduce_66( val, _values, result ) if val[0].instance_of?(AST::ASTArray) val[0].push(val[2]) result = val[0] @@ -1115,8 +1137,8 @@ module_eval <<'.,.,', 'grammar.ra', 408 end .,., -module_eval <<'.,.,', 'grammar.ra', 418 - def _reduce_65( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 429 + def _reduce_67( val, _values, result ) result = AST::ObjectParam.new( :pin => "=>", :line => @lexer.line, @@ -1128,8 +1150,8 @@ module_eval <<'.,.,', 'grammar.ra', 418 end .,., -module_eval <<'.,.,', 'grammar.ra', 426 - def _reduce_66( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 437 + def _reduce_68( val, _values, result ) result = AST::String.new( :line => @lexer.line, :file => @lexer.file, @@ -1139,8 +1161,8 @@ module_eval <<'.,.,', 'grammar.ra', 426 end .,., -module_eval <<'.,.,', 'grammar.ra', 433 - def _reduce_67( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 444 + def _reduce_69( val, _values, result ) result = AST::String.new( :line => @lexer.line, :file => @lexer.file, @@ -1150,12 +1172,12 @@ module_eval <<'.,.,', 'grammar.ra', 433 end .,., - # reduce 68 omitted + # reduce 70 omitted - # reduce 69 omitted + # reduce 71 omitted -module_eval <<'.,.,', 'grammar.ra', 442 - def _reduce_70( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 453 + def _reduce_72( val, _values, result ) result = AST::Default.new( :line => @lexer.line, :file => @lexer.file, @@ -1165,10 +1187,10 @@ module_eval <<'.,.,', 'grammar.ra', 442 end .,., - # reduce 71 omitted + # reduce 73 omitted -module_eval <<'.,.,', 'grammar.ra', 495 - def _reduce_72( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 506 + def _reduce_74( val, _values, result ) # importing files # yuk, i hate keywords # we'll probably have to have some kind of search path eventually @@ -1222,8 +1244,8 @@ module_eval <<'.,.,', 'grammar.ra', 495 end .,., -module_eval <<'.,.,', 'grammar.ra', 506 - def _reduce_73( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 517 + def _reduce_75( val, _values, result ) result = AST::CompDef.new( :type => AST::Name.new(:value => val[1], :line => @lexer.line), :args => val[2], @@ -1236,8 +1258,8 @@ module_eval <<'.,.,', 'grammar.ra', 506 end .,., -module_eval <<'.,.,', 'grammar.ra', 519 - def _reduce_74( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 530 + def _reduce_76( val, _values, result ) result = AST::CompDef.new( :type => AST::Name.new(:value => val[1], :line => @lexer.line), :args => val[2], @@ -1254,8 +1276,8 @@ module_eval <<'.,.,', 'grammar.ra', 519 end .,., -module_eval <<'.,.,', 'grammar.ra', 536 - def _reduce_75( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 547 + def _reduce_77( val, _values, result ) #:args => val[2], args = { :type => AST::Name.new(:value => val[1], :line => @lexer.line), @@ -1273,8 +1295,8 @@ module_eval <<'.,.,', 'grammar.ra', 536 end .,., -module_eval <<'.,.,', 'grammar.ra', 553 - def _reduce_76( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 564 + def _reduce_78( val, _values, result ) args = { :type => AST::Name.new(:value => val[1], :line => @lexer.line), :file => @lexer.file, @@ -1295,8 +1317,8 @@ module_eval <<'.,.,', 'grammar.ra', 553 end .,., -module_eval <<'.,.,', 'grammar.ra', 574 - def _reduce_77( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 585 + def _reduce_79( val, _values, result ) unless val[1].instance_of?(AST::ASTArray) val[1] = AST::ASTArray.new( :line => val[1].line, @@ -1319,8 +1341,8 @@ module_eval <<'.,.,', 'grammar.ra', 574 end .,., -module_eval <<'.,.,', 'grammar.ra', 597 - def _reduce_78( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 608 + def _reduce_80( val, _values, result ) unless val[1].instance_of?(AST::ASTArray) val[1] = AST::ASTArray.new( :line => val[1].line, @@ -1347,10 +1369,10 @@ module_eval <<'.,.,', 'grammar.ra', 597 end .,., - # reduce 79 omitted + # reduce 81 omitted -module_eval <<'.,.,', 'grammar.ra', 611 - def _reduce_80( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 622 + def _reduce_82( val, _values, result ) if val[0].instance_of?(AST::ASTArray) result = val[0] result.push val[1] @@ -1365,8 +1387,8 @@ module_eval <<'.,.,', 'grammar.ra', 611 end .,., -module_eval <<'.,.,', 'grammar.ra', 619 - def _reduce_81( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 630 + def _reduce_83( val, _values, result ) result = AST::HostName.new( :line => @lexer.line, :file => @lexer.file, @@ -1376,8 +1398,8 @@ module_eval <<'.,.,', 'grammar.ra', 619 end .,., -module_eval <<'.,.,', 'grammar.ra', 625 - def _reduce_82( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 636 + def _reduce_84( val, _values, result ) result = AST::HostName.new( :line => @lexer.line, :file => @lexer.file, @@ -1387,8 +1409,8 @@ module_eval <<'.,.,', 'grammar.ra', 625 end .,., -module_eval <<'.,.,', 'grammar.ra', 633 - def _reduce_83( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 644 + def _reduce_85( val, _values, result ) result = AST::ASTArray.new( :line => @lexer.line, :file => @lexer.file, @@ -1398,17 +1420,17 @@ module_eval <<'.,.,', 'grammar.ra', 633 end .,., - # reduce 84 omitted + # reduce 86 omitted -module_eval <<'.,.,', 'grammar.ra', 638 - def _reduce_85( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 649 + def _reduce_87( val, _values, result ) result = val[1] result end .,., -module_eval <<'.,.,', 'grammar.ra', 649 - def _reduce_86( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 660 + def _reduce_88( val, _values, result ) if val[1].instance_of?(AST::ASTArray) result = val[1] else @@ -1422,10 +1444,10 @@ module_eval <<'.,.,', 'grammar.ra', 649 end .,., - # reduce 87 omitted + # reduce 89 omitted -module_eval <<'.,.,', 'grammar.ra', 663 - def _reduce_88( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 674 + def _reduce_90( val, _values, result ) if val[0].instance_of?(AST::ASTArray) val[0].push(val[2]) result = val[0] @@ -1440,8 +1462,8 @@ module_eval <<'.,.,', 'grammar.ra', 663 end .,., -module_eval <<'.,.,', 'grammar.ra', 671 - def _reduce_89( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 682 + def _reduce_91( val, _values, result ) result = AST::CompArgument.new( :line => @lexer.line, :file => @lexer.file, @@ -1451,8 +1473,8 @@ module_eval <<'.,.,', 'grammar.ra', 671 end .,., -module_eval <<'.,.,', 'grammar.ra', 678 - def _reduce_90( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 689 + def _reduce_92( val, _values, result ) result = AST::CompArgument.new( :line => @lexer.line, :file => @lexer.file, @@ -1462,10 +1484,10 @@ module_eval <<'.,.,', 'grammar.ra', 678 end .,., - # reduce 91 omitted + # reduce 93 omitted -module_eval <<'.,.,', 'grammar.ra', 687 - def _reduce_92( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 698 + def _reduce_94( val, _values, result ) result = AST::Name.new( :value => val[1], :file => @lexer.file, @@ -1475,8 +1497,8 @@ module_eval <<'.,.,', 'grammar.ra', 687 end .,., -module_eval <<'.,.,', 'grammar.ra', 696 - def _reduce_93( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 707 + def _reduce_95( val, _values, result ) name = val[0].sub(/^\$/,'') result = AST::Variable.new( :line => @lexer.line, @@ -1487,8 +1509,8 @@ module_eval <<'.,.,', 'grammar.ra', 696 end .,., -module_eval <<'.,.,', 'grammar.ra', 708 - def _reduce_94( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 719 + def _reduce_96( val, _values, result ) if val[1].instance_of?(AST::ASTArray) result = val[1] else @@ -1502,14 +1524,14 @@ module_eval <<'.,.,', 'grammar.ra', 708 end .,., - # reduce 95 omitted + # reduce 97 omitted - # reduce 96 omitted + # reduce 98 omitted - # reduce 97 omitted + # reduce 99 omitted -module_eval <<'.,.,', 'grammar.ra', 713 - def _reduce_98( val, _values, result ) +module_eval <<'.,.,', 'grammar.ra', 724 + def _reduce_100( val, _values, result ) result = nil result end |