puppet 3.8.7-x64-mingw32 → 4.0.0.rc1-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puppet might be problematic. Click here for more details.

Files changed (1586) hide show
  1. data/CONTRIBUTING.md +26 -11
  2. data/Gemfile +13 -25
  3. data/LICENSE +1 -1
  4. data/Rakefile +9 -0
  5. data/bin/puppet +7 -6
  6. data/conf/auth.conf +30 -26
  7. data/conf/environment.conf +16 -0
  8. data/conf/fileserver.conf +2 -2
  9. data/conf/puppet.conf +6 -0
  10. data/ext/README.environment +1 -1
  11. data/ext/build_defaults.yaml +16 -7
  12. data/ext/debian/control +5 -5
  13. data/ext/debian/puppet-common.manpages +0 -5
  14. data/ext/debian/puppet-common.postinst +3 -3
  15. data/ext/debian/puppet.init +23 -12
  16. data/ext/debian/puppet.logrotate +1 -2
  17. data/ext/debian/puppetmaster-common.postinst +6 -0
  18. data/ext/debian/puppetmaster.init +5 -5
  19. data/ext/debian/rules +4 -1
  20. data/ext/debian/vim-puppet.dirs +2 -0
  21. data/ext/debian/vim-puppet.yaml +2 -0
  22. data/ext/emacs/puppet-mode.el +0 -1
  23. data/ext/gentoo/conf.d/puppet +1 -1
  24. data/ext/gentoo/conf.d/puppetmaster +1 -1
  25. data/ext/nagios/check_puppet.rb +1 -1
  26. data/ext/project_data.yaml +6 -7
  27. data/ext/puppet-nm-dispatcher +13 -0
  28. data/ext/puppet-test +0 -66
  29. data/ext/puppetlisten/puppetlisten.rb +7 -5
  30. data/ext/rack/config.ru +12 -5
  31. data/ext/redhat/client.init +3 -3
  32. data/ext/redhat/logrotate +1 -2
  33. data/ext/redhat/puppet.spec.erb +12 -8
  34. data/ext/redhat/server.init +1 -1
  35. data/ext/regexp_nodes/regexp_nodes.rb +1 -1
  36. data/ext/solaris/smf/svc-puppetd +1 -1
  37. data/ext/solaris/smf/svc-puppetmasterd +1 -1
  38. data/ext/suse/client.init +1 -1
  39. data/ext/suse/server.init +1 -1
  40. data/ext/systemd/puppet.service +1 -3
  41. data/ext/vim/syntax/puppet.vim +1 -1
  42. data/ext/windows/service/daemon.rb +19 -2
  43. data/install.rb +63 -7
  44. data/lib/hiera/puppet_function.rb +7 -18
  45. data/lib/hiera/scope.rb +4 -1
  46. data/lib/puppet.rb +19 -51
  47. data/lib/puppet/agent.rb +2 -6
  48. data/lib/puppet/application.rb +14 -65
  49. data/lib/puppet/application/agent.rb +7 -56
  50. data/lib/puppet/application/apply.rb +1 -6
  51. data/lib/puppet/application/ca.rb +5 -0
  52. data/lib/puppet/application/cert.rb +7 -3
  53. data/lib/puppet/application/certificate.rb +2 -0
  54. data/lib/puppet/application/device.rb +10 -36
  55. data/lib/puppet/application/doc.rb +16 -63
  56. data/lib/puppet/application/epp.rb +5 -0
  57. data/lib/puppet/application/face_base.rb +24 -5
  58. data/lib/puppet/application/master.rb +2 -5
  59. data/lib/puppet/application/resource.rb +17 -17
  60. data/lib/puppet/application_support.rb +57 -0
  61. data/lib/puppet/configurer.rb +3 -7
  62. data/lib/puppet/configurer/downloader.rb +1 -0
  63. data/lib/puppet/configurer/fact_handler.rb +1 -1
  64. data/lib/puppet/daemon.rb +6 -15
  65. data/lib/puppet/data_providers.rb +28 -0
  66. data/lib/puppet/data_providers/data_adapter.rb +86 -0
  67. data/lib/puppet/data_providers/data_function_support.rb +32 -0
  68. data/lib/puppet/data_providers/function_env_data_provider.rb +28 -0
  69. data/lib/puppet/data_providers/function_module_data_provider.rb +44 -0
  70. data/lib/puppet/defaults.rb +135 -530
  71. data/lib/puppet/environments.rb +10 -156
  72. data/lib/puppet/error.rb +4 -30
  73. data/lib/puppet/external/nagios/base.rb +2 -2
  74. data/lib/puppet/external/pson/common.rb +2 -17
  75. data/lib/puppet/external/pson/pure/generator.rb +1 -0
  76. data/lib/puppet/external/pson/pure/parser.rb +0 -11
  77. data/lib/puppet/face/catalog.rb +4 -4
  78. data/lib/puppet/face/certificate.rb +2 -3
  79. data/lib/puppet/face/certificate_request.rb +4 -3
  80. data/lib/puppet/face/certificate_revocation_list.rb +5 -9
  81. data/lib/puppet/face/config.rb +2 -2
  82. data/lib/puppet/face/epp.rb +479 -0
  83. data/lib/puppet/face/facts.rb +6 -49
  84. data/lib/puppet/face/file.rb +2 -2
  85. data/lib/puppet/face/file/download.rb +1 -2
  86. data/lib/puppet/face/help.rb +2 -3
  87. data/lib/puppet/face/module/build.rb +5 -5
  88. data/lib/puppet/face/module/changes.rb +1 -1
  89. data/lib/puppet/face/module/generate.rb +6 -6
  90. data/lib/puppet/face/module/install.rb +16 -16
  91. data/lib/puppet/face/module/list.rb +9 -9
  92. data/lib/puppet/face/module/uninstall.rb +5 -5
  93. data/lib/puppet/face/module/upgrade.rb +3 -3
  94. data/lib/puppet/face/node.rb +3 -4
  95. data/lib/puppet/face/node/clean.rb +5 -68
  96. data/lib/puppet/face/parser.rb +6 -8
  97. data/lib/puppet/face/report.rb +4 -4
  98. data/lib/puppet/face/resource.rb +1 -1
  99. data/lib/puppet/face/resource_type.rb +7 -4
  100. data/lib/puppet/face/status.rb +6 -12
  101. data/lib/puppet/feature/base.rb +0 -7
  102. data/lib/puppet/file_bucket/dipper.rb +1 -2
  103. data/lib/puppet/file_bucket/file.rb +12 -25
  104. data/lib/puppet/file_serving/base.rb +1 -11
  105. data/lib/puppet/file_serving/content.rb +5 -7
  106. data/lib/puppet/file_serving/metadata.rb +4 -61
  107. data/lib/puppet/file_serving/mount/pluginfacts.rb +1 -1
  108. data/lib/puppet/file_serving/mount/plugins.rb +1 -1
  109. data/lib/puppet/file_serving/terminus_helper.rb +16 -5
  110. data/lib/puppet/file_system.rb +6 -22
  111. data/lib/puppet/file_system/file_impl.rb +0 -4
  112. data/lib/puppet/file_system/memory_file.rb +0 -5
  113. data/lib/puppet/file_system/memory_impl.rb +0 -4
  114. data/lib/puppet/file_system/{file19.rb → posix.rb} +1 -1
  115. data/lib/puppet/file_system/{file19windows.rb → windows.rb} +2 -10
  116. data/lib/puppet/forge/repository.rb +12 -8
  117. data/lib/puppet/functions.rb +17 -51
  118. data/lib/puppet/functions/assert_type.rb +7 -7
  119. data/lib/puppet/functions/each.rb +1 -3
  120. data/lib/puppet/functions/epp.rb +3 -3
  121. data/lib/puppet/functions/filter.rb +3 -5
  122. data/lib/puppet/functions/hiera.rb +2 -23
  123. data/lib/puppet/functions/hiera_array.rb +3 -25
  124. data/lib/puppet/functions/hiera_hash.rb +2 -26
  125. data/lib/puppet/functions/hiera_include.rb +4 -37
  126. data/lib/puppet/functions/inline_epp.rb +1 -2
  127. data/lib/puppet/functions/lookup.rb +234 -0
  128. data/lib/puppet/functions/map.rb +1 -3
  129. data/lib/puppet/functions/match.rb +5 -5
  130. data/lib/puppet/functions/reduce.rb +1 -3
  131. data/lib/puppet/functions/regsubst.rb +79 -0
  132. data/lib/puppet/functions/scanf.rb +4 -3
  133. data/lib/puppet/functions/slice.rb +1 -3
  134. data/lib/puppet/functions/split.rb +47 -0
  135. data/lib/puppet/functions/with.rb +1 -1
  136. data/lib/puppet/graph/relationship_graph.rb +41 -13
  137. data/lib/puppet/graph/simple_graph.rb +6 -10
  138. data/lib/puppet/indirector/catalog/compiler.rb +0 -2
  139. data/lib/puppet/indirector/catalog/static_compiler.rb +4 -5
  140. data/lib/puppet/indirector/direct_file_server.rb +1 -3
  141. data/lib/puppet/indirector/face.rb +11 -2
  142. data/lib/puppet/indirector/facts/facter.rb +5 -1
  143. data/lib/puppet/indirector/facts/network_device.rb +5 -2
  144. data/lib/puppet/indirector/facts/store_configs.rb +3 -0
  145. data/lib/puppet/indirector/facts/yaml.rb +4 -0
  146. data/lib/puppet/indirector/file_metadata/file.rb +0 -15
  147. data/lib/puppet/indirector/file_server.rb +2 -16
  148. data/lib/puppet/indirector/hiera.rb +39 -1
  149. data/lib/puppet/indirector/indirection.rb +2 -9
  150. data/lib/puppet/indirector/node/ldap.rb +1 -1
  151. data/lib/puppet/indirector/request.rb +21 -81
  152. data/lib/puppet/indirector/resource/ral.rb +1 -2
  153. data/lib/puppet/indirector/resource/store_configs.rb +1 -2
  154. data/lib/puppet/indirector/resource_type/parser.rb +1 -1
  155. data/lib/puppet/indirector/rest.rb +21 -33
  156. data/lib/puppet/interface.rb +0 -7
  157. data/lib/puppet/interface/action_builder.rb +1 -1
  158. data/lib/puppet/interface/action_manager.rb +9 -13
  159. data/lib/puppet/interface/face_collection.rb +2 -2
  160. data/lib/puppet/interface/option_builder.rb +1 -3
  161. data/lib/puppet/metatype/manager.rb +1 -7
  162. data/lib/puppet/module.rb +42 -35
  163. data/lib/puppet/module_tool.rb +5 -7
  164. data/lib/puppet/module_tool/applications/application.rb +3 -10
  165. data/lib/puppet/module_tool/applications/installer.rb +13 -15
  166. data/lib/puppet/module_tool/applications/unpacker.rb +1 -1
  167. data/lib/puppet/module_tool/applications/upgrader.rb +9 -11
  168. data/lib/puppet/module_tool/contents_description.rb +17 -13
  169. data/lib/puppet/module_tool/installed_modules.rb +4 -6
  170. data/lib/puppet/module_tool/metadata.rb +3 -14
  171. data/lib/puppet/module_tool/skeleton/templates/generator/Gemfile +3 -3
  172. data/lib/puppet/module_tool/skeleton/templates/generator/Rakefile +0 -1
  173. data/lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb +1 -1
  174. data/lib/puppet/module_tool/tar/gnu.rb +1 -1
  175. data/lib/puppet/module_tool/tar/mini.rb +2 -2
  176. data/lib/puppet/network/auth_config_parser.rb +2 -2
  177. data/lib/puppet/network/authconfig.rb +32 -16
  178. data/lib/puppet/network/format_handler.rb +7 -7
  179. data/lib/puppet/network/format_support.rb +4 -0
  180. data/lib/puppet/network/formats.rb +6 -62
  181. data/lib/puppet/network/http.rb +12 -2
  182. data/lib/puppet/network/http/api.rb +42 -0
  183. data/lib/puppet/network/http/api/ca.rb +2 -0
  184. data/lib/puppet/network/http/api/ca/v1.rb +11 -0
  185. data/lib/puppet/network/http/api/{v1.rb → indirected_routes.rb} +57 -29
  186. data/lib/puppet/network/http/api/indirection_type.rb +32 -0
  187. data/lib/puppet/network/http/api/master.rb +2 -0
  188. data/lib/puppet/network/http/api/master/v3.rb +22 -0
  189. data/lib/puppet/network/http/api/master/v3/authorization.rb +18 -0
  190. data/lib/puppet/network/http/api/{v2 → master/v3}/environments.rb +2 -2
  191. data/lib/puppet/network/http/compression.rb +3 -5
  192. data/lib/puppet/network/http/connection.rb +1 -8
  193. data/lib/puppet/network/http/factory.rb +2 -3
  194. data/lib/puppet/network/http/handler.rb +3 -11
  195. data/lib/puppet/network/http/rack/rest.rb +4 -4
  196. data/lib/puppet/network/http/request.rb +4 -4
  197. data/lib/puppet/network/http/webrick.rb +1 -6
  198. data/lib/puppet/network/http/webrick/rest.rb +15 -8
  199. data/lib/puppet/network/resolver.rb +2 -2
  200. data/lib/puppet/network/rights.rb +2 -2
  201. data/lib/puppet/node.rb +2 -29
  202. data/lib/puppet/node/environment.rb +92 -184
  203. data/lib/puppet/node/facts.rb +22 -44
  204. data/lib/puppet/parameter.rb +3 -16
  205. data/lib/puppet/parameter/value.rb +1 -3
  206. data/lib/puppet/parameter/value_collection.rb +12 -11
  207. data/lib/puppet/parser.rb +12 -2
  208. data/lib/puppet/parser/ast.rb +9 -78
  209. data/lib/puppet/parser/ast/block_expression.rb +11 -36
  210. data/lib/puppet/parser/ast/branch.rb +15 -18
  211. data/lib/puppet/parser/ast/hostclass.rb +1 -3
  212. data/lib/puppet/parser/ast/leaf.rb +55 -212
  213. data/lib/puppet/parser/ast/node.rb +3 -11
  214. data/lib/puppet/parser/ast/pops_bridge.rb +2 -7
  215. data/lib/puppet/parser/ast/resource.rb +14 -20
  216. data/lib/puppet/parser/ast/resource_instance.rb +4 -7
  217. data/lib/puppet/parser/ast/resourceparam.rb +21 -22
  218. data/lib/puppet/parser/compiler.rb +41 -70
  219. data/lib/puppet/parser/e4_parser_adapter.rb +2 -23
  220. data/lib/puppet/parser/files.rb +22 -67
  221. data/lib/puppet/parser/functions.rb +1 -3
  222. data/lib/puppet/parser/functions/assert_type.rb +1 -2
  223. data/lib/puppet/parser/functions/contain.rb +5 -3
  224. data/lib/puppet/parser/functions/create_resources.rb +9 -1
  225. data/lib/puppet/parser/functions/defined.rb +33 -61
  226. data/lib/puppet/parser/functions/each.rb +1 -3
  227. data/lib/puppet/parser/functions/epp.rb +1 -2
  228. data/lib/puppet/parser/functions/file.rb +1 -3
  229. data/lib/puppet/parser/functions/filter.rb +1 -3
  230. data/lib/puppet/parser/functions/hiera.rb +4 -6
  231. data/lib/puppet/parser/functions/hiera_array.rb +4 -6
  232. data/lib/puppet/parser/functions/hiera_hash.rb +6 -8
  233. data/lib/puppet/parser/functions/hiera_include.rb +2 -10
  234. data/lib/puppet/parser/functions/include.rb +4 -2
  235. data/lib/puppet/parser/functions/lookup.rb +115 -105
  236. data/lib/puppet/parser/functions/map.rb +1 -3
  237. data/lib/puppet/parser/functions/match.rb +1 -2
  238. data/lib/puppet/parser/functions/realize.rb +1 -6
  239. data/lib/puppet/parser/functions/reduce.rb +1 -3
  240. data/lib/puppet/parser/functions/regsubst.rb +1 -57
  241. data/lib/puppet/parser/functions/require.rb +6 -4
  242. data/lib/puppet/parser/functions/scanf.rb +1 -1
  243. data/lib/puppet/parser/functions/slice.rb +1 -3
  244. data/lib/puppet/parser/functions/split.rb +1 -1
  245. data/lib/puppet/parser/functions/with.rb +1 -2
  246. data/lib/puppet/parser/parser_factory.rb +5 -21
  247. data/lib/puppet/parser/relationship.rb +14 -37
  248. data/lib/puppet/parser/resource.rb +11 -22
  249. data/lib/puppet/parser/scope.rb +45 -135
  250. data/lib/puppet/parser/templatewrapper.rb +1 -29
  251. data/lib/puppet/parser/type_loader.rb +12 -15
  252. data/lib/puppet/plugins.rb +9 -0
  253. data/lib/{puppetx/puppet/bindings_scheme_handler.rb → puppet/plugins/binding_schemes.rb} +14 -4
  254. data/lib/puppet/plugins/configuration.rb +68 -0
  255. data/lib/puppet/plugins/data_providers.rb +90 -0
  256. data/lib/{puppetx/puppet/syntax_checker.rb → puppet/plugins/syntax_checkers.rb} +14 -2
  257. data/lib/puppet/pops.rb +6 -7
  258. data/lib/puppet/pops/adaptable.rb +16 -5
  259. data/lib/puppet/pops/binder/binder.rb +5 -4
  260. data/lib/puppet/pops/binder/bindings_composer.rb +6 -4
  261. data/lib/puppet/pops/binder/bindings_factory.rb +4 -0
  262. data/lib/puppet/pops/binder/bindings_label_provider.rb +1 -1
  263. data/lib/puppet/pops/binder/bindings_loader.rb +3 -8
  264. data/lib/puppet/pops/binder/bindings_model_dumper.rb +36 -8
  265. data/lib/puppet/pops/binder/config/binder_config.rb +2 -2
  266. data/lib/puppet/pops/binder/config/binder_config_checker.rb +1 -1
  267. data/lib/puppet/pops/binder/config/issues.rb +4 -0
  268. data/lib/puppet/pops/binder/injector.rb +0 -1
  269. data/lib/puppet/pops/binder/scheme_handler/symbolic_scheme.rb +1 -1
  270. data/lib/puppet/pops/evaluator/access_operator.rb +18 -50
  271. data/lib/puppet/pops/evaluator/callable_mismatch_describer.rb +5 -5
  272. data/lib/puppet/pops/evaluator/callable_signature.rb +2 -2
  273. data/lib/puppet/pops/evaluator/closure.rb +16 -21
  274. data/lib/puppet/pops/evaluator/collector_transformer.rb +11 -1
  275. data/lib/puppet/pops/evaluator/compare_operator.rb +0 -43
  276. data/lib/puppet/pops/evaluator/epp_evaluator.rb +1 -1
  277. data/lib/puppet/pops/evaluator/evaluator_impl.rb +36 -152
  278. data/lib/puppet/pops/evaluator/external_syntax_support.rb +6 -3
  279. data/lib/puppet/pops/evaluator/relationship_operator.rb +1 -1
  280. data/lib/puppet/pops/evaluator/runtime3_converter.rb +1 -1
  281. data/lib/puppet/pops/evaluator/runtime3_support.rb +9 -57
  282. data/lib/puppet/pops/functions/dispatch.rb +1 -6
  283. data/lib/puppet/pops/issue_reporter.rb +16 -42
  284. data/lib/puppet/pops/issues.rb +13 -128
  285. data/lib/puppet/pops/loader/dependency_loader.rb +3 -3
  286. data/lib/puppet/pops/loader/loader.rb +21 -20
  287. data/lib/puppet/pops/loaders.rb +13 -8
  288. data/lib/puppet/pops/lookup.rb +96 -0
  289. data/lib/puppet/pops/merge_strategy.rb +283 -0
  290. data/lib/puppet/pops/model/ast_transformer.rb +4 -522
  291. data/lib/puppet/pops/model/factory.rb +20 -21
  292. data/lib/puppet/pops/model/model.rb +1 -1
  293. data/lib/puppet/pops/model/model_label_provider.rb +1 -1
  294. data/lib/puppet/pops/model/model_meta.rb +10 -7
  295. data/lib/puppet/pops/model/tree_dumper.rb +1 -1
  296. data/lib/puppet/pops/parser/egrammar.ra +1 -13
  297. data/lib/puppet/pops/parser/eparser.rb +1132 -1272
  298. data/lib/puppet/pops/parser/epp_support.rb +11 -22
  299. data/lib/puppet/pops/parser/evaluating_parser.rb +11 -10
  300. data/lib/puppet/pops/parser/heredoc_support.rb +12 -13
  301. data/lib/puppet/pops/parser/interpolation_support.rb +1 -7
  302. data/lib/puppet/pops/parser/lexer2.rb +33 -36
  303. data/lib/puppet/pops/parser/lexer_support.rb +20 -46
  304. data/lib/puppet/pops/parser/locator.rb +6 -30
  305. data/lib/puppet/pops/parser/parser_support.rb +14 -11
  306. data/lib/puppet/pops/parser/slurp_support.rb +6 -22
  307. data/lib/puppet/pops/patterns.rb +0 -3
  308. data/lib/puppet/pops/types/class_loader.rb +8 -8
  309. data/lib/puppet/pops/types/enumeration.rb +1 -1
  310. data/lib/puppet/pops/types/type_asserter.rb +45 -0
  311. data/lib/puppet/pops/types/type_assertion_error.rb +26 -0
  312. data/lib/puppet/pops/types/type_calculator.rb +110 -212
  313. data/lib/puppet/pops/types/type_factory.rb +15 -74
  314. data/lib/puppet/pops/types/type_parser.rb +15 -24
  315. data/lib/puppet/pops/types/types.rb +25 -35
  316. data/lib/puppet/pops/types/types_meta.rb +2 -13
  317. data/lib/puppet/pops/utils.rb +1 -1
  318. data/lib/puppet/pops/validation.rb +3 -26
  319. data/lib/puppet/pops/validation/checker4_0.rb +6 -56
  320. data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -3
  321. data/lib/puppet/pops/visitor.rb +10 -7
  322. data/lib/puppet/property.rb +44 -124
  323. data/lib/puppet/provider.rb +0 -52
  324. data/lib/puppet/provider/aixobject.rb +2 -2
  325. data/lib/puppet/provider/augeas/augeas.rb +9 -6
  326. data/lib/puppet/provider/command.rb +1 -1
  327. data/lib/puppet/provider/cron/crontab.rb +37 -0
  328. data/lib/puppet/provider/exec.rb +2 -16
  329. data/lib/puppet/provider/file/posix.rb +1 -1
  330. data/lib/puppet/provider/file/windows.rb +1 -1
  331. data/lib/puppet/provider/group/aix.rb +1 -1
  332. data/lib/puppet/provider/group/pw.rb +0 -1
  333. data/lib/puppet/provider/group/windows_adsi.rb +4 -18
  334. data/lib/puppet/provider/host/parsed.rb +4 -2
  335. data/lib/puppet/provider/macauthorization/macauthorization.rb +0 -12
  336. data/lib/puppet/provider/mailalias/aliases.rb +23 -12
  337. data/lib/puppet/provider/mount/parsed.rb +2 -145
  338. data/lib/puppet/provider/nameservice/directoryservice.rb +57 -131
  339. data/lib/puppet/provider/network_device.rb +3 -0
  340. data/lib/puppet/provider/package/appdmg.rb +5 -2
  341. data/lib/puppet/provider/package/apt.rb +1 -1
  342. data/lib/puppet/provider/package/fink.rb +1 -1
  343. data/lib/puppet/provider/package/openbsd.rb +26 -12
  344. data/lib/puppet/provider/package/opkg.rb +6 -1
  345. data/lib/puppet/provider/package/pacman.rb +159 -127
  346. data/lib/puppet/provider/package/pip.rb +1 -11
  347. data/lib/puppet/provider/package/pkg.rb +73 -29
  348. data/lib/puppet/provider/package/pkgdmg.rb +2 -2
  349. data/lib/puppet/provider/package/pkgin.rb +1 -1
  350. data/lib/puppet/provider/package/portage.rb +5 -1
  351. data/lib/puppet/provider/package/portupgrade.rb +0 -2
  352. data/lib/puppet/provider/package/rpm.rb +109 -0
  353. data/lib/puppet/provider/package/rug.rb +0 -1
  354. data/lib/puppet/provider/package/windows/package.rb +1 -1
  355. data/lib/puppet/provider/package/yum.rb +121 -30
  356. data/lib/puppet/provider/package/zypper.rb +8 -17
  357. data/lib/puppet/provider/scheduled_task/win32_taskscheduler.rb +7 -32
  358. data/lib/puppet/provider/service/base.rb +17 -3
  359. data/lib/puppet/provider/service/bsd.rb +1 -1
  360. data/lib/puppet/provider/service/daemontools.rb +1 -1
  361. data/lib/puppet/provider/service/init.rb +0 -7
  362. data/lib/puppet/provider/service/launchd.rb +11 -89
  363. data/lib/puppet/provider/service/openbsd.rb +56 -298
  364. data/lib/puppet/provider/service/runit.rb +1 -1
  365. data/lib/puppet/provider/service/systemd.rb +1 -0
  366. data/lib/puppet/provider/service/upstart.rb +4 -2
  367. data/lib/puppet/provider/ssh_authorized_key/parsed.rb +1 -1
  368. data/lib/puppet/provider/user/aix.rb +1 -1
  369. data/lib/puppet/provider/user/directoryservice.rb +40 -70
  370. data/lib/puppet/provider/user/hpux.rb +31 -2
  371. data/lib/puppet/provider/user/openbsd.rb +74 -0
  372. data/lib/puppet/provider/user/pw.rb +0 -1
  373. data/lib/puppet/provider/user/user_role_add.rb +1 -3
  374. data/lib/puppet/provider/user/windows_adsi.rb +2 -9
  375. data/lib/puppet/provider/yumrepo/inifile.rb +1 -3
  376. data/lib/puppet/provider/zfs/zfs.rb +3 -2
  377. data/lib/puppet/provider/zone/solaris.rb +3 -3
  378. data/lib/puppet/reference/configuration.rb +4 -3
  379. data/lib/puppet/reference/metaparameter.rb +0 -9
  380. data/lib/puppet/reference/providers.rb +1 -1
  381. data/lib/puppet/reference/type.rb +8 -10
  382. data/lib/puppet/relationship.rb +4 -17
  383. data/lib/puppet/resource.rb +132 -114
  384. data/lib/puppet/resource/catalog.rb +23 -30
  385. data/lib/puppet/resource/status.rb +74 -22
  386. data/lib/puppet/resource/type.rb +12 -52
  387. data/lib/puppet/resource/type_collection.rb +26 -73
  388. data/lib/puppet/settings.rb +94 -153
  389. data/lib/puppet/settings/base_setting.rb +6 -30
  390. data/lib/puppet/settings/config_file.rb +14 -11
  391. data/lib/puppet/settings/duration_setting.rb +1 -1
  392. data/lib/puppet/settings/environment_conf.rb +14 -12
  393. data/lib/puppet/settings/file_setting.rb +9 -10
  394. data/lib/puppet/settings/ttl_setting.rb +1 -3
  395. data/lib/puppet/ssl/certificate.rb +38 -8
  396. data/lib/puppet/ssl/certificate_authority/interface.rb +7 -1
  397. data/lib/puppet/ssl/certificate_factory.rb +3 -3
  398. data/lib/puppet/ssl/certificate_request.rb +36 -8
  399. data/lib/puppet/ssl/configuration.rb +2 -8
  400. data/lib/puppet/ssl/host.rb +1 -8
  401. data/lib/puppet/ssl/inventory.rb +0 -7
  402. data/lib/puppet/ssl/oids.rb +72 -3
  403. data/lib/puppet/ssl/validator/default_validator.rb +0 -1
  404. data/lib/puppet/status.rb +0 -5
  405. data/lib/puppet/syntax_checkers.rb +3 -0
  406. data/lib/{puppetx/puppetlabs → puppet}/syntax_checkers/json.rb +2 -2
  407. data/lib/puppet/test/test_helper.rb +11 -12
  408. data/lib/puppet/transaction.rb +12 -9
  409. data/lib/puppet/transaction/event.rb +4 -5
  410. data/lib/puppet/transaction/event_manager.rb +50 -5
  411. data/lib/puppet/transaction/report.rb +5 -10
  412. data/lib/puppet/transaction/resource_harness.rb +7 -2
  413. data/lib/puppet/type.rb +113 -29
  414. data/lib/puppet/type/augeas.rb +1 -0
  415. data/lib/puppet/type/exec.rb +2 -2
  416. data/lib/puppet/type/file.rb +8 -9
  417. data/lib/puppet/type/file/content.rb +19 -15
  418. data/lib/puppet/type/file/mode.rb +16 -11
  419. data/lib/puppet/type/file/selcontext.rb +1 -1
  420. data/lib/puppet/type/file/source.rb +15 -15
  421. data/lib/puppet/type/filebucket.rb +2 -2
  422. data/lib/puppet/type/group.rb +5 -17
  423. data/lib/puppet/type/host.rb +12 -3
  424. data/lib/puppet/type/k5login.rb +1 -1
  425. data/lib/puppet/type/mailalias.rb +20 -6
  426. data/lib/puppet/type/maillist.rb +1 -1
  427. data/lib/puppet/type/mount.rb +6 -16
  428. data/lib/puppet/type/notify.rb +1 -1
  429. data/lib/puppet/type/package.rb +91 -16
  430. data/lib/puppet/type/resources.rb +0 -7
  431. data/lib/puppet/type/router.rb +1 -1
  432. data/lib/puppet/type/schedule.rb +1 -1
  433. data/lib/puppet/type/scheduled_task.rb +0 -13
  434. data/lib/puppet/type/selboolean.rb +2 -2
  435. data/lib/puppet/type/service.rb +1 -1
  436. data/lib/puppet/type/ssh_authorized_key.rb +1 -1
  437. data/lib/puppet/type/sshkey.rb +1 -1
  438. data/lib/puppet/type/tidy.rb +4 -1
  439. data/lib/puppet/type/user.rb +16 -3
  440. data/lib/puppet/type/yumrepo.rb +26 -0
  441. data/lib/puppet/type/zfs.rb +1 -1
  442. data/lib/puppet/type/zpool.rb +1 -1
  443. data/lib/puppet/util.rb +2 -85
  444. data/lib/puppet/util/autoload.rb +3 -13
  445. data/lib/puppet/util/checksums.rb +59 -22
  446. data/lib/puppet/util/classgen.rb +1 -9
  447. data/lib/puppet/util/colors.rb +0 -117
  448. data/lib/puppet/util/command_line.rb +1 -23
  449. data/lib/puppet/util/errors.rb +2 -4
  450. data/lib/puppet/util/execution.rb +19 -22
  451. data/lib/puppet/util/feature.rb +2 -4
  452. data/lib/puppet/util/fileparsing.rb +3 -2
  453. data/lib/puppet/util/log.rb +13 -56
  454. data/lib/puppet/util/log/destinations.rb +17 -36
  455. data/lib/puppet/util/logging.rb +52 -37
  456. data/lib/puppet/util/metric.rb +0 -149
  457. data/lib/puppet/util/monkey_patches.rb +1 -94
  458. data/lib/puppet/util/network_device/base.rb +1 -5
  459. data/lib/puppet/util/network_device/cisco/interface.rb +2 -2
  460. data/lib/puppet/util/network_device/config.rb +0 -5
  461. data/lib/puppet/util/network_device/transport/ssh.rb +2 -2
  462. data/lib/puppet/util/profiler.rb +1 -1
  463. data/lib/puppet/util/profiler/aggregate.rb +1 -1
  464. data/lib/puppet/util/profiler/around_profiler.rb +1 -1
  465. data/lib/puppet/util/psych_support.rb +38 -0
  466. data/lib/puppet/util/rdoc.rb +6 -42
  467. data/lib/puppet/util/rdoc/code_objects.rb +5 -45
  468. data/lib/puppet/util/rdoc/generators/puppet_generator.rb +1 -1
  469. data/lib/puppet/util/rdoc/parser.rb +5 -15
  470. data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +8 -227
  471. data/lib/puppet/util/retry_action.rb +46 -0
  472. data/lib/puppet/util/run_mode.rb +31 -7
  473. data/lib/puppet/util/selinux.rb +2 -2
  474. data/lib/puppet/util/ssl.rb +11 -11
  475. data/lib/puppet/util/suidmanager.rb +4 -31
  476. data/lib/puppet/util/tag_set.rb +0 -11
  477. data/lib/puppet/util/tagging.rb +50 -19
  478. data/lib/puppet/util/warnings.rb +1 -0
  479. data/lib/puppet/util/windows/adsi.rb +13 -60
  480. data/lib/puppet/util/windows/api_types.rb +16 -2
  481. data/lib/puppet/util/windows/file.rb +2 -8
  482. data/lib/puppet/util/windows/process.rb +58 -0
  483. data/lib/puppet/util/windows/registry.rb +319 -31
  484. data/lib/puppet/util/windows/security.rb +1 -68
  485. data/lib/puppet/util/windows/taskscheduler.rb +0 -21
  486. data/lib/puppet/util/windows/user.rb +2 -3
  487. data/lib/puppet/vendor/deep_merge/CHANGELOG +45 -0
  488. data/lib/puppet/vendor/deep_merge/Gemfile +3 -0
  489. data/lib/puppet/vendor/deep_merge/LICENSE +21 -0
  490. data/lib/puppet/vendor/deep_merge/README.md +113 -0
  491. data/lib/puppet/vendor/deep_merge/Rakefile +19 -0
  492. data/lib/puppet/vendor/deep_merge/deep_merge.gemspec +35 -0
  493. data/lib/puppet/vendor/deep_merge/lib/deep_merge.rb +2 -0
  494. data/lib/puppet/vendor/deep_merge/lib/deep_merge/core.rb +210 -0
  495. data/lib/puppet/vendor/deep_merge/lib/deep_merge/deep_merge_hash.rb +28 -0
  496. data/lib/puppet/vendor/deep_merge/lib/deep_merge/rails_compat.rb +27 -0
  497. data/lib/puppet/vendor/deep_merge/test/test_deep_merge.rb +608 -0
  498. data/lib/puppet/vendor/load_deep_merge.rb +1 -0
  499. data/lib/puppet/vendor/load_rgen.rb +1 -0
  500. data/lib/puppet/vendor/require_vendored.rb +1 -3
  501. data/lib/puppet/vendor/rgen_patch.rb +132 -0
  502. data/lib/puppet/version.rb +1 -1
  503. data/lib/puppet_x.rb +8 -0
  504. data/lib/semver.rb +0 -1
  505. data/man/man5/puppet.conf.5 +432 -287
  506. data/man/man8/extlookup2hiera.8 +2 -15
  507. data/man/man8/puppet-agent.8 +14 -14
  508. data/man/man8/puppet-apply.8 +29 -30
  509. data/man/man8/puppet-ca.8 +29 -17
  510. data/man/man8/puppet-catalog.8 +5 -34
  511. data/man/man8/puppet-cert.8 +8 -4
  512. data/man/man8/puppet-certificate.8 +15 -29
  513. data/man/man8/puppet-certificate_request.8 +9 -16
  514. data/man/man8/puppet-certificate_revocation_list.8 +5 -31
  515. data/man/man8/puppet-config.8 +52 -11
  516. data/man/man8/puppet-describe.8 +1 -1
  517. data/man/man8/puppet-device.8 +5 -16
  518. data/man/man8/puppet-doc.8 +7 -80
  519. data/man/man8/puppet-epp.8 +349 -0
  520. data/man/man8/puppet-facts.8 +5 -95
  521. data/man/man8/puppet-file.8 +2 -28
  522. data/man/man8/puppet-filebucket.8 +2 -2
  523. data/man/man8/puppet-help.8 +2 -2
  524. data/man/man8/puppet-inspect.8 +1 -1
  525. data/man/man8/puppet-key.8 +6 -3
  526. data/man/man8/puppet-man.8 +2 -2
  527. data/man/man8/puppet-master.8 +11 -7
  528. data/man/man8/puppet-module.8 +75 -49
  529. data/man/man8/puppet-node.8 +8 -56
  530. data/man/man8/puppet-parser.8 +38 -4
  531. data/man/man8/puppet-plugin.8 +2 -2
  532. data/man/man8/puppet-report.8 +8 -70
  533. data/man/man8/puppet-resource.8 +7 -3
  534. data/man/man8/puppet-resource_type.8 +2 -28
  535. data/man/man8/puppet-status.8 +5 -47
  536. data/man/man8/puppet.8 +2 -2
  537. data/spec/fixtures/integration/provider/mailalias/aliases/test1 +3 -0
  538. data/spec/fixtures/integration/provider/sshkey/sample +21 -0
  539. data/spec/fixtures/unit/data_providers/environments/production/environment.conf +2 -0
  540. data/spec/fixtures/unit/data_providers/environments/production/lib/puppet/functions/environment/data.rb +7 -0
  541. data/spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/bindings/abc/default.rb +9 -0
  542. data/spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/functions/abc/data.rb +8 -0
  543. data/spec/fixtures/unit/data_providers/environments/production/modules/abc/manifests/init.pp +9 -0
  544. data/spec/fixtures/unit/data_providers/environments/sample/environment.conf +2 -0
  545. data/spec/fixtures/unit/data_providers/environments/sample/manifests/site.pp +6 -0
  546. data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet/bindings/dataprovider/default.rb +54 -0
  547. data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_env_data.rb +31 -0
  548. data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_module_data.rb +32 -0
  549. data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/manifests/init.pp +5 -0
  550. data/spec/fixtures/unit/functions/lookup/environments/production/environment.conf +2 -0
  551. data/spec/fixtures/unit/functions/lookup/environments/production/lib/puppet/functions/environment/data.rb +11 -0
  552. data/spec/fixtures/unit/functions/lookup/environments/production/modules/abc/lib/puppet/bindings/abc/default.rb +9 -0
  553. data/spec/fixtures/unit/functions/lookup/environments/production/modules/abc/lib/puppet/functions/abc/data.rb +9 -0
  554. data/spec/fixtures/unit/functions/lookup/environments/production/modules/abc/manifests/init.pp +8 -0
  555. data/spec/fixtures/unit/parser/lexer/subclass_name_duplication.pp +0 -0
  556. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/binder_config.yaml +1 -1
  557. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome2/lib/{puppetx → puppet_x}/awesome2/echo_scheme_handler.rb +3 -3
  558. data/spec/fixtures/unit/pops/binder/config/binder_config/nolayer/binder_config.yaml +6 -0
  559. data/spec/fixtures/unit/pops/parser/lexer/subclass_name_duplication.pp +0 -0
  560. data/spec/fixtures/unit/provider/mount/parsed/aix.filesystems +85 -93
  561. data/spec/fixtures/unit/provider/mount/parsed/aix.mount +7 -11
  562. data/spec/fixtures/unit/provider/package/pkg/dummy_implicit_version +3 -0
  563. data/spec/fixtures/unit/provider/package/pkg/dummy_solaris10 +1 -1
  564. data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11.certificate_warning +1 -1
  565. data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11.ifo.installed +1 -1
  566. data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11.ifo.known +1 -1
  567. data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11.installed +1 -1
  568. data/spec/fixtures/unit/provider/package/pkg/dummy_solaris11.known +1 -1
  569. data/spec/fixtures/unit/provider/package/pkg/incomplete +1 -1
  570. data/spec/fixtures/unit/provider/package/pkg/solaris11 +2 -2
  571. data/spec/fixtures/unit/provider/package/pkg/unknown_status +12 -12
  572. data/spec/fixtures/unit/provider/package/yum/yum-check-update-multiline.txt +201 -0
  573. data/spec/fixtures/unit/provider/package/yum/yum-check-update-simple.txt +12 -0
  574. data/spec/fixtures/unit/provider/parsedfile/simple.txt +3 -0
  575. data/spec/fixtures/unit/provider/service/openbsd/rcctl_getall +6 -0
  576. data/spec/fixtures/unit/ssl/certificate/old-style-cert-exts.pem +33 -0
  577. data/spec/fixtures/unit/ssl/certificate_request/old-style-cert-request.pem +28 -0
  578. data/spec/integration/agent/logging_spec.rb +1 -5
  579. data/spec/integration/application/apply_spec.rb +1 -1
  580. data/spec/integration/application/doc_spec.rb +1 -43
  581. data/spec/integration/configurer_spec.rb +5 -5
  582. data/spec/integration/data_binding.rb +4 -0
  583. data/spec/integration/defaults_spec.rb +42 -143
  584. data/spec/integration/directory_environments_spec.rb +3 -3
  585. data/spec/integration/environments/default_manifest_spec.rb +3 -51
  586. data/spec/integration/environments/setting_hooks_spec.rb +1 -1
  587. data/spec/integration/environments/settings_interpolation_spec.rb +50 -105
  588. data/spec/integration/environments/settings_spec.rb +100 -0
  589. data/spec/integration/faces/ca_spec.rb +51 -51
  590. data/spec/integration/faces/documentation_spec.rb +6 -6
  591. data/spec/integration/file_bucket/file_spec.rb +5 -16
  592. data/spec/integration/file_serving/fileset_spec.rb +1 -1
  593. data/spec/integration/file_serving/terminus_helper_spec.rb +1 -1
  594. data/spec/integration/indirector/catalog/compiler_spec.rb +6 -6
  595. data/spec/integration/indirector/direct_file_server_spec.rb +40 -12
  596. data/spec/integration/indirector/facts/facter_spec.rb +1 -1
  597. data/spec/integration/indirector/file_content/file_server_spec.rb +23 -21
  598. data/spec/integration/indirector/file_metadata/file_server_spec.rb +53 -0
  599. data/spec/integration/indirector/node/ldap_spec.rb +0 -0
  600. data/spec/integration/network/authconfig_spec.rb +26 -26
  601. data/spec/integration/network/formats_spec.rb +12 -12
  602. data/spec/integration/network/http/api/indirected_routes_spec.rb +56 -0
  603. data/spec/integration/node/environment_spec.rb +12 -15
  604. data/spec/integration/node/facts_spec.rb +3 -3
  605. data/spec/integration/node_spec.rb +8 -8
  606. data/spec/integration/parser/catalog_spec.rb +1 -32
  607. data/spec/integration/parser/class_spec.rb +0 -4
  608. data/spec/integration/parser/{collector_spec.rb → collection_spec.rb} +3 -27
  609. data/spec/integration/parser/compiler_spec.rb +769 -385
  610. data/spec/integration/parser/conditionals_spec.rb +2 -27
  611. data/spec/integration/parser/functions/require_spec.rb +8 -8
  612. data/spec/integration/parser/node_spec.rb +29 -42
  613. data/spec/integration/parser/resource_expressions_spec.rb +125 -210
  614. data/spec/integration/parser/scope_spec.rb +168 -319
  615. data/spec/integration/parser/undef_param_spec.rb +5 -5
  616. data/spec/integration/provider/cron/crontab_spec.rb +3 -3
  617. data/spec/integration/provider/mailalias/aliases_spec.rb +0 -0
  618. data/spec/integration/provider/mount_spec.rb +33 -28
  619. data/spec/integration/provider/package_spec.rb +3 -14
  620. data/spec/integration/provider/service/init_spec.rb +4 -4
  621. data/spec/integration/provider/service/systemd_spec.rb +3 -3
  622. data/spec/integration/provider/ssh_authorized_key_spec.rb +12 -12
  623. data/spec/integration/provider/sshkey_spec.rb +159 -0
  624. data/spec/integration/reference/providers_spec.rb +1 -1
  625. data/spec/integration/reports_spec.rb +1 -1
  626. data/spec/integration/resource/catalog_spec.rb +3 -3
  627. data/spec/integration/resource/type_collection_spec.rb +10 -25
  628. data/spec/integration/ssl/autosign_spec.rb +1 -1
  629. data/spec/integration/ssl/certificate_authority_spec.rb +8 -8
  630. data/spec/integration/ssl/certificate_request_spec.rb +2 -2
  631. data/spec/integration/ssl/certificate_revocation_list_spec.rb +0 -0
  632. data/spec/integration/ssl/host_spec.rb +7 -7
  633. data/spec/integration/transaction/report_spec.rb +0 -0
  634. data/spec/integration/transaction_spec.rb +86 -50
  635. data/spec/integration/type/exec_spec.rb +5 -5
  636. data/spec/integration/type/file_spec.rb +277 -280
  637. data/spec/integration/type/package_spec.rb +105 -6
  638. data/spec/integration/type/tidy_spec.rb +1 -1
  639. data/spec/integration/type/user_spec.rb +4 -4
  640. data/spec/integration/type_spec.rb +2 -2
  641. data/spec/integration/util/autoload_spec.rb +7 -12
  642. data/spec/integration/util/rdoc/parser_spec.rb +13 -99
  643. data/spec/integration/util/settings_spec.rb +1 -1
  644. data/spec/integration/util/windows/process_spec.rb +6 -6
  645. data/spec/integration/util/windows/security_spec.rb +79 -105
  646. data/spec/integration/util/windows/user_spec.rb +12 -12
  647. data/spec/integration/util_spec.rb +8 -8
  648. data/spec/lib/matchers/containment_matchers.rb +1 -1
  649. data/spec/lib/matchers/include.rb +3 -3
  650. data/spec/lib/matchers/include_in_order.rb +2 -2
  651. data/spec/lib/matchers/json.rb +5 -35
  652. data/spec/lib/matchers/match_tokens2.rb +1 -1
  653. data/spec/lib/matchers/relationship_graph_matchers.rb +1 -1
  654. data/spec/lib/matchers/resource.rb +8 -23
  655. data/spec/lib/puppet/face/1.0.0/huzzah.rb +2 -2
  656. data/spec/lib/puppet/face/basetest.rb +0 -0
  657. data/spec/lib/puppet/face/huzzah.rb +2 -2
  658. data/spec/lib/puppet/face/version_matching.rb +1 -1
  659. data/spec/lib/puppet/indirector_proxy.rb +34 -0
  660. data/spec/lib/puppet/indirector_testing.rb +1 -11
  661. data/spec/lib/puppet_spec/files.rb +1 -1
  662. data/spec/lib/puppet_spec/fixtures.rb +0 -0
  663. data/spec/lib/puppet_spec/handler.rb +53 -0
  664. data/spec/lib/puppet_spec/matchers.rb +12 -5
  665. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +3 -3
  666. data/spec/lib/puppet_spec/modules.rb +11 -0
  667. data/spec/lib/puppet_spec/network.rb +101 -0
  668. data/spec/lib/puppet_spec/pops.rb +2 -2
  669. data/spec/lib/puppet_spec/settings.rb +17 -0
  670. data/spec/lib/puppet_spec/verbose.rb +0 -0
  671. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  672. data/spec/shared_behaviours/an_indirector_face.rb +2 -2
  673. data/spec/shared_behaviours/documentation_on_faces.rb +46 -46
  674. data/spec/shared_behaviours/file_server_terminus.rb +1 -1
  675. data/spec/shared_behaviours/file_serving.rb +0 -0
  676. data/spec/shared_behaviours/hiera_indirections.rb +10 -10
  677. data/spec/shared_behaviours/iterative_functions.rb +1 -1
  678. data/spec/shared_behaviours/memory_terminus.rb +5 -5
  679. data/spec/shared_behaviours/path_parameters.rb +8 -8
  680. data/spec/shared_behaviours/store_configs_terminus.rb +3 -3
  681. data/spec/shared_behaviours/things_that_declare_options.rb +25 -25
  682. data/spec/shared_contexts/checksum.rb +62 -0
  683. data/spec/shared_contexts/{checksums.rb → digests.rb} +2 -2
  684. data/spec/spec_helper.rb +14 -5
  685. data/spec/unit/agent/disabler_spec.rb +3 -3
  686. data/spec/unit/agent/locker_spec.rb +9 -9
  687. data/spec/unit/agent_spec.rb +18 -18
  688. data/spec/unit/application/agent_spec.rb +25 -92
  689. data/spec/unit/application/apply_spec.rb +16 -16
  690. data/spec/unit/application/cert_spec.rb +15 -15
  691. data/spec/unit/application/certificate_spec.rb +2 -2
  692. data/spec/unit/application/config_spec.rb +1 -1
  693. data/spec/unit/application/describe_spec.rb +6 -6
  694. data/spec/unit/application/device_spec.rb +25 -63
  695. data/spec/unit/application/doc_spec.rb +22 -31
  696. data/spec/unit/application/face_base_spec.rb +88 -59
  697. data/spec/unit/application/facts_spec.rb +2 -11
  698. data/spec/unit/application/filebucket_spec.rb +7 -7
  699. data/spec/unit/application/indirection_base_spec.rb +0 -4
  700. data/spec/unit/application/inspect_spec.rb +21 -21
  701. data/spec/unit/application/master_spec.rb +8 -9
  702. data/spec/unit/application/resource_spec.rb +27 -79
  703. data/spec/unit/application_spec.rb +54 -58
  704. data/spec/unit/configurer/downloader_factory_spec.rb +0 -0
  705. data/spec/unit/configurer/downloader_spec.rb +26 -20
  706. data/spec/unit/configurer/fact_handler_spec.rb +19 -12
  707. data/spec/unit/configurer/plugin_handler_spec.rb +0 -0
  708. data/spec/unit/configurer_spec.rb +44 -44
  709. data/spec/unit/confine/exists_spec.rb +10 -10
  710. data/spec/unit/confine/false_spec.rb +7 -7
  711. data/spec/unit/confine/feature_spec.rb +7 -7
  712. data/spec/unit/confine/true_spec.rb +7 -7
  713. data/spec/unit/confine/variable_spec.rb +13 -13
  714. data/spec/unit/confine_collection_spec.rb +12 -12
  715. data/spec/unit/confine_spec.rb +10 -10
  716. data/spec/unit/confiner_spec.rb +8 -8
  717. data/spec/unit/context/trusted_information_spec.rb +9 -2
  718. data/spec/unit/daemon_spec.rb +10 -21
  719. data/spec/unit/data_binding_spec.rb +1 -1
  720. data/spec/unit/data_providers/function_data_provider_spec.rb +96 -0
  721. data/spec/unit/data_providers/sample_data_provider_spec.rb +52 -0
  722. data/spec/unit/defaults_spec.rb +6 -6
  723. data/spec/unit/environments_spec.rb +4 -6
  724. data/spec/unit/{util → external}/pson_spec.rb +15 -25
  725. data/spec/unit/face/catalog_spec.rb +0 -0
  726. data/spec/unit/face/certificate_spec.rb +19 -19
  727. data/spec/unit/face/config_spec.rb +2 -7
  728. data/spec/unit/face/epp_face_spec.rb +303 -0
  729. data/spec/unit/face/facts_spec.rb +1 -15
  730. data/spec/unit/face/file_spec.rb +3 -5
  731. data/spec/unit/face/help_spec.rb +17 -16
  732. data/spec/unit/face/module/build_spec.rb +2 -2
  733. data/spec/unit/face/module/list_spec.rb +11 -11
  734. data/spec/unit/face/module/search_spec.rb +17 -17
  735. data/spec/unit/face/node_spec.rb +4 -122
  736. data/spec/unit/face/parser_spec.rb +1 -1
  737. data/spec/unit/face/plugin_spec.rb +2 -2
  738. data/spec/unit/face_spec.rb +0 -0
  739. data/spec/unit/file_bucket/dipper_spec.rb +23 -23
  740. data/spec/unit/file_bucket/file_spec.rb +12 -28
  741. data/spec/unit/file_serving/base_spec.rb +26 -26
  742. data/spec/unit/file_serving/configuration/parser_spec.rb +10 -10
  743. data/spec/unit/file_serving/configuration_spec.rb +17 -17
  744. data/spec/unit/file_serving/content_spec.rb +19 -31
  745. data/spec/unit/file_serving/fileset_spec.rb +32 -33
  746. data/spec/unit/file_serving/metadata_spec.rb +115 -71
  747. data/spec/unit/file_serving/mount/file_spec.rb +15 -15
  748. data/spec/unit/file_serving/mount/modules_spec.rb +2 -2
  749. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +5 -5
  750. data/spec/unit/file_serving/mount/plugins_spec.rb +5 -5
  751. data/spec/unit/file_serving/mount_spec.rb +5 -5
  752. data/spec/unit/file_serving/terminus_helper_spec.rb +19 -0
  753. data/spec/unit/file_serving/terminus_selector_spec.rb +6 -6
  754. data/spec/unit/file_system/uniquefile_spec.rb +2 -2
  755. data/spec/unit/file_system_spec.rb +79 -117
  756. data/spec/unit/forge/errors_spec.rb +8 -8
  757. data/spec/unit/forge/module_release_spec.rb +2 -4
  758. data/spec/unit/forge/repository_spec.rb +38 -44
  759. data/spec/unit/forge_spec.rb +1 -1
  760. data/spec/unit/functions/assert_type_spec.rb +1 -1
  761. data/spec/unit/functions/each_spec.rb +19 -23
  762. data/spec/unit/functions/epp_spec.rb +9 -17
  763. data/spec/unit/functions/filter_spec.rb +0 -22
  764. data/spec/unit/functions/hiera_spec.rb +18 -24
  765. data/spec/unit/functions/inline_epp_spec.rb +8 -16
  766. data/spec/unit/functions/lookup_spec.rb +324 -0
  767. data/spec/unit/functions/map_spec.rb +1 -7
  768. data/spec/unit/functions/reduce_spec.rb +0 -11
  769. data/spec/unit/functions/regsubst_spec.rb +94 -0
  770. data/spec/unit/functions/scanf_spec.rb +0 -4
  771. data/spec/unit/functions/slice_spec.rb +0 -12
  772. data/spec/unit/functions/split_spec.rb +46 -0
  773. data/spec/unit/functions/with_spec.rb +4 -13
  774. data/spec/unit/functions4_spec.rb +57 -162
  775. data/spec/unit/graph/rb_tree_map_spec.rb +78 -78
  776. data/spec/unit/graph/relationship_graph_spec.rb +17 -17
  777. data/spec/unit/graph/{simple_graph.rb → simple_graph_spec.rb} +122 -126
  778. data/spec/unit/hiera/scope_spec.rb +13 -12
  779. data/spec/unit/hiera_puppet_spec.rb +12 -12
  780. data/spec/unit/indirector/catalog/compiler_spec.rb +10 -15
  781. data/spec/unit/indirector/catalog/json_spec.rb +2 -2
  782. data/spec/unit/indirector/catalog/msgpack_spec.rb +2 -2
  783. data/spec/unit/indirector/catalog/rest_spec.rb +1 -1
  784. data/spec/unit/indirector/catalog/static_compiler_spec.rb +14 -14
  785. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -0
  786. data/spec/unit/indirector/catalog/yaml_spec.rb +4 -4
  787. data/spec/unit/indirector/certificate/ca_spec.rb +3 -3
  788. data/spec/unit/indirector/certificate/disabled_ca_spec.rb +0 -0
  789. data/spec/unit/indirector/certificate/file_spec.rb +3 -3
  790. data/spec/unit/indirector/certificate/rest_spec.rb +6 -6
  791. data/spec/unit/indirector/certificate_request/ca_spec.rb +8 -8
  792. data/spec/unit/indirector/certificate_request/disabled_ca_spec.rb +0 -0
  793. data/spec/unit/indirector/certificate_request/file_spec.rb +2 -2
  794. data/spec/unit/indirector/certificate_request/rest_spec.rb +4 -4
  795. data/spec/unit/indirector/certificate_revocation_list/ca_spec.rb +2 -2
  796. data/spec/unit/indirector/certificate_revocation_list/disabled_ca_spec.rb +0 -0
  797. data/spec/unit/indirector/certificate_revocation_list/file_spec.rb +2 -2
  798. data/spec/unit/indirector/certificate_revocation_list/rest_spec.rb +4 -4
  799. data/spec/unit/indirector/certificate_status/file_spec.rb +18 -18
  800. data/spec/unit/indirector/certificate_status/rest_spec.rb +2 -2
  801. data/spec/unit/indirector/code_spec.rb +3 -3
  802. data/spec/unit/indirector/data_binding/hiera_spec.rb +3 -3
  803. data/spec/unit/indirector/data_binding/none_spec.rb +5 -5
  804. data/spec/unit/indirector/direct_file_server_spec.rb +14 -4
  805. data/spec/unit/indirector/envelope_spec.rb +4 -4
  806. data/spec/unit/indirector/exec_spec.rb +4 -4
  807. data/spec/unit/indirector/face_spec.rb +13 -8
  808. data/spec/unit/indirector/facts/facter_spec.rb +10 -20
  809. data/spec/unit/indirector/facts/network_device_spec.rb +10 -20
  810. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -0
  811. data/spec/unit/indirector/facts/yaml_spec.rb +6 -6
  812. data/spec/unit/indirector/file_bucket_file/file_spec.rb +34 -34
  813. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +1 -1
  814. data/spec/unit/indirector/file_content/file_server_spec.rb +2 -2
  815. data/spec/unit/indirector/file_content/file_spec.rb +2 -2
  816. data/spec/unit/indirector/file_content/rest_spec.rb +1 -1
  817. data/spec/unit/indirector/file_metadata/file_server_spec.rb +2 -2
  818. data/spec/unit/indirector/file_metadata/file_spec.rb +13 -5
  819. data/spec/unit/indirector/file_metadata/rest_spec.rb +1 -1
  820. data/spec/unit/indirector/file_server_spec.rb +35 -17
  821. data/spec/unit/indirector/indirection_spec.rb +56 -56
  822. data/spec/unit/indirector/json_spec.rb +15 -16
  823. data/spec/unit/indirector/key/ca_spec.rb +3 -3
  824. data/spec/unit/indirector/key/disabled_ca_spec.rb +0 -0
  825. data/spec/unit/indirector/key/file_spec.rb +5 -5
  826. data/spec/unit/indirector/ldap_spec.rb +13 -13
  827. data/spec/unit/indirector/memory_spec.rb +0 -0
  828. data/spec/unit/indirector/msgpack_spec.rb +15 -15
  829. data/spec/unit/indirector/node/exec_spec.rb +20 -9
  830. data/spec/unit/indirector/node/ldap_spec.rb +48 -48
  831. data/spec/unit/indirector/node/memory_spec.rb +0 -0
  832. data/spec/unit/indirector/node/msgpack_spec.rb +4 -4
  833. data/spec/unit/indirector/node/plain_spec.rb +2 -2
  834. data/spec/unit/indirector/node/rest_spec.rb +0 -0
  835. data/spec/unit/indirector/node/store_configs_spec.rb +0 -0
  836. data/spec/unit/indirector/node/yaml_spec.rb +4 -4
  837. data/spec/unit/indirector/none_spec.rb +2 -2
  838. data/spec/unit/indirector/plain_spec.rb +1 -1
  839. data/spec/unit/indirector/report/msgpack_spec.rb +5 -5
  840. data/spec/unit/indirector/report/processor_spec.rb +4 -4
  841. data/spec/unit/indirector/report/rest_spec.rb +8 -8
  842. data/spec/unit/indirector/report/yaml_spec.rb +5 -5
  843. data/spec/unit/indirector/request_spec.rb +103 -206
  844. data/spec/unit/indirector/resource/ral_spec.rb +8 -10
  845. data/spec/unit/indirector/resource/store_configs_spec.rb +2 -4
  846. data/spec/unit/indirector/resource_type/parser_spec.rb +37 -37
  847. data/spec/unit/indirector/resource_type/rest_spec.rb +2 -2
  848. data/spec/unit/indirector/rest_spec.rb +70 -55
  849. data/spec/unit/indirector/ssl_file_spec.rb +13 -13
  850. data/spec/unit/indirector/status/rest_spec.rb +1 -1
  851. data/spec/unit/indirector/store_configs_spec.rb +0 -0
  852. data/spec/unit/indirector/terminus_spec.rb +17 -17
  853. data/spec/unit/indirector/yaml_spec.rb +12 -12
  854. data/spec/unit/indirector_spec.rb +7 -7
  855. data/spec/unit/interface/action_builder_spec.rb +15 -15
  856. data/spec/unit/interface/action_manager_spec.rb +31 -56
  857. data/spec/unit/interface/action_spec.rb +62 -65
  858. data/spec/unit/interface/documentation_spec.rb +2 -2
  859. data/spec/unit/interface/face_collection_spec.rb +33 -33
  860. data/spec/unit/interface/option_builder_spec.rb +8 -8
  861. data/spec/unit/interface/option_spec.rb +23 -23
  862. data/spec/unit/interface_spec.rb +19 -24
  863. data/spec/unit/man_spec.rb +0 -0
  864. data/spec/unit/module_spec.rb +163 -115
  865. data/spec/unit/module_tool/applications/builder_spec.rb +0 -19
  866. data/spec/unit/module_tool/applications/installer_spec.rb +29 -29
  867. data/spec/unit/module_tool/applications/searcher_spec.rb +4 -4
  868. data/spec/unit/module_tool/applications/uninstaller_spec.rb +15 -15
  869. data/spec/unit/module_tool/applications/unpacker_spec.rb +3 -3
  870. data/spec/unit/module_tool/applications/upgrader_spec.rb +28 -28
  871. data/spec/unit/module_tool/install_directory_spec.rb +3 -3
  872. data/spec/unit/module_tool/metadata_spec.rb +26 -26
  873. data/spec/unit/module_tool/tar/gnu_spec.rb +1 -1
  874. data/spec/unit/module_tool/tar/mini_spec.rb +2 -2
  875. data/spec/unit/module_tool/tar_spec.rb +2 -2
  876. data/spec/unit/module_tool_spec.rb +13 -34
  877. data/spec/unit/network/auth_config_parser_spec.rb +7 -7
  878. data/spec/unit/network/authconfig_spec.rb +9 -9
  879. data/spec/unit/network/authstore_spec.rb +38 -39
  880. data/spec/unit/network/format_handler_spec.rb +14 -14
  881. data/spec/unit/network/format_spec.rb +34 -34
  882. data/spec/unit/network/format_support_spec.rb +10 -10
  883. data/spec/unit/network/formats_spec.rb +50 -136
  884. data/spec/unit/network/http/api/ca/v1_spec.rb +26 -0
  885. data/spec/unit/network/http/api/{v1_spec.rb → indirected_routes_spec.rb} +128 -184
  886. data/spec/unit/network/http/api/{v2 → master/v3}/authorization_spec.rb +23 -21
  887. data/spec/unit/network/http/api/{v2 → master/v3}/environments_spec.rb +5 -5
  888. data/spec/unit/network/http/api/master/v3_spec.rb +39 -0
  889. data/spec/unit/network/http/api_spec.rb +127 -0
  890. data/spec/unit/network/http/compression_spec.rb +20 -26
  891. data/spec/unit/network/http/connection_spec.rb +2 -5
  892. data/spec/unit/network/http/factory_spec.rb +6 -8
  893. data/spec/unit/network/http/handler_spec.rb +31 -84
  894. data/spec/unit/network/http/nocache_pool_spec.rb +0 -0
  895. data/spec/unit/network/http/pool_spec.rb +0 -0
  896. data/spec/unit/network/http/rack/rest_spec.rb +38 -39
  897. data/spec/unit/network/http/rack_spec.rb +1 -1
  898. data/spec/unit/network/http/route_spec.rb +3 -3
  899. data/spec/unit/network/http/session_spec.rb +4 -4
  900. data/spec/unit/network/http/site_spec.rb +1 -1
  901. data/spec/unit/network/http/webrick/rest_spec.rb +36 -55
  902. data/spec/unit/network/http/webrick_spec.rb +16 -27
  903. data/spec/unit/network/http_pool_spec.rb +11 -11
  904. data/spec/unit/network/http_spec.rb +0 -0
  905. data/spec/unit/network/resolver_spec.rb +10 -10
  906. data/spec/unit/network/rights_spec.rb +67 -67
  907. data/spec/unit/network/server_spec.rb +3 -3
  908. data/spec/unit/node/environment_spec.rb +177 -273
  909. data/spec/unit/node/facts_spec.rb +71 -33
  910. data/spec/unit/node_spec.rb +150 -158
  911. data/spec/unit/other/selinux_spec.rb +6 -6
  912. data/spec/unit/parameter/boolean_spec.rb +4 -3
  913. data/spec/unit/parameter/package_options_spec.rb +5 -5
  914. data/spec/unit/parameter/path_spec.rb +1 -1
  915. data/spec/unit/parameter/value_collection_spec.rb +23 -28
  916. data/spec/unit/parameter/value_spec.rb +20 -24
  917. data/spec/unit/parameter_spec.rb +26 -26
  918. data/spec/unit/parser/ast/block_expression_spec.rb +3 -2
  919. data/spec/unit/parser/ast/leaf_spec.rb +5 -378
  920. data/spec/unit/parser/compiler_spec.rb +84 -74
  921. data/spec/unit/parser/files_spec.rb +55 -121
  922. data/spec/unit/parser/functions/contain_spec.rb +8 -11
  923. data/spec/unit/parser/functions/create_resources_spec.rb +29 -29
  924. data/spec/unit/parser/functions/defined_spec.rb +52 -51
  925. data/spec/unit/parser/functions/digest_spec.rb +2 -2
  926. data/spec/unit/parser/functions/fail_spec.rb +1 -1
  927. data/spec/unit/parser/functions/file_spec.rb +7 -13
  928. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -5
  929. data/spec/unit/parser/functions/generate_spec.rb +20 -20
  930. data/spec/unit/parser/functions/hiera_array_spec.rb +2 -16
  931. data/spec/unit/parser/functions/hiera_hash_spec.rb +2 -12
  932. data/spec/unit/parser/functions/hiera_include_spec.rb +2 -29
  933. data/spec/unit/parser/functions/hiera_spec.rb +2 -12
  934. data/spec/unit/parser/functions/include_spec.rb +9 -19
  935. data/spec/unit/parser/functions/inline_template_spec.rb +3 -3
  936. data/spec/unit/parser/functions/lookup_spec.rb +3 -140
  937. data/spec/unit/parser/functions/realize_spec.rb +0 -0
  938. data/spec/unit/parser/functions/regsubst_spec.rb +7 -179
  939. data/spec/unit/parser/functions/require_spec.rb +14 -21
  940. data/spec/unit/parser/functions/scanf_spec.rb +0 -0
  941. data/spec/unit/parser/functions/shellquote_spec.rb +20 -20
  942. data/spec/unit/parser/functions/split_spec.rb +2 -37
  943. data/spec/unit/parser/functions/sprintf_spec.rb +7 -11
  944. data/spec/unit/parser/functions/tag_spec.rb +3 -3
  945. data/spec/unit/parser/functions/template_spec.rb +10 -10
  946. data/spec/unit/parser/functions/versioncmp_spec.rb +3 -3
  947. data/spec/unit/parser/functions_spec.rb +8 -8
  948. data/spec/unit/parser/relationship_spec.rb +14 -32
  949. data/spec/unit/parser/resource/param_spec.rb +0 -0
  950. data/spec/unit/parser/resource_spec.rb +57 -57
  951. data/spec/unit/parser/scope_spec.rb +89 -101
  952. data/spec/unit/parser/templatewrapper_spec.rb +15 -32
  953. data/spec/unit/parser/type_loader_spec.rb +53 -73
  954. data/spec/unit/pops/adaptable_spec.rb +22 -22
  955. data/spec/unit/pops/binder/bindings_checker_spec.rb +14 -14
  956. data/spec/unit/pops/binder/bindings_composer_spec.rb +4 -6
  957. data/spec/unit/pops/binder/bindings_validator_factory_spec.rb +3 -3
  958. data/spec/unit/pops/binder/config/binder_config_spec.rb +8 -1
  959. data/spec/unit/pops/binder/injector_spec.rb +92 -92
  960. data/spec/unit/pops/containment_spec.rb +4 -4
  961. data/spec/unit/pops/evaluator/access_ops_spec.rb +5 -24
  962. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +23 -23
  963. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +22 -22
  964. data/spec/unit/pops/evaluator/collections_ops_spec.rb +1 -3
  965. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +104 -107
  966. data/spec/unit/pops/evaluator/conditionals_spec.rb +39 -39
  967. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +75 -143
  968. data/spec/unit/pops/evaluator/evaluator_rspec_helper.rb +1 -5
  969. data/spec/unit/pops/evaluator/logical_ops_spec.rb +15 -15
  970. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +5 -5
  971. data/spec/unit/pops/evaluator/variables_spec.rb +18 -18
  972. data/spec/unit/pops/factory_rspec_helper.rb +0 -8
  973. data/spec/unit/pops/factory_spec.rb +104 -104
  974. data/spec/unit/pops/issues_spec.rb +21 -21
  975. data/spec/unit/pops/label_provider_spec.rb +6 -6
  976. data/spec/unit/pops/loaders/loaders_spec.rb +3 -3
  977. data/spec/unit/pops/model/model_spec.rb +10 -10
  978. data/spec/unit/pops/parser/epp_parser_spec.rb +20 -20
  979. data/spec/unit/pops/parser/evaluating_parser_spec.rb +2 -2
  980. data/spec/unit/pops/parser/lexer2_spec.rb +65 -276
  981. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +91 -91
  982. data/spec/unit/pops/parser/parse_calls_spec.rb +19 -19
  983. data/spec/unit/pops/parser/parse_conditionals_spec.rb +38 -22
  984. data/spec/unit/pops/parser/parse_containers_spec.rb +47 -47
  985. data/spec/unit/pops/parser/parse_heredoc_spec.rb +15 -62
  986. data/spec/unit/pops/parser/parse_resource_spec.rb +75 -70
  987. data/spec/unit/pops/parser/parser_rspec_helper.rb +0 -5
  988. data/spec/unit/pops/parser/parser_spec.rb +7 -7
  989. data/spec/unit/pops/parser/parsing_typed_parameters_spec.rb +0 -7
  990. data/spec/unit/pops/parser/rgen_sanitycheck_spec.rb +2 -2
  991. data/spec/unit/pops/types/class_loader_spec.rb +10 -0
  992. data/spec/unit/pops/types/type_calculator_spec.rb +456 -651
  993. data/spec/unit/pops/types/type_factory_spec.rb +59 -59
  994. data/spec/unit/pops/types/type_parser_spec.rb +2 -10
  995. data/spec/unit/pops/validator/validator_spec.rb +3 -57
  996. data/spec/unit/pops/visitor_spec.rb +4 -4
  997. data/spec/unit/property/boolean_spec.rb +2 -2
  998. data/spec/unit/property/ensure_spec.rb +1 -1
  999. data/spec/unit/property/keyvalue_spec.rb +16 -16
  1000. data/spec/unit/property/list_spec.rb +18 -18
  1001. data/spec/unit/property/ordered_list_spec.rb +7 -7
  1002. data/spec/unit/property_spec.rb +72 -96
  1003. data/spec/unit/provider/aixobject_spec.rb +12 -12
  1004. data/spec/unit/provider/augeas/augeas_spec.rb +171 -149
  1005. data/spec/unit/provider/cisco_spec.rb +2 -2
  1006. data/spec/unit/provider/command_spec.rb +1 -1
  1007. data/spec/unit/provider/cron/crontab_spec.rb +9 -9
  1008. data/spec/unit/provider/cron/parsed_spec.rb +59 -38
  1009. data/spec/unit/provider/exec/posix_spec.rb +9 -19
  1010. data/spec/unit/provider/exec/shell_spec.rb +13 -13
  1011. data/spec/unit/provider/exec/windows_spec.rb +10 -10
  1012. data/spec/unit/provider/exec_spec.rb +2 -2
  1013. data/spec/unit/provider/file/posix_spec.rb +27 -27
  1014. data/spec/unit/provider/file/windows_spec.rb +15 -15
  1015. data/spec/unit/provider/group/groupadd_spec.rb +1 -1
  1016. data/spec/unit/provider/group/ldap_spec.rb +11 -11
  1017. data/spec/unit/provider/group/pw_spec.rb +3 -3
  1018. data/spec/unit/provider/group/windows_adsi_spec.rb +48 -62
  1019. data/spec/unit/provider/host/parsed_spec.rb +58 -22
  1020. data/spec/unit/provider/interface/cisco_spec.rb +3 -3
  1021. data/spec/unit/provider/ldap_spec.rb +23 -23
  1022. data/spec/unit/provider/macauthorization_spec.rb +6 -6
  1023. data/spec/unit/provider/mcx/mcxcontent_spec.rb +6 -6
  1024. data/spec/unit/provider/mount/parsed_spec.rb +101 -119
  1025. data/spec/unit/provider/mount_spec.rb +0 -0
  1026. data/spec/unit/provider/naginator_spec.rb +8 -8
  1027. data/spec/unit/provider/nameservice/directoryservice_spec.rb +5 -27
  1028. data/spec/unit/provider/nameservice_spec.rb +26 -26
  1029. data/spec/unit/provider/network_device_spec.rb +11 -11
  1030. data/spec/unit/provider/package/aix_spec.rb +3 -3
  1031. data/spec/unit/provider/package/appdmg_spec.rb +1 -1
  1032. data/spec/unit/provider/package/apt_spec.rb +4 -4
  1033. data/spec/unit/provider/package/aptitude_spec.rb +1 -1
  1034. data/spec/unit/provider/package/aptrpm_spec.rb +3 -3
  1035. data/spec/unit/provider/package/dpkg_spec.rb +0 -0
  1036. data/spec/unit/provider/package/freebsd_spec.rb +1 -1
  1037. data/spec/unit/provider/package/gem_spec.rb +12 -12
  1038. data/spec/unit/provider/package/hpux_spec.rb +3 -3
  1039. data/spec/unit/provider/package/macports_spec.rb +15 -15
  1040. data/spec/unit/provider/package/nim_spec.rb +11 -11
  1041. data/spec/unit/provider/package/openbsd_spec.rb +72 -37
  1042. data/spec/unit/provider/package/opkg_spec.rb +14 -11
  1043. data/spec/unit/provider/package/pacman_spec.rb +185 -86
  1044. data/spec/unit/provider/package/pip_spec.rb +25 -54
  1045. data/spec/unit/provider/package/pkg_spec.rb +145 -71
  1046. data/spec/unit/provider/package/pkgdmg_spec.rb +9 -9
  1047. data/spec/unit/provider/package/pkgin_spec.rb +18 -18
  1048. data/spec/unit/provider/package/pkgutil_spec.rb +19 -19
  1049. data/spec/unit/provider/package/portage_spec.rb +8 -4
  1050. data/spec/unit/provider/package/rpm_spec.rb +103 -9
  1051. data/spec/unit/provider/package/sun_spec.rb +14 -14
  1052. data/spec/unit/provider/package/up2date_spec.rb +1 -1
  1053. data/spec/unit/provider/package/{urpmi.rb → urpmi_spec.rb} +3 -3
  1054. data/spec/unit/provider/package/windows/exe_package_spec.rb +15 -13
  1055. data/spec/unit/provider/package/windows/msi_package_spec.rb +16 -16
  1056. data/spec/unit/provider/package/windows/package_spec.rb +14 -14
  1057. data/spec/unit/provider/package/windows_spec.rb +26 -26
  1058. data/spec/unit/provider/package/yum_spec.rb +292 -98
  1059. data/spec/unit/provider/package/zypper_spec.rb +20 -31
  1060. data/spec/unit/provider/parsedfile_spec.rb +9 -9
  1061. data/spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb +192 -434
  1062. data/spec/unit/provider/selboolean_spec.rb +2 -2
  1063. data/spec/unit/provider/selmodule_spec.rb +8 -8
  1064. data/spec/unit/provider/service/base_spec.rb +27 -38
  1065. data/spec/unit/provider/service/daemontools_spec.rb +11 -11
  1066. data/spec/unit/provider/service/debian_spec.rb +8 -8
  1067. data/spec/unit/provider/service/freebsd_spec.rb +7 -8
  1068. data/spec/unit/provider/service/gentoo_spec.rb +12 -13
  1069. data/spec/unit/provider/service/init_spec.rb +25 -38
  1070. data/spec/unit/provider/service/launchd_spec.rb +19 -125
  1071. data/spec/unit/provider/service/openbsd_spec.rb +90 -144
  1072. data/spec/unit/provider/service/openrc_spec.rb +14 -14
  1073. data/spec/unit/provider/service/openwrt_spec.rb +9 -9
  1074. data/spec/unit/provider/service/redhat_spec.rb +14 -15
  1075. data/spec/unit/provider/service/runit_spec.rb +11 -11
  1076. data/spec/unit/provider/service/smf_spec.rb +19 -19
  1077. data/spec/unit/provider/service/src_spec.rb +9 -9
  1078. data/spec/unit/provider/service/systemd_spec.rb +33 -15
  1079. data/spec/unit/provider/service/upstart_spec.rb +59 -59
  1080. data/spec/unit/provider/service/windows_spec.rb +6 -6
  1081. data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +18 -18
  1082. data/spec/unit/provider/sshkey/parsed_spec.rb +11 -11
  1083. data/spec/unit/provider/user/aix_spec.rb +19 -19
  1084. data/spec/unit/provider/user/directoryservice_spec.rb +51 -95
  1085. data/spec/unit/provider/user/hpux_spec.rb +24 -3
  1086. data/spec/unit/provider/user/ldap_spec.rb +12 -12
  1087. data/spec/unit/provider/user/openbsd_spec.rb +77 -0
  1088. data/spec/unit/provider/user/pw_spec.rb +5 -5
  1089. data/spec/unit/provider/user/user_role_add_spec.rb +20 -20
  1090. data/spec/unit/provider/user/useradd_spec.rb +48 -32
  1091. data/spec/unit/provider/user/windows_adsi_spec.rb +9 -31
  1092. data/spec/unit/provider/vlan/cisco_spec.rb +3 -3
  1093. data/spec/unit/provider/yumrepo/inifile_spec.rb +3 -3
  1094. data/spec/unit/provider/zfs/zfs_spec.rb +11 -11
  1095. data/spec/unit/provider/zone/solaris_spec.rb +22 -55
  1096. data/spec/unit/provider/zpool/zpool_spec.rb +22 -22
  1097. data/spec/unit/provider_spec.rb +110 -102
  1098. data/spec/unit/puppet_spec.rb +15 -8
  1099. data/spec/unit/relationship_spec.rb +37 -41
  1100. data/spec/unit/reports/http_spec.rb +0 -0
  1101. data/spec/unit/reports/store_spec.rb +3 -3
  1102. data/spec/unit/reports_spec.rb +5 -5
  1103. data/spec/unit/resource/catalog_spec.rb +93 -111
  1104. data/spec/unit/resource/status_spec.rb +49 -75
  1105. data/spec/unit/resource/type_collection_helper_spec.rb +1 -1
  1106. data/spec/unit/resource/type_collection_spec.rb +59 -164
  1107. data/spec/unit/resource/type_spec.rb +115 -120
  1108. data/spec/unit/resource_spec.rb +176 -159
  1109. data/spec/unit/scheduler/job_spec.rb +12 -12
  1110. data/spec/unit/scheduler/scheduler_spec.rb +8 -8
  1111. data/spec/unit/scheduler/splay_job_spec.rb +4 -4
  1112. data/spec/unit/semver_spec.rb +66 -64
  1113. data/spec/unit/settings/autosign_setting_spec.rb +1 -0
  1114. data/spec/unit/settings/config_file_spec.rb +13 -40
  1115. data/spec/unit/settings/directory_setting_spec.rb +1 -1
  1116. data/spec/unit/settings/duration_setting_spec.rb +9 -5
  1117. data/spec/unit/settings/environment_conf_spec.rb +0 -11
  1118. data/spec/unit/settings/file_setting_spec.rb +38 -69
  1119. data/spec/unit/settings/ini_file_spec.rb +2 -2
  1120. data/spec/unit/settings/path_setting_spec.rb +5 -5
  1121. data/spec/unit/settings/priority_setting_spec.rb +7 -7
  1122. data/spec/unit/settings/string_setting_spec.rb +7 -7
  1123. data/spec/unit/settings/terminus_setting_spec.rb +4 -4
  1124. data/spec/unit/settings/value_translator_spec.rb +22 -22
  1125. data/spec/unit/settings_spec.rb +189 -338
  1126. data/spec/unit/ssl/base_spec.rb +5 -5
  1127. data/spec/unit/ssl/certificate_authority/autosign_command_spec.rb +2 -2
  1128. data/spec/unit/ssl/certificate_authority/interface_spec.rb +40 -13
  1129. data/spec/unit/ssl/certificate_authority_spec.rb +23 -23
  1130. data/spec/unit/ssl/certificate_factory_spec.rb +39 -26
  1131. data/spec/unit/ssl/certificate_request_attributes_spec.rb +2 -2
  1132. data/spec/unit/ssl/certificate_request_spec.rb +52 -40
  1133. data/spec/unit/ssl/certificate_revocation_list_spec.rb +10 -10
  1134. data/spec/unit/ssl/certificate_spec.rb +35 -38
  1135. data/spec/unit/ssl/configuration_spec.rb +12 -14
  1136. data/spec/unit/ssl/digest_spec.rb +5 -5
  1137. data/spec/unit/ssl/host_spec.rb +91 -91
  1138. data/spec/unit/ssl/inventory_spec.rb +11 -34
  1139. data/spec/unit/ssl/key_spec.rb +23 -23
  1140. data/spec/unit/ssl/oids_spec.rb +28 -15
  1141. data/spec/unit/ssl/validator_spec.rb +16 -17
  1142. data/spec/unit/status_spec.rb +6 -12
  1143. data/spec/unit/transaction/additional_resource_generator_spec.rb +2 -2
  1144. data/spec/unit/transaction/event_manager_spec.rb +38 -8
  1145. data/spec/unit/transaction/event_spec.rb +29 -29
  1146. data/spec/unit/transaction/report_spec.rb +76 -90
  1147. data/spec/unit/transaction/resource_harness_spec.rb +42 -42
  1148. data/spec/unit/transaction_spec.rb +66 -59
  1149. data/spec/unit/type/augeas_spec.rb +20 -20
  1150. data/spec/unit/type/component_spec.rb +10 -10
  1151. data/spec/unit/type/computer_spec.rb +10 -10
  1152. data/spec/unit/type/cron_spec.rb +21 -21
  1153. data/spec/unit/type/exec_spec.rb +65 -73
  1154. data/spec/unit/type/file/checksum_spec.rb +8 -8
  1155. data/spec/unit/type/file/content_spec.rb +144 -85
  1156. data/spec/unit/type/file/ctime_spec.rb +4 -4
  1157. data/spec/unit/type/file/ensure_spec.rb +11 -11
  1158. data/spec/unit/type/file/group_spec.rb +5 -5
  1159. data/spec/unit/type/file/mode_spec.rb +30 -28
  1160. data/spec/unit/type/file/mtime_spec.rb +4 -4
  1161. data/spec/unit/type/file/owner_spec.rb +5 -5
  1162. data/spec/unit/type/file/selinux_spec.rb +8 -8
  1163. data/spec/unit/type/file/source_spec.rb +118 -135
  1164. data/spec/unit/type/file/type_spec.rb +2 -2
  1165. data/spec/unit/type/file_spec.rb +161 -160
  1166. data/spec/unit/type/filebucket_spec.rb +8 -8
  1167. data/spec/unit/type/group_spec.rb +12 -12
  1168. data/spec/unit/type/host_spec.rb +41 -25
  1169. data/spec/unit/type/interface_spec.rb +6 -6
  1170. data/spec/unit/type/k5login_spec.rb +18 -18
  1171. data/spec/unit/type/macauthorization_spec.rb +17 -17
  1172. data/spec/unit/type/mailalias_spec.rb +34 -6
  1173. data/spec/unit/type/maillist_spec.rb +2 -2
  1174. data/spec/unit/type/mcx_spec.rb +13 -13
  1175. data/spec/unit/type/mount_spec.rb +40 -40
  1176. data/spec/unit/type/nagios_spec.rb +23 -23
  1177. data/spec/unit/type/noop_metaparam_spec.rb +5 -5
  1178. data/spec/unit/type/package/package_settings_spec.rb +9 -9
  1179. data/spec/unit/type/package_spec.rb +87 -18
  1180. data/spec/unit/type/resources_spec.rb +46 -46
  1181. data/spec/unit/type/schedule_spec.rb +83 -83
  1182. data/spec/unit/type/scheduled_task_spec.rb +15 -15
  1183. data/spec/unit/type/selboolean_spec.rb +2 -2
  1184. data/spec/unit/type/selmodule_spec.rb +2 -2
  1185. data/spec/unit/type/service_spec.rb +24 -24
  1186. data/spec/unit/type/ssh_authorized_key_spec.rb +2 -2
  1187. data/spec/unit/type/sshkey_spec.rb +0 -0
  1188. data/spec/unit/type/stage_spec.rb +1 -1
  1189. data/spec/unit/type/tidy_spec.rb +58 -39
  1190. data/spec/unit/type/user_spec.rb +56 -56
  1191. data/spec/unit/type/vlan_spec.rb +6 -6
  1192. data/spec/unit/type/whit_spec.rb +1 -1
  1193. data/spec/unit/type/yumrepo_spec.rb +15 -0
  1194. data/spec/unit/type/zfs_spec.rb +3 -3
  1195. data/spec/unit/type/zone_spec.rb +19 -19
  1196. data/spec/unit/type/zpool_spec.rb +15 -15
  1197. data/spec/unit/type_spec.rb +236 -163
  1198. data/spec/unit/util/autoload_spec.rb +31 -25
  1199. data/spec/unit/util/backups_spec.rb +4 -4
  1200. data/spec/unit/util/checksums_spec.rb +55 -27
  1201. data/spec/unit/util/colors_spec.rb +6 -50
  1202. data/spec/unit/util/command_line_spec.rb +13 -41
  1203. data/spec/unit/util/command_line_utils/puppet_option_parser_spec.rb +2 -2
  1204. data/spec/unit/util/constant_inflector_spec.rb +12 -12
  1205. data/spec/unit/util/diff_spec.rb +4 -4
  1206. data/spec/unit/util/errors_spec.rb +5 -5
  1207. data/spec/unit/util/execution_spec.rb +74 -29
  1208. data/spec/unit/util/execution_stub_spec.rb +10 -10
  1209. data/spec/unit/util/feature_spec.rb +15 -19
  1210. data/spec/unit/util/filetype_spec.rb +9 -9
  1211. data/spec/unit/util/http_proxy_spec.rb +18 -18
  1212. data/spec/unit/util/inifile_spec.rb +2 -2
  1213. data/spec/unit/util/json_lockfile_spec.rb +1 -1
  1214. data/spec/unit/util/ldap/connection_spec.rb +6 -6
  1215. data/spec/unit/util/ldap/generator_spec.rb +8 -8
  1216. data/spec/unit/util/ldap/manager_spec.rb +40 -40
  1217. data/spec/unit/util/lockfile_spec.rb +13 -13
  1218. data/spec/unit/util/log/destinations_spec.rb +52 -49
  1219. data/spec/unit/util/log_spec.rb +48 -173
  1220. data/spec/unit/util/logging_spec.rb +120 -3
  1221. data/spec/unit/util/metric_spec.rb +18 -33
  1222. data/spec/unit/util/monkey_patches_spec.rb +18 -139
  1223. data/spec/unit/util/nagios_maker_spec.rb +2 -2
  1224. data/spec/unit/util/network_device/cisco/device_spec.rb +23 -23
  1225. data/spec/unit/util/network_device/cisco/facts_spec.rb +3 -3
  1226. data/spec/unit/util/network_device/cisco/interface_spec.rb +0 -0
  1227. data/spec/unit/util/network_device/config_spec.rb +10 -16
  1228. data/spec/unit/util/network_device/ipcalc_spec.rb +10 -10
  1229. data/spec/unit/util/network_device/transport/base_spec.rb +2 -2
  1230. data/spec/unit/util/network_device/transport/ssh_spec.rb +10 -10
  1231. data/spec/unit/util/network_device/transport/telnet_spec.rb +3 -3
  1232. data/spec/unit/util/network_device_spec.rb +2 -2
  1233. data/spec/unit/util/package_spec.rb +2 -2
  1234. data/spec/unit/util/pidlock_spec.rb +38 -38
  1235. data/spec/unit/util/posix_spec.rb +25 -25
  1236. data/spec/unit/util/profiler/aggregate_spec.rb +14 -18
  1237. data/spec/unit/util/profiler/around_profiler_spec.rb +6 -6
  1238. data/spec/unit/util/profiler/logging_spec.rb +8 -8
  1239. data/spec/unit/util/profiler/object_counts_spec.rb +3 -5
  1240. data/spec/unit/util/profiler/wall_clock_spec.rb +1 -1
  1241. data/spec/unit/util/profiler_spec.rb +6 -14
  1242. data/spec/unit/util/rdoc_spec.rb +0 -85
  1243. data/spec/unit/util/reference_spec.rb +1 -1
  1244. data/spec/unit/util/resource_template_spec.rb +2 -2
  1245. data/spec/unit/util/{retryaction_spec.rb → retry_action_spec.rb} +25 -2
  1246. data/spec/unit/util/rubygems_spec.rb +8 -8
  1247. data/spec/unit/util/run_mode_spec.rb +159 -17
  1248. data/spec/unit/util/selinux_spec.rb +61 -39
  1249. data/spec/unit/util/ssl_spec.rb +13 -13
  1250. data/spec/unit/util/storage_spec.rb +27 -27
  1251. data/spec/unit/util/suidmanager_spec.rb +56 -67
  1252. data/spec/unit/util/symbolic_file_mode_spec.rb +15 -16
  1253. data/spec/unit/util/tag_set_spec.rb +5 -5
  1254. data/spec/unit/util/tagging_spec.rb +0 -0
  1255. data/spec/unit/util/terminal_spec.rb +5 -5
  1256. data/spec/unit/util/user_attr_spec.rb +6 -6
  1257. data/spec/unit/util/warnings_spec.rb +9 -1
  1258. data/spec/unit/util/watcher_spec.rb +1 -1
  1259. data/spec/unit/util/windows/access_control_entry_spec.rb +9 -9
  1260. data/spec/unit/util/windows/access_control_list_spec.rb +21 -21
  1261. data/spec/unit/util/windows/adsi_spec.rb +71 -209
  1262. data/spec/unit/util/windows/api_types_spec.rb +3 -3
  1263. data/spec/unit/util/windows/registry_spec.rb +71 -46
  1264. data/spec/unit/util/windows/root_certs_spec.rb +1 -1
  1265. data/spec/unit/util/windows/security_descriptor_spec.rb +18 -18
  1266. data/spec/unit/util/windows/sid_spec.rb +40 -20
  1267. data/spec/unit/util/windows/string_spec.rb +4 -4
  1268. data/spec/unit/util/yaml_spec.rb +1 -1
  1269. data/spec/unit/util_spec.rb +73 -124
  1270. data/spec/unit/version_spec.rb +4 -4
  1271. data/spec/watchr.rb +1 -5
  1272. data/tasks/benchmark.rake +1 -6
  1273. data/tasks/ci.rake +1 -1
  1274. data/tasks/manpages.rake +0 -9
  1275. data/tasks/parallel.rake +4 -7
  1276. data/tasks/parser.rake +0 -5
  1277. metadata +179 -465
  1278. data/conf/tagmail.conf +0 -16
  1279. data/ext/debian/puppet.conf +0 -14
  1280. data/ext/debian/puppetmaster-common.puppetqd.default +0 -27
  1281. data/ext/debian/puppetmaster-common.puppetqd.init +0 -84
  1282. data/ext/gentoo/puppet/puppet.conf +0 -25
  1283. data/ext/ips/puppet.conf +0 -29
  1284. data/ext/nagios/naggen +0 -309
  1285. data/ext/puppet-load.rb +0 -393
  1286. data/ext/redhat/puppet.conf +0 -25
  1287. data/ext/redhat/queue.init +0 -105
  1288. data/lib/hiera/backend/puppet_backend.rb +0 -103
  1289. data/lib/puppet/application/instrumentation_data.rb +0 -7
  1290. data/lib/puppet/application/instrumentation_listener.rb +0 -7
  1291. data/lib/puppet/application/instrumentation_probe.rb +0 -7
  1292. data/lib/puppet/application/kick.rb +0 -351
  1293. data/lib/puppet/application/queue.rb +0 -161
  1294. data/lib/puppet/application/secret_agent.rb +0 -9
  1295. data/lib/puppet/dsl.rb +0 -7
  1296. data/lib/puppet/dsl/resource_api.rb +0 -120
  1297. data/lib/puppet/dsl/resource_type_api.rb +0 -34
  1298. data/lib/puppet/face/instrumentation_data.rb +0 -30
  1299. data/lib/puppet/face/instrumentation_listener.rb +0 -98
  1300. data/lib/puppet/face/instrumentation_probe.rb +0 -79
  1301. data/lib/puppet/face/secret_agent.rb +0 -54
  1302. data/lib/puppet/feature/pson.rb +0 -4
  1303. data/lib/puppet/feature/rails.rb +0 -47
  1304. data/lib/puppet/feature/rdoc1.rb +0 -16
  1305. data/lib/puppet/feature/rubygems.rb +0 -7
  1306. data/lib/puppet/feature/stomp.rb +0 -5
  1307. data/lib/puppet/file_collection.rb +0 -19
  1308. data/lib/puppet/file_collection/lookup.rb +0 -10
  1309. data/lib/puppet/file_system/file18.rb +0 -5
  1310. data/lib/puppet/functions/defined.rb +0 -130
  1311. data/lib/puppet/indirector/active_record.rb +0 -29
  1312. data/lib/puppet/indirector/catalog/active_record.rb +0 -39
  1313. data/lib/puppet/indirector/catalog/queue.rb +0 -9
  1314. data/lib/puppet/indirector/couch.rb +0 -78
  1315. data/lib/puppet/indirector/facts/active_record.rb +0 -44
  1316. data/lib/puppet/indirector/facts/couch.rb +0 -36
  1317. data/lib/puppet/indirector/facts/inventory_active_record.rb +0 -110
  1318. data/lib/puppet/indirector/facts/inventory_service.rb +0 -20
  1319. data/lib/puppet/indirector/facts/rest.rb +0 -8
  1320. data/lib/puppet/indirector/instrumentation_data.rb +0 -3
  1321. data/lib/puppet/indirector/instrumentation_data/local.rb +0 -22
  1322. data/lib/puppet/indirector/instrumentation_data/rest.rb +0 -8
  1323. data/lib/puppet/indirector/instrumentation_listener.rb +0 -3
  1324. data/lib/puppet/indirector/instrumentation_listener/local.rb +0 -26
  1325. data/lib/puppet/indirector/instrumentation_listener/rest.rb +0 -8
  1326. data/lib/puppet/indirector/instrumentation_probe.rb +0 -3
  1327. data/lib/puppet/indirector/instrumentation_probe/local.rb +0 -27
  1328. data/lib/puppet/indirector/instrumentation_probe/rest.rb +0 -8
  1329. data/lib/puppet/indirector/node/active_record.rb +0 -22
  1330. data/lib/puppet/indirector/queue.rb +0 -80
  1331. data/lib/puppet/indirector/resource/active_record.rb +0 -104
  1332. data/lib/puppet/indirector/resource/rest.rb +0 -17
  1333. data/lib/puppet/indirector/run/local.rb +0 -15
  1334. data/lib/puppet/indirector/run/rest.rb +0 -12
  1335. data/lib/puppet/module_tool/modulefile.rb +0 -78
  1336. data/lib/puppet/network/authentication.rb +0 -35
  1337. data/lib/puppet/network/http/api/v2.rb +0 -32
  1338. data/lib/puppet/network/http/api/v2/authorization.rb +0 -15
  1339. data/lib/puppet/parser/ast/arithmetic_operator.rb +0 -91
  1340. data/lib/puppet/parser/ast/astarray.rb +0 -50
  1341. data/lib/puppet/parser/ast/asthash.rb +0 -37
  1342. data/lib/puppet/parser/ast/boolean_operator.rb +0 -46
  1343. data/lib/puppet/parser/ast/caseopt.rb +0 -52
  1344. data/lib/puppet/parser/ast/casestatement.rb +0 -41
  1345. data/lib/puppet/parser/ast/collection.rb +0 -53
  1346. data/lib/puppet/parser/ast/collexpr.rb +0 -109
  1347. data/lib/puppet/parser/ast/comparison_operator.rb +0 -38
  1348. data/lib/puppet/parser/ast/definition.rb +0 -17
  1349. data/lib/puppet/parser/ast/else.rb +0 -22
  1350. data/lib/puppet/parser/ast/function.rb +0 -59
  1351. data/lib/puppet/parser/ast/ifstatement.rb +0 -34
  1352. data/lib/puppet/parser/ast/in_operator.rb +0 -24
  1353. data/lib/puppet/parser/ast/lambda.rb +0 -135
  1354. data/lib/puppet/parser/ast/match_operator.rb +0 -28
  1355. data/lib/puppet/parser/ast/method_call.rb +0 -77
  1356. data/lib/puppet/parser/ast/minus.rb +0 -23
  1357. data/lib/puppet/parser/ast/nop.rb +0 -11
  1358. data/lib/puppet/parser/ast/not.rb +0 -19
  1359. data/lib/puppet/parser/ast/relationship.rb +0 -47
  1360. data/lib/puppet/parser/ast/resource_defaults.rb +0 -24
  1361. data/lib/puppet/parser/ast/resource_override.rb +0 -62
  1362. data/lib/puppet/parser/ast/resource_reference.rb +0 -28
  1363. data/lib/puppet/parser/ast/selector.rb +0 -50
  1364. data/lib/puppet/parser/ast/vardef.rb +0 -38
  1365. data/lib/puppet/parser/code_merger.rb +0 -13
  1366. data/lib/puppet/parser/collector.rb +0 -177
  1367. data/lib/puppet/parser/functions/extlookup.rb +0 -153
  1368. data/lib/puppet/parser/functions/search.rb +0 -12
  1369. data/lib/puppet/parser/grammar.ra +0 -806
  1370. data/lib/puppet/parser/lexer.rb +0 -608
  1371. data/lib/puppet/parser/makefile +0 -8
  1372. data/lib/puppet/parser/methods.rb +0 -69
  1373. data/lib/puppet/parser/parser.rb +0 -2559
  1374. data/lib/puppet/parser/parser_support.rb +0 -195
  1375. data/lib/puppet/pops/binder/lookup.rb +0 -216
  1376. data/lib/puppet/pops/migration/migration_checker.rb +0 -45
  1377. data/lib/puppet/pops/model/ast_tree_dumper.rb +0 -386
  1378. data/lib/puppet/provider/package/msi.rb +0 -125
  1379. data/lib/puppet/provider/package/yumhelper.py +0 -159
  1380. data/lib/puppet/rails.rb +0 -139
  1381. data/lib/puppet/rails/benchmark.rb +0 -63
  1382. data/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb +0 -13
  1383. data/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb +0 -13
  1384. data/lib/puppet/rails/database/003_add_environment_to_host.rb +0 -9
  1385. data/lib/puppet/rails/database/004_add_inventory_service_tables.rb +0 -36
  1386. data/lib/puppet/rails/database/schema.rb +0 -136
  1387. data/lib/puppet/rails/fact_name.rb +0 -7
  1388. data/lib/puppet/rails/fact_value.rb +0 -10
  1389. data/lib/puppet/rails/host.rb +0 -258
  1390. data/lib/puppet/rails/inventory_fact.rb +0 -5
  1391. data/lib/puppet/rails/inventory_node.rb +0 -43
  1392. data/lib/puppet/rails/param_name.rb +0 -25
  1393. data/lib/puppet/rails/param_value.rb +0 -74
  1394. data/lib/puppet/rails/puppet_tag.rb +0 -10
  1395. data/lib/puppet/rails/resource.rb +0 -235
  1396. data/lib/puppet/rails/resource_tag.rb +0 -26
  1397. data/lib/puppet/rails/source_file.rb +0 -8
  1398. data/lib/puppet/reports/rrdgraph.rb +0 -128
  1399. data/lib/puppet/reports/tagmail.rb +0 -179
  1400. data/lib/puppet/run.rb +0 -109
  1401. data/lib/puppet/util/cacher.rb +0 -74
  1402. data/lib/puppet/util/inline_docs.rb +0 -26
  1403. data/lib/puppet/util/instrumentation.rb +0 -152
  1404. data/lib/puppet/util/instrumentation/data.rb +0 -46
  1405. data/lib/puppet/util/instrumentation/indirection_probe.rb +0 -41
  1406. data/lib/puppet/util/instrumentation/instrumentable.rb +0 -136
  1407. data/lib/puppet/util/instrumentation/listener.rb +0 -72
  1408. data/lib/puppet/util/instrumentation/listeners/log.rb +0 -23
  1409. data/lib/puppet/util/instrumentation/listeners/performance.rb +0 -24
  1410. data/lib/puppet/util/log/rate_limited_logger.rb +0 -40
  1411. data/lib/puppet/util/monkey_patches/lines.rb +0 -13
  1412. data/lib/puppet/util/plugins.rb +0 -82
  1413. data/lib/puppet/util/pson.rb +0 -13
  1414. data/lib/puppet/util/queue.rb +0 -96
  1415. data/lib/puppet/util/queue/stomp.rb +0 -60
  1416. data/lib/puppet/util/rails/cache_accumulator.rb +0 -65
  1417. data/lib/puppet/util/rails/collection_merger.rb +0 -17
  1418. data/lib/puppet/util/rails/reference_serializer.rb +0 -32
  1419. data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc1.rb +0 -19
  1420. data/lib/puppet/util/retryaction.rb +0 -47
  1421. data/lib/puppet/util/zaml.rb +0 -419
  1422. data/lib/puppet/vendor/load_safe_yaml.rb +0 -1
  1423. data/lib/puppet/vendor/safe_yaml/CHANGES.md +0 -104
  1424. data/lib/puppet/vendor/safe_yaml/Gemfile +0 -11
  1425. data/lib/puppet/vendor/safe_yaml/LICENSE.txt +0 -22
  1426. data/lib/puppet/vendor/safe_yaml/PUPPET_README.md +0 -6
  1427. data/lib/puppet/vendor/safe_yaml/README.md +0 -179
  1428. data/lib/puppet/vendor/safe_yaml/Rakefile +0 -6
  1429. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb +0 -253
  1430. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/deep.rb +0 -34
  1431. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/parse/date.rb +0 -27
  1432. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/parse/hexadecimal.rb +0 -12
  1433. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/parse/sexagesimal.rb +0 -26
  1434. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/psych_handler.rb +0 -92
  1435. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/psych_resolver.rb +0 -52
  1436. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/resolver.rb +0 -94
  1437. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/safe_to_ruby_visitor.rb +0 -17
  1438. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_hack.rb +0 -36
  1439. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_node_monkeypatch.rb +0 -43
  1440. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_resolver.rb +0 -38
  1441. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform.rb +0 -41
  1442. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_boolean.rb +0 -21
  1443. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_date.rb +0 -11
  1444. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_float.rb +0 -33
  1445. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_integer.rb +0 -25
  1446. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_nil.rb +0 -18
  1447. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_symbol.rb +0 -13
  1448. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/transformation_map.rb +0 -47
  1449. data/lib/puppet/vendor/safe_yaml/lib/safe_yaml/version.rb +0 -3
  1450. data/lib/puppet/vendor/safe_yaml/run_specs_all_ruby_versions.sh +0 -21
  1451. data/lib/puppet/vendor/safe_yaml/safe_yaml.gemspec +0 -18
  1452. data/lib/puppet/vendor/safe_yaml/spec/exploit.1.9.2.yaml +0 -2
  1453. data/lib/puppet/vendor/safe_yaml/spec/exploit.1.9.3.yaml +0 -2
  1454. data/lib/puppet/vendor/safe_yaml/spec/psych_resolver_spec.rb +0 -10
  1455. data/lib/puppet/vendor/safe_yaml/spec/resolver_specs.rb +0 -250
  1456. data/lib/puppet/vendor/safe_yaml/spec/safe_yaml_spec.rb +0 -702
  1457. data/lib/puppet/vendor/safe_yaml/spec/spec_helper.rb +0 -18
  1458. data/lib/puppet/vendor/safe_yaml/spec/support/exploitable_back_door.rb +0 -29
  1459. data/lib/puppet/vendor/safe_yaml/spec/syck_resolver_spec.rb +0 -10
  1460. data/lib/puppet/vendor/safe_yaml/spec/transform/base64_spec.rb +0 -11
  1461. data/lib/puppet/vendor/safe_yaml/spec/transform/to_date_spec.rb +0 -34
  1462. data/lib/puppet/vendor/safe_yaml/spec/transform/to_float_spec.rb +0 -42
  1463. data/lib/puppet/vendor/safe_yaml/spec/transform/to_integer_spec.rb +0 -59
  1464. data/lib/puppet/vendor/safe_yaml/spec/transform/to_symbol_spec.rb +0 -49
  1465. data/lib/puppet/vendor/safe_yaml_patches.rb +0 -9
  1466. data/lib/puppetx.rb +0 -89
  1467. data/man/man8/puppet-instrumentation_data.8 +0 -141
  1468. data/man/man8/puppet-instrumentation_listener.8 +0 -218
  1469. data/man/man8/puppet-instrumentation_probe.8 +0 -203
  1470. data/man/man8/puppet-kick.8 +0 -131
  1471. data/man/man8/puppet-queue.8 +0 -55
  1472. data/man/man8/puppet-secret_agent.8 +0 -70
  1473. data/spec/fixtures/module.tar.gz +0 -0
  1474. data/spec/fixtures/unit/provider/package/pkg/publisher +0 -2
  1475. data/spec/fixtures/unit/provider/package/pkg/simple +0 -2
  1476. data/spec/fixtures/yaml/report0.25.x.yaml +0 -64
  1477. data/spec/integration/indirector/catalog/queue_spec.rb +0 -55
  1478. data/spec/integration/module_tool/tar/mini_spec.rb +0 -28
  1479. data/spec/integration/parser/dynamic_scoping_spec.rb +0 -131
  1480. data/spec/integration/parser/future_compiler_spec.rb +0 -822
  1481. data/spec/integration/parser/parser_spec.rb +0 -207
  1482. data/spec/integration/parser/ruby_manifest_spec.rb +0 -119
  1483. data/spec/integration/type/sshkey_spec.rb +0 -22
  1484. data/spec/integration/util/feature_spec.rb +0 -53
  1485. data/spec/lib/puppet_spec/database.rb +0 -29
  1486. data/spec/monkey_patches/alias_should_to_must.rb +0 -21
  1487. data/spec/shared_contexts/platform.rb +0 -52
  1488. data/spec/unit/application/kick_spec.rb +0 -296
  1489. data/spec/unit/application/queue_spec.rb +0 -168
  1490. data/spec/unit/application/secret_agent_spec.rb +0 -34
  1491. data/spec/unit/dsl/resource_api_spec.rb +0 -180
  1492. data/spec/unit/dsl/resource_type_api_spec.rb +0 -53
  1493. data/spec/unit/face/instrumentation_data_spec.rb +0 -7
  1494. data/spec/unit/face/instrumentation_listener_spec.rb +0 -38
  1495. data/spec/unit/face/instrumentation_probe_spec.rb +0 -21
  1496. data/spec/unit/face/secret_agent_spec.rb +0 -27
  1497. data/spec/unit/functions/defined_spec.rb +0 -291
  1498. data/spec/unit/hiera/backend/puppet_backend_spec.rb +0 -148
  1499. data/spec/unit/indirector/active_record_spec.rb +0 -75
  1500. data/spec/unit/indirector/catalog/active_record_spec.rb +0 -107
  1501. data/spec/unit/indirector/catalog/queue_spec.rb +0 -19
  1502. data/spec/unit/indirector/facts/active_record_spec.rb +0 -113
  1503. data/spec/unit/indirector/facts/couch_spec.rb +0 -102
  1504. data/spec/unit/indirector/facts/inventory_active_record_spec.rb +0 -175
  1505. data/spec/unit/indirector/facts/inventory_service_spec.rb +0 -21
  1506. data/spec/unit/indirector/facts/rest_spec.rb +0 -10
  1507. data/spec/unit/indirector/instrumentation_data/local_spec.rb +0 -52
  1508. data/spec/unit/indirector/instrumentation_data/rest_spec.rb +0 -11
  1509. data/spec/unit/indirector/instrumentation_listener/local_spec.rb +0 -65
  1510. data/spec/unit/indirector/instrumentation_listener/rest_spec.rb +0 -11
  1511. data/spec/unit/indirector/instrumentation_probe/local_spec.rb +0 -65
  1512. data/spec/unit/indirector/instrumentation_probe/rest_spec.rb +0 -11
  1513. data/spec/unit/indirector/node/active_record_spec.rb +0 -48
  1514. data/spec/unit/indirector/queue_spec.rb +0 -115
  1515. data/spec/unit/indirector/resource/active_record_spec.rb +0 -166
  1516. data/spec/unit/indirector/resource/rest_spec.rb +0 -10
  1517. data/spec/unit/indirector/run/local_spec.rb +0 -21
  1518. data/spec/unit/indirector/run/rest_spec.rb +0 -10
  1519. data/spec/unit/network/authentication_spec.rb +0 -104
  1520. data/spec/unit/network/http/api/v2_spec.rb +0 -14
  1521. data/spec/unit/parser/ast/arithmetic_operator_spec.rb +0 -160
  1522. data/spec/unit/parser/ast/astarray_spec.rb +0 -56
  1523. data/spec/unit/parser/ast/asthash_spec.rb +0 -98
  1524. data/spec/unit/parser/ast/boolean_operator_spec.rb +0 -54
  1525. data/spec/unit/parser/ast/casestatement_spec.rb +0 -168
  1526. data/spec/unit/parser/ast/collection_spec.rb +0 -70
  1527. data/spec/unit/parser/ast/collexpr_spec.rb +0 -120
  1528. data/spec/unit/parser/ast/comparison_operator_spec.rb +0 -118
  1529. data/spec/unit/parser/ast/definition_spec.rb +0 -21
  1530. data/spec/unit/parser/ast/function_spec.rb +0 -92
  1531. data/spec/unit/parser/ast/hostclass_spec.rb +0 -72
  1532. data/spec/unit/parser/ast/ifstatement_spec.rb +0 -77
  1533. data/spec/unit/parser/ast/in_operator_spec.rb +0 -61
  1534. data/spec/unit/parser/ast/match_operator_spec.rb +0 -51
  1535. data/spec/unit/parser/ast/minus_spec.rb +0 -37
  1536. data/spec/unit/parser/ast/node_spec.rb +0 -30
  1537. data/spec/unit/parser/ast/nop_spec.rb +0 -19
  1538. data/spec/unit/parser/ast/not_spec.rb +0 -31
  1539. data/spec/unit/parser/ast/relationship_spec.rb +0 -87
  1540. data/spec/unit/parser/ast/resource_defaults_spec.rb +0 -21
  1541. data/spec/unit/parser/ast/resource_override_spec.rb +0 -50
  1542. data/spec/unit/parser/ast/resource_reference_spec.rb +0 -56
  1543. data/spec/unit/parser/ast/resource_spec.rb +0 -183
  1544. data/spec/unit/parser/ast/resourceparam_spec.rb +0 -51
  1545. data/spec/unit/parser/ast/selector_spec.rb +0 -88
  1546. data/spec/unit/parser/ast/vardef_spec.rb +0 -68
  1547. data/spec/unit/parser/ast_spec.rb +0 -76
  1548. data/spec/unit/parser/collector_spec.rb +0 -438
  1549. data/spec/unit/parser/functions/extlookup_spec.rb +0 -102
  1550. data/spec/unit/parser/functions/search_spec.rb +0 -28
  1551. data/spec/unit/parser/lexer_spec.rb +0 -877
  1552. data/spec/unit/parser/parser_spec.rb +0 -535
  1553. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -19
  1554. data/spec/unit/pops/migration_spec.rb +0 -180
  1555. data/spec/unit/pops/model/ast_transformer_spec.rb +0 -76
  1556. data/spec/unit/pops/transformer/transform_basic_expressions_spec.rb +0 -243
  1557. data/spec/unit/pops/transformer/transform_calls_spec.rb +0 -115
  1558. data/spec/unit/pops/transformer/transform_conditionals_spec.rb +0 -123
  1559. data/spec/unit/pops/transformer/transform_containers_spec.rb +0 -190
  1560. data/spec/unit/pops/transformer/transformer_rspec_helper.rb +0 -27
  1561. data/spec/unit/pops/validation_spec.rb +0 -66
  1562. data/spec/unit/provider/package/msi_spec.rb +0 -229
  1563. data/spec/unit/rails/host_spec.rb +0 -162
  1564. data/spec/unit/rails/param_value_spec.rb +0 -46
  1565. data/spec/unit/rails/resource_spec.rb +0 -115
  1566. data/spec/unit/rails_spec.rb +0 -244
  1567. data/spec/unit/reports/rrdgraph_spec.rb +0 -29
  1568. data/spec/unit/reports/tagmail_spec.rb +0 -218
  1569. data/spec/unit/run_spec.rb +0 -175
  1570. data/spec/unit/util/cache_accumulator_spec.rb +0 -74
  1571. data/spec/unit/util/cacher_spec.rb +0 -107
  1572. data/spec/unit/util/inline_docs_spec.rb +0 -31
  1573. data/spec/unit/util/instrumentation/data_spec.rb +0 -46
  1574. data/spec/unit/util/instrumentation/indirection_probe_spec.rb +0 -21
  1575. data/spec/unit/util/instrumentation/instrumentable_spec.rb +0 -186
  1576. data/spec/unit/util/instrumentation/listener_spec.rb +0 -101
  1577. data/spec/unit/util/instrumentation/listeners/log_spec.rb +0 -34
  1578. data/spec/unit/util/instrumentation/listeners/performance_spec.rb +0 -36
  1579. data/spec/unit/util/instrumentation_spec.rb +0 -181
  1580. data/spec/unit/util/log/rate_limited_logger_spec.rb +0 -51
  1581. data/spec/unit/util/monkey_patches/lines_spec.rb +0 -83
  1582. data/spec/unit/util/queue/stomp_spec.rb +0 -137
  1583. data/spec/unit/util/queue_spec.rb +0 -94
  1584. data/spec/unit/util/rdoc/parser_spec.rb +0 -608
  1585. data/spec/unit/util/reference_serializer_spec.rb +0 -51
  1586. data/spec/unit/util/zaml_spec.rb +0 -308
@@ -34,7 +34,7 @@ class Puppet::Pops::Model::Factory
34
34
  # Polymorphic build
35
35
  def build(o, *args)
36
36
  begin
37
- @@build_visitor.visit_this(self, o, *args)
37
+ @@build_visitor.visit_this(self, o, args)
38
38
  rescue =>e
39
39
  # debug here when in trouble...
40
40
  raise e
@@ -77,7 +77,7 @@ class Puppet::Pops::Model::Factory
77
77
 
78
78
  def build_AccessExpression(o, left, *keys)
79
79
  o.left_expr = to_ops(left)
80
- keys.each {|expr| o.addKeys(to_ops(expr)) }
80
+ o.keys = keys.map {|expr| to_ops(expr) }
81
81
  o
82
82
  end
83
83
 
@@ -88,14 +88,14 @@ class Puppet::Pops::Model::Factory
88
88
  end
89
89
 
90
90
  def build_BlockExpression(o, *args)
91
- args.each {|expr| o.addStatements(to_ops(expr)) }
91
+ o.statements = args.map {|expr| to_ops(expr) }
92
92
  o
93
93
  end
94
94
 
95
95
  def build_CollectExpression(o, type_expr, query_expr, attribute_operations)
96
96
  o.type_expr = to_ops(type_expr)
97
97
  o.query = build(query_expr)
98
- attribute_operations.each {|op| o.addOperations(build(op)) }
98
+ o.operations = attribute_operations.map {|op| build(op) }
99
99
  o
100
100
  end
101
101
 
@@ -105,7 +105,7 @@ class Puppet::Pops::Model::Factory
105
105
  end
106
106
 
107
107
  def build_ConcatenatedString(o, *args)
108
- args.each {|expr| o.addSegments(build(expr)) }
108
+ o.segments = args.map {|expr| build(expr) }
109
109
  o
110
110
  end
111
111
 
@@ -147,13 +147,12 @@ class Puppet::Pops::Model::Factory
147
147
 
148
148
  def build_ResourceOverrideExpression(o, resources, attribute_operations)
149
149
  o.resources = build(resources)
150
- attribute_operations.each {|ao| o.addOperations(build(ao)) }
150
+ o.operations = attribute_operations.map {|ao| build(ao) }
151
151
  o
152
152
  end
153
153
 
154
- def build_ReservedWord(o, name, future)
154
+ def build_ReservedWord(o, name)
155
155
  o.word = name
156
- o.future = future
157
156
  o
158
157
  end
159
158
 
@@ -164,12 +163,12 @@ class Puppet::Pops::Model::Factory
164
163
  end
165
164
 
166
165
  def build_LiteralHash(o, *keyed_entries)
167
- keyed_entries.each {|entry| o.addEntries build(entry) }
166
+ o.entries = keyed_entries.map {|entry| build(entry) }
168
167
  o
169
168
  end
170
169
 
171
170
  def build_LiteralList(o, *values)
172
- values.each {|v| o.addValues build(v) }
171
+ o.values = values.map {|v| build(v) }
173
172
  o
174
173
  end
175
174
 
@@ -217,14 +216,14 @@ class Puppet::Pops::Model::Factory
217
216
  end
218
217
 
219
218
  def build_LambdaExpression(o, parameters, body)
220
- parameters.each {|p| o.addParameters(build(p)) }
219
+ o.parameters = parameters.map {|p| build(p) }
221
220
  b = f_build_body(body)
222
221
  o.body = to_ops(b) if b
223
222
  o
224
223
  end
225
224
 
226
225
  def build_NamedDefinition(o, name, parameters, body)
227
- parameters.each {|p| o.addParameters(build(p)) }
226
+ o.parameters = parameters.map {|p| build(p) }
228
227
  b = f_build_body(body)
229
228
  o.body = b.current if b
230
229
  o.name = name
@@ -236,7 +235,7 @@ class Puppet::Pops::Model::Factory
236
235
  # @param parent [Expression] parent node matcher
237
236
  # @param body [Object] see {#f_build_body}
238
237
  def build_NodeDefinition(o, hosts, parent, body)
239
- hosts.each {|h| o.addHost_matches(build(h)) }
238
+ o.host_matches = hosts.map {|h| build(h) }
240
239
  o.parent = build(parent) if parent # no nop here
241
240
  b = f_build_body(body)
242
241
  o.body = b.current if b
@@ -261,7 +260,7 @@ class Puppet::Pops::Model::Factory
261
260
 
262
261
  def build_ResourceExpression(o, type_name, bodies)
263
262
  o.type_name = build(type_name)
264
- bodies.each {|b| o.addBodies(build(b)) }
263
+ o.bodies = bodies.map {|b| build(b) }
265
264
  o
266
265
  end
267
266
 
@@ -272,19 +271,19 @@ class Puppet::Pops::Model::Factory
272
271
 
273
272
  def build_ResourceBody(o, title_expression, attribute_operations)
274
273
  o.title = build(title_expression)
275
- attribute_operations.each {|ao| o.addOperations(build(ao)) }
274
+ o.operations = attribute_operations.map {|ao| build(ao) }
276
275
  o
277
276
  end
278
277
 
279
278
  def build_ResourceDefaultsExpression(o, type_ref, attribute_operations)
280
279
  o.type_ref = build(type_ref)
281
- attribute_operations.each {|ao| o.addOperations(build(ao)) }
280
+ o.operations = attribute_operations.map {|ao| build(ao) }
282
281
  o
283
282
  end
284
283
 
285
284
  def build_SelectorExpression(o, left, *selectors)
286
285
  o.left_expr = to_ops(left)
287
- selectors.each {|s| o.addSelectors(build(s)) }
286
+ o.selectors = selectors.map {|s| build(s) }
288
287
  o
289
288
  end
290
289
 
@@ -327,7 +326,7 @@ class Puppet::Pops::Model::Factory
327
326
  def build_Program(o, body, definitions, locator)
328
327
  o.body = to_ops(body)
329
328
  # non containment
330
- definitions.each { |d| o.addDefinitions(d) }
329
+ o.definitions = definitions
331
330
  o.source_ref = locator.file
332
331
  o.source_text = locator.string
333
332
  o.line_offsets = locator.line_index
@@ -639,8 +638,8 @@ class Puppet::Pops::Model::Factory
639
638
  LAMBDA(params, new(Model::EppExpression, parameters_specified, body))
640
639
  end
641
640
 
642
- def self.RESERVED(name, future=false)
643
- new(Model::ReservedWord, name, future)
641
+ def self.RESERVED(name)
642
+ new(Model::ReservedWord, name)
644
643
  end
645
644
 
646
645
  # TODO: This is the same a fqn factory method, don't know if callers to fqn and QNAME can live with the
@@ -774,7 +773,7 @@ class Puppet::Pops::Model::Factory
774
773
  'info' => true,
775
774
  'notice' => true,
776
775
  'warning' => true,
777
- 'err' => true,
776
+ 'error' => true,
778
777
 
779
778
  'fail' => true,
780
779
  'import' => true # discontinued, but transform it to make it call error reporting function
@@ -102,7 +102,7 @@ module Puppet::Pops
102
102
  module ClassModule
103
103
  def locator
104
104
  unless result = getLocator
105
- setLocator(result = Puppet::Pops::Parser::Locator.locator(source_text, source_ref(), line_offsets))
105
+ setLocator(result = Puppet::Pops::Parser::Locator.locator(source_text, source_ref(), line_offsets, char_offsets))
106
106
  end
107
107
  result
108
108
  end
@@ -11,7 +11,7 @@ class Puppet::Pops::Model::ModelLabelProvider < Puppet::Pops::LabelProvider
11
11
  # If a Class is given, its name is used as label
12
12
  #
13
13
  def label o
14
- @@label_visitor.visit(o)
14
+ @@label_visitor.visit_this_0(self, o)
15
15
  end
16
16
 
17
17
  def label_Factory o ; label(o.current) end
@@ -258,7 +258,7 @@ module Puppet::Pops::Model
258
258
  class CollectExpression < Expression
259
259
  contains_one_uni 'type_expr', Expression, :lowerBound => 1
260
260
  contains_one_uni 'query', QueryExpression, :lowerBound => 1
261
- contains_many_uni 'operations', AbstractAttributeOperation
261
+ contains_many_uni 'operations', AttributeOperation
262
262
  end
263
263
 
264
264
  class Parameter < Positioned
@@ -463,12 +463,9 @@ module Puppet::Pops::Model
463
463
  has_attr 'value', String, :lowerBound => 1
464
464
  end
465
465
 
466
- # Represents a parsed reserved word. If the 'future' attribute is true
467
- # the ReserwedWord functions as a deprecation warning + string value
468
- #
466
+ # Represents a parsed reserved word
469
467
  class ReservedWord < LiteralValue
470
468
  has_attr 'word', String, :lowerBound => 1
471
- has_attr 'future', Boolean
472
469
  end
473
470
 
474
471
  # A DSL CLASSREF (one or multiple parts separated by '::' where (at least) the first part starts with an upper case letter).
@@ -486,7 +483,7 @@ module Puppet::Pops::Model
486
483
  class EppExpression < Expression
487
484
  # EPP can be specified without giving any parameter specification.
488
485
  # However, the parameters of the lambda in that case are the empty
489
- # array, which is the same as when the parameters are explicity
486
+ # array, which is the same as when the parameters are explicitly
490
487
  # specified as empty. This attribute tracks that difference.
491
488
  has_attr 'parameters_specified', Boolean
492
489
  contains_one_uni 'body', Expression
@@ -566,14 +563,20 @@ module Puppet::Pops::Model
566
563
 
567
564
  # A Program is the top level construct returned by the parser
568
565
  # it contains the parsed result in the body, and has a reference to the full source text,
569
- # and its origin. The line_offset's is an array with the start offset of each line.
566
+ # and its origin. The line_offset's is an array with the start offset of each line measured
567
+ # in bytes or characters (as given by the attribute char_offsets). The `char_offsets` setting
568
+ # applies to all offsets recorded in the mode (not just the line_offsets).
570
569
  #
570
+ # A model that will be shared across different platforms should use char_offsets true as the byte
571
+ # offsets are platform and encoding dependent.
572
+ #
571
573
  class Program < PopsObject
572
574
  contains_one_uni 'body', Expression
573
575
  has_many 'definitions', Definition
574
576
  has_attr 'source_text', String
575
577
  has_attr 'source_ref', String
576
578
  has_many_attr 'line_offsets', Integer
579
+ has_attr 'char_offsets', Boolean, :defaultValueLiteral => 'false'
577
580
  has_attr 'locator', Object, :lowerBound => 1, :transient => true
578
581
  end
579
582
  end
@@ -12,7 +12,7 @@ class Puppet::Pops::Model::TreeDumper
12
12
  end
13
13
 
14
14
  def do_dump(o)
15
- @@dump_visitor.visit_this(self, o)
15
+ @@dump_visitor.visit_this_0(self, o)
16
16
  end
17
17
 
18
18
  def indent
@@ -21,7 +21,6 @@ token HEREDOC SUBLOCATE
21
21
  token RENDER_STRING RENDER_EXPR EPP_START EPP_END EPP_END_TRIM
22
22
  token FUNCTION
23
23
  token PRIVATE ATTR TYPE
24
- token APPLICATION_R CONSUMES_R PRODUCES_R
25
24
  token LOW
26
25
 
27
26
  prechigh
@@ -355,7 +354,7 @@ unless_expression
355
354
  loc result, val[0], val[4]
356
355
  }
357
356
  | UNLESS expression LBRACE RBRACE unless_else {
358
- result = Factory.UNLESS(val[1], nil, val[4])
357
+ result = Factory.UNLESS(val[1], nil, nil)
359
358
  loc result, val[0], val[4]
360
359
  }
361
360
 
@@ -454,9 +453,6 @@ attribute_operations
454
453
  attribute_name
455
454
  : NAME
456
455
  | keyword
457
- | APPLICATION_R
458
- | CONSUMES_R
459
- | PRODUCES_R
460
456
  # | BOOLEAN
461
457
 
462
458
  # In this version, illegal combinations are validated instead of producing syntax errors
@@ -585,11 +581,6 @@ node_definition_expression
585
581
  # TODO: The error that "class" is not a valid classname is bad - classname rule is also used for other things
586
582
  classname
587
583
  : NAME
588
- | WORD
589
- | CLASSREF
590
- | APPLICATION_R
591
- | CONSUMES_R
592
- | PRODUCES_R
593
584
  | CLASS { error val[0], "'class' is not a valid classname" }
594
585
 
595
586
  # Produces Array<Model::Parameter>
@@ -638,9 +629,6 @@ reserved_word
638
629
  | PRIVATE { result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] }
639
630
  | TYPE { result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] }
640
631
  | ATTR { result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] }
641
- | APPLICATION_R { result = Factory.RESERVED(val[0][:value], true) ; loc result, val[0] }
642
- | CONSUMES_R { result = Factory.RESERVED(val[0][:value], true) ; loc result, val[0] }
643
- | PRODUCES_R { result = Factory.RESERVED(val[0][:value], true) ; loc result, val[0] }
644
632
 
645
633
  #---LITERALS (dynamic and static)
646
634
  #
@@ -20,7 +20,7 @@ module Puppet
20
20
  module Parser
21
21
  class Parser < Racc::Parser
22
22
 
23
- module_eval(<<'...end egrammar.ra/module_eval...', 'egrammar.ra', 765)
23
+ module_eval(<<'...end egrammar.ra/module_eval...', 'egrammar.ra', 753)
24
24
 
25
25
  # Make emacs happy
26
26
  # Local Variables:
@@ -30,258 +30,220 @@ module_eval(<<'...end egrammar.ra/module_eval...', 'egrammar.ra', 765)
30
30
  ##### State transition tables begin ###
31
31
 
32
32
  clist = [
33
- '61,64,331,-248,62,56,289,57,-247,83,-250,-249,247,141,286,387,332,406',
34
- '383,-133,382,-132,289,104,18,107,288,102,103,161,42,289,45,248,47,12',
35
- '-131,46,36,39,347,44,37,10,11,-248,142,69,17,106,-247,38,-250,-249,15',
36
- '16,287,87,88,90,89,-133,70,-132,85,86,-236,-245,43,278,279,84,35,65',
37
- '-129,67,68,66,-131,348,48,49,51,50,52,53,54,61,64,55,263,62,56,264,57',
38
- '91,83,61,64,260,383,62,382,267,266,313,284,326,-236,-245,104,18,107',
39
- '265,102,103,-129,42,247,45,354,47,121,82,46,36,39,247,44,37,356,69,82',
40
- '82,69,17,106,82,38,248,69,15,16,74,87,88,90,89,248,70,343,85,86,240',
41
- '340,43,364,365,84,35,65,284,67,68,285,367,265,48,49,51,50,52,53,54,61',
42
- '64,55,314,62,56,370,57,91,83,260,326,375,376,316,260,259,258,380,320',
43
- '384,386,330,104,18,107,114,102,103,236,42,239,45,393,47,12,237,46,36',
44
- '39,72,44,37,10,11,395,247,69,17,106,284,38,236,82,15,16,82,119,226,90',
45
- '89,113,70,225,85,86,114,399,43,115,74,84,35,65,127,67,68,402,284,127',
46
- '48,49,51,50,52,53,54,61,64,55,405,62,56,158,57,91,83,119,327,326,156',
47
- '113,409,386,411,412,116,117,118,115,104,18,107,413,102,103,128,42,416',
48
- '45,417,47,12,321,46,36,39,418,44,37,10,11,247,127,69,17,106,82,38,74',
49
- '426,15,16,71,428,69,116,117,118,70,429,430,114,248,316,43,,,114,35,65',
50
- '110,67,68,247,,,48,49,51,50,52,53,54,61,64,55,69,62,56,,57,334,119,',
51
- '248,,113,,119,,,114,113,,115,,,18,276,,115,,,42,,45,,47,12,,46,36,39',
52
- ',44,37,10,11,,,69,17,119,,38,,113,15,16,373,,116,117,118,115,70,,116',
53
- '117,118,,43,,114,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62',
54
- '56,,57,422,83,,116,117,118,119,,,,113,,,,,104,18,107,115,102,103,,42',
55
- ',45,,47,12,,46,36,39,,44,37,10,11,,,69,17,106,,38,,,15,16,75,76,77,',
56
- ',,70,116,117,118,,,43,,,84,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64',
57
- '55,,62,56,,57,336,83,,,,,,,,,78,80,79,81,,104,18,107,,102,103,,42,,45',
58
- ',47,12,,46,36,39,,44,37,10,11,,,69,17,106,,38,,,15,16,,,,90,89,,70,',
59
- '85,86,,,43,,,84,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56',
60
- ',57,91,83,,,,,,,,,,,,,,104,18,107,,102,103,,42,,45,,47,12,,46,36,39',
61
- ',44,37,10,11,,,69,17,106,,38,,,15,16,,,,,,,70,,85,86,,,43,,,84,35,65',
62
- ',67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,83,,,,,,,,,,,,,',
63
- '104,18,107,,102,103,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,106',
64
- ',38,,,15,16,,,,,,,70,,85,86,,,43,,,84,35,65,,67,68,,,,48,49,51,50,52',
65
- '53,54,61,64,55,83,62,56,,57,,83,,,,,,,,104,,107,,102,103,104,18,107',
66
- ',102,103,,42,,45,,47,121,,46,36,39,,44,37,106,,,,69,17,106,,38,,,15',
67
- '16,,,85,86,,,70,,,84,,,43,,,84,35,65,,67,68,,,,48,49,51,50,52,53,54',
68
- '61,64,55,83,62,56,,57,,83,,,,,,,,104,,107,,102,103,104,18,107,,102,103',
69
- ',42,,45,,47,121,,46,36,39,,44,37,106,,,,69,17,106,,38,,,15,16,,,,,,',
70
- '70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,83,62,56',
71
- ',57,,,,,,,,,,104,,107,,102,103,,18,,,,,,42,,45,,47,121,,46,36,39,,44',
72
- '37,106,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48',
73
- '49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45',
74
- ',47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,',
75
- '35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,',
76
- ',,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15',
77
- '16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55',
78
- ',62,56,,57,420,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37',
79
- '10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49',
80
- '51,50,52,53,54,61,64,55,,62,56,,57,415,,,,,,,,,,,,,,,,18,,,,,,42,,45',
81
- ',47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43',
82
- ',,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,',
83
- ',,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15',
84
- '16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55',
85
- ',62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,',
86
- ',,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50',
87
- '52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121',
88
- ',46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
89
- '68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,',
90
- ',,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70',
91
- ',,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57',
92
- '349,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69',
93
- '17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53',
94
- '54,61,64,55,,62,56,145,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46',
95
- '36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
96
- '68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,147,57,,,,,,,,,,,,,,,,,18',
97
- ',,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,',
98
- ',70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56',
99
- ',57,149,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11',
100
- ',,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50',
101
- '52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,',
102
- '46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65',
103
- ',67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18',
104
- ',,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70',
105
- ',,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57',
106
- ',,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,',
107
- '38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54',
108
- '61,64,55,,62,56,,160,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39',
109
- ',44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48',
110
- '49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45',
111
- ',47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43',
112
- ',,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,',
113
- ',,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,',
114
- '15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64',
115
- '55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37',
116
- ',,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51',
117
- '50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12',
118
- ',46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65',
119
- ',67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18',
120
- ',,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,',
121
- ',70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56',
122
- ',57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69',
123
- '17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53',
124
- '54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36',
125
- '39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68',
126
- ',,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,',
127
- '42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,',
128
- ',,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,',
129
- ',,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17',
130
- ',,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54',
131
- '61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39',
132
- ',44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48',
133
- '49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45',
134
- ',47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43',
135
- ',,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,',
136
- ',,,,,,,,18,,,,,,177,194,186,195,47,187,197,188,36,176,,179,174,,,,,69',
137
- '17,198,193,175,,,15,173,,,,,,,70,,,,,196,178,,,,35,65,,67,68,,,,189',
138
- '190,192,191,182,183,184,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,',
139
- '42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,',
140
- ',43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,',
141
- ',,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,',
142
- ',15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64',
143
- '55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37',
144
- ',,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51',
145
- '50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121',
146
- ',46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
147
- '68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,',
148
- ',,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,',
149
- ',,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,',
150
- ',,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38',
151
- ',,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61',
152
- '64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44',
153
- '37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49',
154
- '51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47',
155
- '121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65',
156
- ',67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18',
157
- ',,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70',
158
- ',,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57',
159
- ',,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,',
160
- '38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54',
161
- '61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39',
162
- ',44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48',
163
- '49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45',
164
- ',47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,',
165
- '35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,',
166
- ',,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16',
167
- ',,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62',
168
- '56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69',
169
- '17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53',
170
- '54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36',
171
- '39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,',
172
- ',48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42',
173
- ',45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43',
174
- ',,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,',
175
- ',,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15',
176
- '16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55',
177
- ',62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,',
178
- ',,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50',
179
- '52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121',
180
- ',46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
181
- '68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,',
182
- ',,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,',
183
- ',,,,43,,,222,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57',
184
- ',,,,,,,,,,,,,,,,18,224,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69',
185
- '17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53',
186
- '54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36',
187
- '39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68',
188
- ',,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,',
189
- '42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,',
190
- ',43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,',
191
- ',,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,',
192
- ',15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64',
193
- '55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37',
194
- ',,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51',
195
- '50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121',
196
- ',46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
197
- '68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,',
198
- ',,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,',
199
- ',,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,',
200
- ',,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38',
201
- ',,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61',
202
- '64,55,,62,56,,57,,,285,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39',
203
- ',44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48',
204
- '49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45',
205
- ',47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43',
206
- ',,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,',
207
- ',,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15',
208
- '16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55',
209
- ',62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,',
210
- ',,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50',
211
- '52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121',
212
- ',46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
213
- '68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,149,,,,,,,,,,,,,,,,18',
214
- ',,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,',
215
- ',70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56',
216
- ',57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69',
217
- '17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53',
218
- '54,61,64,55,,62,56,,57,324,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46',
219
- '36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67',
220
- '68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,252',
221
- ',,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69,17,,,38,,,15,16,,,,,,',
222
- '70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,',
223
- '57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,69',
224
- '17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53',
225
- '54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36',
226
- '39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,',
227
- ',48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42',
228
- ',45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43',
229
- ',,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,388,,,,',
230
- ',,,,,,,,,,,18,,,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,',
231
- '15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64',
232
- '55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37',
233
- '10,11,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65,,67,68,,,,48,49',
234
- '51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47',
235
- '121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70,,,,,,43,,,,35,65',
236
- ',67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57,,,,,,,,,,,,,,,,,18',
237
- ',,,,,42,,45,,47,121,,46,36,39,,44,37,,,,,69,17,,,38,,,15,16,,,,,,,70',
238
- ',,,,,43,,,,35,65,,67,68,,,,48,49,51,50,52,53,54,61,64,55,,62,56,,57',
239
- ',,,,,,,,,,,,,,,,18,61,64,,,62,42,,45,,47,12,,46,36,39,,44,37,10,11,',
240
- ',69,17,,,38,,,15,16,,,,,,,70,,141,,,138,43,,,,35,65,83,67,68,,,,48,49',
241
- '51,50,52,53,54,70,104,55,107,83,102,103,,,,142,65,,,,,,,104,,107,,102',
242
- '103,,,,106,,,,,,,,87,88,90,89,92,93,,85,86,106,,,,,84,,,87,88,90,89',
243
- '92,93,,85,86,,83,,255,,84,,,,,,,91,99,94,104,,107,,102,103,,95,97,96',
244
- '98,,61,64,91,,62,,,,,,,,,,106,,,,101,100,,,87,88,90,89,92,93,,85,86',
245
- '83,,254,,,84,,,141,,,138,99,94,104,,107,,102,103,,95,97,96,98,,61,64',
246
- ',91,62,70,,,,,,,,,106,142,65,,101,100,,,87,88,90,89,92,93,,85,86,83',
247
- ',253,,,84,,,141,,,138,99,94,104,,107,,102,103,,95,97,96,98,,,,,91,,70',
248
- ',,,,,,,,106,142,65,,101,100,,,87,88,90,89,92,93,83,85,86,,,,,,84,,,',
249
- '99,94,104,317,107,,102,103,,95,97,96,98,,,,,,,,91,,,,,,,,106,,,,101',
250
- '100,,83,87,88,90,89,92,93,,85,86,,,99,94,104,84,107,,102,103,,95,97',
251
- '96,98,,,,,,,,,,,,,,,91,106,,,,101,100,,83,87,88,90,89,92,93,,85,86,',
252
- ',99,94,104,84,107,83,102,103,,95,97,96,98,,278,279,,,94,104,,107,,102',
253
- '103,,95,91,106,,,,101,100,,,87,88,90,89,92,93,,85,86,106,,,,,84,,,87',
254
- '88,90,89,92,93,,85,86,,83,,,,84,,,,,,,91,99,94,104,282,107,,102,103',
255
- ',95,97,96,98,,,,91,,,,,,,,,,,,106,,,,101,100,,83,87,88,90,89,92,93,',
256
- '85,86,,,99,94,104,84,107,,102,103,,95,97,96,98,,,,,,,,,,,,,,,91,106',
257
- ',,,101,100,,83,87,88,90,89,92,93,,85,86,,,99,94,104,84,107,,102,103',
258
- ',95,97,96,98,,,,,,,,,,,,,,,91,106,,,,101,100,,83,87,88,90,89,92,93,',
259
- '85,86,,,99,94,104,84,107,,102,103,,95,97,96,98,,,,,,,,,,,,,,,91,106',
260
- ',,,101,100,,83,87,88,90,89,92,93,,85,86,,,99,94,104,84,107,83,102,103',
261
- ',95,97,96,98,,,,,,94,104,,107,,102,103,,95,91,106,,,,101,100,,,87,88',
262
- '90,89,92,93,,85,86,106,,,,,84,,,87,88,90,89,92,93,83,85,86,,,,,,84,',
263
- ',,99,94,104,91,107,,102,103,,95,97,96,98,,,,,,,,91,,,,,,,,106,,,,101',
264
- '100,,83,87,88,90,89,92,93,,85,86,,,99,94,104,84,107,,102,103,,95,97',
265
- '96,98,,,,,,,,,,,,,,,91,106,,,,101,100,,83,87,88,90,89,92,93,,85,86,',
266
- ',99,94,104,84,107,83,102,103,,95,97,96,98,,,,,,94,104,,107,,102,103',
267
- ',95,91,106,,,,101,100,,,87,88,90,89,92,93,,85,86,106,,,,,84,,,87,88',
268
- '90,89,92,93,83,85,86,,,,,,84,,,,99,94,104,91,107,,102,103,,95,97,96',
269
- '98,,,,,,,,91,,,,,,,,106,,,,,,,,87,88,90,89,92,93,83,85,86,,,290,,,84',
270
- ',,,99,94,104,,107,,102,103,,95,97,96,98,,,,,,,,91,,,,,,,,106,,,,101',
271
- '100,,83,87,88,90,89,92,93,,85,86,,,99,94,104,84,107,83,102,103,,95,97',
272
- '96,98,,,,,,94,104,,107,,102,103,,95,91,106,,,,,100,,,87,88,90,89,92',
273
- '93,,85,86,106,,,,,84,,,87,88,90,89,92,93,83,85,86,,,,,,84,,,,99,94,104',
274
- '91,107,,102,103,,95,97,96,98,61,64,,,62,,,91,,,,,,,,106,,,,101,100,',
275
- ',87,88,90,89,92,93,,85,86,,,,,,84,,141,,,138,,305,194,304,195,,302,197',
276
- '306,,296,,301,303,,,,,91,70,198,193,307,,,,300,,,142,65,,,,,,,,196,308',
277
- ',,,,,,,,,,,311,312,310,309,297,298,299,305,194,304,195,,302,197,306',
278
- ',296,,301,303,,,,,,,198,193,307,,,,300,,,,,,,,,,,,196,308,,,,,,,,,,',
279
- ',311,312,310,309,297,298,299,305,194,304,195,,302,197,306,,296,,301',
280
- '303,,,,,,,198,193,307,,,,300,,,,,,,,,,,,196,308,,,,,,,,,,,,311,312,310',
281
- '309,297,298,299,305,194,304,195,,302,197,306,,296,,301,303,,,,,,,198',
282
- '193,307,,,,300,,,,,,,,,,,,196,308,,,,,,,,,,,,311,312,310,309,297,298',
283
- '299' ]
284
- racc_action_table = arr = ::Array.new(8687, nil)
33
+ '58,61,388,275,59,53,317,54,-236,80,-238,-237,236,133,-129,-234,-239',
34
+ '-225,256,255,318,392,278,101,18,104,278,99,100,333,42,373,45,237,47',
35
+ '12,111,46,36,39,110,44,37,10,11,276,134,66,17,103,-236,38,-238,-237',
36
+ '15,16,-129,-234,-239,-225,58,61,67,334,59,53,236,54,43,277,79,81,35',
37
+ '62,278,64,65,63,107,66,48,49,51,50,18,111,52,237,79,110,42,236,45,79',
38
+ '47,113,236,46,36,39,252,44,37,253,66,312,111,66,17,66,110,38,237,254',
39
+ '15,16,369,237,368,111,58,61,67,110,59,53,229,54,43,340,111,265,35,62',
40
+ '110,64,65,359,267,268,48,49,51,50,18,111,52,307,71,110,42,369,45,368',
41
+ '47,12,236,46,36,39,69,44,37,10,11,342,273,66,17,66,329,38,58,61,15,16',
42
+ '59,237,254,326,58,61,67,249,59,53,249,54,43,72,73,74,35,62,350,64,65',
43
+ '351,273,274,48,49,51,50,18,353,52,248,247,356,42,316,45,312,47,12,361',
44
+ '46,36,39,362,44,37,10,11,236,225,66,17,228,226,38,366,313,15,16,370',
45
+ '372,75,77,76,78,67,312,249,225,379,79,43,381,299,273,35,62,79,64,65',
46
+ '215,214,71,48,49,51,50,58,61,52,153,59,53,385,54,310,150,119,79,273',
47
+ '148,391,306,119,302,120,395,372,397,398,399,18,58,61,119,402,59,42,403',
48
+ '45,404,47,12,300,46,36,39,79,44,37,10,11,71,412,66,17,68,414,38,415',
49
+ '416,15,16,302,,,,,,67,,133,,,130,43,,,,35,62,,64,65,,,,48,49,51,50,58',
50
+ '61,52,67,59,53,,54,408,80,,,,134,62,,,,,,,,,101,18,104,,99,100,,42,',
51
+ '45,,47,12,,46,36,39,,44,37,10,11,,,66,17,103,,38,,,15,16,,,,,58,61,67',
52
+ ',59,53,,54,43,,,81,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47',
53
+ '113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54',
54
+ '43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39',
55
+ ',44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
56
+ ',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11',
57
+ ',,66,17,,,38,,,15,16,,,,,,,67,,,,,,43,,,,35,62,,64,65,,,,48,49,51,50',
58
+ '58,61,52,,59,53,,54,406,80,,,,,,,,,,,,,,101,18,104,,99,100,,42,,45,',
59
+ '47,12,,46,36,39,,44,37,10,11,,,66,17,103,,38,,,15,16,,,,,58,61,67,,59',
60
+ '53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46',
61
+ '36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35',
62
+ '62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,',
63
+ ',,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,',
64
+ '48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38',
65
+ ',,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
66
+ ',52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,',
67
+ ',,,67,,,,,,43,,,,35,62,,64,65,,,,48,49,51,50,58,61,52,,59,53,,54,401',
68
+ '80,,,,,,,,,,,,,,101,18,104,,99,100,,42,,45,,47,12,,46,36,39,,44,37,10',
69
+ '11,,,66,17,103,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65',
70
+ ',,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,',
71
+ ',38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50',
72
+ '18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,',
73
+ ',58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42',
74
+ ',45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59',
75
+ '53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46',
76
+ '36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,,,67,,,,,,43,,,,35,62,,64,65',
77
+ ',,,48,49,51,50,58,61,52,,59,53,,54,320,,,,,,,,,,,,,,,,18,58,61,,,59',
78
+ '42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,,,67,',
79
+ '133,,,130,43,,,,35,62,,64,65,,,,48,49,51,50,58,61,52,67,59,53,,54,322',
80
+ '80,,,,134,62,,,,,,,,,101,18,104,,99,100,,42,,45,,47,12,,46,36,39,,44',
81
+ '37,10,11,,,66,17,103,,38,,,15,16,,,,,58,61,67,,59,53,137,54,43,,,,35',
82
+ '62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10',
83
+ '11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,139,54,43,,,,35,62,,64,65',
84
+ ',,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17',
85
+ ',,38,,,15,16,,,,,,,67,,,,,,43,,,,35,62,,64,65,,,,48,49,51,50,58,61,52',
86
+ ',59,53,,54,141,80,,,,,,,,,,,,,,101,18,104,,99,100,,42,,45,,47,12,,46',
87
+ '36,39,,44,37,10,11,,,66,17,103,,38,,,15,16,,,,,58,61,67,,59,53,,54,43',
88
+ ',,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44',
89
+ '37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64',
90
+ '65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66',
91
+ '17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49',
92
+ '51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15',
93
+ '16,,,,,58,61,67,,59,53,,152,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52',
94
+ ',,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61',
95
+ '67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47',
96
+ '113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54',
97
+ '43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39',
98
+ ',44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
99
+ ',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,',
100
+ '66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
101
+ '49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38',
102
+ ',,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
103
+ ',52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,',
104
+ ',58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42',
105
+ ',45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67',
106
+ ',59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12',
107
+ ',46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54',
108
+ '43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39',
109
+ ',44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
110
+ ',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11',
111
+ ',,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
112
+ '49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38',
113
+ ',,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
114
+ ',52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,',
115
+ ',58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,169',
116
+ '183,175,184,47,176,186,177,36,168,,171,166,,,,,66,17,187,182,167,,,15',
117
+ '165,,,,,,,67,,,,,185,170,,,,35,62,,64,65,,,,178,179,181,180,58,61,52',
118
+ ',59,53,,54,,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,113,,46,36,39,,44,37,',
119
+ ',,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,',
120
+ '48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38',
121
+ ',,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
122
+ ',52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
123
+ '61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
124
+ ',47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53',
125
+ ',54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36',
126
+ '39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
127
+ ',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,',
128
+ '66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
129
+ '49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,',
130
+ '15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,',
131
+ '52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
132
+ '61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
133
+ ',47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53',
134
+ ',54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36',
135
+ '39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
136
+ ',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,',
137
+ '66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
138
+ '49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,',
139
+ '15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,',
140
+ '52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
141
+ '61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
142
+ ',47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53',
143
+ ',54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36',
144
+ '39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
145
+ ',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,',
146
+ '66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
147
+ '49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,',
148
+ '15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,',
149
+ '52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
150
+ '61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
151
+ ',47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53',
152
+ ',54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36',
153
+ '39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,211,35',
154
+ '62,,64,65,,,,48,49,51,50,18,213,52,,,,42,,45,,47,12,,46,36,39,,44,37',
155
+ '10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65',
156
+ ',,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,',
157
+ ',38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50',
158
+ '18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,',
159
+ ',58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42',
160
+ ',45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59',
161
+ '53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46',
162
+ '36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,274',
163
+ ',35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44',
164
+ '37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65',
165
+ ',,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17',
166
+ ',,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51',
167
+ '50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16',
168
+ ',,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,',
169
+ '42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,,,67,',
170
+ ',,,,43,,,,35,62,,64,65,,,,48,49,51,50,58,61,52,,59,53,,54,335,,,,,,',
171
+ ',,,,,,,,,18,58,61,,,59,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17',
172
+ ',,38,,,15,16,,,,,,,67,,133,,,130,43,,,,35,62,,64,65,,,,48,49,51,50,58',
173
+ '61,52,67,59,53,,54,374,,,,,134,62,,,,,,,,,,18,,,,,,42,,45,,47,113,,46',
174
+ '36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35',
175
+ '62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10',
176
+ '11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,',
177
+ ',,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17',
178
+ ',,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51',
179
+ '50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15',
180
+ '16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52',
181
+ ',,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,,,67,',
182
+ ',,,,43,,,,35,62,,64,65,,,,48,49,51,50,58,61,52,,59,53,,54,141,,,,,,',
183
+ ',,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,',
184
+ ',15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
185
+ '241,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16',
186
+ ',,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,',
187
+ '42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61',
188
+ '67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47',
189
+ '113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54',
190
+ '43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39',
191
+ ',44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64',
192
+ '65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17',
193
+ ',,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51',
194
+ '50,18,,52,,,,42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16',
195
+ ',,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,',
196
+ '42,,45,,47,113,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67',
197
+ ',59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113',
198
+ ',46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,',
199
+ ',,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,113,,46,36,39,,44',
200
+ '37,,,,,66,17,,,38,,,15,16,,,,,,,67,,,,,,43,,,,35,62,,64,65,80,,,48,49',
201
+ '51,50,,,52,,,96,91,101,,104,,99,100,,92,94,93,95,,58,61,,,59,,,,,,,',
202
+ ',,103,,,,98,97,,,84,85,87,86,89,90,,82,83,80,,244,,,81,,,133,,,130,96',
203
+ '91,101,,104,,99,100,,92,94,93,95,,88,,,,,67,,,,,,,,,103,134,62,,98,97',
204
+ ',,84,85,87,86,89,90,,82,83,80,,243,,,81,,,,,,,96,91,101,,104,80,99,100',
205
+ ',92,94,93,95,,88,,,,,101,,104,,99,100,,,,103,,,,98,97,,,84,85,87,86',
206
+ '89,90,,82,83,103,,,,,81,,,,,87,86,,,,82,83,80,,242,,,81,,,,88,,,96,91',
207
+ '101,,104,80,99,100,,92,94,93,95,,88,,,,,101,,104,,99,100,,,,103,,,,98',
208
+ '97,,80,84,85,87,86,89,90,,82,83,103,,96,91,101,81,104,,99,100,,92,94',
209
+ '93,95,82,83,,,,,,81,,,,88,,,,103,,,,98,97,,80,84,85,87,86,89,90,,82',
210
+ '83,,,96,91,101,81,104,,99,100,,92,94,93,95,,,,,,,,,,,,88,,,,103,,,,98',
211
+ '97,,,84,85,87,86,89,90,,82,83,,,,,,81,80,,,,,,,,,,267,268,96,91,101',
212
+ '303,104,80,99,100,88,92,94,93,95,,,,,,,101,,104,,99,100,,,,103,,,,98',
213
+ '97,,,84,85,87,86,89,90,,82,83,103,,,,,81,,,84,85,87,86,,,,82,83,80,',
214
+ ',,,81,,,,88,,,96,91,101,,104,,99,100,,92,94,93,95,,88,,,,,,,,,,,,,,103',
215
+ ',,,98,97,,,84,85,87,86,89,90,80,82,83,,,279,,,81,,,,96,91,101,,104,80',
216
+ '99,100,,92,94,93,95,,,,,88,,101,,104,,99,100,,,,103,,,,98,97,,80,84',
217
+ '85,87,86,89,90,,82,83,103,,96,91,101,81,104,,99,100,,92,94,93,95,82',
218
+ '83,,,,,,81,,,,88,,,,103,,,,,97,,80,84,85,87,86,89,90,,82,83,,,96,91',
219
+ '101,81,104,,99,100,,92,94,93,95,,,,,,,,,,,,88,,,,103,,,,98,97,,,84,85',
220
+ '87,86,89,90,80,82,83,,,,,,81,,,,96,91,101,271,104,80,99,100,,92,94,93',
221
+ '95,,,,,88,,101,,104,,99,100,,,,103,,,,98,97,,80,84,85,87,86,89,90,,82',
222
+ '83,103,,96,91,101,81,104,,99,100,,92,94,93,95,82,83,,,,,,81,,,,88,,',
223
+ ',103,,,,98,97,,80,84,85,87,86,89,90,,82,83,,,96,91,101,81,104,,99,100',
224
+ ',92,94,93,95,,,,,,,,,,,,88,,,,103,,,,98,97,,80,84,85,87,86,89,90,,82',
225
+ '83,,,96,91,101,81,104,,99,100,,92,94,93,95,80,,,,,,,,,,,88,,91,101,103',
226
+ '104,,99,100,80,92,,84,85,87,86,89,90,,82,83,,,101,,104,81,99,100,103',
227
+ ',,,,,,,84,85,87,86,89,90,,82,83,,88,,103,,81,,,,,,84,85,87,86,80,,,82',
228
+ '83,,,,,,81,88,96,91,101,,104,,99,100,80,92,94,93,95,,,,,,,88,,,101,',
229
+ '104,,99,100,103,,,,98,97,,,84,85,87,86,89,90,,82,83,,,,103,,81,,,,,',
230
+ ',,87,86,80,,,82,83,,,,,,81,88,96,91,101,,104,,99,100,80,92,94,93,95',
231
+ ',,,,,,88,,91,101,,104,,99,100,103,92,,,98,97,,,84,85,87,86,89,90,,82',
232
+ '83,,,,103,,81,,,,,,84,85,87,86,89,90,80,82,83,,,,,,81,88,,,96,91,101',
233
+ ',104,80,99,100,,92,94,93,95,,,,,88,,101,,104,,99,100,,,,103,,,,98,97',
234
+ ',,84,85,87,86,89,90,,82,83,103,,,,,81,,,84,85,87,86,89,90,80,82,83,',
235
+ ',,,,81,,,,88,,101,,104,80,99,100,,,,,,,,,,88,91,101,,104,,99,100,,92',
236
+ ',103,,,,,,,,84,85,87,86,89,90,,82,83,103,,,,,81,,,84,85,87,86,89,90',
237
+ '80,82,83,,,,,,81,,,,88,91,101,,104,,99,100,,92,,,,,,,,88,,,,,,,,,,,103',
238
+ ',,,,,,,84,85,87,86,89,90,,82,83,,,,,,81,,,291,183,290,184,,288,186,292',
239
+ ',285,,287,289,,,,,,88,187,182,293,,,,286,,,,,,,,,,,,185,294,,,,,,,,',
240
+ ',,,297,298,296,295,291,183,290,184,,288,186,292,,285,,287,289,,,,,,',
241
+ '187,182,293,,,,286,,,,,,,,,,,,185,294,,,,,,,,,,,,297,298,296,295,291',
242
+ '183,290,184,,288,186,292,,285,,287,289,,,,,,,187,182,293,,,,286,,,,',
243
+ ',,,,,,,185,294,,,,,,,,,,,,297,298,296,295,291,183,290,184,,288,186,292',
244
+ ',285,,287,289,,,,,,,187,182,293,,,,286,,,,,,,,,,,,185,294,,,,,,,,,,',
245
+ ',297,298,296,295' ]
246
+ racc_action_table = arr = ::Array.new(6809, nil)
285
247
  idx = 0
286
248
  clist.each do |str|
287
249
  str.split(',', -1).each do |i|
@@ -291,281 +253,241 @@ clist = [
291
253
  end
292
254
 
293
255
  clist = [
294
- '0,0,251,192,0,0,337,0,191,210,190,189,249,259,185,337,251,379,380,184',
295
- '380,183,379,210,0,210,200,210,210,71,0,200,0,249,0,0,182,0,0,0,261,0',
296
- '0,0,0,192,259,0,0,210,191,0,190,189,0,0,185,210,210,210,210,184,0,183',
297
- '210,210,174,175,0,354,354,210,0,0,176,0,0,0,182,262,0,0,0,0,0,0,0,417',
298
- '417,0,148,417,417,148,417,210,209,156,156,223,334,156,334,153,153,228',
299
- '172,275,174,175,209,417,209,280,209,209,176,417,127,417,281,417,417',
300
- '170,417,417,417,326,417,417,283,127,169,168,417,417,209,167,417,127',
301
- '326,417,417,162,209,209,209,209,326,417,257,209,209,127,256,417,291',
302
- '293,209,417,417,295,417,417,300,315,151,417,417,417,417,417,417,417',
303
- '4,4,417,230,4,4,318,4,209,205,146,322,323,325,231,144,136,134,333,234',
304
- '335,336,250,205,4,205,121,205,205,133,4,126,4,341,4,4,124,4,4,4,4,4',
305
- '4,4,4,353,248,4,4,205,355,4,111,109,4,4,108,121,105,205,205,121,4,104',
306
- '205,205,187,363,4,121,73,205,4,4,365,4,4,366,369,224,4,4,4,4,4,4,4,412',
307
- '412,4,374,412,412,66,412,205,120,187,247,241,65,187,383,384,386,387',
308
- '121,121,121,187,120,412,120,390,120,120,41,412,397,412,398,412,412,236',
309
- '412,412,412,404,412,412,412,412,236,40,412,412,120,8,412,5,414,412,412',
310
- '1,419,236,187,187,187,412,421,423,186,236,427,412,,,12,412,412,12,412',
311
- '412,158,,,412,412,412,412,412,412,412,253,253,412,158,253,253,,253,253',
312
- '186,,158,,186,,12,,,320,12,,186,,,253,158,,12,,,253,,253,,253,253,,253',
313
- '253,253,,253,253,253,253,,,253,253,320,,253,,320,253,253,320,,186,186',
314
- '186,320,253,,12,12,12,,253,,45,,253,253,,253,253,,,,253,253,253,253',
315
- '253,253,253,411,411,253,,411,411,,411,411,202,,320,320,320,45,,,,45',
316
- ',,,,202,411,202,45,202,202,,411,,411,,411,411,,411,411,411,,411,411',
317
- '411,411,,,411,411,202,,411,,,411,411,7,7,7,,,,411,45,45,45,,,411,,,202',
318
- '411,411,,411,411,,,,411,411,411,411,411,411,411,254,254,411,,254,254',
319
- ',254,254,204,,,,,,,,,7,7,7,7,,204,254,204,,204,204,,254,,254,,254,254',
320
- ',254,254,254,,254,254,254,254,,,254,254,204,,254,,,254,254,,,,204,204',
321
- ',254,,204,204,,,254,,,204,254,254,,254,254,,,,254,254,254,254,254,254',
322
- '254,10,10,254,,10,10,,10,204,208,,,,,,,,,,,,,,208,10,208,,208,208,,10',
323
- ',10,,10,10,,10,10,10,,10,10,10,10,,,10,10,208,,10,,,10,10,,,,,,,10,',
324
- '208,208,,,10,,,208,10,10,,10,10,,,,10,10,10,10,10,10,10,11,11,10,,11',
325
- '11,,11,,206,,,,,,,,,,,,,,206,11,206,,206,206,,11,,11,,11,11,,11,11,11',
326
- ',11,11,11,11,,,11,11,206,,11,,,11,11,,,,,,,11,,206,206,,,11,,,206,11',
327
- '11,,11,11,,,,11,11,11,11,11,11,11,255,255,11,207,255,255,,255,,203,',
328
- ',,,,,,207,,207,,207,207,203,255,203,,203,203,,255,,255,,255,255,,255',
329
- '255,255,,255,255,207,,,,255,255,203,,255,,,255,255,,,207,207,,,255,',
330
- ',207,,,255,,,203,255,255,,255,255,,,,255,255,255,255,255,255,255,15',
331
- '15,255,122,15,15,,15,,201,,,,,,,,122,,122,,122,122,201,15,201,,201,201',
332
- ',15,,15,,15,15,,15,15,15,,15,15,122,,,,15,15,201,,15,,,15,15,,,,,,,15',
333
- ',,,,,15,,,,15,15,,15,15,,,,15,15,15,15,15,15,15,16,16,15,123,16,16,',
334
- '16,,,,,,,,,,123,,123,,123,123,,16,,,,,,16,,16,,16,16,,16,16,16,,16,16',
335
- '123,,,,16,16,,,16,,,16,16,,,,,,,16,,,,,,16,,,,16,16,,16,16,,,,16,16',
336
- '16,16,16,16,16,17,17,16,,17,17,,17,,,,,,,,,,,,,,,,,17,,,,,,17,,17,,17',
337
- '17,,17,17,17,,17,17,,,,,17,17,,,17,,,17,17,,,,,,,17,,,,,,17,,,,17,17',
338
- ',17,17,,,,17,17,17,17,17,17,17,18,18,17,,18,18,,18,,,,,,,,,,,,,,,,,18',
339
- ',,,,,18,,18,,18,18,,18,18,18,,18,18,18,18,,,18,18,,,18,,,18,18,,,,,',
340
- ',18,,,,,,18,,,,18,18,,18,18,,,,18,18,18,18,18,18,18,409,409,18,,409',
341
- '409,,409,409,,,,,,,,,,,,,,,,409,,,,,,409,,409,,409,409,,409,409,409',
342
- ',409,409,409,409,,,409,409,,,409,,,409,409,,,,,,,409,,,,,,409,,,,409',
343
- '409,,409,409,,,,409,409,409,409,409,409,409,393,393,409,,393,393,,393',
344
- '393,,,,,,,,,,,,,,,,393,,,,,,393,,393,,393,393,,393,393,393,,393,393',
345
- '393,393,,,393,393,,,393,,,393,393,,,,,,,393,,,,,,393,,,,393,393,,393',
346
- '393,,,,393,393,393,393,393,393,393,42,42,393,,42,42,,42,,,,,,,,,,,,',
347
- ',,,,42,,,,,,42,,42,,42,42,,42,42,42,,42,42,,,,,42,42,,,42,,,42,42,,',
348
- ',,,,42,,,,,,42,,,,42,42,,42,42,,,,42,42,42,42,42,42,42,43,43,42,,43',
349
- '43,,43,,,,,,,,,,,,,,,,,43,,,,,,43,,43,,43,43,,43,43,43,,43,43,,,,,43',
350
- '43,,,43,,,43,43,,,,,,,43,,,,,,43,,,,43,43,,43,43,,,,43,43,43,43,43,43',
351
- '43,44,44,43,,44,44,,44,,,,,,,,,,,,,,,,,44,,,,,,44,,44,,44,44,,44,44',
352
- '44,,44,44,,,,,44,44,,,44,,,44,44,,,,,,,44,,,,,,44,,,,44,44,,44,44,,',
353
- ',44,44,44,44,44,44,44,260,260,44,,260,260,,260,,,,,,,,,,,,,,,,,260,',
354
- ',,,,260,,260,,260,260,,260,260,260,,260,260,260,260,,,260,260,,,260',
355
- ',,260,260,,,,,,,260,,,,,,260,,,,260,260,,260,260,,,,260,260,260,260',
356
- '260,260,260,264,264,260,,264,264,,264,264,,,,,,,,,,,,,,,,264,,,,,,264',
357
- ',264,,264,264,,264,264,264,,264,264,264,264,,,264,264,,,264,,,264,264',
358
- ',,,,,,264,,,,,,264,,,,264,264,,264,264,,,,264,264,264,264,264,264,264',
359
- '55,55,264,,55,55,55,55,,,,,,,,,,,,,,,,,55,,,,,,55,,55,,55,55,,55,55',
360
- '55,,55,55,55,55,,,55,55,,,55,,,55,55,,,,,,,55,,,,,,55,,,,55,55,,55,55',
361
- ',,,55,55,55,55,55,55,55,56,56,55,,56,56,56,56,,,,,,,,,,,,,,,,,56,,,',
362
- ',,56,,56,,56,56,,56,56,56,,56,56,56,56,,,56,56,,,56,,,56,56,,,,,,,56',
363
- ',,,,,56,,,,56,56,,56,56,,,,56,56,56,56,56,56,56,57,57,56,,57,57,,57',
364
- '57,,,,,,,,,,,,,,,,57,,,,,,57,,57,,57,57,,57,57,57,,57,57,57,57,,,57',
365
- '57,,,57,,,57,57,,,,,,,57,,,,,,57,,,,57,57,,57,57,,,,57,57,57,57,57,57',
366
- '57,63,63,57,,63,63,,63,,,,,,,,,,,,,,,,,63,,,,,,63,,63,,63,63,,63,63',
367
- '63,,63,63,63,63,,,63,63,,,63,,,63,63,,,,,,,63,,,,,,63,,,,63,63,,63,63',
368
- ',,,63,63,63,63,63,63,63,382,382,63,,382,382,,382,,,,,,,,,,,,,,,,,382',
369
- ',,,,,382,,382,,382,382,,382,382,382,,382,382,,,,,382,382,,,382,,,382',
370
- '382,,,,,,,382,,,,,,382,,,,382,382,,382,382,,,,382,382,382,382,382,382',
371
- '382,222,222,382,,222,222,,222,,,,,,,,,,,,,,,,,222,,,,,,222,,222,,222',
372
- '222,,222,222,222,,222,222,,,,,222,222,,,222,,,222,222,,,,,,,222,,,,',
373
- ',222,,,,222,222,,222,222,,,,222,222,222,222,222,222,222,68,68,222,,68',
374
- '68,,68,,,,,,,,,,,,,,,,,68,,,,,,68,,68,,68,68,,68,68,68,,68,68,,,,,68',
375
- '68,,,68,,,68,68,,,,,,,68,,,,,,68,,,,68,68,,68,68,,,,68,68,68,68,68,68',
376
- '68,370,370,68,,370,370,,370,,,,,,,,,,,,,,,,,370,,,,,,370,,370,,370,370',
377
- ',370,370,370,,370,370,370,370,,,370,370,,,370,,,370,370,,,,,,,370,,',
378
- ',,,370,,,,370,370,,370,370,,,,370,370,370,370,370,370,370,72,72,370',
379
- ',72,72,,72,,,,,,,,,,,,,,,,,72,,,,,,72,,72,,72,72,,72,72,72,,72,72,72',
380
- '72,,,72,72,,,72,,,72,72,,,,,,,72,,,,,,72,,,,72,72,,72,72,,,,72,72,72',
381
- '72,72,72,72,364,364,72,,364,364,,364,,,,,,,,,,,,,,,,,364,,,,,,364,,364',
382
- ',364,364,,364,364,364,,364,364,,,,,364,364,,,364,,,364,364,,,,,,,364',
383
- ',,,,,364,,,,364,364,,364,364,,,,364,364,364,364,364,364,364,74,74,364',
384
- ',74,74,,74,,,,,,,,,,,,,,,,,74,,,,,,74,,74,,74,74,,74,74,74,,74,74,74',
385
- '74,,,74,74,,,74,,,74,74,,,,,,,74,,,,,,74,,,,74,74,,74,74,,,,74,74,74',
386
- '74,74,74,74,75,75,74,,75,75,,75,,,,,,,,,,,,,,,,,75,,,,,,75,,75,,75,75',
387
- ',75,75,75,,75,75,75,75,,,75,75,,,75,,,75,75,,,,,,,75,,,,,,75,,,,75,75',
388
- ',75,75,,,,75,75,75,75,75,75,75,76,76,75,,76,76,,76,,,,,,,,,,,,,,,,,76',
389
- ',,,,,76,,76,,76,76,,76,76,76,,76,76,76,76,,,76,76,,,76,,,76,76,,,,,',
390
- ',76,,,,,,76,,,,76,76,,76,76,,,,76,76,76,76,76,76,76,77,77,76,,77,77',
391
- ',77,,,,,,,,,,,,,,,,,77,,,,,,77,,77,,77,77,,77,77,77,,77,77,77,77,,,77',
392
- '77,,,77,,,77,77,,,,,,,77,,,,,,77,,,,77,77,,77,77,,,,77,77,77,77,77,77',
393
- '77,78,78,77,,78,78,,78,,,,,,,,,,,,,,,,,78,,,,,,78,,78,,78,78,,78,78',
394
- '78,,78,78,78,78,,,78,78,,,78,,,78,78,,,,,,,78,,,,,,78,,,,78,78,,78,78',
395
- ',,,78,78,78,78,78,78,78,79,79,78,,79,79,,79,,,,,,,,,,,,,,,,,79,,,,,',
396
- '79,,79,,79,79,,79,79,79,,79,79,79,79,,,79,79,,,79,,,79,79,,,,,,,79,',
397
- ',,,,79,,,,79,79,,79,79,,,,79,79,79,79,79,79,79,316,316,79,,316,316,',
398
- '316,,,,,,,,,,,,,,,,,316,,,,,,316,,316,,316,316,,316,316,316,,316,316',
399
- ',,,,316,316,,,316,,,316,316,,,,,,,316,,,,,,316,,,,316,316,,316,316,',
400
- ',,316,316,316,316,316,316,316,81,81,316,,81,81,,81,,,,,,,,,,,,,,,,,81',
401
- ',,,,,81,,81,,81,81,,81,81,81,,81,81,81,81,,,81,81,,,81,,,81,81,,,,,',
402
- ',81,,,,,,81,,,,81,81,,81,81,,,,81,81,81,81,81,81,81,82,82,81,,82,82',
403
- ',82,,,,,,,,,,,,,,,,,82,,,,,,82,82,82,82,82,82,82,82,82,82,,82,82,,,',
404
- ',82,82,82,82,82,,,82,82,,,,,,,82,,,,,82,82,,,,82,82,,82,82,,,,82,82',
405
- '82,82,82,82,82,83,83,82,,83,83,,83,,,,,,,,,,,,,,,,,83,,,,,,83,,83,,83',
406
- '83,,83,83,83,,83,83,,,,,83,83,,,83,,,83,83,,,,,,,83,,,,,,83,,,,83,83',
407
- ',83,83,,,,83,83,83,83,83,83,83,84,84,83,,84,84,,84,,,,,,,,,,,,,,,,,84',
408
- ',,,,,84,,84,,84,84,,84,84,84,,84,84,,,,,84,84,,,84,,,84,84,,,,,,,84',
409
- ',,,,,84,,,,84,84,,84,84,,,,84,84,84,84,84,84,84,85,85,84,,85,85,,85',
410
- ',,,,,,,,,,,,,,,,85,,,,,,85,,85,,85,85,,85,85,85,,85,85,,,,,85,85,,,85',
411
- ',,85,85,,,,,,,85,,,,,,85,,,,85,85,,85,85,,,,85,85,85,85,85,85,85,86',
412
- '86,85,,86,86,,86,,,,,,,,,,,,,,,,,86,,,,,,86,,86,,86,86,,86,86,86,,86',
413
- '86,,,,,86,86,,,86,,,86,86,,,,,,,86,,,,,,86,,,,86,86,,86,86,,,,86,86',
414
- '86,86,86,86,86,87,87,86,,87,87,,87,,,,,,,,,,,,,,,,,87,,,,,,87,,87,,87',
415
- '87,,87,87,87,,87,87,,,,,87,87,,,87,,,87,87,,,,,,,87,,,,,,87,,,,87,87',
416
- ',87,87,,,,87,87,87,87,87,87,87,88,88,87,,88,88,,88,,,,,,,,,,,,,,,,,88',
417
- ',,,,,88,,88,,88,88,,88,88,88,,88,88,,,,,88,88,,,88,,,88,88,,,,,,,88',
418
- ',,,,,88,,,,88,88,,88,88,,,,88,88,88,88,88,88,88,89,89,88,,89,89,,89',
419
- ',,,,,,,,,,,,,,,,89,,,,,,89,,89,,89,89,,89,89,89,,89,89,,,,,89,89,,,89',
420
- ',,89,89,,,,,,,89,,,,,,89,,,,89,89,,89,89,,,,89,89,89,89,89,89,89,90',
421
- '90,89,,90,90,,90,,,,,,,,,,,,,,,,,90,,,,,,90,,90,,90,90,,90,90,90,,90',
422
- '90,,,,,90,90,,,90,,,90,90,,,,,,,90,,,,,,90,,,,90,90,,90,90,,,,90,90',
423
- '90,90,90,90,90,91,91,90,,91,91,,91,,,,,,,,,,,,,,,,,91,,,,,,91,,91,,91',
424
- '91,,91,91,91,,91,91,,,,,91,91,,,91,,,91,91,,,,,,,91,,,,,,91,,,,91,91',
425
- ',91,91,,,,91,91,91,91,91,91,91,92,92,91,,92,92,,92,,,,,,,,,,,,,,,,,92',
426
- ',,,,,92,,92,,92,92,,92,92,92,,92,92,,,,,92,92,,,92,,,92,92,,,,,,,92',
427
- ',,,,,92,,,,92,92,,92,92,,,,92,92,92,92,92,92,92,93,93,92,,93,93,,93',
428
- ',,,,,,,,,,,,,,,,93,,,,,,93,,93,,93,93,,93,93,93,,93,93,,,,,93,93,,,93',
429
- ',,93,93,,,,,,,93,,,,,,93,,,,93,93,,93,93,,,,93,93,93,93,93,93,93,94',
430
- '94,93,,94,94,,94,,,,,,,,,,,,,,,,,94,,,,,,94,,94,,94,94,,94,94,94,,94',
431
- '94,,,,,94,94,,,94,,,94,94,,,,,,,94,,,,,,94,,,,94,94,,94,94,,,,94,94',
432
- '94,94,94,94,94,95,95,94,,95,95,,95,,,,,,,,,,,,,,,,,95,,,,,,95,,95,,95',
433
- '95,,95,95,95,,95,95,,,,,95,95,,,95,,,95,95,,,,,,,95,,,,,,95,,,,95,95',
434
- ',95,95,,,,95,95,95,95,95,95,95,96,96,95,,96,96,,96,,,,,,,,,,,,,,,,,96',
435
- ',,,,,96,,96,,96,96,,96,96,96,,96,96,,,,,96,96,,,96,,,96,96,,,,,,,96',
436
- ',,,,,96,,,,96,96,,96,96,,,,96,96,96,96,96,96,96,97,97,96,,97,97,,97',
437
- ',,,,,,,,,,,,,,,,97,,,,,,97,,97,,97,97,,97,97,97,,97,97,,,,,97,97,,,97',
438
- ',,97,97,,,,,,,97,,,,,,97,,,,97,97,,97,97,,,,97,97,97,97,97,97,97,98',
439
- '98,97,,98,98,,98,,,,,,,,,,,,,,,,,98,,,,,,98,,98,,98,98,,98,98,98,,98',
440
- '98,,,,,98,98,,,98,,,98,98,,,,,,,98,,,,,,98,,,,98,98,,98,98,,,,98,98',
441
- '98,98,98,98,98,99,99,98,,99,99,,99,,,,,,,,,,,,,,,,,99,,,,,,99,,99,,99',
442
- '99,,99,99,99,,99,99,,,,,99,99,,,99,,,99,99,,,,,,,99,,,,,,99,,,,99,99',
443
- ',99,99,,,,99,99,99,99,99,99,99,100,100,99,,100,100,,100,,,,,,,,,,,,',
444
- ',,,,100,,,,,,100,,100,,100,100,,100,100,100,,100,100,,,,,100,100,,,100',
445
- ',,100,100,,,,,,,100,,,,,,100,,,,100,100,,100,100,,,,100,100,100,100',
446
- '100,100,100,101,101,100,,101,101,,101,,,,,,,,,,,,,,,,,101,,,,,,101,',
447
- '101,,101,101,,101,101,101,,101,101,,,,,101,101,,,101,,,101,101,,,,,',
448
- ',101,,,,,,101,,,,101,101,,101,101,,,,101,101,101,101,101,101,101,102',
449
- '102,101,,102,102,,102,,,,,,,,,,,,,,,,,102,,,,,,102,,102,,102,102,,102',
450
- '102,102,,102,102,,,,,102,102,,,102,,,102,102,,,,,,,102,,,,,,102,,,102',
451
- '102,102,,102,102,,,,102,102,102,102,102,102,102,103,103,102,,103,103',
452
- ',103,,,,,,,,,,,,,,,,,103,103,,,,,103,,103,,103,103,,103,103,103,,103',
453
- '103,103,103,,,103,103,,,103,,,103,103,,,,,,,103,,,,,,103,,,,103,103',
454
- ',103,103,,,,103,103,103,103,103,103,103,265,265,103,,265,265,,265,,',
455
- ',,,,,,,,,,,,,,265,,,,,,265,,265,,265,265,,265,265,265,,265,265,265,265',
456
- ',,265,265,,,265,,,265,265,,,,,,,265,,,,,,265,,,,265,265,,265,265,,,',
457
- '265,265,265,265,265,265,265,179,179,265,,179,179,,179,,,,,,,,,,,,,,',
458
- ',,179,,,,,,179,,179,,179,179,,179,179,179,,179,179,,,,,179,179,,,179',
459
- ',,179,179,,,,,,,179,,,,,,179,,,,179,179,,179,179,,,,179,179,179,179',
460
- '179,179,179,106,106,179,,106,106,,106,,,,,,,,,,,,,,,,,106,,,,,,106,',
461
- '106,,106,106,,106,106,106,,106,106,,,,,106,106,,,106,,,106,106,,,,,',
462
- ',106,,,,,,106,,,,106,106,,106,106,,,,106,106,106,106,106,106,106,107',
463
- '107,106,,107,107,,107,,,,,,,,,,,,,,,,,107,,,,,,107,,107,,107,107,,107',
464
- '107,107,,107,107,,,,,107,107,,,107,,,107,107,,,,,,,107,,,,,,107,,,,107',
465
- '107,,107,107,,,,107,107,107,107,107,107,107,178,178,107,,178,178,,178',
466
- ',,,,,,,,,,,,,,,,178,,,,,,178,,178,,178,178,,178,178,178,,178,178,,,',
467
- ',178,178,,,178,,,178,178,,,,,,,178,,,,,,178,,,,178,178,,178,178,,,,178',
468
- '178,178,178,178,178,178,177,177,178,,177,177,,177,,,,,,,,,,,,,,,,,177',
469
- ',,,,,177,,177,,177,177,,177,177,177,,177,177,,,,,177,177,,,177,,,177',
470
- '177,,,,,,,177,,,,,,177,,,,177,177,,177,177,,,,177,177,177,177,177,177',
471
- '177,110,110,177,,110,110,,110,,,,,,,,,,,,,,,,,110,,,,,,110,,110,,110',
472
- '110,,110,110,110,,110,110,,,,,110,110,,,110,,,110,110,,,,,,,110,,,,',
473
- ',110,,,,110,110,,110,110,,,,110,110,110,110,110,110,110,173,173,110',
474
- ',173,173,,173,,,173,,,,,,,,,,,,,,173,,,,,,173,,173,,173,173,,173,173',
475
- '173,,173,173,,,,,173,173,,,173,,,173,173,,,,,,,173,,,,,,173,,,,173,173',
476
- ',173,173,,,,173,173,173,173,173,173,173,270,270,173,,270,270,,270,,',
477
- ',,,,,,,,,,,,,,270,,,,,,270,,270,,270,270,,270,270,270,,270,270,270,270',
478
- ',,270,270,,,270,,,270,270,,,,,,,270,,,,,,270,,,,270,270,,270,270,,,',
479
- '270,270,270,270,270,270,270,285,285,270,,285,285,,285,,,,,,,,,,,,,,',
480
- ',,285,,,,,,285,,285,,285,285,,285,285,285,,285,285,,,,,285,285,,,285',
481
- ',,285,285,,,,,,,285,,,,,,285,,,,285,285,,285,285,,,,285,285,285,285',
482
- '285,285,285,286,286,285,,286,286,,286,,,,,,,,,,,,,,,,,286,,,,,,286,',
483
- '286,,286,286,,286,286,286,,286,286,,,,,286,286,,,286,,,286,286,,,,,',
484
- ',286,,,,,,286,,,,286,286,,286,286,,,,286,286,286,286,286,286,286,287',
485
- '287,286,,287,287,,287,,,,,,,,,,,,,,,,,287,,,,,,287,,287,,287,287,,287',
486
- '287,287,,287,287,,,,,287,287,,,287,,,287,287,,,,,,,287,,,,,,287,,,,287',
487
- '287,,287,287,,,,287,287,287,287,287,287,287,160,160,287,,160,160,,160',
488
- '160,,,,,,,,,,,,,,,,160,,,,,,160,,160,,160,160,,160,160,160,,160,160',
489
- '160,160,,,160,160,,,160,,,160,160,,,,,,,160,,,,,,160,,,,160,160,,160',
490
- '160,,,,160,160,160,160,160,160,160,340,340,160,,340,340,,340,,,,,,,',
491
- ',,,,,,,,,340,,,,,,340,,340,,340,340,,340,340,340,,340,340,340,340,,',
492
- '340,340,,,340,,,340,340,,,,,,,340,,,,,,340,,,,340,340,,340,340,,,,340',
493
- '340,340,340,340,340,340,239,239,340,,239,239,,239,239,,,,,,,,,,,,,,',
494
- ',239,,,,,,239,,239,,239,239,,239,239,239,,239,239,239,239,,,239,239',
495
- ',,239,,,239,239,,,,,,,239,,,,,,239,,,,239,239,,239,239,,,,239,239,239',
496
- '239,239,239,239,128,128,239,,128,128,,128,,,,,,,,,,,,,,,,,128,128,,',
497
- ',,128,,128,,128,128,,128,128,128,,128,128,128,128,,,128,128,,,128,,',
498
- '128,128,,,,,,,128,,,,,,128,,,,128,128,,128,128,,,,128,128,128,128,128',
499
- '128,128,157,157,128,,157,157,,157,,,,,,,,,,,,,,,,,157,,,,,,157,,157',
500
- ',157,157,,157,157,157,,157,157,157,157,,,157,157,,,157,,,157,157,,,',
501
- ',,,157,,,,,,157,,,,157,157,,157,157,,,,157,157,157,157,157,157,157,289',
502
- '289,157,,289,289,,289,,,,,,,,,,,,,,,,,289,,,,,,289,,289,,289,289,,289',
503
- '289,289,,289,289,,,,,289,289,,,289,,,289,289,,,,,,,289,,,,,,289,,,,289',
504
- '289,,289,289,,,,289,289,289,289,289,289,289,290,290,289,,290,290,,290',
505
- ',,,,,,,,,,,,,,,,290,,,,,,290,,290,,290,290,,290,290,290,,290,290,,,',
506
- ',290,290,,,290,,,290,290,,,,,,,290,,,,,,290,,,,290,290,,290,290,,,,290',
507
- '290,290,290,290,290,290,338,338,290,,338,338,,338,338,,,,,,,,,,,,,,',
508
- ',338,,,,,,338,,338,,338,338,,338,338,338,,338,338,,,,,338,338,,,338',
509
- ',,338,338,,,,,,,338,,,,,,338,,,,338,338,,338,338,,,,338,338,338,338',
510
- '338,338,338,331,331,338,,331,331,,331,,,,,,,,,,,,,,,,,331,,,,,,331,',
511
- '331,,331,331,,331,331,331,,331,331,331,331,,,331,331,,,331,,,331,331',
512
- ',,,,,,331,,,,,,331,,,,331,331,,331,331,,,,331,331,331,331,331,331,331',
513
- '330,330,331,,330,330,,330,,,,,,,,,,,,,,,,,330,,,,,,330,,330,,330,330',
514
- ',330,330,330,,330,330,,,,,330,330,,,330,,,330,330,,,,,,,330,,,,,,330',
515
- ',,,330,330,,330,330,,,,330,330,330,330,330,330,330,327,327,330,,327',
516
- '327,,327,,,,,,,,,,,,,,,,,327,,,,,,327,,327,,327,327,,327,327,327,,327',
517
- '327,,,,,327,327,,,327,,,327,327,,,,,,,327,,,,,,327,,,,327,327,,327,327',
518
- ',,,327,327,327,327,327,327,327,80,80,327,,80,80,,80,,,,,,,,,,,,,,,,',
519
- '80,258,258,,,258,80,,80,,80,80,,80,80,80,,80,80,80,80,,,80,80,,,80,',
520
- ',80,80,,,,,,,80,,258,,,258,80,,,,80,80,212,80,80,,,,80,80,80,80,80,80',
521
- '80,258,212,80,212,211,212,212,,,,258,258,,,,,,,211,,211,,211,211,,,',
522
- '212,,,,,,,,212,212,212,212,212,212,,212,212,211,,,,,212,,,211,211,211',
523
- '211,211,211,,211,211,,132,,132,,211,,,,,,,212,132,132,132,,132,,132',
524
- '132,,132,132,132,132,,46,46,211,,46,,,,,,,,,,132,,,,132,132,,,132,132',
525
- '132,132,132,132,,132,132,131,,131,,,132,,,46,,,46,131,131,131,,131,',
526
- '131,131,,131,131,131,131,,188,188,,132,188,46,,,,,,,,,131,46,46,,131',
527
- '131,,,131,131,131,131,131,131,,131,131,129,,129,,,131,,,188,,,188,129',
528
- '129,129,,129,,129,129,,129,129,129,129,,,,,131,,188,,,,,,,,,129,188',
529
- '188,,129,129,,,129,129,129,129,129,129,232,129,129,,,,,,129,,,,232,232',
530
- '232,232,232,,232,232,,232,232,232,232,,,,,,,,129,,,,,,,,232,,,,232,232',
531
- ',159,232,232,232,232,232,232,,232,232,,,159,159,159,232,159,,159,159',
532
- ',159,159,159,159,,,,,,,,,,,,,,,232,159,,,,159,159,,9,159,159,159,159',
533
- '159,159,,159,159,,,9,9,9,159,9,214,9,9,,9,9,9,9,,159,159,,,214,214,',
534
- '214,,214,214,,214,159,9,,,,9,9,,,9,9,9,9,9,9,,9,9,214,,,,,9,,,214,214',
535
- '214,214,214,214,,214,214,,171,,,,214,,,,,,,9,171,171,171,171,171,,171',
536
- '171,,171,171,171,171,,,,214,,,,,,,,,,,,171,,,,171,171,,362,171,171,171',
537
- '171,171,171,,171,171,,,362,362,362,171,362,,362,362,,362,362,362,362',
538
- ',,,,,,,,,,,,,,171,362,,,,362,362,,358,362,362,362,362,362,362,,362,362',
539
- ',,358,358,358,362,358,,358,358,,358,358,358,358,,,,,,,,,,,,,,,362,358',
540
- ',,,358,358,,227,358,358,358,358,358,358,,358,358,,,227,227,227,358,227',
541
- ',227,227,,227,227,227,227,,,,,,,,,,,,,,,358,227,,,,227,227,,199,227',
542
- '227,227,227,227,227,,227,227,,,199,199,199,227,199,213,199,199,,199',
543
- '199,199,199,,,,,,213,213,,213,,213,213,,213,227,199,,,,199,199,,,199',
544
- '199,199,199,199,199,,199,199,213,,,,,199,,,213,213,213,213,213,213,359',
545
- '213,213,,,,,,213,,,,359,359,359,199,359,,359,359,,359,359,359,359,,',
546
- ',,,,,213,,,,,,,,359,,,,359,359,,360,359,359,359,359,359,359,,359,359',
547
- ',,360,360,360,359,360,,360,360,,360,360,360,360,,,,,,,,,,,,,,,359,360',
548
- ',,,360,360,,361,360,360,360,360,360,360,,360,360,,,361,361,361,360,361',
549
- '215,361,361,,361,361,361,361,,,,,,215,215,,215,,215,215,,215,360,361',
550
- ',,,361,361,,,361,361,361,361,361,361,,361,361,215,,,,,361,,,215,215',
551
- '215,215,215,215,217,215,215,,,,,,215,,,,217,217,217,361,217,,217,217',
552
- ',217,217,217,217,,,,,,,,215,,,,,,,,217,,,,,,,,217,217,217,217,217,217',
553
- '219,217,217,,,219,,,217,,,,219,219,219,,219,,219,219,,219,219,219,219',
554
- ',,,,,,,217,,,,,,,,219,,,,219,219,,218,219,219,219,219,219,219,,219,219',
555
- ',,218,218,218,219,218,216,218,218,,218,218,218,218,,,,,,216,216,,216',
556
- ',216,216,,216,219,218,,,,,218,,,218,218,218,218,218,218,,218,218,216',
557
- ',,,,218,,,216,216,216,216,216,216,378,216,216,,,,,,216,,,,378,378,378',
558
- '218,378,,378,378,,378,378,378,378,343,343,,,343,,,216,,,,,,,,378,,,',
559
- '378,378,,,378,378,378,378,378,378,,378,378,,,,,,378,,343,,,343,,284',
560
- '284,284,284,,284,284,284,,284,,284,284,,,,,378,343,284,284,284,,,,284',
561
- ',,343,343,,,,,,,,284,284,,,,,,,,,,,,284,284,284,284,284,284,284,282',
562
- '282,282,282,,282,282,282,,282,,282,282,,,,,,,282,282,282,,,,282,,,,',
563
- ',,,,,,,282,282,,,,,,,,,,,,282,282,282,282,282,282,282,226,226,226,226',
564
- ',226,226,226,,226,,226,226,,,,,,,226,226,226,,,,226,,,,,,,,,,,,226,226',
565
- ',,,,,,,,,,,226,226,226,226,226,226,226,317,317,317,317,,317,317,317',
566
- ',317,,317,317,,,,,,,317,317,317,,,,317,,,,,,,,,,,,317,317,,,,,,,,,,',
567
- ',317,317,317,317,317,317,317' ]
568
- racc_action_check = arr = ::Array.new(8687, nil)
256
+ '0,0,352,174,0,0,240,0,180,191,178,181,238,248,168,167,179,166,145,145',
257
+ '240,365,323,191,0,191,365,191,191,250,0,323,0,238,0,0,113,0,0,0,113',
258
+ '0,0,0,0,174,248,0,0,191,180,0,178,181,0,0,168,167,179,166,403,403,0',
259
+ '251,403,403,312,403,0,189,161,191,0,0,189,0,0,0,12,312,0,0,0,0,403,45',
260
+ '0,312,160,45,403,119,403,159,403,403,150,403,403,403,140,403,403,140',
261
+ '119,264,12,403,403,150,12,403,119,269,403,403,320,150,320,175,4,4,403',
262
+ '175,4,4,119,4,403,270,306,150,403,403,306,403,403,306,340,340,403,403',
263
+ '403,403,4,176,403,225,154,176,4,366,4,366,4,4,225,4,4,4,4,4,4,4,4,272',
264
+ '164,4,4,225,246,4,148,148,4,4,148,225,143,245,398,398,4,138,398,398',
265
+ '136,398,4,7,7,7,4,4,280,4,4,282,284,286,4,4,4,4,398,301,4,128,126,304',
266
+ '398,239,398,308,398,398,309,398,398,398,311,398,398,398,398,237,125',
267
+ '398,398,118,116,398,319,236,398,398,321,322,7,7,7,7,398,230,212,108',
268
+ '327,106,398,339,217,341,398,398,105,398,398,102,101,70,398,398,398,398',
269
+ '228,228,398,68,228,228,349,228,228,63,351,162,355,62,360,223,213,220',
270
+ '41,369,370,372,373,376,228,177,177,40,383,177,228,384,228,390,228,228',
271
+ '219,228,228,228,8,228,228,228,228,5,400,228,228,1,405,228,407,409,228',
272
+ '228,413,,,,,,228,,177,,,177,228,,,,228,228,,228,228,,,,228,228,228,228',
273
+ '397,397,228,177,397,397,,397,397,192,,,,177,177,,,,,,,,,192,397,192',
274
+ ',192,192,,397,,397,,397,397,,397,397,397,,397,397,397,397,,,397,397',
275
+ '192,,397,,,397,397,,,,,211,211,397,,211,211,,211,397,,,192,397,397,',
276
+ '397,397,,,,397,397,397,397,211,,397,,,,211,,211,,211,211,,211,211,211',
277
+ ',211,211,,,,,211,211,,,211,,,211,211,,,,,10,10,211,,10,10,,10,211,,',
278
+ ',211,211,,211,211,,,,211,211,211,211,10,,211,,,,10,,10,,10,10,,10,10',
279
+ '10,,10,10,10,10,,,10,10,,,10,,,10,10,,,,,11,11,10,,11,11,,11,10,,,,10',
280
+ '10,,10,10,,,,10,10,10,10,11,,10,,,,11,,11,,11,11,,11,11,11,,11,11,11',
281
+ '11,,,11,11,,,11,,,11,11,,,,,,,11,,,,,,11,,,,11,11,,11,11,,,,11,11,11',
282
+ '11,395,395,11,,395,395,,395,395,114,,,,,,,,,,,,,,114,395,114,,114,114',
283
+ ',395,,395,,395,395,,395,395,395,,395,395,395,395,,,395,395,114,,395',
284
+ ',,395,395,,,,,15,15,395,,15,15,,15,395,,,,395,395,,395,395,,,,395,395',
285
+ '395,395,15,,395,,,,15,,15,,15,15,,15,15,15,,15,15,,,,,15,15,,,15,,,15',
286
+ '15,,,,,16,16,15,,16,16,,16,15,,,,15,15,,15,15,,,,15,15,15,15,16,,15',
287
+ ',,,16,,16,,16,16,,16,16,16,,16,16,,,,,16,16,,,16,,,16,16,,,,,17,17,16',
288
+ ',17,17,,17,16,,,,16,16,,16,16,,,,16,16,16,16,17,,16,,,,17,,17,,17,17',
289
+ ',17,17,17,,17,17,,,,,17,17,,,17,,,17,17,,,,,18,18,17,,18,18,,18,17,',
290
+ ',,17,17,,17,17,,,,17,17,17,17,18,,17,,,,18,,18,,18,18,,18,18,18,,18',
291
+ '18,18,18,,,18,18,,,18,,,18,18,,,,,,,18,,,,,,18,,,,18,18,,18,18,,,,18',
292
+ '18,18,18,379,379,18,,379,379,,379,379,115,,,,,,,,,,,,,,115,379,115,',
293
+ '115,115,,379,,379,,379,379,,379,379,379,,379,379,379,379,,,379,379,115',
294
+ ',379,,,379,379,,,,,368,368,379,,368,368,,368,379,,,,379,379,,379,379',
295
+ ',,,379,379,379,379,368,,379,,,,368,,368,,368,368,,368,368,368,,368,368',
296
+ ',,,,368,368,,,368,,,368,368,,,,,42,42,368,,42,42,,42,368,,,,368,368',
297
+ ',368,368,,,,368,368,368,368,42,,368,,,,42,,42,,42,42,,42,42,42,,42,42',
298
+ ',,,,42,42,,,42,,,42,42,,,,,43,43,42,,43,43,,43,42,,,,42,42,,42,42,,',
299
+ ',42,42,42,42,43,,42,,,,43,,43,,43,43,,43,43,43,,43,43,,,,,43,43,,,43',
300
+ ',,43,43,,,,,44,44,43,,44,44,,44,43,,,,43,43,,43,43,,,,43,43,43,43,44',
301
+ ',43,,,,44,,44,,44,44,,44,44,44,,44,44,,,,,44,44,,,44,,,44,44,,,,,,,44',
302
+ ',,,,,44,,,,44,44,,44,44,,,,44,44,44,44,242,242,44,,242,242,,242,242',
303
+ ',,,,,,,,,,,,,,,242,46,46,,,46,242,,242,,242,242,,242,242,242,,242,242',
304
+ '242,242,,,242,242,,,242,,,242,242,,,,,,,242,,46,,,46,242,,,,242,242',
305
+ ',242,242,,,,242,242,242,242,243,243,242,46,243,243,,243,243,190,,,,46',
306
+ '46,,,,,,,,,190,243,190,,190,190,,243,,243,,243,243,,243,243,243,,243',
307
+ '243,243,243,,,243,243,190,,243,,,243,243,,,,,52,52,243,,52,52,52,52',
308
+ '243,,,,243,243,,243,243,,,,243,243,243,243,52,,243,,,,52,,52,,52,52',
309
+ ',52,52,52,,52,52,52,52,,,52,52,,,52,,,52,52,,,,,53,53,52,,53,53,53,53',
310
+ '52,,,,52,52,,52,52,,,,52,52,52,52,53,,52,,,,53,,53,,53,53,,53,53,53',
311
+ ',53,53,53,53,,,53,53,,,53,,,53,53,,,,,,,53,,,,,,53,,,,53,53,,53,53,',
312
+ ',,53,53,53,53,54,54,53,,54,54,,54,54,112,,,,,,,,,,,,,,112,54,112,,112',
313
+ '112,,54,,54,,54,54,,54,54,54,,54,54,54,54,,,54,54,112,,54,,,54,54,,',
314
+ ',,60,60,54,,60,60,,60,54,,,,54,54,,54,54,,,,54,54,54,54,60,,54,,,,60',
315
+ ',60,,60,60,,60,60,60,,60,60,60,60,,,60,60,,,60,,,60,60,,,,,356,356,60',
316
+ ',356,356,,356,60,,,,60,60,,60,60,,,,60,60,60,60,356,,60,,,,356,,356',
317
+ ',356,356,,356,356,356,,356,356,356,356,,,356,356,,,356,,,356,356,,,',
318
+ ',350,350,356,,350,350,,350,356,,,,356,356,,356,356,,,,356,356,356,356',
319
+ '350,,356,,,,350,,350,,350,350,,350,350,350,,350,350,,,,,350,350,,,350',
320
+ ',,350,350,,,,,65,65,350,,65,65,,65,350,,,,350,350,,350,350,,,,350,350',
321
+ '350,350,65,,350,,,,65,,65,,65,65,,65,65,65,,65,65,,,,,65,65,,,65,,,65',
322
+ '65,,,,,244,244,65,,244,244,,244,65,,,,65,65,,65,65,,,,65,65,65,65,244',
323
+ ',65,,,,244,,244,,244,244,,244,244,244,,244,244,,,,,244,244,,,244,,,244',
324
+ '244,,,,,69,69,244,,69,69,,69,244,,,,244,244,,244,244,,,,244,244,244',
325
+ '244,69,,244,,,,69,,69,,69,69,,69,69,69,,69,69,69,69,,,69,69,,,69,,,69',
326
+ '69,,,,,171,171,69,,171,171,,171,69,,,,69,69,,69,69,,,,69,69,69,69,171',
327
+ ',69,,,,171,,171,,171,171,,171,171,171,,171,171,,,,,171,171,,,171,,,171',
328
+ '171,,,,,71,71,171,,71,71,,71,171,,,,171,171,,171,171,,,,171,171,171',
329
+ '171,71,,171,,,,71,,71,,71,71,,71,71,71,,71,71,71,71,,,71,71,,,71,,,71',
330
+ '71,,,,,72,72,71,,72,72,,72,71,,,,71,71,,71,71,,,,71,71,71,71,72,,71',
331
+ ',,,72,,72,,72,72,,72,72,72,,72,72,72,72,,,72,72,,,72,,,72,72,,,,,73',
332
+ '73,72,,73,73,,73,72,,,,72,72,,72,72,,,,72,72,72,72,73,,72,,,,73,,73',
333
+ ',73,73,,73,73,73,,73,73,73,73,,,73,73,,,73,,,73,73,,,,,74,74,73,,74',
334
+ '74,,74,73,,,,73,73,,73,73,,,,73,73,73,73,74,,73,,,,74,,74,,74,74,,74',
335
+ '74,74,,74,74,74,74,,,74,74,,,74,,,74,74,,,,,75,75,74,,75,75,,75,74,',
336
+ ',,74,74,,74,74,,,,74,74,74,74,75,,74,,,,75,,75,,75,75,,75,75,75,,75',
337
+ '75,75,75,,,75,75,,,75,,,75,75,,,,,76,76,75,,76,76,,76,75,,,,75,75,,75',
338
+ '75,,,,75,75,75,75,76,,75,,,,76,,76,,76,76,,76,76,76,,76,76,76,76,,,76',
339
+ '76,,,76,,,76,76,,,,,77,77,76,,77,77,,77,76,,,,76,76,,76,76,,,,76,76',
340
+ '76,76,77,,76,,,,77,,77,,77,77,,77,77,77,,77,77,77,77,,,77,77,,,77,,',
341
+ '77,77,,,,,78,78,77,,78,78,,78,77,,,,77,77,,77,77,,,,77,77,77,77,78,',
342
+ '77,,,,78,,78,,78,78,,78,78,78,,78,78,78,78,,,78,78,,,78,,,78,78,,,,',
343
+ '79,79,78,,79,79,,79,78,,,,78,78,,78,78,,,,78,78,78,78,79,,78,,,,79,79',
344
+ '79,79,79,79,79,79,79,79,,79,79,,,,,79,79,79,79,79,,,79,79,,,,,,,79,',
345
+ ',,,79,79,,,,79,79,,79,79,,,,79,79,79,79,80,80,79,,80,80,,80,,,,,,,,',
346
+ ',,,,,,,,80,,,,,,80,,80,,80,80,,80,80,80,,80,80,,,,,80,80,,,80,,,80,80',
347
+ ',,,,81,81,80,,81,81,,81,80,,,,80,80,,80,80,,,,80,80,80,80,81,,80,,,',
348
+ '81,,81,,81,81,,81,81,81,,81,81,,,,,81,81,,,81,,,81,81,,,,,82,82,81,',
349
+ '82,82,,82,81,,,,81,81,,81,81,,,,81,81,81,81,82,,81,,,,82,,82,,82,82',
350
+ ',82,82,82,,82,82,,,,,82,82,,,82,,,82,82,,,,,83,83,82,,83,83,,83,82,',
351
+ ',,82,82,,82,82,,,,82,82,82,82,83,,82,,,,83,,83,,83,83,,83,83,83,,83',
352
+ '83,,,,,83,83,,,83,,,83,83,,,,,84,84,83,,84,84,,84,83,,,,83,83,,83,83',
353
+ ',,,83,83,83,83,84,,83,,,,84,,84,,84,84,,84,84,84,,84,84,,,,,84,84,,',
354
+ '84,,,84,84,,,,,85,85,84,,85,85,,85,84,,,,84,84,,84,84,,,,84,84,84,84',
355
+ '85,,84,,,,85,,85,,85,85,,85,85,85,,85,85,,,,,85,85,,,85,,,85,85,,,,',
356
+ '86,86,85,,86,86,,86,85,,,,85,85,,85,85,,,,85,85,85,85,86,,85,,,,86,',
357
+ '86,,86,86,,86,86,86,,86,86,,,,,86,86,,,86,,,86,86,,,,,87,87,86,,87,87',
358
+ ',87,86,,,,86,86,,86,86,,,,86,86,86,86,87,,86,,,,87,,87,,87,87,,87,87',
359
+ '87,,87,87,,,,,87,87,,,87,,,87,87,,,,,88,88,87,,88,88,,88,87,,,,87,87',
360
+ ',87,87,,,,87,87,87,87,88,,87,,,,88,,88,,88,88,,88,88,88,,88,88,,,,,88',
361
+ '88,,,88,,,88,88,,,,,89,89,88,,89,89,,89,88,,,,88,88,,88,88,,,,88,88',
362
+ '88,88,89,,88,,,,89,,89,,89,89,,89,89,89,,89,89,,,,,89,89,,,89,,,89,89',
363
+ ',,,,90,90,89,,90,90,,90,89,,,,89,89,,89,89,,,,89,89,89,89,90,,89,,,',
364
+ '90,,90,,90,90,,90,90,90,,90,90,,,,,90,90,,,90,,,90,90,,,,,91,91,90,',
365
+ '91,91,,91,90,,,,90,90,,90,90,,,,90,90,90,90,91,,90,,,,91,,91,,91,91',
366
+ ',91,91,91,,91,91,,,,,91,91,,,91,,,91,91,,,,,92,92,91,,92,92,,92,91,',
367
+ ',,91,91,,91,91,,,,91,91,91,91,92,,91,,,,92,,92,,92,92,,92,92,92,,92',
368
+ '92,,,,,92,92,,,92,,,92,92,,,,,93,93,92,,93,93,,93,92,,,,92,92,,92,92',
369
+ ',,,92,92,92,92,93,,92,,,,93,,93,,93,93,,93,93,93,,93,93,,,,,93,93,,',
370
+ '93,,,93,93,,,,,94,94,93,,94,94,,94,93,,,,93,93,,93,93,,,,93,93,93,93',
371
+ '94,,93,,,,94,,94,,94,94,,94,94,94,,94,94,,,,,94,94,,,94,,,94,94,,,,',
372
+ '95,95,94,,95,95,,95,94,,,,94,94,,94,94,,,,94,94,94,94,95,,94,,,,95,',
373
+ '95,,95,95,,95,95,95,,95,95,,,,,95,95,,,95,,,95,95,,,,,96,96,95,,96,96',
374
+ ',96,95,,,,95,95,,95,95,,,,95,95,95,95,96,,95,,,,96,,96,,96,96,,96,96',
375
+ '96,,96,96,,,,,96,96,,,96,,,96,96,,,,,97,97,96,,97,97,,97,96,,,,96,96',
376
+ ',96,96,,,,96,96,96,96,97,,96,,,,97,,97,,97,97,,97,97,97,,97,97,,,,,97',
377
+ '97,,,97,,,97,97,,,,,98,98,97,,98,98,,98,97,,,,97,97,,97,97,,,,97,97',
378
+ '97,97,98,,97,,,,98,,98,,98,98,,98,98,98,,98,98,,,,,98,98,,,98,,,98,98',
379
+ ',,,,99,99,98,,99,99,,99,98,,,,98,98,,98,98,,,,98,98,98,98,99,,98,,,',
380
+ '99,,99,,99,99,,99,99,99,,99,99,,,,,99,99,,,99,,,99,99,,,,,100,100,99',
381
+ ',100,100,,100,99,,,99,99,99,,99,99,,,,99,99,99,99,100,100,99,,,,100',
382
+ ',100,,100,100,,100,100,100,,100,100,100,100,,,100,100,,,100,,,100,100',
383
+ ',,,,278,278,100,,278,278,,278,100,,,,100,100,,100,100,,,,100,100,100',
384
+ '100,278,,100,,,,278,,278,,278,278,,278,278,278,,278,278,,,,,278,278',
385
+ ',,278,,,278,278,,,,,169,169,278,,169,169,,169,278,,,,278,278,,278,278',
386
+ ',,,278,278,278,278,169,,278,,,,169,,169,,169,169,,169,169,169,,169,169',
387
+ ',,,,169,169,,,169,,,169,169,,,,,103,103,169,,103,103,,103,169,,,,169',
388
+ '169,,169,169,,,,169,169,169,169,103,,169,,,,103,,103,,103,103,,103,103',
389
+ '103,,103,103,,,,,103,103,,,103,,,103,103,,,,,104,104,103,,104,104,,104',
390
+ '103,,,,103,103,,103,103,,,,103,103,103,103,104,,103,,,,104,,104,,104',
391
+ '104,,104,104,104,,104,104,,,,,104,104,,,104,,,104,104,,,,,165,165,104',
392
+ ',165,165,,165,104,,165,,104,104,,104,104,,,,104,104,104,104,165,,104',
393
+ ',,,165,,165,,165,165,,165,165,165,,165,165,,,,,165,165,,,165,,,165,165',
394
+ ',,,,249,249,165,,249,249,,249,165,,,,165,165,,165,165,,,,165,165,165',
395
+ '165,249,,165,,,,249,,249,,249,249,,249,249,249,,249,249,249,249,,,249',
396
+ '249,,,249,,,249,249,,,,,107,107,249,,107,107,,107,249,,,,249,249,,249',
397
+ '249,,,,249,249,249,249,107,,249,,,,107,,107,,107,107,,107,107,107,,107',
398
+ '107,,,,,107,107,,,107,,,107,107,,,,,326,326,107,,326,326,,326,107,,',
399
+ ',107,107,,107,107,,,,107,107,107,107,326,,107,,,,326,,326,,326,326,',
400
+ '326,326,326,,326,326,326,326,,,326,326,,,326,,,326,326,,,,,,,326,,,',
401
+ ',,326,,,,326,326,,326,326,,,,326,326,326,326,253,253,326,,253,253,,253',
402
+ '253,,,,,,,,,,,,,,,,253,247,247,,,247,253,,253,,253,253,,253,253,253',
403
+ ',253,253,253,253,,,253,253,,,253,,,253,253,,,,,,,253,,247,,,247,253',
404
+ ',,,253,253,,253,253,,,,253,253,253,253,324,324,253,247,324,324,,324',
405
+ '324,,,,,247,247,,,,,,,,,,324,,,,,,324,,324,,324,324,,324,324,324,,324',
406
+ '324,,,,,324,324,,,324,,,324,324,,,,,254,254,324,,254,254,,254,324,,',
407
+ ',324,324,,324,324,,,,324,324,324,324,254,,324,,,,254,,254,,254,254,',
408
+ '254,254,254,,254,254,254,254,,,254,254,,,254,,,254,254,,,,,259,259,254',
409
+ ',259,259,,259,254,,,,254,254,,254,254,,,,254,254,254,254,259,,254,,',
410
+ ',259,,259,,259,259,,259,259,259,,259,259,259,259,,,259,259,,,259,,,259',
411
+ '259,,,,,317,317,259,,317,317,,317,259,,,,259,259,,259,259,,,,259,259',
412
+ '259,259,317,,259,,,,317,,317,,317,317,,317,317,317,,317,317,317,317',
413
+ ',,317,317,,,317,,,317,317,,,,,316,316,317,,316,316,,316,317,,,,317,317',
414
+ ',317,317,,,,317,317,317,317,316,,317,,,,316,,316,,316,316,,316,316,316',
415
+ ',316,316,,,,,316,316,,,316,,,316,316,,,,,,,316,,,,,,316,,,,316,316,',
416
+ '316,316,,,,316,316,316,316,152,152,316,,152,152,,152,152,,,,,,,,,,,',
417
+ ',,,,152,,,,,,152,,152,,152,152,,152,152,152,,152,152,152,152,,,152,152',
418
+ ',,152,,,152,152,,,,,120,120,152,,120,120,,120,152,,,,152,152,,152,152',
419
+ ',,,152,152,152,152,120,120,152,,,,120,,120,,120,120,,120,120,120,,120',
420
+ '120,120,120,,,120,120,,,120,,,120,120,,,,,149,149,120,,149,149,,149',
421
+ '120,,,,120,120,,120,120,,,,120,120,120,120,149,,120,,,,149,,149,,149',
422
+ '149,,149,149,149,,149,149,149,149,,,149,149,,,149,,,149,149,,,,,274',
423
+ '274,149,,274,274,,274,149,,,,149,149,,149,149,,,,149,149,149,149,274',
424
+ ',149,,,,274,,274,,274,274,,274,274,274,,274,274,,,,,274,274,,,274,,',
425
+ '274,274,,,,,275,275,274,,275,275,,275,274,,,,274,274,,274,274,,,,274',
426
+ '274,274,274,275,,274,,,,275,,275,,275,275,,275,275,275,,275,275,,,,',
427
+ '275,275,,,275,,,275,275,,,,,313,313,275,,313,313,,313,275,,,,275,275',
428
+ ',275,275,,,,275,275,275,275,313,,275,,,,313,,313,,313,313,,313,313,313',
429
+ ',313,313,,,,,313,313,,,313,,,313,313,,,,,276,276,313,,276,276,,276,313',
430
+ ',,,313,313,,313,313,,,,313,313,313,313,276,,313,,,,276,,276,,276,276',
431
+ ',276,276,276,,276,276,,,,,276,276,,,276,,,276,276,,,,,302,302,276,,302',
432
+ '302,,302,276,,,,276,276,,276,276,,,,276,276,276,276,302,,276,,,,302',
433
+ ',302,,302,302,,302,302,302,,302,302,,,,,302,302,,,302,,,302,302,,,,',
434
+ '279,279,302,,279,279,,279,302,,,,302,302,,302,302,,,,302,302,302,302',
435
+ '279,,302,,,,279,,279,,279,279,,279,279,279,,279,279,,,,,279,279,,,279',
436
+ ',,279,279,,,,,170,170,279,,170,170,,170,279,,,,279,279,,279,279,,,,279',
437
+ '279,279,279,170,,279,,,,170,,170,,170,170,,170,170,170,,170,170,,,,',
438
+ '170,170,,,170,,,170,170,,,,,,,170,,,,,,170,,,,170,170,,170,170,346,',
439
+ ',170,170,170,170,,,170,,,346,346,346,,346,,346,346,,346,346,346,346',
440
+ ',329,329,,,329,,,,,,,,,,346,,,,346,346,,,346,346,346,346,346,346,,346',
441
+ '346,124,,124,,,346,,,329,,,329,124,124,124,,124,,124,124,,124,124,124',
442
+ '124,,346,,,,,329,,,,,,,,,124,329,329,,124,124,,,124,124,124,124,124',
443
+ '124,,124,124,123,,123,,,124,,,,,,,123,123,123,,123,193,123,123,,123',
444
+ '123,123,123,,124,,,,,193,,193,,193,193,,,,123,,,,123,123,,,123,123,123',
445
+ '123,123,123,,123,123,193,,,,,123,,,,,193,193,,,,193,193,121,,121,,,193',
446
+ ',,,123,,,121,121,121,,121,195,121,121,,121,121,121,121,,193,,,,,195',
447
+ ',195,,195,195,,,,121,,,,121,121,,216,121,121,121,121,121,121,,121,121',
448
+ '195,,216,216,216,121,216,,216,216,,216,216,216,216,195,195,,,,,,195',
449
+ ',,,121,,,,216,,,,216,216,,151,216,216,216,216,216,216,,216,216,,,151',
450
+ '151,151,216,151,,151,151,,151,151,151,151,,,,,,,,,,,,216,,,,151,,,,151',
451
+ '151,,,151,151,151,151,151,151,,151,151,,,,,,151,221,,,,,,,,,,151,151',
452
+ '221,221,221,221,221,199,221,221,151,221,221,221,221,,,,,,,199,,199,',
453
+ '199,199,,,,221,,,,221,221,,,221,221,221,221,221,221,,221,221,199,,,',
454
+ ',221,,,199,199,199,199,,,,199,199,9,,,,,199,,,,221,,,9,9,9,,9,,9,9,',
455
+ '9,9,9,9,,199,,,,,,,,,,,,,,9,,,,9,9,,,9,9,9,9,9,9,208,9,9,,,208,,,9,',
456
+ ',,208,208,208,,208,196,208,208,,208,208,208,208,,,,,9,,196,,196,,196',
457
+ '196,,,,208,,,,208,208,,207,208,208,208,208,208,208,,208,208,196,,207',
458
+ '207,207,208,207,,207,207,,207,207,207,207,196,196,,,,,,196,,,,208,,',
459
+ ',207,,,,,207,,364,207,207,207,207,207,207,,207,207,,,364,364,364,207',
460
+ '364,,364,364,,364,364,364,364,,,,,,,,,,,,207,,,,364,,,,364,364,,,364',
461
+ '364,364,364,364,364,163,364,364,,,,,,364,,,,163,163,163,163,163,197',
462
+ '163,163,,163,163,163,163,,,,,364,,197,,197,,197,197,,,,163,,,,163,163',
463
+ ',188,163,163,163,163,163,163,,163,163,197,,188,188,188,163,188,,188',
464
+ '188,,188,188,188,188,197,197,,,,,,197,,,,163,,,,188,,,,188,188,,344',
465
+ '188,188,188,188,188,188,,188,188,,,344,344,344,188,344,,344,344,,344',
466
+ '344,344,344,,,,,,,,,,,,188,,,,344,,,,344,344,,206,344,344,344,344,344',
467
+ '344,,344,344,,,206,206,206,344,206,,206,206,,206,206,206,206,205,,,',
468
+ ',,,,,,,344,,205,205,206,205,,205,205,198,205,,206,206,206,206,206,206',
469
+ ',206,206,,,198,,198,206,198,198,205,,,,,,,,205,205,205,205,205,205,',
470
+ '205,205,,206,,198,,205,,,,,,198,198,198,198,345,,,198,198,,,,,,198,205',
471
+ '345,345,345,,345,,345,345,194,345,345,345,345,,,,,,,198,,,194,,194,',
472
+ '194,194,345,,,,345,345,,,345,345,345,345,345,345,,345,345,,,,194,,345',
473
+ ',,,,,,,194,194,347,,,194,194,,,,,,194,345,347,347,347,,347,,347,347',
474
+ '203,347,347,347,347,,,,,,,194,,203,203,,203,,203,203,347,203,,,347,347',
475
+ ',,347,347,347,347,347,347,,347,347,,,,203,,347,,,,,,203,203,203,203',
476
+ '203,203,348,203,203,,,,,,203,347,,,348,348,348,,348,200,348,348,,348',
477
+ '348,348,348,,,,,203,,200,,200,,200,200,,,,348,,,,348,348,,,348,348,348',
478
+ '348,348,348,,348,348,200,,,,,348,,,200,200,200,200,200,200,201,200,200',
479
+ ',,,,,200,,,,348,,201,,201,202,201,201,,,,,,,,,,200,202,202,,202,,202',
480
+ '202,,202,,201,,,,,,,,201,201,201,201,201,201,,201,201,202,,,,,201,,',
481
+ '202,202,202,202,202,202,204,202,202,,,,,,202,,,,201,204,204,,204,,204',
482
+ '204,,204,,,,,,,,202,,,,,,,,,,,204,,,,,,,,204,204,204,204,204,204,,204',
483
+ '204,,,,,,204,,,271,271,271,271,,271,271,271,,271,,271,271,,,,,,204,271',
484
+ '271,271,,,,271,,,,,,,,,,,,271,271,,,,,,,,,,,,271,271,271,271,273,273',
485
+ '273,273,,273,273,273,,273,,273,273,,,,,,,273,273,273,,,,273,,,,,,,,',
486
+ ',,,273,273,,,,,,,,,,,,273,273,273,273,303,303,303,303,,303,303,303,',
487
+ '303,,303,303,,,,,,,303,303,303,,,,303,,,,,,,,,,,,303,303,,,,,,,,,,,',
488
+ '303,303,303,303,215,215,215,215,,215,215,215,,215,,215,215,,,,,,,215',
489
+ '215,215,,,,215,,,,,,,,,,,,215,215,,,,,,,,,,,,215,215,215,215' ]
490
+ racc_action_check = arr = ::Array.new(6809, nil)
569
491
  idx = 0
570
492
  clist.each do |str|
571
493
  str.split(',', -1).each do |i|
@@ -575,464 +497,445 @@ clist = [
575
497
  end
576
498
 
577
499
  racc_action_pointer = [
578
- -2, 317, nil, nil, 172, 300, nil, 475, 302, 7712,
579
- 607, 694, 326, nil, nil, 868, 955, 1042, 1129, nil,
500
+ -2, 313, nil, nil, 118, 296, nil, 173, 295, 5793,
501
+ 466, 526, 69, nil, nil, 670, 730, 790, 850, nil,
580
502
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
581
503
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
582
- 236, 264, 1390, 1477, 1564, 412, 7481, nil, nil, nil,
583
- nil, nil, nil, nil, nil, 1825, 1912, 1999, nil, nil,
584
- nil, nil, nil, 2086, nil, 198, 196, nil, 2347, nil,
585
- nil, 29, 2521, 231, 2695, 2782, 2869, 2956, 3043, 3130,
586
- 7306, 3304, 3391, 3478, 3565, 3652, 3739, 3826, 3913, 4000,
587
- 4087, 4174, 4261, 4348, 4435, 4522, 4609, 4696, 4783, 4870,
588
- 4957, 5044, 5131, 5218, 196, 223, 5479, 5566, 221, 218,
589
- 5827, 200, nil, nil, nil, nil, nil, nil, nil, nil,
590
- 263, 194, 866, 953, 183, nil, 196, 82, 6610, 7564,
591
- nil, 7507, 7450, 177, 178, nil, 169, nil, nil, nil,
592
- nil, nil, nil, nil, 176, nil, 171, nil, 80, nil,
593
- nil, 154, nil, 99, nil, nil, 95, 6697, 302, 7665,
594
- 6349, nil, 130, nil, nil, nil, nil, 128, 124, 123,
595
- 114, 7787, 93, 5914, 54, 55, 62, 5740, 5653, 5392,
596
- nil, nil, 24, 9, 7, 2, 320, 234, 7538, -1,
597
- -2, -4, -9, nil, nil, nil, nil, nil, nil, 7975,
598
- 18, 872, 437, 785, 524, 176, 698, 779, 611, 89,
599
- 2, 7392, 7375, 7992, 7729, 8157, 8329, 8211, 8312, 8265,
600
- nil, nil, 2260, 86, 182, nil, 8541, 7928, 57, nil,
601
- 153, 146, 7618, nil, 155, nil, 270, nil, nil, 6523,
602
- nil, 260, nil, nil, nil, nil, nil, 256, 184, -24,
603
- 189, -11, nil, 346, 520, 781, 145, 112, 7331, -28,
604
- 1651, 32, 71, nil, 1738, 5305, nil, nil, nil, nil,
605
- 6001, nil, nil, nil, nil, 94, nil, nil, nil, nil,
606
- 101, 110, 8484, 120, 8427, 6088, 6175, 6262, nil, 6784,
607
- 6871, 143, nil, 130, nil, 148, nil, nil, nil, nil,
608
- 152, nil, nil, nil, nil, nil, nil, nil, nil, nil,
609
- nil, nil, nil, nil, nil, 155, 3217, 8598, 171, nil,
610
- 360, nil, 172, 176, nil, 116, 91, 7219, nil, nil,
611
- 7132, 7045, nil, 182, 67, 184, 162, -7, 6958, nil,
612
- 6436, 198, nil, 8413, nil, nil, nil, nil, nil, nil,
613
- nil, nil, nil, 148, -11, 211, nil, nil, 7881, 8046,
614
- 8093, 8140, 7834, 231, 2608, 177, 241, nil, nil, 239,
615
- 2434, nil, nil, nil, 237, nil, nil, nil, 8383, 9,
616
- -15, nil, 2173, 267, 244, nil, 269, 270, nil, nil,
617
- 277, nil, nil, 1303, nil, nil, nil, 282, 252, nil,
618
- nil, nil, nil, nil, 291, nil, nil, nil, nil, 1216,
619
- nil, 433, 259, nil, 304, nil, nil, 85, nil, 308,
620
- nil, 314, nil, 315, nil, nil, nil, 286, nil, nil,
621
- nil, nil ]
504
+ 220, 256, 1054, 1114, 1174, 48, 1283, nil, nil, nil,
505
+ nil, nil, 1402, 1462, 1546, nil, nil, nil, nil, nil,
506
+ 1606, nil, 201, 202, nil, 1786, nil, nil, 267, 1906,
507
+ 246, 2026, 2086, 2146, 2206, 2266, 2326, 2386, 2446, 2506,
508
+ 2590, 2650, 2710, 2770, 2830, 2890, 2950, 3010, 3070, 3130,
509
+ 3190, 3250, 3310, 3370, 3430, 3490, 3550, 3610, 3670, 3730,
510
+ 3790, 217, 248, 3970, 4030, 245, 238, 4210, 219, nil,
511
+ nil, nil, 1550, -1, 614, 938, 203, nil, 220, 55,
512
+ 4822, 5562, nil, 5488, 5431, 200, 195, nil, 186, nil,
513
+ nil, nil, nil, nil, nil, nil, 173, nil, 170, nil,
514
+ 90, nil, nil, 166, nil, 14, nil, nil, 170, 4882,
515
+ 60, 5656, 4762, nil, 135, nil, nil, nil, nil, 84,
516
+ 79, 61, 266, 5995, 153, 4090, 5, 3, 2, 3910,
517
+ 5302, 1966, nil, nil, -9, 82, 108, 287, -2, 4,
518
+ -4, -1, nil, nil, nil, nil, nil, nil, 6042, 61,
519
+ 1346, 2, 350, 5505, 6253, 5579, 5864, 6012, 6181, 5736,
520
+ 6396, 6450, 6467, 6325, 6521, 6161, 6136, 5894, 5847, nil,
521
+ nil, 406, 231, 209, nil, 6723, 5609, 202, nil, 276,
522
+ 239, 5719, nil, 241, nil, 120, nil, nil, 262, nil,
523
+ 230, nil, nil, nil, nil, nil, 217, 189, -24, 204,
524
+ -7, nil, 1258, 1342, 1846, 170, 132, 4379, -28, 4150,
525
+ 21, 55, nil, 4354, 4498, nil, nil, nil, nil, 4558,
526
+ nil, nil, nil, nil, 92, nil, nil, nil, nil, 101,
527
+ 119, 6561, 155, 6615, 4942, 5002, 5122, nil, 3850, 5242,
528
+ 181, nil, 170, nil, 185, nil, 187, nil, nil, nil,
529
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
530
+ nil, 195, 5182, 6669, 200, nil, 93, nil, 200, 206,
531
+ nil, 149, 30, 5062, nil, nil, 4678, 4618, nil, 222,
532
+ 83, 226, 204, 9, 4438, nil, 4270, 237, nil, 5405,
533
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, 178,
534
+ 58, 238, nil, nil, 6089, 6233, 5374, 6305, 6379, 260,
535
+ 1726, 203, -8, nil, nil, 263, 1666, nil, nil, nil,
536
+ 251, nil, nil, nil, 5941, 13, 118, nil, 994, 274,
537
+ 251, nil, 276, 277, nil, nil, 277, nil, nil, 934,
538
+ nil, nil, nil, 282, 253, nil, nil, nil, nil, nil,
539
+ 287, nil, nil, nil, nil, 610, nil, 346, 178, nil,
540
+ 300, nil, nil, 58, nil, 304, nil, 306, nil, 307,
541
+ nil, nil, nil, 278, nil, nil, nil, nil ]
622
542
 
623
543
  racc_action_default = [
624
- -3, -252, -1, -2, -4, -5, -8, -10, -16, -21,
625
- -252, -252, -252, -33, -34, -252, -252, -252, -252, -61,
544
+ -3, -241, -1, -2, -4, -5, -8, -10, -16, -21,
545
+ -241, -241, -241, -33, -34, -241, -241, -241, -241, -61,
626
546
  -62, -63, -64, -65, -66, -67, -68, -69, -70, -71,
627
547
  -72, -73, -74, -75, -76, -77, -78, -79, -80, -81,
628
- -86, -90, -252, -252, -252, -252, -252, -182, -183, -184,
629
- -185, -186, -187, -188, -189, -252, -252, -252, -200, -201,
630
- -202, -203, -204, -252, -206, -252, -219, -222, -252, -227,
631
- -228, -252, -252, -7, -252, -252, -252, -252, -252, -252,
632
- -252, -252, -126, -252, -252, -252, -252, -252, -252, -252,
633
- -252, -252, -252, -252, -252, -252, -252, -252, -252, -252,
634
- -252, -252, -252, -252, -252, -121, -251, -251, -22, -23,
635
- -252, -251, -139, -160, -161, -162, -163, -164, -165, -166,
636
- -46, -252, -47, -54, -252, -87, -252, -252, -252, -252,
637
- -97, -252, -252, -251, -229, -148, -150, -151, -152, -153,
638
- -154, -156, -157, -14, -229, -191, -229, -193, -252, -196,
639
- -197, -252, -205, -252, -210, -213, -252, -217, -252, -252,
640
- -252, 432, -6, -9, -11, -12, -13, -17, -18, -19,
641
- -20, -252, -229, -252, -79, -80, -81, -240, -246, -234,
642
- -127, -130, -187, -188, -189, -252, -237, -235, -243, -183,
643
- -184, -185, -186, -233, -238, -239, -241, -242, -244, -59,
644
- -252, -36, -37, -38, -39, -40, -41, -42, -43, -44,
645
- -45, -48, -49, -50, -51, -52, -53, -55, -56, -252,
646
- -57, -115, -252, -229, -83, -91, -126, -125, -252, -124,
647
- -252, -231, -252, -28, -251, -167, -252, -58, -92, -252,
648
- -95, -229, -170, -172, -173, -174, -175, -177, -252, -252,
649
- -180, -252, -89, -252, -252, -252, -252, -251, -230, -252,
650
- -230, -252, -252, -194, -252, -252, -207, -208, -209, -211,
651
- -252, -214, -215, -216, -218, -229, -220, -223, -225, -226,
652
- -8, -252, -126, -252, -230, -252, -252, -252, -35, -252,
653
- -252, -229, -117, -252, -85, -229, -129, -131, -132, -133,
654
- -252, -234, -235, -236, -237, -240, -243, -245, -246, -247,
655
- -248, -249, -250, -122, -123, -252, -232, -126, -252, -142,
656
- -252, -168, -229, -252, -94, -252, -230, -252, -178, -179,
657
- -252, -252, -88, -252, -100, -252, -106, -252, -252, -110,
658
- -251, -252, -158, -252, -149, -155, -15, -190, -192, -195,
659
- -198, -199, -212, -252, -252, -229, -26, -128, -136, -134,
660
- -135, -60, -119, -252, -230, -82, -252, -25, -29, -229,
661
- -251, -143, -144, -145, -252, -93, -96, -171, -176, -252,
662
- -100, -99, -252, -252, -106, -105, -252, -252, -109, -111,
663
- -252, -140, -141, -252, -159, -221, -224, -252, -30, -116,
664
- -118, -84, -120, -27, -252, -169, -181, -98, -101, -252,
665
- -104, -252, -251, -137, -252, -147, -24, -31, -138, -252,
666
- -103, -252, -108, -252, -113, -114, -146, -231, -102, -107,
667
- -112, -32 ]
548
+ -86, -90, -241, -241, -241, -241, -241, -174, -175, -176,
549
+ -177, -178, -241, -241, -241, -189, -190, -191, -192, -193,
550
+ -241, -195, -241, -208, -211, -241, -216, -217, -241, -241,
551
+ -7, -241, -241, -241, -241, -241, -241, -241, -241, -126,
552
+ -241, -241, -241, -241, -241, -241, -241, -241, -241, -241,
553
+ -241, -241, -241, -241, -241, -241, -241, -241, -241, -241,
554
+ -241, -241, -121, -240, -240, -22, -23, -241, -240, -136,
555
+ -157, -158, -46, -241, -47, -54, -241, -87, -241, -241,
556
+ -241, -241, -97, -241, -241, -240, -218, -145, -147, -148,
557
+ -149, -150, -151, -153, -154, -14, -218, -180, -218, -182,
558
+ -241, -185, -186, -241, -194, -241, -199, -202, -241, -206,
559
+ -241, -241, -241, 418, -6, -9, -11, -12, -13, -17,
560
+ -18, -19, -20, -241, -218, -241, -79, -80, -81, -229,
561
+ -235, -223, -127, -130, -241, -226, -224, -232, -175, -176,
562
+ -177, -178, -222, -227, -228, -230, -231, -233, -59, -241,
563
+ -36, -37, -38, -39, -40, -41, -42, -43, -44, -45,
564
+ -48, -49, -50, -51, -52, -53, -55, -56, -241, -57,
565
+ -115, -241, -218, -83, -91, -126, -125, -241, -124, -241,
566
+ -220, -241, -28, -240, -159, -241, -58, -92, -241, -95,
567
+ -218, -162, -164, -165, -166, -167, -169, -241, -241, -172,
568
+ -241, -89, -241, -241, -241, -241, -240, -219, -241, -219,
569
+ -241, -241, -183, -241, -241, -196, -197, -198, -200, -241,
570
+ -203, -204, -205, -207, -218, -209, -212, -214, -215, -8,
571
+ -241, -126, -241, -219, -241, -241, -241, -35, -241, -241,
572
+ -218, -117, -241, -85, -218, -129, -241, -223, -224, -225,
573
+ -226, -229, -232, -234, -235, -236, -237, -238, -239, -122,
574
+ -123, -241, -221, -126, -241, -139, -241, -160, -218, -241,
575
+ -94, -241, -219, -241, -170, -171, -241, -241, -88, -241,
576
+ -100, -241, -106, -241, -241, -110, -240, -241, -155, -241,
577
+ -146, -152, -15, -179, -181, -184, -187, -188, -201, -241,
578
+ -241, -218, -26, -128, -133, -131, -132, -60, -119, -241,
579
+ -219, -82, -241, -25, -29, -218, -240, -140, -141, -142,
580
+ -241, -93, -96, -163, -168, -241, -100, -99, -241, -241,
581
+ -106, -105, -241, -241, -109, -111, -241, -137, -138, -241,
582
+ -156, -210, -213, -241, -30, -116, -118, -84, -120, -27,
583
+ -241, -161, -173, -98, -101, -241, -104, -241, -240, -134,
584
+ -241, -144, -24, -31, -135, -241, -103, -241, -108, -241,
585
+ -113, -114, -143, -220, -102, -107, -112, -32 ]
668
586
 
669
587
  racc_goto_table = [
670
- 2, 120, 122, 123, 125, 124, 137, 231, 139, 235,
671
- 133, 200, 152, 257, 172, 221, 250, 315, 241, 344,
672
- 339, 277, 390, 261, 234, 262, 73, 423, 129, 131,
673
- 132, 235, 228, 230, 338, 291, 408, 357, 108, 109,
674
- 238, 385, 143, 143, 151, 381, 256, 250, 220, 275,
675
- 154, 283, 404, 368, 159, 318, 371, 144, 146, 341,
676
- 397, 163, 164, 165, 166, 345, 377, 329, 171, 199,
677
- 201, 202, 203, 204, 205, 206, 207, 208, 209, 210,
678
- 211, 212, 213, 214, 215, 216, 217, 218, 219, 410,
679
- 143, 407, 227, 227, 162, 328, 232, 350, 271, 272,
680
- 3, 269, 293, 389, 394, 223, 167, 168, 169, 170,
681
- 270, 268, 155, 157, 273, 143, 1, nil, nil, nil,
682
- 325, nil, nil, nil, nil, 250, nil, 322, nil, nil,
683
- 251, nil, 319, nil, nil, 292, nil, nil, nil, nil,
684
- nil, nil, nil, nil, nil, nil, nil, 280, 137, nil,
685
- 139, 133, nil, nil, 353, 342, nil, 274, 295, 122,
686
- 281, nil, nil, 129, 131, 132, nil, nil, nil, nil,
687
- 363, nil, nil, nil, 366, nil, nil, nil, nil, nil,
688
- nil, nil, nil, nil, nil, nil, nil, nil, 294, nil,
689
- nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
690
- nil, 374, nil, nil, nil, nil, nil, nil, 219, nil,
691
- nil, nil, nil, 431, 355, 250, 396, nil, 137, 352,
692
- 139, nil, nil, nil, nil, nil, nil, nil, nil, nil,
693
- nil, nil, nil, nil, 398, nil, nil, nil, 392, 323,
694
- nil, 199, nil, nil, nil, nil, nil, 346, 403, 369,
695
- nil, 151, 351, 333, 335, nil, nil, 154, 379, nil,
696
- nil, nil, nil, nil, nil, nil, nil, nil, 392, nil,
697
- nil, 358, 359, 360, nil, 361, 362, 400, nil, nil,
698
- nil, nil, nil, nil, nil, 372, nil, nil, nil, nil,
588
+ 2, 112, 114, 115, 117, 116, 224, 220, 125, 129,
589
+ 131, 189, 210, 144, 301, 266, 330, 230, 367, 325,
590
+ 376, 239, 409, 224, 246, 164, 324, 70, 121, 123,
591
+ 124, 280, 223, 394, 250, 343, 251, 105, 106, 135,
592
+ 135, 143, 227, 136, 138, 209, 371, 146, 264, 245,
593
+ 390, 151, 239, 217, 219, 354, 304, 357, 155, 156,
594
+ 157, 158, 272, 327, 393, 163, 188, 190, 191, 192,
595
+ 193, 194, 195, 196, 197, 198, 199, 200, 201, 202,
596
+ 203, 204, 205, 206, 207, 208, 383, 135, 331, 216,
597
+ 216, 212, 154, 221, 396, 363, 315, 314, 380, 375,
598
+ 336, 260, 159, 160, 161, 162, 261, 135, 3, 258,
599
+ 282, 240, 259, 257, 147, 149, 262, 1, nil, nil,
600
+ nil, 305, nil, 308, 281, nil, nil, 239, 311, nil,
601
+ nil, nil, nil, nil, nil, nil, nil, nil, 125, 269,
602
+ 129, 131, nil, nil, 328, nil, nil, nil, nil, 263,
603
+ nil, 114, 270, nil, nil, 121, 123, 124, nil, nil,
604
+ nil, 284, 339, nil, nil, nil, nil, nil, nil, nil,
605
+ nil, nil, nil, nil, nil, nil, nil, 283, 349, nil,
606
+ nil, nil, 352, nil, nil, nil, nil, nil, nil, nil,
607
+ nil, nil, nil, nil, nil, nil, nil, 208, nil, nil,
608
+ nil, nil, nil, nil, 382, nil, 360, 417, nil, nil,
609
+ 129, 131, 338, nil, 239, nil, nil, 341, nil, nil,
610
+ nil, nil, nil, nil, 378, nil, nil, nil, 309, nil,
611
+ 188, nil, nil, nil, nil, nil, 332, nil, nil, 384,
612
+ 143, 337, 319, 321, nil, nil, 146, 365, nil, 355,
613
+ nil, nil, nil, 389, 378, nil, nil, nil, nil, nil,
614
+ 344, 345, 346, 386, 347, 348, nil, nil, nil, 358,
699
615
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
700
- nil, nil, 232, 137, nil, 139, nil, nil, nil, nil,
701
- 424, nil, nil, 378, 427, nil, 199, nil, 346, nil,
702
- nil, nil, nil, nil, 199, nil, nil, nil, nil, 401,
616
+ nil, nil, nil, nil, nil, nil, nil, nil, 221, nil,
617
+ nil, nil, 129, 131, nil, nil, 410, nil, nil, 364,
618
+ nil, nil, 188, 413, 332, nil, nil, nil, nil, nil,
619
+ 188, nil, nil, nil, nil, 387, nil, nil, nil, nil,
703
620
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
621
+ nil, nil, nil, nil, nil, nil, 208, nil, nil, nil,
704
622
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
705
- 219, nil, nil, nil, nil, nil, nil, nil, nil, nil,
706
- nil, nil, nil, nil, nil, nil, nil, nil, 129, nil,
623
+ nil, nil, nil, nil, 121, nil, nil, nil, nil, nil,
707
624
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
708
- nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
709
- nil, nil, nil, 414, nil, nil, nil, nil, nil, nil,
710
- nil, nil, nil, 232, nil, nil, nil, nil, nil, 419,
711
- nil, 421, 425 ]
625
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, 400,
626
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, 221,
627
+ nil, nil, nil, nil, nil, 405, nil, 407, 411 ]
712
628
 
713
629
  racc_goto_check = [
714
- 2, 10, 10, 10, 37, 6, 35, 13, 34, 49,
715
- 57, 19, 80, 15, 11, 50, 36, 14, 42, 65,
716
- 47, 88, 59, 15, 58, 15, 5, 48, 10, 10,
717
- 10, 49, 53, 53, 46, 51, 43, 54, 9, 9,
718
- 41, 45, 6, 6, 6, 44, 58, 36, 20, 42,
719
- 6, 15, 59, 16, 10, 61, 62, 8, 8, 64,
720
- 12, 6, 6, 6, 6, 67, 68, 69, 10, 10,
630
+ 2, 10, 10, 10, 37, 6, 49, 13, 57, 35,
631
+ 34, 19, 50, 80, 14, 88, 65, 42, 44, 47,
632
+ 59, 36, 48, 49, 15, 11, 46, 5, 10, 10,
633
+ 10, 51, 58, 43, 15, 54, 15, 9, 9, 6,
634
+ 6, 6, 41, 8, 8, 20, 45, 6, 42, 58,
635
+ 59, 10, 36, 53, 53, 16, 61, 62, 6, 6,
636
+ 6, 6, 15, 64, 44, 10, 10, 10, 10, 10,
721
637
  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
722
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 45,
723
- 6, 44, 10, 10, 5, 71, 10, 75, 76, 77,
724
- 3, 81, 15, 47, 65, 8, 9, 9, 9, 9,
725
- 82, 84, 85, 86, 87, 6, 1, nil, nil, nil,
726
- 15, nil, nil, nil, nil, 36, nil, 42, nil, nil,
727
- 8, nil, 49, nil, nil, 50, nil, nil, nil, nil,
728
- nil, nil, nil, nil, nil, nil, nil, 6, 35, nil,
729
- 34, 57, nil, nil, 15, 49, nil, 2, 11, 10,
730
- 2, nil, nil, 10, 10, 10, nil, nil, nil, nil,
731
- 15, nil, nil, nil, 15, nil, nil, nil, nil, nil,
732
- nil, nil, nil, nil, nil, nil, nil, nil, 37, nil,
733
- nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
734
- nil, 15, nil, nil, nil, nil, nil, nil, 10, nil,
735
- nil, nil, nil, 14, 11, 36, 88, nil, 35, 80,
736
- 34, nil, nil, nil, nil, nil, nil, nil, nil, nil,
737
- nil, nil, nil, nil, 15, nil, nil, nil, 49, 2,
738
- nil, 10, nil, nil, nil, nil, nil, 6, 15, 11,
739
- nil, 6, 6, 2, 2, nil, nil, 6, 19, nil,
740
- nil, nil, nil, nil, nil, nil, nil, nil, 49, nil,
741
- nil, 10, 10, 10, nil, 10, 10, 50, nil, nil,
742
- nil, nil, nil, nil, nil, 57, nil, nil, nil, nil,
638
+ 10, 10, 10, 10, 10, 10, 12, 6, 67, 10,
639
+ 10, 8, 5, 10, 45, 68, 69, 71, 65, 47,
640
+ 75, 76, 9, 9, 9, 9, 77, 6, 3, 81,
641
+ 15, 8, 82, 84, 85, 86, 87, 1, nil, nil,
642
+ nil, 49, nil, 42, 50, nil, nil, 36, 15, nil,
643
+ nil, nil, nil, nil, nil, nil, nil, nil, 57, 6,
644
+ 35, 34, nil, nil, 49, nil, nil, nil, nil, 2,
645
+ nil, 10, 2, nil, nil, 10, 10, 10, nil, nil,
646
+ nil, 11, 15, nil, nil, nil, nil, nil, nil, nil,
647
+ nil, nil, nil, nil, nil, nil, nil, 37, 15, nil,
648
+ nil, nil, 15, nil, nil, nil, nil, nil, nil, nil,
649
+ nil, nil, nil, nil, nil, nil, nil, 10, nil, nil,
650
+ nil, nil, nil, nil, 88, nil, 15, 14, nil, nil,
651
+ 35, 34, 80, nil, 36, nil, nil, 11, nil, nil,
652
+ nil, nil, nil, nil, 49, nil, nil, nil, 2, nil,
653
+ 10, nil, nil, nil, nil, nil, 6, nil, nil, 15,
654
+ 6, 6, 2, 2, nil, nil, 6, 19, nil, 11,
655
+ nil, nil, nil, 15, 49, nil, nil, nil, nil, nil,
656
+ 10, 10, 10, 50, 10, 10, nil, nil, nil, 57,
743
657
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
744
- nil, nil, 10, 35, nil, 34, nil, nil, nil, nil,
745
- 49, nil, nil, 10, 13, nil, 10, nil, 6, nil,
746
- nil, nil, nil, nil, 10, nil, nil, nil, nil, 37,
747
- nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
748
- nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
749
- 10, nil, nil, nil, nil, nil, nil, nil, nil, nil,
750
658
  nil, nil, nil, nil, nil, nil, nil, nil, 10, nil,
659
+ nil, nil, 35, 34, nil, nil, 49, nil, nil, 10,
660
+ nil, nil, 10, 13, 6, nil, nil, nil, nil, nil,
661
+ 10, nil, nil, nil, nil, 37, nil, nil, nil, nil,
662
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
663
+ nil, nil, nil, nil, nil, nil, 10, nil, nil, nil,
751
664
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
665
+ nil, nil, nil, nil, 10, nil, nil, nil, nil, nil,
752
666
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
753
- nil, nil, nil, 2, nil, nil, nil, nil, nil, nil,
754
- nil, nil, nil, 10, nil, nil, nil, nil, nil, 2,
755
- nil, 2, 2 ]
667
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, 2,
668
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, 10,
669
+ nil, nil, nil, nil, nil, 2, nil, 2, 2 ]
756
670
 
757
671
  racc_goto_pointer = [
758
- nil, 116, 0, 100, nil, 22, -13, nil, 2, 28,
759
- -14, -68, -295, -103, -214, -121, -263, nil, nil, -72,
672
+ nil, 117, 0, 108, nil, 23, -13, nil, -9, 27,
673
+ -14, -54, -255, -100, -206, -102, -247, nil, nil, -69,
760
674
  -54, nil, nil, nil, nil, nil, nil, nil, nil, nil,
761
- nil, nil, nil, nil, -38, -40, -111, -36, nil, nil,
762
- nil, -86, -109, -346, -289, -295, -221, -235, -385, -102,
763
- -87, -187, nil, -74, -247, nil, nil, -35, -87, -318,
764
- nil, -179, -264, nil, -198, -239, nil, -194, -260, -182,
765
- nil, -153, nil, nil, nil, -167, -58, -57, nil, nil,
766
- -51, -52, -43, nil, -42, 47, 47, -43, -138 ]
675
+ nil, nil, nil, nil, -36, -37, -98, -36, nil, nil,
676
+ nil, -76, -102, -335, -302, -276, -218, -225, -376, -102,
677
+ -87, -180, nil, -50, -238, nil, nil, -37, -76, -306,
678
+ nil, -167, -249, nil, -183, -231, nil, -160, -217, -142,
679
+ nil, -140, nil, nil, nil, -153, -47, -42, nil, nil,
680
+ -47, -36, -33, nil, -32, 52, 52, -33, -136 ]
767
681
 
768
682
  racc_goto_default = [
769
- nil, nil, 391, nil, 4, 5, 6, 7, nil, 8,
770
- 9, nil, nil, nil, nil, nil, 233, 13, 14, 337,
683
+ nil, nil, 377, nil, 4, 5, 6, 7, nil, 8,
684
+ 9, nil, nil, nil, nil, nil, 222, 13, 14, 323,
771
685
  nil, 19, 20, 21, 22, 23, 24, 25, 26, 27,
772
686
  28, 29, 30, 31, 32, 33, 34, nil, 40, 41,
773
- 126, nil, nil, 130, nil, nil, nil, nil, nil, 229,
774
- nil, nil, 105, nil, 180, 185, 181, 112, nil, nil,
775
- 111, nil, nil, 134, nil, 135, 136, 140, 242, 243,
776
- 244, 245, 246, 249, 148, 150, 58, 59, 60, 63,
777
- nil, nil, nil, 153, nil, nil, nil, nil, nil ]
687
+ 118, nil, nil, 122, nil, nil, nil, nil, nil, 218,
688
+ nil, nil, 102, nil, 172, 174, 173, 109, nil, nil,
689
+ 108, nil, nil, 126, nil, 127, 128, 132, 231, 232,
690
+ 233, 234, 235, 238, 140, 142, 55, 56, 57, 60,
691
+ nil, nil, nil, 145, nil, nil, nil, nil, nil ]
778
692
 
779
693
  racc_reduce_table = [
780
694
  0, 0, :racc_error,
781
- 1, 95, :_reduce_1,
782
- 1, 95, :_reduce_2,
783
- 0, 95, :_reduce_3,
784
- 1, 96, :_reduce_4,
785
- 1, 98, :_reduce_5,
786
- 3, 98, :_reduce_6,
787
- 2, 98, :_reduce_7,
788
- 1, 99, :_reduce_8,
789
- 3, 99, :_reduce_9,
695
+ 1, 92, :_reduce_1,
696
+ 1, 92, :_reduce_2,
697
+ 0, 92, :_reduce_3,
698
+ 1, 93, :_reduce_4,
699
+ 1, 95, :_reduce_5,
700
+ 3, 95, :_reduce_6,
701
+ 2, 95, :_reduce_7,
702
+ 1, 96, :_reduce_8,
703
+ 3, 96, :_reduce_9,
704
+ 1, 97, :_reduce_none,
705
+ 3, 97, :_reduce_11,
706
+ 3, 97, :_reduce_12,
707
+ 3, 97, :_reduce_13,
708
+ 1, 99, :_reduce_14,
709
+ 3, 99, :_reduce_15,
710
+ 1, 98, :_reduce_none,
711
+ 3, 98, :_reduce_17,
712
+ 3, 98, :_reduce_18,
713
+ 3, 98, :_reduce_19,
714
+ 3, 98, :_reduce_20,
790
715
  1, 100, :_reduce_none,
791
- 3, 100, :_reduce_11,
792
- 3, 100, :_reduce_12,
793
- 3, 100, :_reduce_13,
794
- 1, 102, :_reduce_14,
795
- 3, 102, :_reduce_15,
716
+ 2, 100, :_reduce_22,
717
+ 2, 100, :_reduce_23,
718
+ 7, 100, :_reduce_24,
719
+ 5, 100, :_reduce_25,
720
+ 5, 100, :_reduce_26,
721
+ 4, 107, :_reduce_27,
722
+ 1, 104, :_reduce_28,
723
+ 3, 104, :_reduce_29,
724
+ 1, 103, :_reduce_30,
725
+ 2, 103, :_reduce_31,
726
+ 4, 103, :_reduce_32,
796
727
  1, 101, :_reduce_none,
797
- 3, 101, :_reduce_17,
798
- 3, 101, :_reduce_18,
799
- 3, 101, :_reduce_19,
800
- 3, 101, :_reduce_20,
801
- 1, 103, :_reduce_none,
802
- 2, 103, :_reduce_22,
803
- 2, 103, :_reduce_23,
804
- 7, 103, :_reduce_24,
805
- 5, 103, :_reduce_25,
806
- 5, 103, :_reduce_26,
807
- 4, 110, :_reduce_27,
808
- 1, 107, :_reduce_28,
809
- 3, 107, :_reduce_29,
810
- 1, 106, :_reduce_30,
811
- 2, 106, :_reduce_31,
812
- 4, 106, :_reduce_32,
813
- 1, 104, :_reduce_none,
814
- 1, 104, :_reduce_none,
815
- 4, 104, :_reduce_35,
816
- 3, 104, :_reduce_36,
817
- 3, 104, :_reduce_37,
818
- 3, 104, :_reduce_38,
819
- 3, 104, :_reduce_39,
820
- 3, 104, :_reduce_40,
821
- 3, 104, :_reduce_41,
822
- 3, 104, :_reduce_42,
823
- 3, 104, :_reduce_43,
824
- 3, 104, :_reduce_44,
825
- 3, 104, :_reduce_45,
826
- 2, 104, :_reduce_46,
827
- 2, 104, :_reduce_47,
828
- 3, 104, :_reduce_48,
829
- 3, 104, :_reduce_49,
830
- 3, 104, :_reduce_50,
831
- 3, 104, :_reduce_51,
832
- 3, 104, :_reduce_52,
833
- 3, 104, :_reduce_53,
834
- 2, 104, :_reduce_54,
835
- 3, 104, :_reduce_55,
836
- 3, 104, :_reduce_56,
837
- 3, 104, :_reduce_57,
838
- 3, 104, :_reduce_58,
839
- 1, 113, :_reduce_59,
840
- 3, 113, :_reduce_60,
841
- 1, 111, :_reduce_none,
842
- 1, 111, :_reduce_none,
843
- 1, 111, :_reduce_none,
844
- 1, 111, :_reduce_none,
845
- 1, 111, :_reduce_none,
846
- 1, 111, :_reduce_none,
847
- 1, 111, :_reduce_none,
848
- 1, 111, :_reduce_none,
849
- 1, 111, :_reduce_none,
850
- 1, 111, :_reduce_none,
851
- 1, 111, :_reduce_none,
852
- 1, 111, :_reduce_none,
853
- 1, 111, :_reduce_none,
854
- 1, 111, :_reduce_none,
855
- 1, 111, :_reduce_none,
728
+ 1, 101, :_reduce_none,
729
+ 4, 101, :_reduce_35,
730
+ 3, 101, :_reduce_36,
731
+ 3, 101, :_reduce_37,
732
+ 3, 101, :_reduce_38,
733
+ 3, 101, :_reduce_39,
734
+ 3, 101, :_reduce_40,
735
+ 3, 101, :_reduce_41,
736
+ 3, 101, :_reduce_42,
737
+ 3, 101, :_reduce_43,
738
+ 3, 101, :_reduce_44,
739
+ 3, 101, :_reduce_45,
740
+ 2, 101, :_reduce_46,
741
+ 2, 101, :_reduce_47,
742
+ 3, 101, :_reduce_48,
743
+ 3, 101, :_reduce_49,
744
+ 3, 101, :_reduce_50,
745
+ 3, 101, :_reduce_51,
746
+ 3, 101, :_reduce_52,
747
+ 3, 101, :_reduce_53,
748
+ 2, 101, :_reduce_54,
749
+ 3, 101, :_reduce_55,
750
+ 3, 101, :_reduce_56,
751
+ 3, 101, :_reduce_57,
752
+ 3, 101, :_reduce_58,
753
+ 1, 110, :_reduce_59,
754
+ 3, 110, :_reduce_60,
755
+ 1, 108, :_reduce_none,
756
+ 1, 108, :_reduce_none,
757
+ 1, 108, :_reduce_none,
758
+ 1, 108, :_reduce_none,
759
+ 1, 108, :_reduce_none,
760
+ 1, 108, :_reduce_none,
761
+ 1, 108, :_reduce_none,
762
+ 1, 108, :_reduce_none,
763
+ 1, 108, :_reduce_none,
764
+ 1, 108, :_reduce_none,
765
+ 1, 108, :_reduce_none,
766
+ 1, 108, :_reduce_none,
767
+ 1, 108, :_reduce_none,
768
+ 1, 108, :_reduce_none,
769
+ 1, 108, :_reduce_none,
770
+ 1, 108, :_reduce_none,
771
+ 1, 108, :_reduce_77,
772
+ 1, 108, :_reduce_78,
773
+ 1, 108, :_reduce_79,
774
+ 1, 108, :_reduce_80,
775
+ 1, 108, :_reduce_81,
776
+ 5, 109, :_reduce_82,
777
+ 3, 109, :_reduce_83,
778
+ 6, 109, :_reduce_84,
779
+ 4, 109, :_reduce_85,
780
+ 1, 113, :_reduce_86,
781
+ 2, 113, :_reduce_87,
782
+ 4, 129, :_reduce_88,
783
+ 3, 129, :_reduce_89,
784
+ 1, 129, :_reduce_90,
785
+ 3, 130, :_reduce_91,
786
+ 2, 128, :_reduce_92,
787
+ 3, 132, :_reduce_93,
788
+ 2, 132, :_reduce_94,
789
+ 2, 131, :_reduce_95,
790
+ 4, 131, :_reduce_96,
791
+ 2, 116, :_reduce_97,
792
+ 5, 134, :_reduce_98,
793
+ 4, 134, :_reduce_99,
794
+ 0, 135, :_reduce_none,
795
+ 2, 135, :_reduce_101,
796
+ 4, 135, :_reduce_102,
797
+ 3, 135, :_reduce_103,
798
+ 6, 117, :_reduce_104,
799
+ 5, 117, :_reduce_105,
800
+ 0, 136, :_reduce_none,
801
+ 4, 136, :_reduce_107,
802
+ 3, 136, :_reduce_108,
803
+ 5, 115, :_reduce_109,
804
+ 1, 137, :_reduce_110,
805
+ 2, 137, :_reduce_111,
806
+ 5, 138, :_reduce_112,
807
+ 1, 139, :_reduce_none,
808
+ 1, 139, :_reduce_none,
856
809
  1, 111, :_reduce_none,
857
- 1, 111, :_reduce_77,
858
- 1, 111, :_reduce_78,
859
- 1, 111, :_reduce_79,
860
- 1, 111, :_reduce_80,
861
- 1, 111, :_reduce_81,
862
- 5, 112, :_reduce_82,
863
- 3, 112, :_reduce_83,
864
- 6, 112, :_reduce_84,
865
- 4, 112, :_reduce_85,
866
- 1, 116, :_reduce_86,
867
- 2, 116, :_reduce_87,
868
- 4, 132, :_reduce_88,
869
- 3, 132, :_reduce_89,
870
- 1, 132, :_reduce_90,
871
- 3, 133, :_reduce_91,
872
- 2, 131, :_reduce_92,
873
- 3, 135, :_reduce_93,
874
- 2, 135, :_reduce_94,
875
- 2, 134, :_reduce_95,
876
- 4, 134, :_reduce_96,
877
- 2, 119, :_reduce_97,
878
- 5, 137, :_reduce_98,
879
- 4, 137, :_reduce_99,
880
- 0, 138, :_reduce_none,
881
- 2, 138, :_reduce_101,
882
- 4, 138, :_reduce_102,
883
- 3, 138, :_reduce_103,
884
- 6, 120, :_reduce_104,
885
- 5, 120, :_reduce_105,
886
- 0, 139, :_reduce_none,
887
- 4, 139, :_reduce_107,
888
- 3, 139, :_reduce_108,
889
- 5, 118, :_reduce_109,
890
- 1, 140, :_reduce_110,
891
- 2, 140, :_reduce_111,
892
- 5, 141, :_reduce_112,
893
- 1, 142, :_reduce_none,
894
- 1, 142, :_reduce_none,
895
- 1, 114, :_reduce_none,
896
- 4, 114, :_reduce_116,
897
- 1, 145, :_reduce_117,
898
- 3, 145, :_reduce_118,
899
- 3, 144, :_reduce_119,
900
- 6, 117, :_reduce_120,
901
- 2, 117, :_reduce_121,
902
- 3, 146, :_reduce_122,
903
- 3, 146, :_reduce_123,
904
- 1, 147, :_reduce_none,
905
- 1, 147, :_reduce_none,
906
- 0, 105, :_reduce_126,
907
- 1, 105, :_reduce_127,
908
- 3, 105, :_reduce_128,
909
- 1, 149, :_reduce_none,
910
- 1, 149, :_reduce_none,
911
- 1, 149, :_reduce_none,
912
- 1, 149, :_reduce_none,
913
- 1, 149, :_reduce_none,
914
- 3, 148, :_reduce_134,
915
- 3, 148, :_reduce_135,
916
- 3, 148, :_reduce_136,
917
- 6, 121, :_reduce_137,
918
- 7, 122, :_reduce_138,
919
- 1, 154, :_reduce_139,
810
+ 4, 111, :_reduce_116,
811
+ 1, 142, :_reduce_117,
812
+ 3, 142, :_reduce_118,
813
+ 3, 141, :_reduce_119,
814
+ 6, 114, :_reduce_120,
815
+ 2, 114, :_reduce_121,
816
+ 3, 143, :_reduce_122,
817
+ 3, 143, :_reduce_123,
818
+ 1, 144, :_reduce_none,
819
+ 1, 144, :_reduce_none,
820
+ 0, 102, :_reduce_126,
821
+ 1, 102, :_reduce_127,
822
+ 3, 102, :_reduce_128,
823
+ 1, 146, :_reduce_none,
824
+ 1, 146, :_reduce_none,
825
+ 3, 145, :_reduce_131,
826
+ 3, 145, :_reduce_132,
827
+ 3, 145, :_reduce_133,
828
+ 6, 118, :_reduce_134,
829
+ 7, 119, :_reduce_135,
830
+ 1, 151, :_reduce_136,
831
+ 1, 150, :_reduce_none,
832
+ 1, 150, :_reduce_none,
833
+ 1, 152, :_reduce_none,
834
+ 2, 152, :_reduce_140,
920
835
  1, 153, :_reduce_none,
921
836
  1, 153, :_reduce_none,
922
- 1, 155, :_reduce_none,
923
- 2, 155, :_reduce_143,
837
+ 7, 120, :_reduce_143,
838
+ 6, 120, :_reduce_144,
839
+ 1, 154, :_reduce_145,
840
+ 3, 154, :_reduce_146,
924
841
  1, 156, :_reduce_none,
925
842
  1, 156, :_reduce_none,
926
- 7, 123, :_reduce_146,
927
- 6, 123, :_reduce_147,
928
- 1, 157, :_reduce_148,
929
- 3, 157, :_reduce_149,
930
- 1, 159, :_reduce_none,
843
+ 1, 156, :_reduce_149,
844
+ 1, 156, :_reduce_none,
845
+ 1, 157, :_reduce_151,
846
+ 3, 157, :_reduce_152,
847
+ 1, 158, :_reduce_none,
848
+ 1, 158, :_reduce_none,
849
+ 1, 155, :_reduce_none,
850
+ 2, 155, :_reduce_156,
851
+ 1, 148, :_reduce_none,
852
+ 1, 148, :_reduce_158,
853
+ 1, 149, :_reduce_159,
854
+ 2, 149, :_reduce_160,
855
+ 4, 149, :_reduce_161,
856
+ 1, 133, :_reduce_162,
857
+ 3, 133, :_reduce_163,
931
858
  1, 159, :_reduce_none,
932
- 1, 159, :_reduce_152,
933
859
  1, 159, :_reduce_none,
934
- 1, 160, :_reduce_154,
935
- 3, 160, :_reduce_155,
936
- 1, 161, :_reduce_none,
937
- 1, 161, :_reduce_none,
938
- 1, 158, :_reduce_none,
939
- 2, 158, :_reduce_159,
940
- 1, 151, :_reduce_none,
941
- 1, 151, :_reduce_none,
942
- 1, 151, :_reduce_none,
943
- 1, 151, :_reduce_none,
944
- 1, 151, :_reduce_none,
945
- 1, 151, :_reduce_none,
946
- 1, 151, :_reduce_166,
947
- 1, 152, :_reduce_167,
948
- 2, 152, :_reduce_168,
949
- 4, 152, :_reduce_169,
950
- 1, 136, :_reduce_170,
951
- 3, 136, :_reduce_171,
952
- 1, 162, :_reduce_none,
953
- 1, 162, :_reduce_none,
954
- 1, 163, :_reduce_none,
955
- 1, 163, :_reduce_none,
956
- 3, 165, :_reduce_176,
957
- 1, 165, :_reduce_177,
958
- 2, 166, :_reduce_178,
959
- 2, 164, :_reduce_179,
960
- 1, 167, :_reduce_180,
961
- 4, 167, :_reduce_181,
962
- 1, 115, :_reduce_182,
963
- 1, 125, :_reduce_183,
964
- 1, 125, :_reduce_184,
965
- 1, 125, :_reduce_185,
966
- 1, 125, :_reduce_186,
967
- 1, 125, :_reduce_187,
968
- 1, 125, :_reduce_188,
969
- 1, 125, :_reduce_189,
970
- 4, 126, :_reduce_190,
971
- 2, 126, :_reduce_191,
972
- 4, 126, :_reduce_192,
973
- 2, 126, :_reduce_193,
974
- 3, 127, :_reduce_194,
975
- 4, 127, :_reduce_195,
976
- 2, 127, :_reduce_196,
977
- 1, 168, :_reduce_197,
978
- 3, 168, :_reduce_198,
979
- 3, 169, :_reduce_199,
980
- 1, 129, :_reduce_none,
981
- 1, 129, :_reduce_none,
982
- 1, 129, :_reduce_none,
983
- 1, 170, :_reduce_203,
984
- 1, 170, :_reduce_204,
985
- 2, 171, :_reduce_205,
986
- 1, 173, :_reduce_206,
987
- 1, 175, :_reduce_207,
988
- 1, 176, :_reduce_208,
989
- 2, 174, :_reduce_209,
990
- 1, 177, :_reduce_210,
991
- 1, 178, :_reduce_211,
992
- 2, 178, :_reduce_212,
993
- 2, 172, :_reduce_213,
994
- 2, 179, :_reduce_214,
995
- 2, 179, :_reduce_215,
996
- 3, 97, :_reduce_216,
997
- 0, 181, :_reduce_none,
998
- 1, 181, :_reduce_none,
999
- 0, 180, :_reduce_219,
1000
- 2, 180, :_reduce_220,
1001
- 4, 180, :_reduce_221,
1002
- 1, 124, :_reduce_222,
1003
- 3, 124, :_reduce_223,
1004
- 5, 124, :_reduce_224,
1005
- 1, 182, :_reduce_none,
1006
- 1, 182, :_reduce_none,
1007
- 1, 130, :_reduce_227,
1008
- 1, 128, :_reduce_228,
1009
- 0, 109, :_reduce_none,
1010
- 1, 109, :_reduce_230,
1011
- 0, 108, :_reduce_none,
1012
- 1, 108, :_reduce_none,
1013
- 1, 150, :_reduce_none,
1014
- 1, 150, :_reduce_none,
1015
- 1, 150, :_reduce_none,
1016
- 1, 150, :_reduce_none,
1017
- 1, 150, :_reduce_none,
1018
- 1, 150, :_reduce_none,
1019
- 1, 150, :_reduce_none,
1020
- 1, 150, :_reduce_none,
1021
- 1, 150, :_reduce_none,
1022
- 1, 150, :_reduce_none,
1023
- 1, 150, :_reduce_none,
1024
- 1, 150, :_reduce_none,
1025
- 1, 150, :_reduce_none,
1026
- 1, 150, :_reduce_none,
1027
- 1, 150, :_reduce_none,
1028
- 1, 150, :_reduce_none,
1029
- 1, 150, :_reduce_none,
1030
- 1, 150, :_reduce_none,
1031
- 0, 143, :_reduce_251 ]
860
+ 1, 160, :_reduce_none,
861
+ 1, 160, :_reduce_none,
862
+ 3, 162, :_reduce_168,
863
+ 1, 162, :_reduce_169,
864
+ 2, 163, :_reduce_170,
865
+ 2, 161, :_reduce_171,
866
+ 1, 164, :_reduce_172,
867
+ 4, 164, :_reduce_173,
868
+ 1, 112, :_reduce_174,
869
+ 1, 122, :_reduce_175,
870
+ 1, 122, :_reduce_176,
871
+ 1, 122, :_reduce_177,
872
+ 1, 122, :_reduce_178,
873
+ 4, 123, :_reduce_179,
874
+ 2, 123, :_reduce_180,
875
+ 4, 123, :_reduce_181,
876
+ 2, 123, :_reduce_182,
877
+ 3, 124, :_reduce_183,
878
+ 4, 124, :_reduce_184,
879
+ 2, 124, :_reduce_185,
880
+ 1, 165, :_reduce_186,
881
+ 3, 165, :_reduce_187,
882
+ 3, 166, :_reduce_188,
883
+ 1, 126, :_reduce_none,
884
+ 1, 126, :_reduce_none,
885
+ 1, 126, :_reduce_none,
886
+ 1, 167, :_reduce_192,
887
+ 1, 167, :_reduce_193,
888
+ 2, 168, :_reduce_194,
889
+ 1, 170, :_reduce_195,
890
+ 1, 172, :_reduce_196,
891
+ 1, 173, :_reduce_197,
892
+ 2, 171, :_reduce_198,
893
+ 1, 174, :_reduce_199,
894
+ 1, 175, :_reduce_200,
895
+ 2, 175, :_reduce_201,
896
+ 2, 169, :_reduce_202,
897
+ 2, 176, :_reduce_203,
898
+ 2, 176, :_reduce_204,
899
+ 3, 94, :_reduce_205,
900
+ 0, 178, :_reduce_none,
901
+ 1, 178, :_reduce_none,
902
+ 0, 177, :_reduce_208,
903
+ 2, 177, :_reduce_209,
904
+ 4, 177, :_reduce_210,
905
+ 1, 121, :_reduce_211,
906
+ 3, 121, :_reduce_212,
907
+ 5, 121, :_reduce_213,
908
+ 1, 179, :_reduce_none,
909
+ 1, 179, :_reduce_none,
910
+ 1, 127, :_reduce_216,
911
+ 1, 125, :_reduce_217,
912
+ 0, 106, :_reduce_none,
913
+ 1, 106, :_reduce_219,
914
+ 0, 105, :_reduce_none,
915
+ 1, 105, :_reduce_none,
916
+ 1, 147, :_reduce_none,
917
+ 1, 147, :_reduce_none,
918
+ 1, 147, :_reduce_none,
919
+ 1, 147, :_reduce_none,
920
+ 1, 147, :_reduce_none,
921
+ 1, 147, :_reduce_none,
922
+ 1, 147, :_reduce_none,
923
+ 1, 147, :_reduce_none,
924
+ 1, 147, :_reduce_none,
925
+ 1, 147, :_reduce_none,
926
+ 1, 147, :_reduce_none,
927
+ 1, 147, :_reduce_none,
928
+ 1, 147, :_reduce_none,
929
+ 1, 147, :_reduce_none,
930
+ 1, 147, :_reduce_none,
931
+ 1, 147, :_reduce_none,
932
+ 1, 147, :_reduce_none,
933
+ 1, 147, :_reduce_none,
934
+ 0, 140, :_reduce_240 ]
1032
935
 
1033
- racc_reduce_n = 252
936
+ racc_reduce_n = 241
1034
937
 
1035
- racc_shift_n = 432
938
+ racc_shift_n = 418
1036
939
 
1037
940
  racc_token_table = {
1038
941
  false => 0,
@@ -1121,16 +1024,13 @@ racc_token_table = {
1121
1024
  :PRIVATE => 83,
1122
1025
  :ATTR => 84,
1123
1026
  :TYPE => 85,
1124
- :APPLICATION_R => 86,
1125
- :CONSUMES_R => 87,
1126
- :PRODUCES_R => 88,
1127
- :LOW => 89,
1128
- :HIGH => 90,
1129
- :LISTSTART => 91,
1130
- :SPLAT => 92,
1131
- :MODULO => 93 }
1027
+ :LOW => 86,
1028
+ :HIGH => 87,
1029
+ :LISTSTART => 88,
1030
+ :SPLAT => 89,
1031
+ :MODULO => 90 }
1132
1032
 
1133
- racc_nt_base = 94
1033
+ racc_nt_base = 91
1134
1034
 
1135
1035
  racc_use_result_var = true
1136
1036
 
@@ -1237,9 +1137,6 @@ Racc_token_to_s_table = [
1237
1137
  "PRIVATE",
1238
1138
  "ATTR",
1239
1139
  "TYPE",
1240
- "APPLICATION_R",
1241
- "CONSUMES_R",
1242
- "PRODUCES_R",
1243
1140
  "LOW",
1244
1141
  "HIGH",
1245
1142
  "LISTSTART",
@@ -1341,63 +1238,63 @@ Racc_debug_parser = false
1341
1238
 
1342
1239
  # reduce 0 omitted
1343
1240
 
1344
- module_eval(<<'.,.,', 'egrammar.ra', 66)
1241
+ module_eval(<<'.,.,', 'egrammar.ra', 65)
1345
1242
  def _reduce_1(val, _values, result)
1346
1243
  result = create_program(Factory.block_or_expression(*val[0]))
1347
1244
  result
1348
1245
  end
1349
1246
  .,.,
1350
1247
 
1351
- module_eval(<<'.,.,', 'egrammar.ra', 67)
1248
+ module_eval(<<'.,.,', 'egrammar.ra', 66)
1352
1249
  def _reduce_2(val, _values, result)
1353
1250
  result = create_program(Factory.block_or_expression(*val[0]))
1354
1251
  result
1355
1252
  end
1356
1253
  .,.,
1357
1254
 
1358
- module_eval(<<'.,.,', 'egrammar.ra', 68)
1255
+ module_eval(<<'.,.,', 'egrammar.ra', 67)
1359
1256
  def _reduce_3(val, _values, result)
1360
1257
  result = create_empty_program()
1361
1258
  result
1362
1259
  end
1363
1260
  .,.,
1364
1261
 
1365
- module_eval(<<'.,.,', 'egrammar.ra', 72)
1262
+ module_eval(<<'.,.,', 'egrammar.ra', 71)
1366
1263
  def _reduce_4(val, _values, result)
1367
1264
  result = transform_calls(val[0])
1368
1265
  result
1369
1266
  end
1370
1267
  .,.,
1371
1268
 
1372
- module_eval(<<'.,.,', 'egrammar.ra', 79)
1269
+ module_eval(<<'.,.,', 'egrammar.ra', 78)
1373
1270
  def _reduce_5(val, _values, result)
1374
1271
  result = [val[0]]
1375
1272
  result
1376
1273
  end
1377
1274
  .,.,
1378
1275
 
1379
- module_eval(<<'.,.,', 'egrammar.ra', 80)
1276
+ module_eval(<<'.,.,', 'egrammar.ra', 79)
1380
1277
  def _reduce_6(val, _values, result)
1381
1278
  result = val[0].push val[2]
1382
1279
  result
1383
1280
  end
1384
1281
  .,.,
1385
1282
 
1386
- module_eval(<<'.,.,', 'egrammar.ra', 81)
1283
+ module_eval(<<'.,.,', 'egrammar.ra', 80)
1387
1284
  def _reduce_7(val, _values, result)
1388
1285
  result = val[0].push val[1]
1389
1286
  result
1390
1287
  end
1391
1288
  .,.,
1392
1289
 
1393
- module_eval(<<'.,.,', 'egrammar.ra', 88)
1290
+ module_eval(<<'.,.,', 'egrammar.ra', 87)
1394
1291
  def _reduce_8(val, _values, result)
1395
1292
  result = val[0]
1396
1293
  result
1397
1294
  end
1398
1295
  .,.,
1399
1296
 
1400
- module_eval(<<'.,.,', 'egrammar.ra', 89)
1297
+ module_eval(<<'.,.,', 'egrammar.ra', 88)
1401
1298
  def _reduce_9(val, _values, result)
1402
1299
  result = aryfy(val[0]).push(val[1]).push(val[2])
1403
1300
  result
@@ -1406,35 +1303,35 @@ module_eval(<<'.,.,', 'egrammar.ra', 89)
1406
1303
 
1407
1304
  # reduce 10 omitted
1408
1305
 
1409
- module_eval(<<'.,.,', 'egrammar.ra', 94)
1306
+ module_eval(<<'.,.,', 'egrammar.ra', 93)
1410
1307
  def _reduce_11(val, _values, result)
1411
1308
  result = val[0].set(val[2]) ; loc result, val[1]
1412
1309
  result
1413
1310
  end
1414
1311
  .,.,
1415
1312
 
1416
- module_eval(<<'.,.,', 'egrammar.ra', 95)
1313
+ module_eval(<<'.,.,', 'egrammar.ra', 94)
1417
1314
  def _reduce_12(val, _values, result)
1418
1315
  result = val[0].plus_set(val[2]) ; loc result, val[1]
1419
1316
  result
1420
1317
  end
1421
1318
  .,.,
1422
1319
 
1423
- module_eval(<<'.,.,', 'egrammar.ra', 96)
1320
+ module_eval(<<'.,.,', 'egrammar.ra', 95)
1424
1321
  def _reduce_13(val, _values, result)
1425
1322
  result = val[0].minus_set(val[2]); loc result, val[1]
1426
1323
  result
1427
1324
  end
1428
1325
  .,.,
1429
1326
 
1430
- module_eval(<<'.,.,', 'egrammar.ra', 99)
1327
+ module_eval(<<'.,.,', 'egrammar.ra', 98)
1431
1328
  def _reduce_14(val, _values, result)
1432
1329
  result = [val[0]]
1433
1330
  result
1434
1331
  end
1435
1332
  .,.,
1436
1333
 
1437
- module_eval(<<'.,.,', 'egrammar.ra', 100)
1334
+ module_eval(<<'.,.,', 'egrammar.ra', 99)
1438
1335
  def _reduce_15(val, _values, result)
1439
1336
  result = val[0].push(val[2])
1440
1337
  result
@@ -1443,28 +1340,28 @@ module_eval(<<'.,.,', 'egrammar.ra', 100)
1443
1340
 
1444
1341
  # reduce 16 omitted
1445
1342
 
1446
- module_eval(<<'.,.,', 'egrammar.ra', 104)
1343
+ module_eval(<<'.,.,', 'egrammar.ra', 103)
1447
1344
  def _reduce_17(val, _values, result)
1448
1345
  result = val[0].relop(val[1][:value], val[2]); loc result, val[1]
1449
1346
  result
1450
1347
  end
1451
1348
  .,.,
1452
1349
 
1453
- module_eval(<<'.,.,', 'egrammar.ra', 105)
1350
+ module_eval(<<'.,.,', 'egrammar.ra', 104)
1454
1351
  def _reduce_18(val, _values, result)
1455
1352
  result = val[0].relop(val[1][:value], val[2]); loc result, val[1]
1456
1353
  result
1457
1354
  end
1458
1355
  .,.,
1459
1356
 
1460
- module_eval(<<'.,.,', 'egrammar.ra', 106)
1357
+ module_eval(<<'.,.,', 'egrammar.ra', 105)
1461
1358
  def _reduce_19(val, _values, result)
1462
1359
  result = val[0].relop(val[1][:value], val[2]); loc result, val[1]
1463
1360
  result
1464
1361
  end
1465
1362
  .,.,
1466
1363
 
1467
- module_eval(<<'.,.,', 'egrammar.ra', 107)
1364
+ module_eval(<<'.,.,', 'egrammar.ra', 106)
1468
1365
  def _reduce_20(val, _values, result)
1469
1366
  result = val[0].relop(val[1][:value], val[2]); loc result, val[1]
1470
1367
  result
@@ -1473,7 +1370,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 107)
1473
1370
 
1474
1371
  # reduce 21 omitted
1475
1372
 
1476
- module_eval(<<'.,.,', 'egrammar.ra', 116)
1373
+ module_eval(<<'.,.,', 'egrammar.ra', 115)
1477
1374
  def _reduce_22(val, _values, result)
1478
1375
  result = val[1]
1479
1376
  unless Factory.set_resource_form(result, :virtual)
@@ -1487,7 +1384,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 116)
1487
1384
  end
1488
1385
  .,.,
1489
1386
 
1490
- module_eval(<<'.,.,', 'egrammar.ra', 127)
1387
+ module_eval(<<'.,.,', 'egrammar.ra', 126)
1491
1388
  def _reduce_23(val, _values, result)
1492
1389
  result = val[1]
1493
1390
  unless Factory.set_resource_form(result, :exported)
@@ -1501,7 +1398,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 127)
1501
1398
  end
1502
1399
  .,.,
1503
1400
 
1504
- module_eval(<<'.,.,', 'egrammar.ra', 138)
1401
+ module_eval(<<'.,.,', 'egrammar.ra', 137)
1505
1402
  def _reduce_24(val, _values, result)
1506
1403
  bodies = [Factory.RESOURCE_BODY(val[2], val[4])] + val[5]
1507
1404
  result = Factory.RESOURCE(val[0], bodies)
@@ -1511,7 +1408,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 138)
1511
1408
  end
1512
1409
  .,.,
1513
1410
 
1514
- module_eval(<<'.,.,', 'egrammar.ra', 145)
1411
+ module_eval(<<'.,.,', 'egrammar.ra', 144)
1515
1412
  def _reduce_25(val, _values, result)
1516
1413
  result = Factory.RESOURCE(Factory.fqn(token_text(val[0])), val[2])
1517
1414
  loc result, val[0], val[4]
@@ -1520,7 +1417,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 145)
1520
1417
  end
1521
1418
  .,.,
1522
1419
 
1523
- module_eval(<<'.,.,', 'egrammar.ra', 154)
1420
+ module_eval(<<'.,.,', 'egrammar.ra', 153)
1524
1421
  def _reduce_26(val, _values, result)
1525
1422
  result = case Factory.resource_shape(val[0])
1526
1423
  when :resource, :class
@@ -1546,42 +1443,42 @@ module_eval(<<'.,.,', 'egrammar.ra', 154)
1546
1443
  end
1547
1444
  .,.,
1548
1445
 
1549
- module_eval(<<'.,.,', 'egrammar.ra', 176)
1446
+ module_eval(<<'.,.,', 'egrammar.ra', 175)
1550
1447
  def _reduce_27(val, _values, result)
1551
1448
  result = Factory.RESOURCE_BODY(val[0], val[2])
1552
1449
  result
1553
1450
  end
1554
1451
  .,.,
1555
1452
 
1556
- module_eval(<<'.,.,', 'egrammar.ra', 179)
1453
+ module_eval(<<'.,.,', 'egrammar.ra', 178)
1557
1454
  def _reduce_28(val, _values, result)
1558
1455
  result = [val[0]]
1559
1456
  result
1560
1457
  end
1561
1458
  .,.,
1562
1459
 
1563
- module_eval(<<'.,.,', 'egrammar.ra', 180)
1460
+ module_eval(<<'.,.,', 'egrammar.ra', 179)
1564
1461
  def _reduce_29(val, _values, result)
1565
1462
  result = val[0].push val[2]
1566
1463
  result
1567
1464
  end
1568
1465
  .,.,
1569
1466
 
1570
- module_eval(<<'.,.,', 'egrammar.ra', 186)
1467
+ module_eval(<<'.,.,', 'egrammar.ra', 185)
1571
1468
  def _reduce_30(val, _values, result)
1572
1469
  result = []
1573
1470
  result
1574
1471
  end
1575
1472
  .,.,
1576
1473
 
1577
- module_eval(<<'.,.,', 'egrammar.ra', 187)
1474
+ module_eval(<<'.,.,', 'egrammar.ra', 186)
1578
1475
  def _reduce_31(val, _values, result)
1579
1476
  result = []
1580
1477
  result
1581
1478
  end
1582
1479
  .,.,
1583
1480
 
1584
- module_eval(<<'.,.,', 'egrammar.ra', 188)
1481
+ module_eval(<<'.,.,', 'egrammar.ra', 187)
1585
1482
  def _reduce_32(val, _values, result)
1586
1483
  result = val[2]
1587
1484
  result
@@ -1592,182 +1489,182 @@ module_eval(<<'.,.,', 'egrammar.ra', 188)
1592
1489
 
1593
1490
  # reduce 34 omitted
1594
1491
 
1595
- module_eval(<<'.,.,', 'egrammar.ra', 195)
1492
+ module_eval(<<'.,.,', 'egrammar.ra', 194)
1596
1493
  def _reduce_35(val, _values, result)
1597
1494
  result = val[0][*val[2]] ; loc result, val[0], val[3]
1598
1495
  result
1599
1496
  end
1600
1497
  .,.,
1601
1498
 
1602
- module_eval(<<'.,.,', 'egrammar.ra', 196)
1499
+ module_eval(<<'.,.,', 'egrammar.ra', 195)
1603
1500
  def _reduce_36(val, _values, result)
1604
1501
  result = val[0].in val[2] ; loc result, val[1]
1605
1502
  result
1606
1503
  end
1607
1504
  .,.,
1608
1505
 
1609
- module_eval(<<'.,.,', 'egrammar.ra', 197)
1506
+ module_eval(<<'.,.,', 'egrammar.ra', 196)
1610
1507
  def _reduce_37(val, _values, result)
1611
1508
  result = val[0] =~ val[2] ; loc result, val[1]
1612
1509
  result
1613
1510
  end
1614
1511
  .,.,
1615
1512
 
1616
- module_eval(<<'.,.,', 'egrammar.ra', 198)
1513
+ module_eval(<<'.,.,', 'egrammar.ra', 197)
1617
1514
  def _reduce_38(val, _values, result)
1618
1515
  result = val[0].mne val[2] ; loc result, val[1]
1619
1516
  result
1620
1517
  end
1621
1518
  .,.,
1622
1519
 
1623
- module_eval(<<'.,.,', 'egrammar.ra', 199)
1520
+ module_eval(<<'.,.,', 'egrammar.ra', 198)
1624
1521
  def _reduce_39(val, _values, result)
1625
1522
  result = val[0] + val[2] ; loc result, val[1]
1626
1523
  result
1627
1524
  end
1628
1525
  .,.,
1629
1526
 
1630
- module_eval(<<'.,.,', 'egrammar.ra', 200)
1527
+ module_eval(<<'.,.,', 'egrammar.ra', 199)
1631
1528
  def _reduce_40(val, _values, result)
1632
1529
  result = val[0] - val[2] ; loc result, val[1]
1633
1530
  result
1634
1531
  end
1635
1532
  .,.,
1636
1533
 
1637
- module_eval(<<'.,.,', 'egrammar.ra', 201)
1534
+ module_eval(<<'.,.,', 'egrammar.ra', 200)
1638
1535
  def _reduce_41(val, _values, result)
1639
1536
  result = val[0] / val[2] ; loc result, val[1]
1640
1537
  result
1641
1538
  end
1642
1539
  .,.,
1643
1540
 
1644
- module_eval(<<'.,.,', 'egrammar.ra', 202)
1541
+ module_eval(<<'.,.,', 'egrammar.ra', 201)
1645
1542
  def _reduce_42(val, _values, result)
1646
1543
  result = val[0] * val[2] ; loc result, val[1]
1647
1544
  result
1648
1545
  end
1649
1546
  .,.,
1650
1547
 
1651
- module_eval(<<'.,.,', 'egrammar.ra', 203)
1548
+ module_eval(<<'.,.,', 'egrammar.ra', 202)
1652
1549
  def _reduce_43(val, _values, result)
1653
1550
  result = val[0] % val[2] ; loc result, val[1]
1654
1551
  result
1655
1552
  end
1656
1553
  .,.,
1657
1554
 
1658
- module_eval(<<'.,.,', 'egrammar.ra', 204)
1555
+ module_eval(<<'.,.,', 'egrammar.ra', 203)
1659
1556
  def _reduce_44(val, _values, result)
1660
1557
  result = val[0] << val[2] ; loc result, val[1]
1661
1558
  result
1662
1559
  end
1663
1560
  .,.,
1664
1561
 
1665
- module_eval(<<'.,.,', 'egrammar.ra', 205)
1562
+ module_eval(<<'.,.,', 'egrammar.ra', 204)
1666
1563
  def _reduce_45(val, _values, result)
1667
1564
  result = val[0] >> val[2] ; loc result, val[1]
1668
1565
  result
1669
1566
  end
1670
1567
  .,.,
1671
1568
 
1672
- module_eval(<<'.,.,', 'egrammar.ra', 206)
1569
+ module_eval(<<'.,.,', 'egrammar.ra', 205)
1673
1570
  def _reduce_46(val, _values, result)
1674
1571
  result = val[1].minus() ; loc result, val[0]
1675
1572
  result
1676
1573
  end
1677
1574
  .,.,
1678
1575
 
1679
- module_eval(<<'.,.,', 'egrammar.ra', 207)
1576
+ module_eval(<<'.,.,', 'egrammar.ra', 206)
1680
1577
  def _reduce_47(val, _values, result)
1681
1578
  result = val[1].unfold() ; loc result, val[0]
1682
1579
  result
1683
1580
  end
1684
1581
  .,.,
1685
1582
 
1686
- module_eval(<<'.,.,', 'egrammar.ra', 208)
1583
+ module_eval(<<'.,.,', 'egrammar.ra', 207)
1687
1584
  def _reduce_48(val, _values, result)
1688
1585
  result = val[0].ne val[2] ; loc result, val[1]
1689
1586
  result
1690
1587
  end
1691
1588
  .,.,
1692
1589
 
1693
- module_eval(<<'.,.,', 'egrammar.ra', 209)
1590
+ module_eval(<<'.,.,', 'egrammar.ra', 208)
1694
1591
  def _reduce_49(val, _values, result)
1695
1592
  result = val[0] == val[2] ; loc result, val[1]
1696
1593
  result
1697
1594
  end
1698
1595
  .,.,
1699
1596
 
1700
- module_eval(<<'.,.,', 'egrammar.ra', 210)
1597
+ module_eval(<<'.,.,', 'egrammar.ra', 209)
1701
1598
  def _reduce_50(val, _values, result)
1702
1599
  result = val[0] > val[2] ; loc result, val[1]
1703
1600
  result
1704
1601
  end
1705
1602
  .,.,
1706
1603
 
1707
- module_eval(<<'.,.,', 'egrammar.ra', 211)
1604
+ module_eval(<<'.,.,', 'egrammar.ra', 210)
1708
1605
  def _reduce_51(val, _values, result)
1709
1606
  result = val[0] >= val[2] ; loc result, val[1]
1710
1607
  result
1711
1608
  end
1712
1609
  .,.,
1713
1610
 
1714
- module_eval(<<'.,.,', 'egrammar.ra', 212)
1611
+ module_eval(<<'.,.,', 'egrammar.ra', 211)
1715
1612
  def _reduce_52(val, _values, result)
1716
1613
  result = val[0] < val[2] ; loc result, val[1]
1717
1614
  result
1718
1615
  end
1719
1616
  .,.,
1720
1617
 
1721
- module_eval(<<'.,.,', 'egrammar.ra', 213)
1618
+ module_eval(<<'.,.,', 'egrammar.ra', 212)
1722
1619
  def _reduce_53(val, _values, result)
1723
1620
  result = val[0] <= val[2] ; loc result, val[1]
1724
1621
  result
1725
1622
  end
1726
1623
  .,.,
1727
1624
 
1728
- module_eval(<<'.,.,', 'egrammar.ra', 214)
1625
+ module_eval(<<'.,.,', 'egrammar.ra', 213)
1729
1626
  def _reduce_54(val, _values, result)
1730
1627
  result = val[1].not ; loc result, val[0]
1731
1628
  result
1732
1629
  end
1733
1630
  .,.,
1734
1631
 
1735
- module_eval(<<'.,.,', 'egrammar.ra', 215)
1632
+ module_eval(<<'.,.,', 'egrammar.ra', 214)
1736
1633
  def _reduce_55(val, _values, result)
1737
1634
  result = val[0].and val[2] ; loc result, val[1]
1738
1635
  result
1739
1636
  end
1740
1637
  .,.,
1741
1638
 
1742
- module_eval(<<'.,.,', 'egrammar.ra', 216)
1639
+ module_eval(<<'.,.,', 'egrammar.ra', 215)
1743
1640
  def _reduce_56(val, _values, result)
1744
1641
  result = val[0].or val[2] ; loc result, val[1]
1745
1642
  result
1746
1643
  end
1747
1644
  .,.,
1748
1645
 
1749
- module_eval(<<'.,.,', 'egrammar.ra', 217)
1646
+ module_eval(<<'.,.,', 'egrammar.ra', 216)
1750
1647
  def _reduce_57(val, _values, result)
1751
1648
  result = val[0].select(*val[2]) ; loc result, val[0]
1752
1649
  result
1753
1650
  end
1754
1651
  .,.,
1755
1652
 
1756
- module_eval(<<'.,.,', 'egrammar.ra', 218)
1653
+ module_eval(<<'.,.,', 'egrammar.ra', 217)
1757
1654
  def _reduce_58(val, _values, result)
1758
1655
  result = val[1].paren() ; loc result, val[0]
1759
1656
  result
1760
1657
  end
1761
1658
  .,.,
1762
1659
 
1763
- module_eval(<<'.,.,', 'egrammar.ra', 228)
1660
+ module_eval(<<'.,.,', 'egrammar.ra', 227)
1764
1661
  def _reduce_59(val, _values, result)
1765
1662
  result = [val[0]]
1766
1663
  result
1767
1664
  end
1768
1665
  .,.,
1769
1666
 
1770
- module_eval(<<'.,.,', 'egrammar.ra', 229)
1667
+ module_eval(<<'.,.,', 'egrammar.ra', 228)
1771
1668
  def _reduce_60(val, _values, result)
1772
1669
  result = val[0].push(val[2])
1773
1670
  result
@@ -1806,42 +1703,42 @@ module_eval(<<'.,.,', 'egrammar.ra', 229)
1806
1703
 
1807
1704
  # reduce 76 omitted
1808
1705
 
1809
- module_eval(<<'.,.,', 'egrammar.ra', 248)
1706
+ module_eval(<<'.,.,', 'egrammar.ra', 247)
1810
1707
  def _reduce_77(val, _values, result)
1811
1708
  result = Factory.NUMBER(val[0][:value]) ; loc result, val[0]
1812
1709
  result
1813
1710
  end
1814
1711
  .,.,
1815
1712
 
1816
- module_eval(<<'.,.,', 'egrammar.ra', 249)
1713
+ module_eval(<<'.,.,', 'egrammar.ra', 248)
1817
1714
  def _reduce_78(val, _values, result)
1818
1715
  result = Factory.literal(val[0][:value]) ; loc result, val[0]
1819
1716
  result
1820
1717
  end
1821
1718
  .,.,
1822
1719
 
1823
- module_eval(<<'.,.,', 'egrammar.ra', 250)
1720
+ module_eval(<<'.,.,', 'egrammar.ra', 249)
1824
1721
  def _reduce_79(val, _values, result)
1825
1722
  result = Factory.literal(:default) ; loc result, val[0]
1826
1723
  result
1827
1724
  end
1828
1725
  .,.,
1829
1726
 
1830
- module_eval(<<'.,.,', 'egrammar.ra', 251)
1727
+ module_eval(<<'.,.,', 'egrammar.ra', 250)
1831
1728
  def _reduce_80(val, _values, result)
1832
1729
  result = Factory.literal(:undef) ; loc result, val[0]
1833
1730
  result
1834
1731
  end
1835
1732
  .,.,
1836
1733
 
1837
- module_eval(<<'.,.,', 'egrammar.ra', 252)
1734
+ module_eval(<<'.,.,', 'egrammar.ra', 251)
1838
1735
  def _reduce_81(val, _values, result)
1839
1736
  result = Factory.QNAME_OR_NUMBER(val[0][:value]) ; loc result, val[0]
1840
1737
  result
1841
1738
  end
1842
1739
  .,.,
1843
1740
 
1844
- module_eval(<<'.,.,', 'egrammar.ra', 261)
1741
+ module_eval(<<'.,.,', 'egrammar.ra', 260)
1845
1742
  def _reduce_82(val, _values, result)
1846
1743
  result = Factory.CALL_NAMED(val[0], true, val[2])
1847
1744
  loc result, val[0], val[4]
@@ -1850,7 +1747,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 261)
1850
1747
  end
1851
1748
  .,.,
1852
1749
 
1853
- module_eval(<<'.,.,', 'egrammar.ra', 265)
1750
+ module_eval(<<'.,.,', 'egrammar.ra', 264)
1854
1751
  def _reduce_83(val, _values, result)
1855
1752
  result = Factory.CALL_NAMED(val[0], true, [])
1856
1753
  loc result, val[0], val[2]
@@ -1859,7 +1756,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 265)
1859
1756
  end
1860
1757
  .,.,
1861
1758
 
1862
- module_eval(<<'.,.,', 'egrammar.ra', 269)
1759
+ module_eval(<<'.,.,', 'egrammar.ra', 268)
1863
1760
  def _reduce_84(val, _values, result)
1864
1761
  result = Factory.CALL_NAMED(val[0], true, val[2])
1865
1762
  loc result, val[0], val[4]
@@ -1869,7 +1766,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 269)
1869
1766
  end
1870
1767
  .,.,
1871
1768
 
1872
- module_eval(<<'.,.,', 'egrammar.ra', 274)
1769
+ module_eval(<<'.,.,', 'egrammar.ra', 273)
1873
1770
  def _reduce_85(val, _values, result)
1874
1771
  result = Factory.CALL_NAMED(val[0], true, [])
1875
1772
  loc result, val[0], val[2]
@@ -1879,42 +1776,42 @@ module_eval(<<'.,.,', 'egrammar.ra', 274)
1879
1776
  end
1880
1777
  .,.,
1881
1778
 
1882
- module_eval(<<'.,.,', 'egrammar.ra', 282)
1779
+ module_eval(<<'.,.,', 'egrammar.ra', 281)
1883
1780
  def _reduce_86(val, _values, result)
1884
1781
  result = val[0]
1885
1782
  result
1886
1783
  end
1887
1784
  .,.,
1888
1785
 
1889
- module_eval(<<'.,.,', 'egrammar.ra', 283)
1786
+ module_eval(<<'.,.,', 'egrammar.ra', 282)
1890
1787
  def _reduce_87(val, _values, result)
1891
1788
  result = val[0]; val[0].lambda = val[1]
1892
1789
  result
1893
1790
  end
1894
1791
  .,.,
1895
1792
 
1896
- module_eval(<<'.,.,', 'egrammar.ra', 286)
1793
+ module_eval(<<'.,.,', 'egrammar.ra', 285)
1897
1794
  def _reduce_88(val, _values, result)
1898
1795
  result = Factory.CALL_METHOD(val[0], val[2]); loc result, val[1], val[3]
1899
1796
  result
1900
1797
  end
1901
1798
  .,.,
1902
1799
 
1903
- module_eval(<<'.,.,', 'egrammar.ra', 287)
1800
+ module_eval(<<'.,.,', 'egrammar.ra', 286)
1904
1801
  def _reduce_89(val, _values, result)
1905
1802
  result = Factory.CALL_METHOD(val[0], []); loc result, val[1], val[3]
1906
1803
  result
1907
1804
  end
1908
1805
  .,.,
1909
1806
 
1910
- module_eval(<<'.,.,', 'egrammar.ra', 288)
1807
+ module_eval(<<'.,.,', 'egrammar.ra', 287)
1911
1808
  def _reduce_90(val, _values, result)
1912
1809
  result = Factory.CALL_METHOD(val[0], []); loc result, val[0]
1913
1810
  result
1914
1811
  end
1915
1812
  .,.,
1916
1813
 
1917
- module_eval(<<'.,.,', 'egrammar.ra', 292)
1814
+ module_eval(<<'.,.,', 'egrammar.ra', 291)
1918
1815
  def _reduce_91(val, _values, result)
1919
1816
  result = val[0].dot(Factory.fqn(val[2][:value]))
1920
1817
  loc result, val[1], val[2]
@@ -1923,7 +1820,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 292)
1923
1820
  end
1924
1821
  .,.,
1925
1822
 
1926
- module_eval(<<'.,.,', 'egrammar.ra', 300)
1823
+ module_eval(<<'.,.,', 'egrammar.ra', 299)
1927
1824
  def _reduce_92(val, _values, result)
1928
1825
  result = Factory.LAMBDA(val[0][:value], val[1][:value])
1929
1826
  loc result, val[0][:start], val[1][:end]
@@ -1932,35 +1829,35 @@ module_eval(<<'.,.,', 'egrammar.ra', 300)
1932
1829
  end
1933
1830
  .,.,
1934
1831
 
1935
- module_eval(<<'.,.,', 'egrammar.ra', 305)
1832
+ module_eval(<<'.,.,', 'egrammar.ra', 304)
1936
1833
  def _reduce_93(val, _values, result)
1937
1834
  result = {:end => val[2], :value =>val[1] }
1938
1835
  result
1939
1836
  end
1940
1837
  .,.,
1941
1838
 
1942
- module_eval(<<'.,.,', 'egrammar.ra', 306)
1839
+ module_eval(<<'.,.,', 'egrammar.ra', 305)
1943
1840
  def _reduce_94(val, _values, result)
1944
1841
  result = {:end => val[1], :value => nil }
1945
1842
  result
1946
1843
  end
1947
1844
  .,.,
1948
1845
 
1949
- module_eval(<<'.,.,', 'egrammar.ra', 310)
1846
+ module_eval(<<'.,.,', 'egrammar.ra', 309)
1950
1847
  def _reduce_95(val, _values, result)
1951
1848
  result = {:start => val[0], :value => [] }
1952
1849
  result
1953
1850
  end
1954
1851
  .,.,
1955
1852
 
1956
- module_eval(<<'.,.,', 'egrammar.ra', 311)
1853
+ module_eval(<<'.,.,', 'egrammar.ra', 310)
1957
1854
  def _reduce_96(val, _values, result)
1958
1855
  result = {:start => val[0], :value => val[1] }
1959
1856
  result
1960
1857
  end
1961
1858
  .,.,
1962
1859
 
1963
- module_eval(<<'.,.,', 'egrammar.ra', 319)
1860
+ module_eval(<<'.,.,', 'egrammar.ra', 318)
1964
1861
  def _reduce_97(val, _values, result)
1965
1862
  result = val[1]
1966
1863
  loc(result, val[0], val[1])
@@ -1969,7 +1866,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 319)
1969
1866
  end
1970
1867
  .,.,
1971
1868
 
1972
- module_eval(<<'.,.,', 'egrammar.ra', 326)
1869
+ module_eval(<<'.,.,', 'egrammar.ra', 325)
1973
1870
  def _reduce_98(val, _values, result)
1974
1871
  result = Factory.IF(val[0], Factory.block_or_expression(*val[2]), val[4])
1975
1872
  loc(result, val[0], (val[4] ? val[4] : val[3]))
@@ -1978,7 +1875,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 326)
1978
1875
  end
1979
1876
  .,.,
1980
1877
 
1981
- module_eval(<<'.,.,', 'egrammar.ra', 330)
1878
+ module_eval(<<'.,.,', 'egrammar.ra', 329)
1982
1879
  def _reduce_99(val, _values, result)
1983
1880
  result = Factory.IF(val[0], nil, val[3])
1984
1881
  loc(result, val[0], (val[3] ? val[3] : val[2]))
@@ -1989,7 +1886,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 330)
1989
1886
 
1990
1887
  # reduce 100 omitted
1991
1888
 
1992
- module_eval(<<'.,.,', 'egrammar.ra', 338)
1889
+ module_eval(<<'.,.,', 'egrammar.ra', 337)
1993
1890
  def _reduce_101(val, _values, result)
1994
1891
  result = val[1]
1995
1892
  loc(result, val[0], val[1])
@@ -1998,7 +1895,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 338)
1998
1895
  end
1999
1896
  .,.,
2000
1897
 
2001
- module_eval(<<'.,.,', 'egrammar.ra', 342)
1898
+ module_eval(<<'.,.,', 'egrammar.ra', 341)
2002
1899
  def _reduce_102(val, _values, result)
2003
1900
  result = Factory.block_or_expression(*val[2])
2004
1901
  loc result, val[0], val[3]
@@ -2007,7 +1904,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 342)
2007
1904
  end
2008
1905
  .,.,
2009
1906
 
2010
- module_eval(<<'.,.,', 'egrammar.ra', 346)
1907
+ module_eval(<<'.,.,', 'egrammar.ra', 345)
2011
1908
  def _reduce_103(val, _values, result)
2012
1909
  result = nil # don't think a nop is needed here either
2013
1910
 
@@ -2015,7 +1912,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 346)
2015
1912
  end
2016
1913
  .,.,
2017
1914
 
2018
- module_eval(<<'.,.,', 'egrammar.ra', 353)
1915
+ module_eval(<<'.,.,', 'egrammar.ra', 352)
2019
1916
  def _reduce_104(val, _values, result)
2020
1917
  result = Factory.UNLESS(val[1], Factory.block_or_expression(*val[3]), val[5])
2021
1918
  loc result, val[0], val[4]
@@ -2024,9 +1921,9 @@ module_eval(<<'.,.,', 'egrammar.ra', 353)
2024
1921
  end
2025
1922
  .,.,
2026
1923
 
2027
- module_eval(<<'.,.,', 'egrammar.ra', 357)
1924
+ module_eval(<<'.,.,', 'egrammar.ra', 356)
2028
1925
  def _reduce_105(val, _values, result)
2029
- result = Factory.UNLESS(val[1], nil, val[4])
1926
+ result = Factory.UNLESS(val[1], nil, nil)
2030
1927
  loc result, val[0], val[4]
2031
1928
 
2032
1929
  result
@@ -2035,7 +1932,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 357)
2035
1932
 
2036
1933
  # reduce 106 omitted
2037
1934
 
2038
- module_eval(<<'.,.,', 'egrammar.ra', 367)
1935
+ module_eval(<<'.,.,', 'egrammar.ra', 366)
2039
1936
  def _reduce_107(val, _values, result)
2040
1937
  result = Factory.block_or_expression(*val[2])
2041
1938
  loc result, val[0], val[3]
@@ -2044,7 +1941,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 367)
2044
1941
  end
2045
1942
  .,.,
2046
1943
 
2047
- module_eval(<<'.,.,', 'egrammar.ra', 371)
1944
+ module_eval(<<'.,.,', 'egrammar.ra', 370)
2048
1945
  def _reduce_108(val, _values, result)
2049
1946
  result = nil # don't think a nop is needed here either
2050
1947
 
@@ -2052,7 +1949,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 371)
2052
1949
  end
2053
1950
  .,.,
2054
1951
 
2055
- module_eval(<<'.,.,', 'egrammar.ra', 378)
1952
+ module_eval(<<'.,.,', 'egrammar.ra', 377)
2056
1953
  def _reduce_109(val, _values, result)
2057
1954
  result = Factory.CASE(val[1], *val[3])
2058
1955
  loc result, val[0], val[4]
@@ -2061,21 +1958,21 @@ module_eval(<<'.,.,', 'egrammar.ra', 378)
2061
1958
  end
2062
1959
  .,.,
2063
1960
 
2064
- module_eval(<<'.,.,', 'egrammar.ra', 384)
1961
+ module_eval(<<'.,.,', 'egrammar.ra', 383)
2065
1962
  def _reduce_110(val, _values, result)
2066
1963
  result = [val[0]]
2067
1964
  result
2068
1965
  end
2069
1966
  .,.,
2070
1967
 
2071
- module_eval(<<'.,.,', 'egrammar.ra', 385)
1968
+ module_eval(<<'.,.,', 'egrammar.ra', 384)
2072
1969
  def _reduce_111(val, _values, result)
2073
1970
  result = val[0].push val[1]
2074
1971
  result
2075
1972
  end
2076
1973
  .,.,
2077
1974
 
2078
- module_eval(<<'.,.,', 'egrammar.ra', 390)
1975
+ module_eval(<<'.,.,', 'egrammar.ra', 389)
2079
1976
  def _reduce_112(val, _values, result)
2080
1977
  result = Factory.WHEN(val[0], val[3]); loc result, val[1], val[4]
2081
1978
 
@@ -2089,7 +1986,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 390)
2089
1986
 
2090
1987
  # reduce 115 omitted
2091
1988
 
2092
- module_eval(<<'.,.,', 'egrammar.ra', 406)
1989
+ module_eval(<<'.,.,', 'egrammar.ra', 405)
2093
1990
  def _reduce_116(val, _values, result)
2094
1991
  result = val[1]
2095
1992
 
@@ -2097,28 +1994,28 @@ module_eval(<<'.,.,', 'egrammar.ra', 406)
2097
1994
  end
2098
1995
  .,.,
2099
1996
 
2100
- module_eval(<<'.,.,', 'egrammar.ra', 411)
1997
+ module_eval(<<'.,.,', 'egrammar.ra', 410)
2101
1998
  def _reduce_117(val, _values, result)
2102
1999
  result = [val[0]]
2103
2000
  result
2104
2001
  end
2105
2002
  .,.,
2106
2003
 
2107
- module_eval(<<'.,.,', 'egrammar.ra', 412)
2004
+ module_eval(<<'.,.,', 'egrammar.ra', 411)
2108
2005
  def _reduce_118(val, _values, result)
2109
2006
  result = val[0].push val[2]
2110
2007
  result
2111
2008
  end
2112
2009
  .,.,
2113
2010
 
2114
- module_eval(<<'.,.,', 'egrammar.ra', 417)
2011
+ module_eval(<<'.,.,', 'egrammar.ra', 416)
2115
2012
  def _reduce_119(val, _values, result)
2116
2013
  result = Factory.MAP(val[0], val[2]) ; loc result, val[1]
2117
2014
  result
2118
2015
  end
2119
2016
  .,.,
2120
2017
 
2121
- module_eval(<<'.,.,', 'egrammar.ra', 427)
2018
+ module_eval(<<'.,.,', 'egrammar.ra', 426)
2122
2019
  def _reduce_120(val, _values, result)
2123
2020
  result = Factory.COLLECT(val[0], val[1], val[3])
2124
2021
  loc result, val[0], val[5]
@@ -2127,7 +2024,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 427)
2127
2024
  end
2128
2025
  .,.,
2129
2026
 
2130
- module_eval(<<'.,.,', 'egrammar.ra', 431)
2027
+ module_eval(<<'.,.,', 'egrammar.ra', 430)
2131
2028
  def _reduce_121(val, _values, result)
2132
2029
  result = Factory.COLLECT(val[0], val[1], [])
2133
2030
  loc result, val[0], val[1]
@@ -2136,14 +2033,14 @@ module_eval(<<'.,.,', 'egrammar.ra', 431)
2136
2033
  end
2137
2034
  .,.,
2138
2035
 
2139
- module_eval(<<'.,.,', 'egrammar.ra', 436)
2036
+ module_eval(<<'.,.,', 'egrammar.ra', 435)
2140
2037
  def _reduce_122(val, _values, result)
2141
2038
  result = Factory.VIRTUAL_QUERY(val[1]) ; loc result, val[0], val[2]
2142
2039
  result
2143
2040
  end
2144
2041
  .,.,
2145
2042
 
2146
- module_eval(<<'.,.,', 'egrammar.ra', 437)
2043
+ module_eval(<<'.,.,', 'egrammar.ra', 436)
2147
2044
  def _reduce_123(val, _values, result)
2148
2045
  result = Factory.EXPORTED_QUERY(val[1]) ; loc result, val[0], val[2]
2149
2046
  result
@@ -2154,21 +2051,21 @@ module_eval(<<'.,.,', 'egrammar.ra', 437)
2154
2051
 
2155
2052
  # reduce 125 omitted
2156
2053
 
2157
- module_eval(<<'.,.,', 'egrammar.ra', 446)
2054
+ module_eval(<<'.,.,', 'egrammar.ra', 445)
2158
2055
  def _reduce_126(val, _values, result)
2159
2056
  result = []
2160
2057
  result
2161
2058
  end
2162
2059
  .,.,
2163
2060
 
2164
- module_eval(<<'.,.,', 'egrammar.ra', 447)
2061
+ module_eval(<<'.,.,', 'egrammar.ra', 446)
2165
2062
  def _reduce_127(val, _values, result)
2166
2063
  result = [val[0]]
2167
2064
  result
2168
2065
  end
2169
2066
  .,.,
2170
2067
 
2171
- module_eval(<<'.,.,', 'egrammar.ra', 448)
2068
+ module_eval(<<'.,.,', 'egrammar.ra', 447)
2172
2069
  def _reduce_128(val, _values, result)
2173
2070
  result = val[0].push(val[2])
2174
2071
  result
@@ -2179,14 +2076,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 448)
2179
2076
 
2180
2077
  # reduce 130 omitted
2181
2078
 
2182
- # reduce 131 omitted
2183
-
2184
- # reduce 132 omitted
2185
-
2186
- # reduce 133 omitted
2187
-
2188
- module_eval(<<'.,.,', 'egrammar.ra', 467)
2189
- def _reduce_134(val, _values, result)
2079
+ module_eval(<<'.,.,', 'egrammar.ra', 463)
2080
+ def _reduce_131(val, _values, result)
2190
2081
  result = Factory.ATTRIBUTE_OP(val[0][:value], :'=>', val[2])
2191
2082
  loc result, val[0], val[2]
2192
2083
 
@@ -2194,8 +2085,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 467)
2194
2085
  end
2195
2086
  .,.,
2196
2087
 
2197
- module_eval(<<'.,.,', 'egrammar.ra', 471)
2198
- def _reduce_135(val, _values, result)
2088
+ module_eval(<<'.,.,', 'egrammar.ra', 467)
2089
+ def _reduce_132(val, _values, result)
2199
2090
  result = Factory.ATTRIBUTE_OP(val[0][:value], :'+>', val[2])
2200
2091
  loc result, val[0], val[2]
2201
2092
 
@@ -2203,16 +2094,16 @@ module_eval(<<'.,.,', 'egrammar.ra', 471)
2203
2094
  end
2204
2095
  .,.,
2205
2096
 
2206
- module_eval(<<'.,.,', 'egrammar.ra', 475)
2207
- def _reduce_136(val, _values, result)
2097
+ module_eval(<<'.,.,', 'egrammar.ra', 471)
2098
+ def _reduce_133(val, _values, result)
2208
2099
  result = Factory.ATTRIBUTES_OP(val[2]) ; loc result, val[0], val[2]
2209
2100
 
2210
2101
  result
2211
2102
  end
2212
2103
  .,.,
2213
2104
 
2214
- module_eval(<<'.,.,', 'egrammar.ra', 484)
2215
- def _reduce_137(val, _values, result)
2105
+ module_eval(<<'.,.,', 'egrammar.ra', 480)
2106
+ def _reduce_134(val, _values, result)
2216
2107
  result = add_definition(Factory.DEFINITION(classname(val[1][:value]), val[2], val[4]))
2217
2108
  loc result, val[0], val[5]
2218
2109
  # New lexer does not keep track of this, this is done in validation
@@ -2224,8 +2115,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 484)
2224
2115
  end
2225
2116
  .,.,
2226
2117
 
2227
- module_eval(<<'.,.,', 'egrammar.ra', 498)
2228
- def _reduce_138(val, _values, result)
2118
+ module_eval(<<'.,.,', 'egrammar.ra', 494)
2119
+ def _reduce_135(val, _values, result)
2229
2120
  # Remove this class' name from the namestack as all nested classes have been parsed
2230
2121
  namepop
2231
2122
  result = add_definition(Factory.HOSTCLASS(classname(val[1][:value]), val[2], token_text(val[3]), val[5]))
@@ -2235,32 +2126,32 @@ module_eval(<<'.,.,', 'egrammar.ra', 498)
2235
2126
  end
2236
2127
  .,.,
2237
2128
 
2238
- module_eval(<<'.,.,', 'egrammar.ra', 508)
2239
- def _reduce_139(val, _values, result)
2129
+ module_eval(<<'.,.,', 'egrammar.ra', 504)
2130
+ def _reduce_136(val, _values, result)
2240
2131
  namestack(val[0][:value]) ; result = val[0]
2241
2132
  result
2242
2133
  end
2243
2134
  .,.,
2244
2135
 
2245
- # reduce 140 omitted
2136
+ # reduce 137 omitted
2246
2137
 
2247
- # reduce 141 omitted
2138
+ # reduce 138 omitted
2248
2139
 
2249
- # reduce 142 omitted
2140
+ # reduce 139 omitted
2250
2141
 
2251
- module_eval(<<'.,.,', 'egrammar.ra', 517)
2252
- def _reduce_143(val, _values, result)
2142
+ module_eval(<<'.,.,', 'egrammar.ra', 513)
2143
+ def _reduce_140(val, _values, result)
2253
2144
  result = val[1]
2254
2145
  result
2255
2146
  end
2256
2147
  .,.,
2257
2148
 
2258
- # reduce 144 omitted
2149
+ # reduce 141 omitted
2259
2150
 
2260
- # reduce 145 omitted
2151
+ # reduce 142 omitted
2261
2152
 
2262
- module_eval(<<'.,.,', 'egrammar.ra', 534)
2263
- def _reduce_146(val, _values, result)
2153
+ module_eval(<<'.,.,', 'egrammar.ra', 530)
2154
+ def _reduce_143(val, _values, result)
2264
2155
  result = add_definition(Factory.NODE(val[1], val[3], val[5]))
2265
2156
  loc result, val[0], val[6]
2266
2157
 
@@ -2268,8 +2159,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 534)
2268
2159
  end
2269
2160
  .,.,
2270
2161
 
2271
- module_eval(<<'.,.,', 'egrammar.ra', 538)
2272
- def _reduce_147(val, _values, result)
2162
+ module_eval(<<'.,.,', 'egrammar.ra', 534)
2163
+ def _reduce_144(val, _values, result)
2273
2164
  result = add_definition(Factory.NODE(val[1], val[3], nil))
2274
2165
  loc result, val[0], val[5]
2275
2166
 
@@ -2277,509 +2168,478 @@ module_eval(<<'.,.,', 'egrammar.ra', 538)
2277
2168
  end
2278
2169
  .,.,
2279
2170
 
2280
- module_eval(<<'.,.,', 'egrammar.ra', 548)
2281
- def _reduce_148(val, _values, result)
2171
+ module_eval(<<'.,.,', 'egrammar.ra', 544)
2172
+ def _reduce_145(val, _values, result)
2282
2173
  result = [result]
2283
2174
  result
2284
2175
  end
2285
2176
  .,.,
2286
2177
 
2287
- module_eval(<<'.,.,', 'egrammar.ra', 549)
2288
- def _reduce_149(val, _values, result)
2178
+ module_eval(<<'.,.,', 'egrammar.ra', 545)
2179
+ def _reduce_146(val, _values, result)
2289
2180
  result = val[0].push(val[2])
2290
2181
  result
2291
2182
  end
2292
2183
  .,.,
2293
2184
 
2294
- # reduce 150 omitted
2185
+ # reduce 147 omitted
2295
2186
 
2296
- # reduce 151 omitted
2187
+ # reduce 148 omitted
2297
2188
 
2298
- module_eval(<<'.,.,', 'egrammar.ra', 556)
2299
- def _reduce_152(val, _values, result)
2189
+ module_eval(<<'.,.,', 'egrammar.ra', 552)
2190
+ def _reduce_149(val, _values, result)
2300
2191
  result = Factory.literal(:default); loc result, val[0]
2301
2192
  result
2302
2193
  end
2303
2194
  .,.,
2304
2195
 
2305
- # reduce 153 omitted
2196
+ # reduce 150 omitted
2306
2197
 
2307
- module_eval(<<'.,.,', 'egrammar.ra', 560)
2308
- def _reduce_154(val, _values, result)
2198
+ module_eval(<<'.,.,', 'egrammar.ra', 556)
2199
+ def _reduce_151(val, _values, result)
2309
2200
  result = Factory.literal(val[0][:value]); loc result, val[0]
2310
2201
  result
2311
2202
  end
2312
2203
  .,.,
2313
2204
 
2314
- module_eval(<<'.,.,', 'egrammar.ra', 561)
2315
- def _reduce_155(val, _values, result)
2205
+ module_eval(<<'.,.,', 'egrammar.ra', 557)
2206
+ def _reduce_152(val, _values, result)
2316
2207
  result = Factory.concat(val[0], '.', val[2][:value]); loc result, val[0], val[2]
2317
2208
  result
2318
2209
  end
2319
2210
  .,.,
2320
2211
 
2321
- # reduce 156 omitted
2212
+ # reduce 153 omitted
2322
2213
 
2323
- # reduce 157 omitted
2214
+ # reduce 154 omitted
2324
2215
 
2325
- # reduce 158 omitted
2216
+ # reduce 155 omitted
2326
2217
 
2327
- module_eval(<<'.,.,', 'egrammar.ra', 570)
2328
- def _reduce_159(val, _values, result)
2218
+ module_eval(<<'.,.,', 'egrammar.ra', 566)
2219
+ def _reduce_156(val, _values, result)
2329
2220
  result = val[1]
2330
2221
  result
2331
2222
  end
2332
2223
  .,.,
2333
2224
 
2334
- # reduce 160 omitted
2335
-
2336
- # reduce 161 omitted
2337
-
2338
- # reduce 162 omitted
2339
-
2340
- # reduce 163 omitted
2341
-
2342
- # reduce 164 omitted
2343
-
2344
- # reduce 165 omitted
2225
+ # reduce 157 omitted
2345
2226
 
2346
- module_eval(<<'.,.,', 'egrammar.ra', 592)
2347
- def _reduce_166(val, _values, result)
2227
+ module_eval(<<'.,.,', 'egrammar.ra', 583)
2228
+ def _reduce_158(val, _values, result)
2348
2229
  error val[0], "'class' is not a valid classname"
2349
2230
  result
2350
2231
  end
2351
2232
  .,.,
2352
2233
 
2353
- module_eval(<<'.,.,', 'egrammar.ra', 596)
2354
- def _reduce_167(val, _values, result)
2234
+ module_eval(<<'.,.,', 'egrammar.ra', 587)
2235
+ def _reduce_159(val, _values, result)
2355
2236
  result = []
2356
2237
  result
2357
2238
  end
2358
2239
  .,.,
2359
2240
 
2360
- module_eval(<<'.,.,', 'egrammar.ra', 597)
2361
- def _reduce_168(val, _values, result)
2241
+ module_eval(<<'.,.,', 'egrammar.ra', 588)
2242
+ def _reduce_160(val, _values, result)
2362
2243
  result = []
2363
2244
  result
2364
2245
  end
2365
2246
  .,.,
2366
2247
 
2367
- module_eval(<<'.,.,', 'egrammar.ra', 598)
2368
- def _reduce_169(val, _values, result)
2248
+ module_eval(<<'.,.,', 'egrammar.ra', 589)
2249
+ def _reduce_161(val, _values, result)
2369
2250
  result = val[1]
2370
2251
  result
2371
2252
  end
2372
2253
  .,.,
2373
2254
 
2374
- module_eval(<<'.,.,', 'egrammar.ra', 602)
2375
- def _reduce_170(val, _values, result)
2255
+ module_eval(<<'.,.,', 'egrammar.ra', 593)
2256
+ def _reduce_162(val, _values, result)
2376
2257
  result = [val[0]]
2377
2258
  result
2378
2259
  end
2379
2260
  .,.,
2380
2261
 
2381
- module_eval(<<'.,.,', 'egrammar.ra', 603)
2382
- def _reduce_171(val, _values, result)
2262
+ module_eval(<<'.,.,', 'egrammar.ra', 594)
2263
+ def _reduce_163(val, _values, result)
2383
2264
  result = val[0].push(val[2])
2384
2265
  result
2385
2266
  end
2386
2267
  .,.,
2387
2268
 
2388
- # reduce 172 omitted
2269
+ # reduce 164 omitted
2389
2270
 
2390
- # reduce 173 omitted
2271
+ # reduce 165 omitted
2391
2272
 
2392
- # reduce 174 omitted
2273
+ # reduce 166 omitted
2393
2274
 
2394
- # reduce 175 omitted
2275
+ # reduce 167 omitted
2395
2276
 
2396
- module_eval(<<'.,.,', 'egrammar.ra', 615)
2397
- def _reduce_176(val, _values, result)
2277
+ module_eval(<<'.,.,', 'egrammar.ra', 606)
2278
+ def _reduce_168(val, _values, result)
2398
2279
  result = Factory.PARAM(val[0][:value], val[2]) ; loc result, val[0]
2399
2280
  result
2400
2281
  end
2401
2282
  .,.,
2402
2283
 
2403
- module_eval(<<'.,.,', 'egrammar.ra', 616)
2404
- def _reduce_177(val, _values, result)
2284
+ module_eval(<<'.,.,', 'egrammar.ra', 607)
2285
+ def _reduce_169(val, _values, result)
2405
2286
  result = Factory.PARAM(val[0][:value]); loc result, val[0]
2406
2287
  result
2407
2288
  end
2408
2289
  .,.,
2409
2290
 
2410
- module_eval(<<'.,.,', 'egrammar.ra', 619)
2411
- def _reduce_178(val, _values, result)
2291
+ module_eval(<<'.,.,', 'egrammar.ra', 610)
2292
+ def _reduce_170(val, _values, result)
2412
2293
  result = val[1]; val[1].captures_rest()
2413
2294
  result
2414
2295
  end
2415
2296
  .,.,
2416
2297
 
2417
- module_eval(<<'.,.,', 'egrammar.ra', 622)
2418
- def _reduce_179(val, _values, result)
2298
+ module_eval(<<'.,.,', 'egrammar.ra', 613)
2299
+ def _reduce_171(val, _values, result)
2419
2300
  val[1].type_expr(val[0]) ; result = val[1]
2420
2301
  result
2421
2302
  end
2422
2303
  .,.,
2423
2304
 
2424
- module_eval(<<'.,.,', 'egrammar.ra', 625)
2425
- def _reduce_180(val, _values, result)
2305
+ module_eval(<<'.,.,', 'egrammar.ra', 616)
2306
+ def _reduce_172(val, _values, result)
2426
2307
  result = val[0]
2427
2308
  result
2428
2309
  end
2429
2310
  .,.,
2430
2311
 
2431
- module_eval(<<'.,.,', 'egrammar.ra', 626)
2432
- def _reduce_181(val, _values, result)
2312
+ module_eval(<<'.,.,', 'egrammar.ra', 617)
2313
+ def _reduce_173(val, _values, result)
2433
2314
  result = val[0][*val[2]] ; loc result, val[0], val[3]
2434
2315
  result
2435
2316
  end
2436
2317
  .,.,
2437
2318
 
2438
- module_eval(<<'.,.,', 'egrammar.ra', 631)
2439
- def _reduce_182(val, _values, result)
2319
+ module_eval(<<'.,.,', 'egrammar.ra', 622)
2320
+ def _reduce_174(val, _values, result)
2440
2321
  result = Factory.fqn(val[0][:value]).var ; loc result, val[0]
2441
2322
  result
2442
2323
  end
2443
2324
  .,.,
2444
2325
 
2445
- module_eval(<<'.,.,', 'egrammar.ra', 636)
2446
- def _reduce_183(val, _values, result)
2326
+ module_eval(<<'.,.,', 'egrammar.ra', 627)
2327
+ def _reduce_175(val, _values, result)
2447
2328
  result = Factory.RESERVED(val[0][:value]) ; loc result, val[0]
2448
2329
  result
2449
2330
  end
2450
2331
  .,.,
2451
2332
 
2452
- module_eval(<<'.,.,', 'egrammar.ra', 637)
2453
- def _reduce_184(val, _values, result)
2333
+ module_eval(<<'.,.,', 'egrammar.ra', 628)
2334
+ def _reduce_176(val, _values, result)
2454
2335
  result = Factory.RESERVED(val[0][:value]) ; loc result, val[0]
2455
2336
  result
2456
2337
  end
2457
2338
  .,.,
2458
2339
 
2459
- module_eval(<<'.,.,', 'egrammar.ra', 638)
2460
- def _reduce_185(val, _values, result)
2340
+ module_eval(<<'.,.,', 'egrammar.ra', 629)
2341
+ def _reduce_177(val, _values, result)
2461
2342
  result = Factory.RESERVED(val[0][:value]) ; loc result, val[0]
2462
2343
  result
2463
2344
  end
2464
2345
  .,.,
2465
2346
 
2466
- module_eval(<<'.,.,', 'egrammar.ra', 639)
2467
- def _reduce_186(val, _values, result)
2347
+ module_eval(<<'.,.,', 'egrammar.ra', 630)
2348
+ def _reduce_178(val, _values, result)
2468
2349
  result = Factory.RESERVED(val[0][:value]) ; loc result, val[0]
2469
2350
  result
2470
2351
  end
2471
2352
  .,.,
2472
2353
 
2473
- module_eval(<<'.,.,', 'egrammar.ra', 640)
2474
- def _reduce_187(val, _values, result)
2475
- result = Factory.RESERVED(val[0][:value], true) ; loc result, val[0]
2476
- result
2477
- end
2478
- .,.,
2479
-
2480
- module_eval(<<'.,.,', 'egrammar.ra', 641)
2481
- def _reduce_188(val, _values, result)
2482
- result = Factory.RESERVED(val[0][:value], true) ; loc result, val[0]
2483
- result
2484
- end
2485
- .,.,
2486
-
2487
- module_eval(<<'.,.,', 'egrammar.ra', 642)
2488
- def _reduce_189(val, _values, result)
2489
- result = Factory.RESERVED(val[0][:value], true) ; loc result, val[0]
2490
- result
2491
- end
2492
- .,.,
2493
-
2494
- module_eval(<<'.,.,', 'egrammar.ra', 648)
2495
- def _reduce_190(val, _values, result)
2354
+ module_eval(<<'.,.,', 'egrammar.ra', 636)
2355
+ def _reduce_179(val, _values, result)
2496
2356
  result = Factory.LIST(val[1]); loc result, val[0], val[3]
2497
2357
  result
2498
2358
  end
2499
2359
  .,.,
2500
2360
 
2501
- module_eval(<<'.,.,', 'egrammar.ra', 649)
2502
- def _reduce_191(val, _values, result)
2361
+ module_eval(<<'.,.,', 'egrammar.ra', 637)
2362
+ def _reduce_180(val, _values, result)
2503
2363
  result = Factory.literal([]) ; loc result, val[0], val[1]
2504
2364
  result
2505
2365
  end
2506
2366
  .,.,
2507
2367
 
2508
- module_eval(<<'.,.,', 'egrammar.ra', 650)
2509
- def _reduce_192(val, _values, result)
2368
+ module_eval(<<'.,.,', 'egrammar.ra', 638)
2369
+ def _reduce_181(val, _values, result)
2510
2370
  result = Factory.LIST(val[1]); loc result, val[0], val[3]
2511
2371
  result
2512
2372
  end
2513
2373
  .,.,
2514
2374
 
2515
- module_eval(<<'.,.,', 'egrammar.ra', 651)
2516
- def _reduce_193(val, _values, result)
2375
+ module_eval(<<'.,.,', 'egrammar.ra', 639)
2376
+ def _reduce_182(val, _values, result)
2517
2377
  result = Factory.literal([]) ; loc result, val[0], val[1]
2518
2378
  result
2519
2379
  end
2520
2380
  .,.,
2521
2381
 
2522
- module_eval(<<'.,.,', 'egrammar.ra', 654)
2523
- def _reduce_194(val, _values, result)
2382
+ module_eval(<<'.,.,', 'egrammar.ra', 642)
2383
+ def _reduce_183(val, _values, result)
2524
2384
  result = Factory.HASH(val[1]); loc result, val[0], val[2]
2525
2385
  result
2526
2386
  end
2527
2387
  .,.,
2528
2388
 
2529
- module_eval(<<'.,.,', 'egrammar.ra', 655)
2530
- def _reduce_195(val, _values, result)
2389
+ module_eval(<<'.,.,', 'egrammar.ra', 643)
2390
+ def _reduce_184(val, _values, result)
2531
2391
  result = Factory.HASH(val[1]); loc result, val[0], val[3]
2532
2392
  result
2533
2393
  end
2534
2394
  .,.,
2535
2395
 
2536
- module_eval(<<'.,.,', 'egrammar.ra', 656)
2537
- def _reduce_196(val, _values, result)
2396
+ module_eval(<<'.,.,', 'egrammar.ra', 644)
2397
+ def _reduce_185(val, _values, result)
2538
2398
  result = Factory.literal({}) ; loc result, val[0], val[1]
2539
2399
  result
2540
2400
  end
2541
2401
  .,.,
2542
2402
 
2543
- module_eval(<<'.,.,', 'egrammar.ra', 659)
2544
- def _reduce_197(val, _values, result)
2403
+ module_eval(<<'.,.,', 'egrammar.ra', 647)
2404
+ def _reduce_186(val, _values, result)
2545
2405
  result = [val[0]]
2546
2406
  result
2547
2407
  end
2548
2408
  .,.,
2549
2409
 
2550
- module_eval(<<'.,.,', 'egrammar.ra', 660)
2551
- def _reduce_198(val, _values, result)
2410
+ module_eval(<<'.,.,', 'egrammar.ra', 648)
2411
+ def _reduce_187(val, _values, result)
2552
2412
  result = val[0].push val[2]
2553
2413
  result
2554
2414
  end
2555
2415
  .,.,
2556
2416
 
2557
- module_eval(<<'.,.,', 'egrammar.ra', 663)
2558
- def _reduce_199(val, _values, result)
2417
+ module_eval(<<'.,.,', 'egrammar.ra', 651)
2418
+ def _reduce_188(val, _values, result)
2559
2419
  result = Factory.KEY_ENTRY(val[0], val[2]); loc result, val[1]
2560
2420
  result
2561
2421
  end
2562
2422
  .,.,
2563
2423
 
2564
- # reduce 200 omitted
2424
+ # reduce 189 omitted
2565
2425
 
2566
- # reduce 201 omitted
2426
+ # reduce 190 omitted
2567
2427
 
2568
- # reduce 202 omitted
2428
+ # reduce 191 omitted
2569
2429
 
2570
- module_eval(<<'.,.,', 'egrammar.ra', 671)
2571
- def _reduce_203(val, _values, result)
2430
+ module_eval(<<'.,.,', 'egrammar.ra', 659)
2431
+ def _reduce_192(val, _values, result)
2572
2432
  result = Factory.literal(val[0][:value]) ; loc result, val[0]
2573
2433
  result
2574
2434
  end
2575
2435
  .,.,
2576
2436
 
2577
- module_eval(<<'.,.,', 'egrammar.ra', 672)
2578
- def _reduce_204(val, _values, result)
2437
+ module_eval(<<'.,.,', 'egrammar.ra', 660)
2438
+ def _reduce_193(val, _values, result)
2579
2439
  result = Factory.literal(val[0][:value]) ; loc result, val[0]
2580
2440
  result
2581
2441
  end
2582
2442
  .,.,
2583
2443
 
2584
- module_eval(<<'.,.,', 'egrammar.ra', 674)
2585
- def _reduce_205(val, _values, result)
2444
+ module_eval(<<'.,.,', 'egrammar.ra', 662)
2445
+ def _reduce_194(val, _values, result)
2586
2446
  result = Factory.string(val[0], *val[1]) ; loc result, val[0], val[1][-1]
2587
2447
  result
2588
2448
  end
2589
2449
  .,.,
2590
2450
 
2591
- module_eval(<<'.,.,', 'egrammar.ra', 675)
2592
- def _reduce_206(val, _values, result)
2451
+ module_eval(<<'.,.,', 'egrammar.ra', 663)
2452
+ def _reduce_195(val, _values, result)
2593
2453
  result = Factory.literal(val[0][:value]); loc result, val[0]
2594
2454
  result
2595
2455
  end
2596
2456
  .,.,
2597
2457
 
2598
- module_eval(<<'.,.,', 'egrammar.ra', 676)
2599
- def _reduce_207(val, _values, result)
2458
+ module_eval(<<'.,.,', 'egrammar.ra', 664)
2459
+ def _reduce_196(val, _values, result)
2600
2460
  result = Factory.literal(val[0][:value]); loc result, val[0]
2601
2461
  result
2602
2462
  end
2603
2463
  .,.,
2604
2464
 
2605
- module_eval(<<'.,.,', 'egrammar.ra', 677)
2606
- def _reduce_208(val, _values, result)
2465
+ module_eval(<<'.,.,', 'egrammar.ra', 665)
2466
+ def _reduce_197(val, _values, result)
2607
2467
  result = Factory.literal(val[0][:value]); loc result, val[0]
2608
2468
  result
2609
2469
  end
2610
2470
  .,.,
2611
2471
 
2612
- module_eval(<<'.,.,', 'egrammar.ra', 678)
2613
- def _reduce_209(val, _values, result)
2472
+ module_eval(<<'.,.,', 'egrammar.ra', 666)
2473
+ def _reduce_198(val, _values, result)
2614
2474
  result = [val[0]] + val[1]
2615
2475
  result
2616
2476
  end
2617
2477
  .,.,
2618
2478
 
2619
- module_eval(<<'.,.,', 'egrammar.ra', 679)
2620
- def _reduce_210(val, _values, result)
2479
+ module_eval(<<'.,.,', 'egrammar.ra', 667)
2480
+ def _reduce_199(val, _values, result)
2621
2481
  result = Factory.TEXT(val[0])
2622
2482
  result
2623
2483
  end
2624
2484
  .,.,
2625
2485
 
2626
- module_eval(<<'.,.,', 'egrammar.ra', 682)
2627
- def _reduce_211(val, _values, result)
2486
+ module_eval(<<'.,.,', 'egrammar.ra', 670)
2487
+ def _reduce_200(val, _values, result)
2628
2488
  result = [val[0]]
2629
2489
  result
2630
2490
  end
2631
2491
  .,.,
2632
2492
 
2633
- module_eval(<<'.,.,', 'egrammar.ra', 683)
2634
- def _reduce_212(val, _values, result)
2493
+ module_eval(<<'.,.,', 'egrammar.ra', 671)
2494
+ def _reduce_201(val, _values, result)
2635
2495
  result = [val[0]] + val[1]
2636
2496
  result
2637
2497
  end
2638
2498
  .,.,
2639
2499
 
2640
- module_eval(<<'.,.,', 'egrammar.ra', 686)
2641
- def _reduce_213(val, _values, result)
2500
+ module_eval(<<'.,.,', 'egrammar.ra', 674)
2501
+ def _reduce_202(val, _values, result)
2642
2502
  result = Factory.HEREDOC(val[0][:value], val[1]); loc result, val[0]
2643
2503
  result
2644
2504
  end
2645
2505
  .,.,
2646
2506
 
2647
- module_eval(<<'.,.,', 'egrammar.ra', 689)
2648
- def _reduce_214(val, _values, result)
2507
+ module_eval(<<'.,.,', 'egrammar.ra', 677)
2508
+ def _reduce_203(val, _values, result)
2649
2509
  result = Factory.SUBLOCATE(val[0], val[1]); loc result, val[0]
2650
2510
  result
2651
2511
  end
2652
2512
  .,.,
2653
2513
 
2654
- module_eval(<<'.,.,', 'egrammar.ra', 690)
2655
- def _reduce_215(val, _values, result)
2514
+ module_eval(<<'.,.,', 'egrammar.ra', 678)
2515
+ def _reduce_204(val, _values, result)
2656
2516
  result = Factory.SUBLOCATE(val[0], val[1]); loc result, val[0]
2657
2517
  result
2658
2518
  end
2659
2519
  .,.,
2660
2520
 
2661
- module_eval(<<'.,.,', 'egrammar.ra', 693)
2662
- def _reduce_216(val, _values, result)
2521
+ module_eval(<<'.,.,', 'egrammar.ra', 681)
2522
+ def _reduce_205(val, _values, result)
2663
2523
  result = Factory.EPP(val[1], val[2]); loc result, val[0]
2664
2524
  result
2665
2525
  end
2666
2526
  .,.,
2667
2527
 
2668
- # reduce 217 omitted
2528
+ # reduce 206 omitted
2669
2529
 
2670
- # reduce 218 omitted
2530
+ # reduce 207 omitted
2671
2531
 
2672
- module_eval(<<'.,.,', 'egrammar.ra', 700)
2673
- def _reduce_219(val, _values, result)
2532
+ module_eval(<<'.,.,', 'egrammar.ra', 688)
2533
+ def _reduce_208(val, _values, result)
2674
2534
  result = nil
2675
2535
  result
2676
2536
  end
2677
2537
  .,.,
2678
2538
 
2679
- module_eval(<<'.,.,', 'egrammar.ra', 701)
2680
- def _reduce_220(val, _values, result)
2539
+ module_eval(<<'.,.,', 'egrammar.ra', 689)
2540
+ def _reduce_209(val, _values, result)
2681
2541
  result = []
2682
2542
  result
2683
2543
  end
2684
2544
  .,.,
2685
2545
 
2686
- module_eval(<<'.,.,', 'egrammar.ra', 702)
2687
- def _reduce_221(val, _values, result)
2546
+ module_eval(<<'.,.,', 'egrammar.ra', 690)
2547
+ def _reduce_210(val, _values, result)
2688
2548
  result = val[1]
2689
2549
  result
2690
2550
  end
2691
2551
  .,.,
2692
2552
 
2693
- module_eval(<<'.,.,', 'egrammar.ra', 705)
2694
- def _reduce_222(val, _values, result)
2553
+ module_eval(<<'.,.,', 'egrammar.ra', 693)
2554
+ def _reduce_211(val, _values, result)
2695
2555
  result = Factory.RENDER_STRING(val[0][:value]); loc result, val[0]
2696
2556
  result
2697
2557
  end
2698
2558
  .,.,
2699
2559
 
2700
- module_eval(<<'.,.,', 'egrammar.ra', 706)
2701
- def _reduce_223(val, _values, result)
2560
+ module_eval(<<'.,.,', 'egrammar.ra', 694)
2561
+ def _reduce_212(val, _values, result)
2702
2562
  result = Factory.RENDER_EXPR(val[1]); loc result, val[0], val[2]
2703
2563
  result
2704
2564
  end
2705
2565
  .,.,
2706
2566
 
2707
- module_eval(<<'.,.,', 'egrammar.ra', 707)
2708
- def _reduce_224(val, _values, result)
2567
+ module_eval(<<'.,.,', 'egrammar.ra', 695)
2568
+ def _reduce_213(val, _values, result)
2709
2569
  result = Factory.RENDER_EXPR(Factory.block_or_expression(*val[2])); loc result, val[0], val[4]
2710
2570
  result
2711
2571
  end
2712
2572
  .,.,
2713
2573
 
2714
- # reduce 225 omitted
2574
+ # reduce 214 omitted
2715
2575
 
2716
- # reduce 226 omitted
2576
+ # reduce 215 omitted
2717
2577
 
2718
- module_eval(<<'.,.,', 'egrammar.ra', 713)
2719
- def _reduce_227(val, _values, result)
2578
+ module_eval(<<'.,.,', 'egrammar.ra', 701)
2579
+ def _reduce_216(val, _values, result)
2720
2580
  result = Factory.QREF(val[0][:value]) ; loc result, val[0]
2721
2581
  result
2722
2582
  end
2723
2583
  .,.,
2724
2584
 
2725
- module_eval(<<'.,.,', 'egrammar.ra', 716)
2726
- def _reduce_228(val, _values, result)
2585
+ module_eval(<<'.,.,', 'egrammar.ra', 704)
2586
+ def _reduce_217(val, _values, result)
2727
2587
  result = Factory.literal(val[0][:value]); loc result, val[0]
2728
2588
  result
2729
2589
  end
2730
2590
  .,.,
2731
2591
 
2732
- # reduce 229 omitted
2592
+ # reduce 218 omitted
2733
2593
 
2734
- module_eval(<<'.,.,', 'egrammar.ra', 722)
2735
- def _reduce_230(val, _values, result)
2594
+ module_eval(<<'.,.,', 'egrammar.ra', 710)
2595
+ def _reduce_219(val, _values, result)
2736
2596
  result = nil
2737
2597
  result
2738
2598
  end
2739
2599
  .,.,
2740
2600
 
2741
- # reduce 231 omitted
2601
+ # reduce 220 omitted
2742
2602
 
2743
- # reduce 232 omitted
2603
+ # reduce 221 omitted
2744
2604
 
2745
- # reduce 233 omitted
2605
+ # reduce 222 omitted
2746
2606
 
2747
- # reduce 234 omitted
2607
+ # reduce 223 omitted
2748
2608
 
2749
- # reduce 235 omitted
2609
+ # reduce 224 omitted
2750
2610
 
2751
- # reduce 236 omitted
2611
+ # reduce 225 omitted
2752
2612
 
2753
- # reduce 237 omitted
2613
+ # reduce 226 omitted
2754
2614
 
2755
- # reduce 238 omitted
2615
+ # reduce 227 omitted
2756
2616
 
2757
- # reduce 239 omitted
2617
+ # reduce 228 omitted
2758
2618
 
2759
- # reduce 240 omitted
2619
+ # reduce 229 omitted
2760
2620
 
2761
- # reduce 241 omitted
2621
+ # reduce 230 omitted
2762
2622
 
2763
- # reduce 242 omitted
2623
+ # reduce 231 omitted
2764
2624
 
2765
- # reduce 243 omitted
2625
+ # reduce 232 omitted
2766
2626
 
2767
- # reduce 244 omitted
2627
+ # reduce 233 omitted
2768
2628
 
2769
- # reduce 245 omitted
2629
+ # reduce 234 omitted
2770
2630
 
2771
- # reduce 246 omitted
2631
+ # reduce 235 omitted
2772
2632
 
2773
- # reduce 247 omitted
2633
+ # reduce 236 omitted
2774
2634
 
2775
- # reduce 248 omitted
2635
+ # reduce 237 omitted
2776
2636
 
2777
- # reduce 249 omitted
2637
+ # reduce 238 omitted
2778
2638
 
2779
- # reduce 250 omitted
2639
+ # reduce 239 omitted
2780
2640
 
2781
- module_eval(<<'.,.,', 'egrammar.ra', 749)
2782
- def _reduce_251(val, _values, result)
2641
+ module_eval(<<'.,.,', 'egrammar.ra', 737)
2642
+ def _reduce_240(val, _values, result)
2783
2643
  result = nil
2784
2644
  result
2785
2645
  end