adlint 2.6.14 → 3.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (401) hide show
  1. data/AUTHORS +1 -3
  2. data/ChangeLog +511 -0
  3. data/INSTALL +1 -1
  4. data/MANIFEST +57 -37
  5. data/NEWS +36 -7
  6. data/README +2 -2
  7. data/Rakefile +6 -6
  8. data/TODO +1 -1
  9. data/bin/adlint +25 -16
  10. data/bin/adlint_chk +22 -12
  11. data/bin/adlint_cma +17 -12
  12. data/bin/adlint_sma +22 -12
  13. data/bin/adlintize +98 -17
  14. data/etc/conf.d/fallback/cinit.erb +1 -1
  15. data/etc/conf.d/fallback/traits.erb +37 -37
  16. data/etc/conf.d/i686-cygwin/cinit-gcc_4.3.4.erb +1 -1
  17. data/etc/conf.d/i686-cygwin/traits-gcc_4.3.4.erb +41 -41
  18. data/etc/conf.d/i686-devkit/cinit-gcc_4.5.2.erb +1 -1
  19. data/etc/conf.d/i686-devkit/traits-gcc_4.5.2.erb +40 -40
  20. data/etc/conf.d/i686-linux/cinit-gcc_4.5.1.erb +1 -1
  21. data/etc/conf.d/i686-linux/traits-gcc_4.5.1.erb +40 -40
  22. data/etc/conf.d/i686-mingw/cinit-gcc_4.6.1.erb +1 -1
  23. data/etc/conf.d/i686-mingw/traits-gcc_4.6.1.erb +40 -40
  24. data/etc/conf.d/noarch/GNUmakefile.erb +1 -1
  25. data/etc/conf.d/noarch/adlint_all_bat.erb +1 -1
  26. data/etc/conf.d/noarch/adlint_all_sh.erb +1 -1
  27. data/etc/conf.d/noarch/pinit.erb +1 -1
  28. data/etc/conf.d/x86_64-ubuntu_12.04/cinit-gcc_4.6.3.erb +1 -1
  29. data/etc/conf.d/x86_64-ubuntu_12.04/traits-gcc_4.6.3.erb +42 -42
  30. data/etc/mesg.d/c_builtin/en_US/messages.yml +33 -33
  31. data/etc/mesg.d/c_builtin/ja_JP/messages.yml +5 -5
  32. data/etc/mesg.d/core/en_US/messages.yml +2 -2
  33. data/etc/mesg.d/core/ja_JP/messages.yml +2 -2
  34. data/features/code_check/W0018.feature +197 -0
  35. data/features/code_check/W0019.feature +79 -0
  36. data/features/code_check/W0021.feature +81 -0
  37. data/features/code_check/W0023.feature +203 -0
  38. data/features/code_check/W0024.feature +226 -0
  39. data/features/code_check/W0025.feature +5 -0
  40. data/features/code_check/W0088.feature +2 -2
  41. data/features/code_check/W0109.feature +2 -2
  42. data/features/code_check/W0477.feature +0 -3
  43. data/features/code_check/W0478.feature +0 -1
  44. data/features/code_check/W0582.feature +3 -3
  45. data/features/code_check/W0583.feature +4 -7
  46. data/features/code_check/W0646.feature +0 -1
  47. data/features/code_check/W0695.feature +0 -1
  48. data/features/code_check/W0705.feature +8 -0
  49. data/features/code_check/W0723.feature +0 -1
  50. data/features/code_check/W0745.feature +1 -0
  51. data/features/code_check/W0781.feature +1 -0
  52. data/features/code_check/W1057.feature +141 -0
  53. data/features/code_check/W1058.feature +93 -0
  54. data/features/code_check/W1059.feature +86 -0
  55. data/features/code_check/W1060.feature +77 -0
  56. data/features/code_check/W1061.feature +143 -0
  57. data/features/code_check/W1062.feature +162 -0
  58. data/features/code_check/W1063.feature +123 -0
  59. data/features/code_check/W1064.feature +83 -0
  60. data/features/code_check/W1065.feature +82 -0
  61. data/features/code_check/W9003.feature +2 -0
  62. data/features/step_definitions/code_check_steps.rb +1 -0
  63. data/features/support/env.rb +16 -13
  64. data/lib/adlint.rb +7 -4
  65. data/lib/adlint/analyzer.rb +131 -157
  66. data/lib/adlint/annot.rb +149 -0
  67. data/lib/adlint/cc1.rb +57 -0
  68. data/lib/adlint/{c → cc1}/branch.rb +74 -62
  69. data/lib/adlint/{c → cc1}/builtin.rb +21 -21
  70. data/lib/adlint/{c → cc1}/const.rb +119 -117
  71. data/lib/adlint/{c → cc1}/conv.rb +76 -78
  72. data/lib/adlint/{c → cc1}/ctrlexpr.rb +69 -86
  73. data/lib/adlint/cc1/domain.rb +8103 -0
  74. data/lib/adlint/{c → cc1}/enum.rb +3 -3
  75. data/lib/adlint/{c → cc1}/environ.rb +21 -21
  76. data/lib/adlint/{c → cc1}/expr.rb +232 -218
  77. data/lib/adlint/{c → cc1}/format.rb +305 -342
  78. data/lib/adlint/{c → cc1}/interp.rb +269 -220
  79. data/lib/adlint/cc1/lexer.rb +246 -0
  80. data/lib/adlint/{c → cc1}/mediator.rb +78 -84
  81. data/lib/adlint/{c → cc1}/object.rb +261 -264
  82. data/lib/adlint/{c → cc1}/operator.rb +7 -7
  83. data/lib/adlint/{c → cc1}/option.rb +4 -3
  84. data/lib/adlint/{c → cc1}/parser.rb +274 -506
  85. data/lib/adlint/{c → cc1}/parser.y +69 -301
  86. data/lib/adlint/cc1/phase.rb +138 -0
  87. data/lib/adlint/{c → cc1}/resolver.rb +66 -78
  88. data/lib/adlint/{c → cc1}/scanner.rb +57 -49
  89. data/lib/adlint/{c → cc1}/scope.rb +3 -3
  90. data/lib/adlint/{c → cc1}/seqp.rb +13 -5
  91. data/lib/adlint/{c → cc1}/syntax.rb +819 -1122
  92. data/lib/adlint/{c → cc1}/type.rb +1498 -1479
  93. data/lib/adlint/{c → cc1}/util.rb +20 -12
  94. data/lib/adlint/{c → cc1}/value.rb +699 -642
  95. data/lib/adlint/code.rb +163 -164
  96. data/lib/adlint/cpp.rb +2 -2
  97. data/lib/adlint/cpp/asm.rb +13 -14
  98. data/lib/adlint/cpp/constexpr.rb +42 -38
  99. data/lib/adlint/cpp/constexpr.y +44 -40
  100. data/lib/adlint/cpp/eval.rb +435 -435
  101. data/lib/adlint/cpp/lexer.rb +343 -340
  102. data/lib/adlint/cpp/macro.rb +188 -190
  103. data/lib/adlint/cpp/phase.rb +66 -45
  104. data/lib/adlint/cpp/scanner.rb +14 -17
  105. data/lib/adlint/cpp/source.rb +49 -55
  106. data/lib/adlint/cpp/subst.rb +65 -65
  107. data/lib/adlint/cpp/syntax.rb +155 -275
  108. data/lib/adlint/cpp/util.rb +22 -19
  109. data/lib/adlint/driver.rb +86 -93
  110. data/lib/adlint/error.rb +33 -52
  111. data/lib/adlint/exam.rb +158 -24
  112. data/lib/adlint/exam/c_builtin.rb +7 -7
  113. data/lib/adlint/exam/c_builtin/cc1_check.rb +20522 -0
  114. data/lib/adlint/exam/c_builtin/cc1_check_shima.rb +957 -0
  115. data/lib/adlint/exam/c_builtin/cc1_code.rb +459 -0
  116. data/lib/adlint/exam/c_builtin/cc1_metric.rb +794 -0
  117. data/lib/adlint/exam/c_builtin/cpp_check.rb +486 -441
  118. data/lib/adlint/exam/c_builtin/cpp_check_shima.rb +36 -39
  119. data/lib/adlint/exam/c_builtin/cpp_code.rb +63 -65
  120. data/lib/adlint/exam/c_builtin/ld_check.rb +136 -129
  121. data/lib/adlint/exam/c_builtin/ld_metric.rb +11 -11
  122. data/lib/adlint/lang.rb +25 -25
  123. data/lib/adlint/ld.rb +2 -2
  124. data/lib/adlint/ld/object.rb +220 -188
  125. data/lib/adlint/ld/phase.rb +94 -63
  126. data/lib/adlint/ld/typedef.rb +22 -11
  127. data/lib/adlint/ld/util.rb +43 -35
  128. data/lib/adlint/lexer.rb +59 -56
  129. data/lib/adlint/location.rb +140 -0
  130. data/lib/adlint/memo.rb +157 -0
  131. data/lib/adlint/message.rb +207 -156
  132. data/lib/adlint/metric.rb +139 -217
  133. data/lib/adlint/monitor.rb +45 -43
  134. data/lib/adlint/phase.rb +56 -29
  135. data/lib/adlint/prelude.rb +66 -54
  136. data/lib/adlint/report.rb +253 -332
  137. data/lib/adlint/source.rb +26 -27
  138. data/lib/adlint/supp.rb +131 -0
  139. data/lib/adlint/symbol.rb +14 -16
  140. data/lib/adlint/token.rb +19 -91
  141. data/lib/adlint/traits.rb +242 -226
  142. data/lib/adlint/util.rb +116 -205
  143. data/lib/adlint/version.rb +8 -8
  144. data/share/HEADER +2 -2
  145. data/share/doc/developers_guide_ja.html +148 -19
  146. data/share/doc/developers_guide_ja.texi +141 -11
  147. data/share/doc/samples/GNUmakefile +1 -1
  148. data/share/doc/samples/adlint_traits.yml +45 -36
  149. data/share/doc/users_guide_en.html +1321 -1252
  150. data/share/doc/users_guide_en.texi +475 -408
  151. data/share/doc/users_guide_ja.html +1932 -1878
  152. data/share/doc/users_guide_ja.texi +324 -273
  153. data/share/sample/bison-2.5/adlint/GNUmakefile +5 -1
  154. data/share/sample/bison-2.5/adlint/adlint_traits.yml +38 -38
  155. data/share/sample/bison-2.5/adlint/lib/GNUmakefile +1 -1
  156. data/share/sample/bison-2.5/adlint/lib/adlint_cinit.h +1 -1
  157. data/share/sample/bison-2.5/adlint/lib/adlint_pinit.h +1 -1
  158. data/share/sample/bison-2.5/adlint/lib/adlint_traits.yml +50 -42
  159. data/share/sample/bison-2.5/adlint/src/GNUmakefile +1 -1
  160. data/share/sample/bison-2.5/adlint/src/adlint_cinit.h +1 -1
  161. data/share/sample/bison-2.5/adlint/src/adlint_pinit.h +1 -1
  162. data/share/sample/bison-2.5/adlint/src/adlint_traits.yml +50 -42
  163. data/share/sample/ctags-5.8/adlint/GNUmakefile +1 -1
  164. data/share/sample/ctags-5.8/adlint/adlint_cinit.h +1 -1
  165. data/share/sample/ctags-5.8/adlint/adlint_pinit.h +1 -1
  166. data/share/sample/ctags-5.8/adlint/adlint_traits.yml +50 -42
  167. data/share/sample/flex-2.5.35/adlint/GNUmakefile +1 -1
  168. data/share/sample/flex-2.5.35/adlint/adlint_cinit.h +1 -1
  169. data/share/sample/flex-2.5.35/adlint/adlint_pinit.h +1 -1
  170. data/share/sample/flex-2.5.35/adlint/adlint_traits.yml +50 -42
  171. data/share/sample/ruby-1.9.3-p0/adlint/GNUmakefile +1 -1
  172. data/share/sample/ruby-1.9.3-p0/adlint/adlint_traits.yml +46 -38
  173. data/share/sample/ruby-1.9.3-p0/adlint/core/GNUmakefile +1 -1
  174. data/share/sample/ruby-1.9.3-p0/adlint/core/adlint_cinit.h +1 -1
  175. data/share/sample/ruby-1.9.3-p0/adlint/core/adlint_pinit.h +1 -1
  176. data/share/sample/ruby-1.9.3-p0/adlint/core/adlint_traits.yml +50 -42
  177. data/share/sample/ruby-1.9.3-p0/adlint/enc-trans/GNUmakefile +1 -1
  178. data/share/sample/ruby-1.9.3-p0/adlint/enc-trans/adlint_cinit.h +1 -1
  179. data/share/sample/ruby-1.9.3-p0/adlint/enc-trans/adlint_pinit.h +1 -1
  180. data/share/sample/ruby-1.9.3-p0/adlint/enc-trans/adlint_traits.yml +50 -42
  181. data/share/sample/ruby-1.9.3-p0/adlint/enc/GNUmakefile +1 -1
  182. data/share/sample/ruby-1.9.3-p0/adlint/enc/adlint_cinit.h +1 -1
  183. data/share/sample/ruby-1.9.3-p0/adlint/enc/adlint_pinit.h +1 -1
  184. data/share/sample/ruby-1.9.3-p0/adlint/enc/adlint_traits.yml +50 -42
  185. data/share/sample/ruby-1.9.3-p0/adlint/ext-bigdecimal/GNUmakefile +1 -1
  186. data/share/sample/ruby-1.9.3-p0/adlint/ext-bigdecimal/adlint_cinit.h +1 -1
  187. data/share/sample/ruby-1.9.3-p0/adlint/ext-bigdecimal/adlint_pinit.h +1 -1
  188. data/share/sample/ruby-1.9.3-p0/adlint/ext-bigdecimal/adlint_traits.yml +50 -42
  189. data/share/sample/ruby-1.9.3-p0/adlint/ext-continuation/GNUmakefile +1 -1
  190. data/share/sample/ruby-1.9.3-p0/adlint/ext-continuation/adlint_cinit.h +1 -1
  191. data/share/sample/ruby-1.9.3-p0/adlint/ext-continuation/adlint_pinit.h +1 -1
  192. data/share/sample/ruby-1.9.3-p0/adlint/ext-continuation/adlint_traits.yml +50 -42
  193. data/share/sample/ruby-1.9.3-p0/adlint/ext-coverage/GNUmakefile +1 -1
  194. data/share/sample/ruby-1.9.3-p0/adlint/ext-coverage/adlint_cinit.h +1 -1
  195. data/share/sample/ruby-1.9.3-p0/adlint/ext-coverage/adlint_pinit.h +1 -1
  196. data/share/sample/ruby-1.9.3-p0/adlint/ext-coverage/adlint_traits.yml +50 -42
  197. data/share/sample/ruby-1.9.3-p0/adlint/ext-curses/GNUmakefile +1 -1
  198. data/share/sample/ruby-1.9.3-p0/adlint/ext-curses/adlint_cinit.h +1 -1
  199. data/share/sample/ruby-1.9.3-p0/adlint/ext-curses/adlint_pinit.h +1 -1
  200. data/share/sample/ruby-1.9.3-p0/adlint/ext-curses/adlint_traits.yml +50 -42
  201. data/share/sample/ruby-1.9.3-p0/adlint/ext-date/GNUmakefile +1 -1
  202. data/share/sample/ruby-1.9.3-p0/adlint/ext-date/adlint_cinit.h +1 -1
  203. data/share/sample/ruby-1.9.3-p0/adlint/ext-date/adlint_pinit.h +1 -1
  204. data/share/sample/ruby-1.9.3-p0/adlint/ext-date/adlint_traits.yml +50 -42
  205. data/share/sample/ruby-1.9.3-p0/adlint/ext-dbm/GNUmakefile +1 -1
  206. data/share/sample/ruby-1.9.3-p0/adlint/ext-dbm/adlint_cinit.h +1 -1
  207. data/share/sample/ruby-1.9.3-p0/adlint/ext-dbm/adlint_pinit.h +1 -1
  208. data/share/sample/ruby-1.9.3-p0/adlint/ext-dbm/adlint_traits.yml +50 -42
  209. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-bubblebabble/GNUmakefile +1 -1
  210. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-bubblebabble/adlint_cinit.h +1 -1
  211. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-bubblebabble/adlint_pinit.h +1 -1
  212. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-bubblebabble/adlint_traits.yml +50 -42
  213. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-md5/GNUmakefile +1 -1
  214. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-md5/adlint_cinit.h +1 -1
  215. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-md5/adlint_pinit.h +1 -1
  216. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-md5/adlint_traits.yml +50 -42
  217. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-rmd160/GNUmakefile +1 -1
  218. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-rmd160/adlint_cinit.h +1 -1
  219. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-rmd160/adlint_pinit.h +1 -1
  220. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-rmd160/adlint_traits.yml +50 -42
  221. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-sha1/GNUmakefile +1 -1
  222. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-sha1/adlint_cinit.h +1 -1
  223. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-sha1/adlint_pinit.h +1 -1
  224. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-sha1/adlint_traits.yml +50 -42
  225. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-sha2/GNUmakefile +1 -1
  226. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-sha2/adlint_cinit.h +1 -1
  227. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-sha2/adlint_pinit.h +1 -1
  228. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest-sha2/adlint_traits.yml +50 -42
  229. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest/GNUmakefile +1 -1
  230. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest/adlint_cinit.h +1 -1
  231. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest/adlint_pinit.h +1 -1
  232. data/share/sample/ruby-1.9.3-p0/adlint/ext-digest/adlint_traits.yml +50 -42
  233. data/share/sample/ruby-1.9.3-p0/adlint/ext-dl-callback/GNUmakefile +1 -1
  234. data/share/sample/ruby-1.9.3-p0/adlint/ext-dl-callback/adlint_cinit.h +1 -1
  235. data/share/sample/ruby-1.9.3-p0/adlint/ext-dl-callback/adlint_pinit.h +1 -1
  236. data/share/sample/ruby-1.9.3-p0/adlint/ext-dl-callback/adlint_traits.yml +50 -42
  237. data/share/sample/ruby-1.9.3-p0/adlint/ext-dl/GNUmakefile +1 -1
  238. data/share/sample/ruby-1.9.3-p0/adlint/ext-dl/adlint_cinit.h +1 -1
  239. data/share/sample/ruby-1.9.3-p0/adlint/ext-dl/adlint_pinit.h +1 -1
  240. data/share/sample/ruby-1.9.3-p0/adlint/ext-dl/adlint_traits.yml +50 -42
  241. data/share/sample/ruby-1.9.3-p0/adlint/ext-etc/GNUmakefile +1 -1
  242. data/share/sample/ruby-1.9.3-p0/adlint/ext-etc/adlint_cinit.h +1 -1
  243. data/share/sample/ruby-1.9.3-p0/adlint/ext-etc/adlint_pinit.h +1 -1
  244. data/share/sample/ruby-1.9.3-p0/adlint/ext-etc/adlint_traits.yml +50 -42
  245. data/share/sample/ruby-1.9.3-p0/adlint/ext-fcntl/GNUmakefile +1 -1
  246. data/share/sample/ruby-1.9.3-p0/adlint/ext-fcntl/adlint_cinit.h +1 -1
  247. data/share/sample/ruby-1.9.3-p0/adlint/ext-fcntl/adlint_pinit.h +1 -1
  248. data/share/sample/ruby-1.9.3-p0/adlint/ext-fcntl/adlint_traits.yml +50 -42
  249. data/share/sample/ruby-1.9.3-p0/adlint/ext-fiber/GNUmakefile +1 -1
  250. data/share/sample/ruby-1.9.3-p0/adlint/ext-fiber/adlint_cinit.h +1 -1
  251. data/share/sample/ruby-1.9.3-p0/adlint/ext-fiber/adlint_pinit.h +1 -1
  252. data/share/sample/ruby-1.9.3-p0/adlint/ext-fiber/adlint_traits.yml +50 -42
  253. data/share/sample/ruby-1.9.3-p0/adlint/ext-fiddle/GNUmakefile +1 -1
  254. data/share/sample/ruby-1.9.3-p0/adlint/ext-fiddle/adlint_cinit.h +1 -1
  255. data/share/sample/ruby-1.9.3-p0/adlint/ext-fiddle/adlint_pinit.h +1 -1
  256. data/share/sample/ruby-1.9.3-p0/adlint/ext-fiddle/adlint_traits.yml +50 -42
  257. data/share/sample/ruby-1.9.3-p0/adlint/ext-gdbm/GNUmakefile +1 -1
  258. data/share/sample/ruby-1.9.3-p0/adlint/ext-gdbm/adlint_cinit.h +1 -1
  259. data/share/sample/ruby-1.9.3-p0/adlint/ext-gdbm/adlint_pinit.h +1 -1
  260. data/share/sample/ruby-1.9.3-p0/adlint/ext-gdbm/adlint_traits.yml +50 -42
  261. data/share/sample/ruby-1.9.3-p0/adlint/ext-iconv/GNUmakefile +1 -1
  262. data/share/sample/ruby-1.9.3-p0/adlint/ext-iconv/adlint_cinit.h +1 -1
  263. data/share/sample/ruby-1.9.3-p0/adlint/ext-iconv/adlint_pinit.h +1 -1
  264. data/share/sample/ruby-1.9.3-p0/adlint/ext-iconv/adlint_traits.yml +50 -42
  265. data/share/sample/ruby-1.9.3-p0/adlint/ext-io-console/GNUmakefile +1 -1
  266. data/share/sample/ruby-1.9.3-p0/adlint/ext-io-console/adlint_cinit.h +1 -1
  267. data/share/sample/ruby-1.9.3-p0/adlint/ext-io-console/adlint_pinit.h +1 -1
  268. data/share/sample/ruby-1.9.3-p0/adlint/ext-io-console/adlint_traits.yml +50 -42
  269. data/share/sample/ruby-1.9.3-p0/adlint/ext-io-nonblock/GNUmakefile +1 -1
  270. data/share/sample/ruby-1.9.3-p0/adlint/ext-io-nonblock/adlint_cinit.h +1 -1
  271. data/share/sample/ruby-1.9.3-p0/adlint/ext-io-nonblock/adlint_pinit.h +1 -1
  272. data/share/sample/ruby-1.9.3-p0/adlint/ext-io-nonblock/adlint_traits.yml +50 -42
  273. data/share/sample/ruby-1.9.3-p0/adlint/ext-io-wait/GNUmakefile +1 -1
  274. data/share/sample/ruby-1.9.3-p0/adlint/ext-io-wait/adlint_cinit.h +1 -1
  275. data/share/sample/ruby-1.9.3-p0/adlint/ext-io-wait/adlint_pinit.h +1 -1
  276. data/share/sample/ruby-1.9.3-p0/adlint/ext-io-wait/adlint_traits.yml +50 -42
  277. data/share/sample/ruby-1.9.3-p0/adlint/ext-json-generator/GNUmakefile +1 -1
  278. data/share/sample/ruby-1.9.3-p0/adlint/ext-json-generator/adlint_cinit.h +1 -1
  279. data/share/sample/ruby-1.9.3-p0/adlint/ext-json-generator/adlint_pinit.h +1 -1
  280. data/share/sample/ruby-1.9.3-p0/adlint/ext-json-generator/adlint_traits.yml +50 -42
  281. data/share/sample/ruby-1.9.3-p0/adlint/ext-json-parser/GNUmakefile +1 -1
  282. data/share/sample/ruby-1.9.3-p0/adlint/ext-json-parser/adlint_cinit.h +1 -1
  283. data/share/sample/ruby-1.9.3-p0/adlint/ext-json-parser/adlint_pinit.h +1 -1
  284. data/share/sample/ruby-1.9.3-p0/adlint/ext-json-parser/adlint_traits.yml +50 -42
  285. data/share/sample/ruby-1.9.3-p0/adlint/ext-mathn-complex/GNUmakefile +1 -1
  286. data/share/sample/ruby-1.9.3-p0/adlint/ext-mathn-complex/adlint_cinit.h +1 -1
  287. data/share/sample/ruby-1.9.3-p0/adlint/ext-mathn-complex/adlint_pinit.h +1 -1
  288. data/share/sample/ruby-1.9.3-p0/adlint/ext-mathn-complex/adlint_traits.yml +50 -42
  289. data/share/sample/ruby-1.9.3-p0/adlint/ext-mathn-rational/GNUmakefile +1 -1
  290. data/share/sample/ruby-1.9.3-p0/adlint/ext-mathn-rational/adlint_cinit.h +1 -1
  291. data/share/sample/ruby-1.9.3-p0/adlint/ext-mathn-rational/adlint_pinit.h +1 -1
  292. data/share/sample/ruby-1.9.3-p0/adlint/ext-mathn-rational/adlint_traits.yml +50 -42
  293. data/share/sample/ruby-1.9.3-p0/adlint/ext-nkf/GNUmakefile +1 -1
  294. data/share/sample/ruby-1.9.3-p0/adlint/ext-nkf/adlint_cinit.h +1 -1
  295. data/share/sample/ruby-1.9.3-p0/adlint/ext-nkf/adlint_pinit.h +1 -1
  296. data/share/sample/ruby-1.9.3-p0/adlint/ext-nkf/adlint_traits.yml +50 -42
  297. data/share/sample/ruby-1.9.3-p0/adlint/ext-openssl/GNUmakefile +1 -1
  298. data/share/sample/ruby-1.9.3-p0/adlint/ext-openssl/adlint_cinit.h +1 -1
  299. data/share/sample/ruby-1.9.3-p0/adlint/ext-openssl/adlint_pinit.h +1 -1
  300. data/share/sample/ruby-1.9.3-p0/adlint/ext-openssl/adlint_traits.yml +50 -42
  301. data/share/sample/ruby-1.9.3-p0/adlint/ext-pathname/GNUmakefile +1 -1
  302. data/share/sample/ruby-1.9.3-p0/adlint/ext-pathname/adlint_cinit.h +1 -1
  303. data/share/sample/ruby-1.9.3-p0/adlint/ext-pathname/adlint_pinit.h +1 -1
  304. data/share/sample/ruby-1.9.3-p0/adlint/ext-pathname/adlint_traits.yml +50 -42
  305. data/share/sample/ruby-1.9.3-p0/adlint/ext-psych/GNUmakefile +1 -1
  306. data/share/sample/ruby-1.9.3-p0/adlint/ext-psych/adlint_cinit.h +1 -1
  307. data/share/sample/ruby-1.9.3-p0/adlint/ext-psych/adlint_pinit.h +1 -1
  308. data/share/sample/ruby-1.9.3-p0/adlint/ext-psych/adlint_traits.yml +50 -42
  309. data/share/sample/ruby-1.9.3-p0/adlint/ext-pty/GNUmakefile +1 -1
  310. data/share/sample/ruby-1.9.3-p0/adlint/ext-pty/adlint_cinit.h +1 -1
  311. data/share/sample/ruby-1.9.3-p0/adlint/ext-pty/adlint_pinit.h +1 -1
  312. data/share/sample/ruby-1.9.3-p0/adlint/ext-pty/adlint_traits.yml +50 -42
  313. data/share/sample/ruby-1.9.3-p0/adlint/ext-racc-cparse/GNUmakefile +1 -1
  314. data/share/sample/ruby-1.9.3-p0/adlint/ext-racc-cparse/adlint_cinit.h +1 -1
  315. data/share/sample/ruby-1.9.3-p0/adlint/ext-racc-cparse/adlint_pinit.h +1 -1
  316. data/share/sample/ruby-1.9.3-p0/adlint/ext-racc-cparse/adlint_traits.yml +50 -42
  317. data/share/sample/ruby-1.9.3-p0/adlint/ext-readline/GNUmakefile +1 -1
  318. data/share/sample/ruby-1.9.3-p0/adlint/ext-readline/adlint_cinit.h +1 -1
  319. data/share/sample/ruby-1.9.3-p0/adlint/ext-readline/adlint_pinit.h +1 -1
  320. data/share/sample/ruby-1.9.3-p0/adlint/ext-readline/adlint_traits.yml +50 -42
  321. data/share/sample/ruby-1.9.3-p0/adlint/ext-ripper/GNUmakefile +1 -1
  322. data/share/sample/ruby-1.9.3-p0/adlint/ext-ripper/adlint_cinit.h +1 -1
  323. data/share/sample/ruby-1.9.3-p0/adlint/ext-ripper/adlint_pinit.h +1 -1
  324. data/share/sample/ruby-1.9.3-p0/adlint/ext-ripper/adlint_traits.yml +50 -42
  325. data/share/sample/ruby-1.9.3-p0/adlint/ext-sdbm/GNUmakefile +1 -1
  326. data/share/sample/ruby-1.9.3-p0/adlint/ext-sdbm/adlint_cinit.h +1 -1
  327. data/share/sample/ruby-1.9.3-p0/adlint/ext-sdbm/adlint_pinit.h +1 -1
  328. data/share/sample/ruby-1.9.3-p0/adlint/ext-sdbm/adlint_traits.yml +50 -42
  329. data/share/sample/ruby-1.9.3-p0/adlint/ext-socket/GNUmakefile +1 -1
  330. data/share/sample/ruby-1.9.3-p0/adlint/ext-socket/adlint_cinit.h +1 -1
  331. data/share/sample/ruby-1.9.3-p0/adlint/ext-socket/adlint_pinit.h +1 -1
  332. data/share/sample/ruby-1.9.3-p0/adlint/ext-socket/adlint_traits.yml +50 -42
  333. data/share/sample/ruby-1.9.3-p0/adlint/ext-stringio/GNUmakefile +1 -1
  334. data/share/sample/ruby-1.9.3-p0/adlint/ext-stringio/adlint_cinit.h +1 -1
  335. data/share/sample/ruby-1.9.3-p0/adlint/ext-stringio/adlint_pinit.h +1 -1
  336. data/share/sample/ruby-1.9.3-p0/adlint/ext-stringio/adlint_traits.yml +50 -42
  337. data/share/sample/ruby-1.9.3-p0/adlint/ext-strscan/GNUmakefile +1 -1
  338. data/share/sample/ruby-1.9.3-p0/adlint/ext-strscan/adlint_cinit.h +1 -1
  339. data/share/sample/ruby-1.9.3-p0/adlint/ext-strscan/adlint_pinit.h +1 -1
  340. data/share/sample/ruby-1.9.3-p0/adlint/ext-strscan/adlint_traits.yml +50 -42
  341. data/share/sample/ruby-1.9.3-p0/adlint/ext-syck/GNUmakefile +1 -1
  342. data/share/sample/ruby-1.9.3-p0/adlint/ext-syck/adlint_cinit.h +1 -1
  343. data/share/sample/ruby-1.9.3-p0/adlint/ext-syck/adlint_pinit.h +1 -1
  344. data/share/sample/ruby-1.9.3-p0/adlint/ext-syck/adlint_traits.yml +50 -42
  345. data/share/sample/ruby-1.9.3-p0/adlint/ext-syslog/GNUmakefile +1 -1
  346. data/share/sample/ruby-1.9.3-p0/adlint/ext-syslog/adlint_cinit.h +1 -1
  347. data/share/sample/ruby-1.9.3-p0/adlint/ext-syslog/adlint_pinit.h +1 -1
  348. data/share/sample/ruby-1.9.3-p0/adlint/ext-syslog/adlint_traits.yml +50 -42
  349. data/share/sample/ruby-1.9.3-p0/adlint/ext-zlib/GNUmakefile +1 -1
  350. data/share/sample/ruby-1.9.3-p0/adlint/ext-zlib/adlint_cinit.h +1 -1
  351. data/share/sample/ruby-1.9.3-p0/adlint/ext-zlib/adlint_pinit.h +1 -1
  352. data/share/sample/ruby-1.9.3-p0/adlint/ext-zlib/adlint_traits.yml +50 -42
  353. data/share/sample/screen-4.0.3/adlint/GNUmakefile +1 -1
  354. data/share/sample/screen-4.0.3/adlint/adlint_cinit.h +1 -1
  355. data/share/sample/screen-4.0.3/adlint/adlint_pinit.h +1 -1
  356. data/share/sample/screen-4.0.3/adlint/adlint_traits.yml +50 -42
  357. data/share/sample/vim-7.3/adlint/vim/GNUmakefile +1 -1
  358. data/share/sample/vim-7.3/adlint/vim/adlint_cinit.h +1 -1
  359. data/share/sample/vim-7.3/adlint/vim/adlint_pinit.h +1 -1
  360. data/share/sample/vim-7.3/adlint/vim/adlint_traits.yml +50 -42
  361. data/share/sample/vim-7.3/adlint/xxd/GNUmakefile +1 -1
  362. data/share/sample/vim-7.3/adlint/xxd/adlint_cinit.h +1 -1
  363. data/share/sample/vim-7.3/adlint/xxd/adlint_pinit.h +1 -1
  364. data/share/sample/vim-7.3/adlint/xxd/adlint_traits.yml +49 -41
  365. data/share/sample/zsh-4.3.15/adlint/GNUmakefile +1 -1
  366. data/share/sample/zsh-4.3.15/adlint/adlint_traits.yml +46 -38
  367. data/share/sample/zsh-4.3.15/adlint/builtins/GNUmakefile +1 -1
  368. data/share/sample/zsh-4.3.15/adlint/builtins/adlint_cinit.h +1 -1
  369. data/share/sample/zsh-4.3.15/adlint/builtins/adlint_pinit.h +1 -1
  370. data/share/sample/zsh-4.3.15/adlint/builtins/adlint_traits.yml +50 -42
  371. data/share/sample/zsh-4.3.15/adlint/core/GNUmakefile +1 -1
  372. data/share/sample/zsh-4.3.15/adlint/core/adlint_cinit.h +1 -1
  373. data/share/sample/zsh-4.3.15/adlint/core/adlint_pinit.h +1 -1
  374. data/share/sample/zsh-4.3.15/adlint/core/adlint_traits.yml +50 -42
  375. data/share/sample/zsh-4.3.15/adlint/modules/GNUmakefile +1 -1
  376. data/share/sample/zsh-4.3.15/adlint/modules/adlint_cinit.h +1 -1
  377. data/share/sample/zsh-4.3.15/adlint/modules/adlint_pinit.h +1 -1
  378. data/share/sample/zsh-4.3.15/adlint/modules/adlint_traits.yml +50 -42
  379. data/share/sample/zsh-4.3.15/adlint/zle/GNUmakefile +1 -1
  380. data/share/sample/zsh-4.3.15/adlint/zle/adlint_cinit.h +1 -1
  381. data/share/sample/zsh-4.3.15/adlint/zle/adlint_pinit.h +1 -1
  382. data/share/sample/zsh-4.3.15/adlint/zle/adlint_traits.yml +50 -42
  383. data/spec/adlint/{c → cc1}/ctrlexpr_spec.rb +51 -49
  384. data/spec/adlint/{c → cc1}/domain_spec.rb +210 -179
  385. data/spec/adlint/{c → cc1}/operator_spec.rb +3 -3
  386. data/spec/adlint/{c → cc1}/syntax_spec.rb +10 -12
  387. data/spec/adlint/{c → cc1}/type_spec.rb +61 -68
  388. data/{lib/adlint/c.rb → spec/adlint/location_spec.rb} +24 -29
  389. data/spec/conf.d/default_traits.yml +38 -37
  390. data/spec/conf.d/empty_cinit.h +1 -1
  391. data/spec/conf.d/empty_pinit.h +1 -1
  392. data/spec/conf.d/project/foo.c +0 -0
  393. data/spec/spec_helper.rb +2 -2
  394. metadata +60 -40
  395. data/lib/adlint/c/domain.rb +0 -7931
  396. data/lib/adlint/c/lexer.rb +0 -252
  397. data/lib/adlint/c/phase.rb +0 -135
  398. data/lib/adlint/exam/c_builtin/c_check.rb +0 -20745
  399. data/lib/adlint/exam/c_builtin/c_check_shima.rb +0 -983
  400. data/lib/adlint/exam/c_builtin/c_code.rb +0 -477
  401. data/lib/adlint/exam/c_builtin/c_metric.rb +0 -818
@@ -1,7 +1,7 @@
1
1
  # Base classes of the warning and the error messages.
2
2
  #
3
3
  # Author:: Yutaka Yanoh <mailto:yanoh@users.sourceforge.net>
4
- # Copyright:: Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
4
+ # Copyright:: Copyright (C) 2010-2013, OGIS-RI Co.,Ltd.
5
5
  # License:: GPLv3+: GNU General Public License version 3 or later
6
6
  #
7
7
  # Owner:: Yutaka Yanoh <mailto:yanoh@users.sourceforge.net>
@@ -11,7 +11,7 @@
11
11
  # / | / _ |/ / / / | / /__ __/ Source Code Static Analyzer
12
12
  # / /| | / / / / / / / |/ / / / AdLint - Advanced Lint
13
13
  # / __ |/ /_/ / /___/ / /| / / /
14
- # /_/ |_|_____/_____/_/_/ |_/ /_/ Copyright (C) 2010-2012, OGIS-RI Co.,Ltd.
14
+ # /_/ |_|_____/_____/_/_/ |_/ /_/ Copyright (C) 2010-2013, OGIS-RI Co.,Ltd.
15
15
  #
16
16
  # This file is part of AdLint.
17
17
  #
@@ -29,40 +29,116 @@
29
29
  #
30
30
  #++
31
31
 
32
- require "adlint/traits"
33
32
  require "adlint/token"
34
33
  require "adlint/error"
35
- require "adlint/version"
36
34
 
37
35
  module AdLint #:nodoc:
38
36
 
37
+ class MessageId
38
+ def initialize(pkg_name, msg_name)
39
+ @package_name = pkg_name
40
+ @message_name = msg_name
41
+ end
42
+
43
+ attr_reader :package_name
44
+ attr_reader :message_name
45
+
46
+ def qualified?
47
+ !@package_name.nil?
48
+ end
49
+
50
+ def ==(rhs)
51
+ self.eql?(rhs)
52
+ end
53
+
54
+ def eql?(rhs)
55
+ if self.qualified? && rhs.qualified?
56
+ @package_name == rhs.package_name && @message_name == rhs.message_name
57
+ else
58
+ @message_name == rhs.message_name
59
+ end
60
+ end
61
+
62
+ def hash
63
+ @message_name.hash
64
+ end
65
+ end
66
+
39
67
  # == DESCRIPTION
40
68
  # Base class of all messages.
41
69
  class Message
42
70
  # === DESCRIPTION
43
- # Creates a fatal error message from exception object.
71
+ # Constructs a message.
44
72
  #
45
73
  # === PARAMETER
46
- # _exception_:: Exception -- Cause exception.
47
- def self.from_exception(exception)
48
- FatalErrorMessage.new(exception)
74
+ # _msg_tmpl_:: MessageTemplate -- Template for the creating message.
75
+ # _loc_:: Location -- Location where the message detected.
76
+ # _parts_:: Array< Object > -- Message formatting parts.
77
+ def initialize(msg_tmpl, loc, *parts)
78
+ @template = msg_tmpl
79
+ @location = loc
80
+ @parts = parts
81
+ @complements = []
82
+ end
83
+
84
+ attr_reader :location
85
+
86
+ def id
87
+ @template.message_id
88
+ end
89
+
90
+ def must_be_unique?
91
+ subclass_responsibility
92
+ end
93
+
94
+ def must_be_deferred?
95
+ subclass_responsibility
96
+ end
97
+
98
+ def complement_with(msg)
99
+ @complements.push(msg)
100
+ end
101
+
102
+ def eql?(rhs)
103
+ id == rhs.id && @location == rhs.location && @parts == rhs.parts
104
+ end
105
+
106
+ def hash
107
+ [id, @location, @parts].hash
108
+ end
109
+
110
+ def print_as_str(io)
111
+ io.puts(to_s)
112
+ @complements.each { |comp| comp.print_as_str(io) }
113
+ end
114
+
115
+ def print_as_csv(io)
116
+ io.puts(to_csv)
117
+ @complements.each { |comp| comp.print_as_csv(io) }
49
118
  end
50
119
 
51
120
  # === DESCRIPTION
52
- # Constructs a message.
121
+ # Converts this message into a string for human readable output.
53
122
  #
54
- # === PARAMETER
55
- # _id_:: Symbol -- Message ID symbol.
56
- # _location_:: Location -- Location where the message detected.
57
- # _parts_:: Array< Object > -- Message formatting parts.
58
- def initialize(package, id, location, *parts)
59
- @package, @id, @location = package, id, location
60
- @parts = parts
61
- validate_id(@package, @id, @location)
123
+ # === RETURN VALUE
124
+ # String -- String representation of this message.
125
+ def to_s
126
+ begin
127
+ "#{@location.to_s.to_default_external}:" +
128
+ "#{type_str.to_default_external}:" +
129
+ "#{id.package_name}:#{id.message_name.to_s}:" +
130
+ "#{@template.typical_class.category}:" +
131
+ "#{@template.typical_class.severity}:" +
132
+ "#{@template.format(@parts)}"
133
+ rescue
134
+ raise InvalidMessageFormatError.new(id, @location)
135
+ end
62
136
  end
63
137
 
64
- attr_reader :id
138
+ protected
139
+ attr_reader :parts
65
140
 
141
+ private
66
142
  # === DESCRIPTION
67
143
  # Reads the type of this message.
68
144
  #
@@ -91,97 +167,38 @@ module AdLint #:nodoc:
91
167
  # === RETURN VALUE
92
168
  # Array< Object > -- Array of message elements.
93
169
  def to_a
94
- if templ = MessageCatalog.instance.lookup(@package, @id)
95
- begin
96
- if Traits.instance.of_message.message_with_class
97
- [
98
- type.to_s,
99
- @location.fpath, @location.line_no, @location.column_no,
100
- templ.package,
101
- @id,
102
- templ.typical_class.category,
103
- templ.typical_class.severity,
104
- templ.format(@parts)
105
- ]
106
- else
107
- [
108
- type.to_s,
109
- @location.fpath, @location.line_no, @location.column_no,
110
- @id,
111
- templ.format(@parts)
112
- ]
113
- end
114
- rescue
115
- raise InvalidMessageFormatError.new(@package, @id, @location)
116
- end
117
- else
118
- raise InvalidMessageIdError.new(@package, @id, @location)
119
- end
120
- end
121
-
122
- # === DESCRIPTION
123
- # Converts this message into a string for human readable output.
124
- #
125
- # === RETURN VALUE
126
- # String -- String representation of this message.
127
- def to_s
128
- if templ = MessageCatalog.instance.lookup(@package, @id)
129
- begin
130
- "#{@location.to_s.to_default_external}:" +
131
- "#{type_str.to_default_external}:" +
132
- "#{templ.package}:" +
133
- "#{@id.to_s.to_default_external}:" +
134
- "#{templ.typical_class.category}:" +
135
- "#{templ.typical_class.severity}:" +
136
- "#{templ.format(@parts)}"
137
- rescue
138
- raise InvalidMessageFormatError.new(@package, @id, @location)
139
- end
140
- else
141
- raise InvalidMessageIdError.new(@package, @id, @location)
170
+ begin
171
+ [
172
+ type.to_s, *@location.to_a, id.package_name, id.message_name,
173
+ @template.typical_class.category, @template.typical_class.severity,
174
+ @template.format(@parts)
175
+ ]
176
+ rescue
177
+ raise InvalidMessageFormatError.new(id, @location)
142
178
  end
143
179
  end
144
180
 
145
181
  def to_csv
146
- to_a.map { |obj| obj ? obj.to_s.to_default_external : nil }.to_csv
147
- end
148
-
149
- def eql?(rhs)
150
- @id == rhs.id && @location == rhs.location && @parts == rhs.parts
151
- end
152
-
153
- def hash
154
- [@id, @location, @parts].hash
155
- end
156
-
157
- protected
158
- attr_reader :location
159
- attr_reader :parts
160
-
161
- private
162
- # === DESCRIPTION
163
- # Validates the message ID.
164
- #
165
- # === PARAMETER
166
- # _id_:: String -- Message ID string.
167
- # _location_:: Location -- Location where the message detected.
168
- #
169
- # === RETURN VALUE
170
- # None.
171
- def validate_id(package, id, location)
172
- MessageCatalog.instance.lookup(package, id) or
173
- raise InvalidMessageIdError.new(package, id, location)
174
- nil
182
+ to_a.map { |obj| obj && obj.to_s.to_default_external }.to_csv
175
183
  end
176
184
  end
177
185
 
178
186
  # == DESCRIPTION
179
187
  # Syntactical error message.
180
188
  class ErrorMessage < Message
181
- def initialize(id, location, *parts)
182
- super("core", id, location, *parts)
189
+ def initialize(msg_catalog, msg_name, loc, *parts)
190
+ super(msg_catalog.lookup(MessageId.new("core", msg_name)), loc, *parts)
191
+ end
192
+
193
+ def must_be_unique?
194
+ false
183
195
  end
184
196
 
197
+ def must_be_deferred?
198
+ false
199
+ end
200
+
201
+ private
185
202
  # === DESCRIPTION
186
203
  # Reads the type of this message.
187
204
  #
@@ -208,14 +225,24 @@ module AdLint #:nodoc:
208
225
  # Constructs a AdLint specific internal fatal error message.
209
226
  #
210
227
  # === PARAMETER
211
- # _exception_:: Exception -- Cause exception.
212
- def initialize(exception)
213
- super("core", exception.id,
214
- exception.location ? exception.location : Location.new,
215
- *exception.parts)
216
- @exception = exception
228
+ # _msg_catalog_:: MessageCatalog -- Message catalog.
229
+ # _cause_ex_:: Exception -- Cause exception.
230
+ def initialize(msg_catalog, cause_ex)
231
+ msg_id = MessageId.new("core", cause_ex.message_name)
232
+ super(msg_catalog.lookup(msg_id), cause_ex.location || Location.new,
233
+ *cause_ex.parts)
234
+ @cause_ex = cause_ex
217
235
  end
218
236
 
237
+ def must_be_unique?
238
+ false
239
+ end
240
+
241
+ def must_be_deferred?
242
+ false
243
+ end
244
+
245
+ private
219
246
  # === DESCRIPTION
220
247
  # Reads the type of this message.
221
248
  #
@@ -238,6 +265,20 @@ module AdLint #:nodoc:
238
265
  # == DESCRIPTION
239
266
  # Semantical warning message.
240
267
  class WarningMessage < Message
268
+ def initialize(msg_catalog, check_class, loc, *parts)
269
+ super(msg_catalog.lookup(check_class.message_id), loc, *parts)
270
+ @check_class = check_class
271
+ end
272
+
273
+ def must_be_unique?
274
+ @check_class.must_be_unique?
275
+ end
276
+
277
+ def must_be_deferred?
278
+ @check_class.must_be_deferred?
279
+ end
280
+
281
+ private
241
282
  # === DESCRIPTION
242
283
  # Reads the type of this message.
243
284
  #
@@ -260,6 +301,20 @@ module AdLint #:nodoc:
260
301
  # == DESCRIPTION
261
302
  # Message complements other messages.
262
303
  class ContextMessage < Message
304
+ def initialize(msg_catalog, msg_name, check_class, loc, *parts)
305
+ msg_id = MessageId.new(check_class.catalog.name, msg_name)
306
+ super(msg_catalog.lookup(msg_id), loc, *parts)
307
+ end
308
+
309
+ def must_be_unique?
310
+ false
311
+ end
312
+
313
+ def must_be_deferred?
314
+ false
315
+ end
316
+
317
+ private
263
318
  # === DESCRIPTION
264
319
  # Reads the type of this message.
265
320
  #
@@ -281,33 +336,34 @@ module AdLint #:nodoc:
281
336
 
282
337
  class MessageClass
283
338
  def initialize(class_str)
284
- @category, @severity = class_str.split(":")
339
+ @category, @severity =
340
+ class_str.split(":").map { |str| str.to_default_external }
285
341
  end
286
342
 
287
- def category
288
- @category.to_s.to_default_external
289
- end
290
-
291
- def severity
292
- @severity.to_s.to_default_external
293
- end
343
+ attr_reader :category
344
+ attr_reader :severity
294
345
  end
295
346
 
296
347
  # == DESCRIPTION
297
348
  # Message catalog entry.
298
349
  class MessageTemplate
299
- def initialize(package, classes, format)
300
- @package = package
301
- @classes = classes.map { |class_str| MessageClass.new(class_str) }
302
- @format = format
303
- @typical_class = @classes.sort { |mesg_class| mesg_class.severity }.first
350
+ def initialize(msg_id, classes, fmt)
351
+ @message_id = msg_id
352
+ @classes = classes.map { |class_str| MessageClass.new(class_str) }
353
+ @format = fmt
354
+ @typical_class = @classes.sort { |msg_class| msg_class.severity }.first
304
355
  end
305
356
 
357
+ attr_reader :message_id
306
358
  attr_reader :classes
307
359
  attr_reader :typical_class
308
360
 
309
- def package
310
- @package.to_s.to_default_external
361
+ def categories
362
+ @classes.map { |c| c.category }
363
+ end
364
+
365
+ def severities
366
+ @classes.map { |c| c.severity }
311
367
  end
312
368
 
313
369
  def format(parts)
@@ -320,24 +376,23 @@ module AdLint #:nodoc:
320
376
  MESSAGES_FNAME = Pathname.new("messages.yml")
321
377
  private_constant :MESSAGES_FNAME
322
378
 
323
- def initialize(package_name)
324
- @package_name = package_name
379
+ def initialize(pkg_name, lang_name)
380
+ @package_name = pkg_name
381
+ @language_name = lang_name
325
382
  end
326
383
 
327
- attr_reader :package_name
328
-
329
- def read_into(message_catalog)
384
+ def read_into(msg_catalog)
330
385
  File.open(fpath, "r:utf-8") do |io|
331
- case array_or_stream = YAML.load_stream(io)
386
+ case ary_or_stream = YAML.load_stream(io)
332
387
  when Array
333
388
  # NOTE: YAML.load_stream returns Array in Ruby 1.9.3-preview1.
334
- doc = array_or_stream.first
389
+ doc = ary_or_stream.first
335
390
  when YAML::Stream
336
- doc = array_or_stream.documents.first
391
+ doc = ary_or_stream.documents.first
337
392
  end
338
393
  validate_version(doc["version"])
339
- if message_definition = doc["message_definition"]
340
- message_catalog.merge!(package_name, message_definition)
394
+ if msg_def = doc["message_definition"]
395
+ msg_catalog.merge!(@package_name, msg_def)
341
396
  else
342
397
  raise "invalid form of the message definition file."
343
398
  end
@@ -351,11 +406,10 @@ module AdLint #:nodoc:
351
406
  end
352
407
 
353
408
  def fpath
354
- lang_dpath = Pathname.new(Traits.instance.of_message.language)
355
- base_dpath.join(lang_dpath).join(MESSAGES_FNAME)
409
+ base_dpath.join(Pathname.new(@language_name)).join(MESSAGES_FNAME)
356
410
  end
357
411
 
358
- def validate_version(version)
412
+ def validate_version(ver)
359
413
  # NOTE: Version field of the message catalog does not mean the schema
360
414
  # version of the catalog file, but a revision number of the catalog
361
415
  # contents.
@@ -366,8 +420,8 @@ module AdLint #:nodoc:
366
420
  end
367
421
 
368
422
  class CoreMessageDefinitionFile < MessageDefinitionFile
369
- def initialize
370
- super("core")
423
+ def initialize(lang_name)
424
+ super("core", lang_name)
371
425
  end
372
426
 
373
427
  private
@@ -377,50 +431,47 @@ module AdLint #:nodoc:
377
431
  end
378
432
 
379
433
  class ExamMessageDefinitionFile < MessageDefinitionFile
380
- def initialize(exam_package)
381
- super(exam_package.name)
382
- @exam_package = exam_package
434
+ def initialize(exam_pkg, lang_name)
435
+ super(exam_pkg.name, lang_name)
436
+ @exam_pkg = exam_pkg
383
437
  end
384
438
 
385
439
  private
386
440
  def base_dpath
387
- @exam_package.catalog.message_definition_dpath
441
+ @exam_pkg.catalog.message_definition_dpath
388
442
  end
389
443
  end
390
444
 
391
445
  # == DESCRIPTION
392
446
  # Message catalog.
393
447
  class MessageCatalog
394
- include Singleton
395
-
396
- def initialize
448
+ def initialize(traits)
449
+ @traits = traits
397
450
  @hash = Hash.new
451
+ message_definition_files.each { |def_file| def_file.read_into(self) }
398
452
  end
399
453
 
400
- def lookup(package_name, mesg_id)
401
- @hash[[package_name, mesg_id]]
454
+ def lookup(msg_id)
455
+ @hash[msg_id] or raise InvalidMessageIdError.new(msg_id)
402
456
  end
403
457
 
404
- def merge!(package_name, message_definition)
405
- message_definition.each do |id, content|
406
- message_traits = Traits.instance.of_message
407
- if changed = message_traits.change_list[[package_name, id.intern]]
408
- content = changed
458
+ def merge!(pkg_name, msg_def)
459
+ msg_def.each do |msg_name_str, cont|
460
+ msg_id = MessageId.new(pkg_name, msg_name_str.to_sym)
461
+ if changed = @traits.of_message.change_list[msg_id]
462
+ cont = changed
409
463
  end
410
- @hash[[package_name, id.intern]] = MessageTemplate.new(
411
- package_name, content["classes"], content["format"])
464
+ @hash[msg_id] =
465
+ MessageTemplate.new(msg_id, cont["classes"], cont["format"])
412
466
  end
413
467
  end
414
468
 
415
- def load
416
- message_definition_files.each { |mdef_file| mdef_file.read_into(self) }
417
- end
418
-
419
469
  private
420
470
  def message_definition_files
421
- [CoreMessageDefinitionFile.new] +
422
- Traits.instance.exam_packages.map { |exam_package|
423
- ExamMessageDefinitionFile.new(exam_package)
471
+ lang_name = @traits.of_message.language
472
+ [CoreMessageDefinitionFile.new(lang_name)] +
473
+ @traits.exam_packages.map { |pkg|
474
+ ExamMessageDefinitionFile.new(pkg, lang_name)
424
475
  }
425
476
  end
426
477
  end