qtbindings 4.8.6.3 → 4.8.6.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (659) hide show
  1. checksums.yaml +5 -5
  2. data/COPYING.LIB.txt +510 -510
  3. data/COPYING.txt +286 -286
  4. data/KNOWN_ISSUES.txt +17 -17
  5. data/bin/rbqtapi +0 -0
  6. data/bin/rbrcc +0 -0
  7. data/bin/rbuic4 +0 -0
  8. data/bin/smokeapi +0 -0
  9. data/bin/smokedeptool +0 -0
  10. data/examples/designer/calculatorbuilder/calculatorbuilder.qrc +5 -5
  11. data/examples/designer/calculatorbuilder/calculatorform.rb +60 -60
  12. data/examples/designer/calculatorbuilder/calculatorform.ui +299 -299
  13. data/examples/designer/calculatorbuilder/main.rb +34 -34
  14. data/examples/designer/calculatorbuilder/makefile +2 -2
  15. data/examples/designer/calculatorform/calculatorform.rb +46 -46
  16. data/examples/designer/calculatorform/calculatorform.ui +277 -277
  17. data/examples/designer/calculatorform/main.rb +32 -32
  18. data/examples/designer/calculatorform/makefile +3 -3
  19. data/examples/desktop/screenshot/main.rb +32 -32
  20. data/examples/desktop/screenshot/screenshot.rb +157 -157
  21. data/examples/desktop/systray/images/bad.svg +64 -64
  22. data/examples/desktop/systray/images/heart.svg +55 -55
  23. data/examples/desktop/systray/images/trash.svg +58 -58
  24. data/examples/desktop/systray/main.rb +41 -41
  25. data/examples/desktop/systray/makefile +2 -2
  26. data/examples/desktop/systray/systray.qrc +7 -7
  27. data/examples/desktop/systray/window.rb +219 -219
  28. data/examples/dialogs/complexwizard/complexwizard.rb +140 -140
  29. data/examples/dialogs/complexwizard/licensewizard.rb +294 -294
  30. data/examples/dialogs/complexwizard/main.rb +31 -31
  31. data/examples/dialogs/configdialog/configdialog.rb +109 -109
  32. data/examples/dialogs/configdialog/main.rb +31 -31
  33. data/examples/dialogs/configdialog/pages.rb +140 -140
  34. data/examples/dialogs/extension/finddialog.rb +89 -89
  35. data/examples/dialogs/extension/main.rb +31 -31
  36. data/examples/dialogs/findfiles/main.rb +32 -32
  37. data/examples/dialogs/findfiles/window.rb +177 -177
  38. data/examples/dialogs/simplewizard/classwizard.rb +374 -374
  39. data/examples/dialogs/simplewizard/main.rb +31 -31
  40. data/examples/dialogs/simplewizard/simplewizard.rb +110 -110
  41. data/examples/dialogs/standarddialogs/dialog.rb +340 -340
  42. data/examples/dialogs/standarddialogs/main.rb +31 -31
  43. data/examples/dialogs/tabdialog/main.rb +38 -38
  44. data/examples/dialogs/tabdialog/tabdialog.rb +178 -178
  45. data/examples/draganddrop/draggableicons/dragwidget.rb +125 -125
  46. data/examples/draganddrop/draggableicons/main.rb +41 -41
  47. data/examples/draganddrop/draggabletext/draglabel.rb +51 -51
  48. data/examples/draganddrop/draggabletext/dragwidget.rb +94 -94
  49. data/examples/draganddrop/draggabletext/main.rb +33 -33
  50. data/examples/draganddrop/draggabletext/words.txt +41 -41
  51. data/examples/draganddrop/dropsite/dropsitewidget.rb +99 -99
  52. data/examples/draganddrop/dropsite/dropsitewindow.rb +114 -114
  53. data/examples/draganddrop/dropsite/main.rb +33 -33
  54. data/examples/draganddrop/fridgemagnets/draglabel.rb +78 -78
  55. data/examples/draganddrop/fridgemagnets/dragwidget.rb +130 -130
  56. data/examples/draganddrop/fridgemagnets/main.rb +33 -33
  57. data/examples/draganddrop/fridgemagnets/words.txt +48 -48
  58. data/examples/draganddrop/puzzle/main.rb +33 -33
  59. data/examples/draganddrop/puzzle/mainwindow.rb +136 -136
  60. data/examples/draganddrop/puzzle/pieceslist.rb +95 -95
  61. data/examples/draganddrop/puzzle/puzzlewidget.rb +190 -190
  62. data/examples/graphicsview/collidingmice/main.rb +53 -53
  63. data/examples/graphicsview/collidingmice/makefile +2 -2
  64. data/examples/graphicsview/collidingmice/mice.qrc +5 -5
  65. data/examples/graphicsview/collidingmice/mouse.rb +176 -176
  66. data/examples/graphicsview/dragdroprobot/coloritem.rb +86 -86
  67. data/examples/graphicsview/dragdroprobot/main.rb +57 -57
  68. data/examples/graphicsview/dragdroprobot/makefile +2 -2
  69. data/examples/graphicsview/dragdroprobot/robot.qrc +5 -5
  70. data/examples/graphicsview/dragdroprobot/robot.rb +246 -246
  71. data/examples/itemviews/chart/chart.qrc +5 -5
  72. data/examples/itemviews/chart/main.rb +33 -33
  73. data/examples/itemviews/chart/mainwindow.rb +151 -151
  74. data/examples/itemviews/chart/makefile +2 -2
  75. data/examples/itemviews/chart/mydata.cht +8 -8
  76. data/examples/itemviews/chart/pieview.rb +516 -516
  77. data/examples/itemviews/chart/qtdata.cht +14 -14
  78. data/examples/itemviews/dirview/main.rb +39 -39
  79. data/examples/itemviews/pixelator/imagemodel.rb +51 -51
  80. data/examples/itemviews/pixelator/images.qrc +5 -5
  81. data/examples/itemviews/pixelator/main.rb +34 -34
  82. data/examples/itemviews/pixelator/mainwindow.rb +218 -218
  83. data/examples/itemviews/pixelator/makefile +3 -3
  84. data/examples/itemviews/pixelator/pixeldelegate.rb +67 -67
  85. data/examples/itemviews/puzzle/main.rb +36 -36
  86. data/examples/itemviews/puzzle/mainwindow.rb +143 -143
  87. data/examples/itemviews/puzzle/piecesmodel.rb +174 -174
  88. data/examples/itemviews/puzzle/puzzlewidget.rb +192 -192
  89. data/examples/itemviews/simpledommodel/domitem.rb +62 -62
  90. data/examples/itemviews/simpledommodel/dommodel.rb +139 -139
  91. data/examples/itemviews/simpledommodel/main.rb +33 -33
  92. data/examples/itemviews/simpledommodel/mainwindow.rb +66 -66
  93. data/examples/itemviews/simpletreemodel/default.txt +40 -40
  94. data/examples/itemviews/simpletreemodel/main.rb +41 -41
  95. data/examples/itemviews/simpletreemodel/makefile +2 -2
  96. data/examples/itemviews/simpletreemodel/simpletreemodel.qrc +5 -5
  97. data/examples/itemviews/simpletreemodel/treeitem.rb +67 -67
  98. data/examples/itemviews/simpletreemodel/treemodel.rb +164 -164
  99. data/examples/itemviews/sortingmodel/default.txt +40 -40
  100. data/examples/itemviews/sortingmodel/main.rb +53 -53
  101. data/examples/itemviews/sortingmodel/treeitem.rb +73 -73
  102. data/examples/itemviews/sortingmodel/treemodel.rb +166 -166
  103. data/examples/itemviews/spinboxdelegate/main.rb +47 -47
  104. data/examples/itemviews/spinboxdelegate/spinboxdelegate.rb +62 -62
  105. data/examples/killerfilter/killerfilter.rb +55 -55
  106. data/examples/layouts/basiclayouts/dialog.rb +110 -110
  107. data/examples/layouts/basiclayouts/main.rb +31 -31
  108. data/examples/layouts/borderlayout/borderlayout.rb +190 -190
  109. data/examples/layouts/borderlayout/main.rb +32 -32
  110. data/examples/layouts/borderlayout/window.rb +52 -52
  111. data/examples/layouts/flowlayouts/flowlayout.rb +108 -108
  112. data/examples/layouts/flowlayouts/main.rb +32 -32
  113. data/examples/layouts/flowlayouts/window.rb +43 -43
  114. data/examples/mainwindows/application/main.rb +32 -32
  115. data/examples/mainwindows/application/mainwindow.rb +285 -285
  116. data/examples/mainwindows/dockwidgets/main.rb +32 -32
  117. data/examples/mainwindows/dockwidgets/mainwindow.rb +302 -302
  118. data/examples/mainwindows/mdi/main.rb +32 -32
  119. data/examples/mainwindows/mdi/mainwindow.rb +363 -363
  120. data/examples/mainwindows/mdi/mdichild.rb +152 -152
  121. data/examples/mainwindows/menus/main.rb +32 -32
  122. data/examples/mainwindows/menus/mainwindow.rb +327 -327
  123. data/examples/mainwindows/recentfiles/main.rb +32 -32
  124. data/examples/mainwindows/recentfiles/mainwindow.rb +258 -258
  125. data/examples/mainwindows/sdi/main.rb +32 -32
  126. data/examples/mainwindows/sdi/mainwindow.rb +335 -335
  127. data/examples/network/broadcastreceiver/main.rb +32 -32
  128. data/examples/network/broadcastreceiver/receiver.rb +64 -64
  129. data/examples/network/broadcastsender/main.rb +32 -32
  130. data/examples/network/broadcastsender/sender.rb +72 -72
  131. data/examples/network/fortuneclient/client.rb +149 -149
  132. data/examples/network/fortuneclient/main.rb +32 -32
  133. data/examples/network/fortuneserver/main.rb +32 -32
  134. data/examples/network/fortuneserver/server.rb +88 -88
  135. data/examples/network/ftp/ftpwindow.rb +259 -259
  136. data/examples/network/ftp/main.rb +32 -32
  137. data/examples/network/http/httpwindow.rb +187 -187
  138. data/examples/network/http/main.rb +32 -32
  139. data/examples/network/loopback/dialog.rb +163 -163
  140. data/examples/network/loopback/main.rb +32 -32
  141. data/examples/opengl/grabber/glwidget.rb +265 -265
  142. data/examples/opengl/grabber/main.rb +32 -32
  143. data/examples/opengl/grabber/mainwindow.rb +189 -189
  144. data/examples/opengl/hellogl/glwidget.rb +226 -226
  145. data/examples/opengl/hellogl/main.rb +32 -32
  146. data/examples/opengl/hellogl/window.rb +66 -66
  147. data/examples/opengl/textures/glwidget.rb +151 -151
  148. data/examples/opengl/textures/main.rb +32 -32
  149. data/examples/opengl/textures/window.rb +77 -77
  150. data/examples/painting/basicdrawing/main.rb +32 -32
  151. data/examples/painting/basicdrawing/renderarea.rb +166 -166
  152. data/examples/painting/basicdrawing/window.rb +215 -215
  153. data/examples/painting/concentriccircles/circlewidget.rb +88 -88
  154. data/examples/painting/concentriccircles/main.rb +32 -32
  155. data/examples/painting/concentriccircles/window.rb +72 -72
  156. data/examples/painting/fontsampler/main.rb +32 -32
  157. data/examples/painting/fontsampler/mainwindow.rb +369 -369
  158. data/examples/painting/fontsampler/mainwindowbase.ui +136 -136
  159. data/examples/painting/fontsampler/makefile +8 -8
  160. data/examples/painting/fontsampler/previewdialog.rb +257 -257
  161. data/examples/painting/fontsampler/previewdialogbase.ui +224 -224
  162. data/examples/painting/fontsampler/previewlabel.rb +43 -43
  163. data/examples/painting/imagecomposition/imagecomposer.rb +152 -152
  164. data/examples/painting/imagecomposition/imagecomposition.qrc +6 -6
  165. data/examples/painting/imagecomposition/main.rb +33 -33
  166. data/examples/painting/imagecomposition/makefile +2 -2
  167. data/examples/painting/painterpaths/main.rb +32 -32
  168. data/examples/painting/painterpaths/renderarea.rb +97 -97
  169. data/examples/painting/painterpaths/window.rb +247 -247
  170. data/examples/painting/svgviewer/files/bubbles.svg +212 -212
  171. data/examples/painting/svgviewer/files/cubic.svg +77 -77
  172. data/examples/painting/svgviewer/files/spheres.svg +79 -79
  173. data/examples/painting/svgviewer/main.rb +38 -38
  174. data/examples/painting/svgviewer/mainwindow.rb +99 -99
  175. data/examples/painting/svgviewer/makefile +2 -2
  176. data/examples/painting/svgviewer/svgview.rb +156 -156
  177. data/examples/painting/svgviewer/svgviewer.qrc +6 -6
  178. data/examples/painting/svgviewer/svgwindow.rb +87 -87
  179. data/examples/painting/transformations/main.rb +32 -32
  180. data/examples/painting/transformations/renderarea.rb +127 -127
  181. data/examples/painting/transformations/window.rb +153 -153
  182. data/examples/passivepopup/passivepopup.rb +38 -38
  183. data/examples/qdbus/chat/chat.rb +146 -146
  184. data/examples/qdbus/chat/chat_adaptor.rb +12 -12
  185. data/examples/qdbus/chat/chat_interface.rb +13 -13
  186. data/examples/qdbus/chat/chatmainwindow.ui +184 -184
  187. data/examples/qdbus/chat/chatsetnickname.ui +145 -145
  188. data/examples/qdbus/chat/makefile +8 -8
  189. data/examples/qdbus/complexpingpong/complexping.rb +92 -92
  190. data/examples/qdbus/complexpingpong/complexpong.rb +83 -83
  191. data/examples/qdbus/complexpingpong/ping-common.rb +1 -1
  192. data/examples/qdbus/listnames/listnames.rb +69 -69
  193. data/examples/qdbus/pingpong/ping-common.rb +1 -1
  194. data/examples/qdbus/pingpong/ping.rb +52 -52
  195. data/examples/qdbus/pingpong/pong.rb +55 -55
  196. data/examples/qdbus/remotecontrolledcar/car/car.rb +151 -151
  197. data/examples/qdbus/remotecontrolledcar/car/main.rb +50 -50
  198. data/examples/qdbus/remotecontrolledcar/controller/controller.rb +66 -66
  199. data/examples/qdbus/remotecontrolledcar/controller/controller.ui +61 -61
  200. data/examples/qdbus/remotecontrolledcar/controller/main.rb +32 -32
  201. data/examples/qdbus/remotecontrolledcar/controller/makefile +2 -2
  202. data/examples/qtscribble/scribble.rb +270 -270
  203. data/examples/richtext/calendar/main.rb +33 -33
  204. data/examples/richtext/calendar/mainwindow.rb +173 -173
  205. data/examples/richtext/orderform/detailsdialog.rb +130 -130
  206. data/examples/richtext/orderform/main.rb +34 -34
  207. data/examples/richtext/orderform/mainwindow.rb +194 -194
  208. data/examples/richtext/syntaxhighlighter/examples/example +79 -79
  209. data/examples/richtext/syntaxhighlighter/highlighter.rb +90 -90
  210. data/examples/richtext/syntaxhighlighter/main.rb +34 -34
  211. data/examples/richtext/syntaxhighlighter/mainwindow.rb +105 -105
  212. data/examples/ruboids/LICENSE.txt +58 -58
  213. data/examples/ruboids/Manifest +26 -26
  214. data/examples/ruboids/README +53 -53
  215. data/examples/ruboids/TODO +29 -29
  216. data/examples/ruboids/boids.properties +33 -33
  217. data/examples/ruboids/generateManifest.rb +42 -42
  218. data/examples/ruboids/release.rb +152 -152
  219. data/examples/ruboids/ruboids/Boid.rb +141 -141
  220. data/examples/ruboids/ruboids/BoidView.rb +159 -159
  221. data/examples/ruboids/ruboids/Camera.rb +24 -24
  222. data/examples/ruboids/ruboids/CameraDialog.rb +218 -218
  223. data/examples/ruboids/ruboids/Canvas.rb +143 -143
  224. data/examples/ruboids/ruboids/Cloud.rb +61 -61
  225. data/examples/ruboids/ruboids/CloudView.rb +54 -54
  226. data/examples/ruboids/ruboids/Flock.rb +47 -47
  227. data/examples/ruboids/ruboids/Graphics.rb +278 -278
  228. data/examples/ruboids/ruboids/Params.rb +87 -87
  229. data/examples/ruboids/ruboids/Point.rb +153 -153
  230. data/examples/ruboids/ruboids/Thing.rb +34 -34
  231. data/examples/ruboids/ruboids/Triangle.rb +21 -21
  232. data/examples/ruboids/ruboids/View.rb +88 -88
  233. data/examples/ruboids/ruboids/World.rb +82 -82
  234. data/examples/ruboids/ruboids/WorldWindow.rb +52 -52
  235. data/examples/ruboids/ruboids/info.rb +12 -12
  236. data/examples/ruboids/ruboids/ruboids.rb +29 -29
  237. data/examples/threading/main_thread.rb +19 -19
  238. data/examples/tutorial/t1/t1.rb +10 -10
  239. data/examples/tutorial/t10/cannon.rb +72 -72
  240. data/examples/tutorial/t10/lcdrange.rb +45 -45
  241. data/examples/tutorial/t10/t10.rb +55 -55
  242. data/examples/tutorial/t11/cannon.rb +123 -124
  243. data/examples/tutorial/t11/lcdrange.rb +45 -45
  244. data/examples/tutorial/t11/t11.rb +65 -65
  245. data/examples/tutorial/t12/cannon.rb +157 -158
  246. data/examples/tutorial/t12/lcdrange.rb +58 -59
  247. data/examples/tutorial/t12/t12.rb +65 -66
  248. data/examples/tutorial/t13/cannon.rb +206 -208
  249. data/examples/tutorial/t13/gamebrd.rb +112 -113
  250. data/examples/tutorial/t13/lcdrange.rb +59 -60
  251. data/examples/tutorial/t13/t13.rb +11 -11
  252. data/examples/tutorial/t14/cannon.rb +262 -263
  253. data/examples/tutorial/t14/gamebrd.rb +122 -123
  254. data/examples/tutorial/t14/lcdrange.rb +61 -63
  255. data/examples/tutorial/t14/t14.rb +11 -11
  256. data/examples/tutorial/t2/t2.rb +16 -16
  257. data/examples/tutorial/t3/t3.rb +17 -18
  258. data/examples/tutorial/t4/t4.rb +23 -25
  259. data/examples/tutorial/t5/t5.rb +35 -37
  260. data/examples/tutorial/t6/t6.rb +48 -52
  261. data/examples/tutorial/t7/lcdrange.rb +32 -32
  262. data/examples/tutorial/t7/t7.rb +40 -42
  263. data/examples/tutorial/t8/cannon.rb +37 -38
  264. data/examples/tutorial/t8/lcdrange.rb +45 -45
  265. data/examples/tutorial/t8/t8.rb +43 -43
  266. data/examples/tutorial/t9/cannon.rb +44 -45
  267. data/examples/tutorial/t9/lcdrange.rb +46 -46
  268. data/examples/tutorial/t9/t9.rb +43 -43
  269. data/examples/widgets/analogclock/analogclock.rb +94 -94
  270. data/examples/widgets/analogclock/main.rb +9 -9
  271. data/examples/widgets/calculator/button.rb +45 -45
  272. data/examples/widgets/calculator/calculator.rb +382 -382
  273. data/examples/widgets/calculator/main.rb +32 -32
  274. data/examples/widgets/charactermap/characterwidget.rb +109 -109
  275. data/examples/widgets/charactermap/main.rb +32 -32
  276. data/examples/widgets/charactermap/mainwindow.rb +118 -118
  277. data/examples/widgets/digitalclock/digitalclock.rb +30 -30
  278. data/examples/widgets/digitalclock/main.rb +9 -9
  279. data/examples/widgets/groupbox/main.rb +32 -32
  280. data/examples/widgets/groupbox/window.rb +134 -134
  281. data/examples/widgets/icons/iconpreviewarea.rb +110 -110
  282. data/examples/widgets/icons/iconsizespinbox.rb +39 -39
  283. data/examples/widgets/icons/imagedelegate.rb +73 -73
  284. data/examples/widgets/icons/main.rb +32 -32
  285. data/examples/widgets/icons/mainwindow.rb +351 -351
  286. data/examples/widgets/imageviewer/imageviewer.rb +219 -219
  287. data/examples/widgets/imageviewer/main.rb +32 -32
  288. data/examples/widgets/lineedits/main.rb +32 -32
  289. data/examples/widgets/lineedits/window.rb +199 -199
  290. data/examples/widgets/movie/main.rb +32 -32
  291. data/examples/widgets/movie/movieplayer.rb +201 -201
  292. data/examples/widgets/screenshot/main.rb +32 -32
  293. data/examples/widgets/screenshot/screenshot.rb +154 -154
  294. data/examples/widgets/scribble/main.rb +32 -32
  295. data/examples/widgets/scribble/mainwindow.rb +202 -202
  296. data/examples/widgets/scribble/scribblearea.rb +154 -154
  297. data/examples/widgets/sliders/main.rb +32 -32
  298. data/examples/widgets/sliders/slidersgroup.rb +97 -97
  299. data/examples/widgets/sliders/window.rb +124 -124
  300. data/examples/widgets/spinboxes/main.rb +32 -32
  301. data/examples/widgets/spinboxes/window.rb +213 -213
  302. data/examples/widgets/tetrix/main.rb +33 -33
  303. data/examples/widgets/tetrix/tetrixboard.rb +346 -346
  304. data/examples/widgets/tetrix/tetrixpiece.rb +135 -135
  305. data/examples/widgets/tetrix/tetrixwindow.rb +88 -88
  306. data/examples/widgets/tooltips/main.rb +32 -32
  307. data/examples/widgets/tooltips/shapeitem.rb +31 -31
  308. data/examples/widgets/tooltips/sortingbox.rb +222 -222
  309. data/examples/widgets/wiggly/dialog.rb +48 -48
  310. data/examples/widgets/wiggly/main.rb +9 -9
  311. data/examples/widgets/wiggly/wigglywidget.rb +75 -75
  312. data/examples/widgets/windowflags/controllerwindow.rb +195 -195
  313. data/examples/widgets/windowflags/main.rb +32 -32
  314. data/examples/widgets/windowflags/previewwindow.rb +103 -103
  315. data/examples/xml/dombookmarks/frank.xbel +230 -230
  316. data/examples/xml/dombookmarks/jennifer.xbel +93 -93
  317. data/examples/xml/dombookmarks/main.rb +34 -34
  318. data/examples/xml/dombookmarks/mainwindow.rb +129 -129
  319. data/examples/xml/dombookmarks/xbeltree.rb +172 -172
  320. data/examples/xml/saxbookmarks/frank.xbel +230 -230
  321. data/examples/xml/saxbookmarks/jennifer.xbel +93 -93
  322. data/examples/xml/saxbookmarks/main.rb +34 -34
  323. data/examples/xml/saxbookmarks/mainwindow.rb +144 -144
  324. data/examples/xml/saxbookmarks/xbelgenerator.rb +95 -95
  325. data/examples/xml/saxbookmarks/xbelhandler.rb +122 -122
  326. data/ext/cmake/modules/BasicFindPackageVersion.cmake.in +30 -30
  327. data/ext/cmake/modules/CMakeCSharpCompiler.cmake.in +7 -7
  328. data/ext/cmake/modules/CMakeCSharpInformation.cmake +366 -366
  329. data/ext/cmake/modules/CMakeDetermineCSharpCompiler.cmake +85 -85
  330. data/ext/cmake/modules/CMakeTestCSharpCompiler.cmake +1 -1
  331. data/ext/cmake/modules/FindLibraryWithDebug.cmake +113 -113
  332. data/ext/cmake/modules/FindMono.cmake +36 -36
  333. data/ext/cmake/modules/FindPHP5.cmake +179 -179
  334. data/ext/cmake/modules/FindPerlMore.cmake +78 -78
  335. data/ext/cmake/modules/FindPhonon.cmake +71 -71
  336. data/ext/cmake/modules/FindQImageBlitz.cmake +51 -51
  337. data/ext/cmake/modules/FindQScintilla.cmake +57 -57
  338. data/ext/cmake/modules/FindQwt5.cmake +104 -104
  339. data/ext/cmake/modules/FindRuby.cmake +279 -279
  340. data/ext/cmake/modules/FindSmoke.cmake +78 -78
  341. data/ext/cmake/modules/MacroLogFeature.cmake +146 -146
  342. data/ext/cmake/modules/MacroOptionalAddBindings.cmake +47 -47
  343. data/ext/cmake/modules/MacroOptionalFindPackage.cmake +28 -28
  344. data/ext/cmake/modules/MacroPushRequiredVars.cmake +47 -47
  345. data/ext/cmake/modules/MacroWriteBasicCMakeVersionFile.cmake +22 -22
  346. data/ext/cmake/modules/SmokeConfig.cmake.in +109 -109
  347. data/ext/generator/CMakeLists.txt +38 -38
  348. data/ext/generator/cmake/BasicFindPackageVersion.cmake.in +30 -30
  349. data/ext/generator/cmake/CMakeLists.txt +24 -24
  350. data/ext/generator/cmake/FindLibraryWithDebug.cmake +113 -113
  351. data/ext/generator/cmake/FindPhonon.cmake +71 -71
  352. data/ext/generator/cmake/FindQImageBlitz.cmake +51 -51
  353. data/ext/generator/cmake/FindQScintilla.cmake +57 -57
  354. data/ext/generator/cmake/FindQwt5.cmake +104 -104
  355. data/ext/generator/cmake/HandleImportedTargetsInCMakeRequiredLibraries.cmake +85 -85
  356. data/ext/generator/cmake/MacroLogFeature.cmake +146 -146
  357. data/ext/generator/cmake/MacroOptionalAddBindings.cmake +47 -47
  358. data/ext/generator/cmake/MacroOptionalFindPackage.cmake +28 -28
  359. data/ext/generator/cmake/MacroWriteBasicCMakeVersionFile.cmake +22 -22
  360. data/ext/generator/cmake/SmokeConfig.cmake.in +109 -109
  361. data/ext/generator/config.h +25 -25
  362. data/ext/generator/generator_export.h +31 -31
  363. data/ext/generator/generatorenvironment.cpp +52 -52
  364. data/ext/generator/generatorenvironment.h +35 -35
  365. data/ext/generator/generatorpreprocessor.cpp +303 -303
  366. data/ext/generator/generatorpreprocessor.h +83 -83
  367. data/ext/generator/generators/CMakeLists.txt +4 -4
  368. data/ext/generator/generators/dump/CMakeLists.txt +15 -15
  369. data/ext/generator/generators/dump/generator_dump.cpp +36 -36
  370. data/ext/generator/generators/smoke/CMakeLists.txt +18 -18
  371. data/ext/generator/generators/smoke/generator_smoke.cpp +240 -240
  372. data/ext/generator/generators/smoke/globals.h +140 -140
  373. data/ext/generator/generators/smoke/helpers.cpp +793 -793
  374. data/ext/generator/generators/smoke/writeClasses.cpp +502 -502
  375. data/ext/generator/generators/smoke/writeSmokeDataFile.cpp +754 -754
  376. data/ext/generator/generatorvisitor.cpp +922 -922
  377. data/ext/generator/generatorvisitor.h +119 -119
  378. data/ext/generator/name_compiler.cpp +205 -205
  379. data/ext/generator/name_compiler.h +76 -76
  380. data/ext/generator/options.cpp +33 -33
  381. data/ext/generator/options.h +46 -46
  382. data/ext/generator/parser/CMakeLists.txt +50 -50
  383. data/ext/generator/parser/ast.cpp +21 -21
  384. data/ext/generator/parser/ast.h +923 -923
  385. data/ext/generator/parser/astutilities.h +65 -65
  386. data/ext/generator/parser/codegenerator.cpp +867 -867
  387. data/ext/generator/parser/codegenerator.h +180 -180
  388. data/ext/generator/parser/codemodel_fwd.h +76 -76
  389. data/ext/generator/parser/commentformatter.cpp +54 -54
  390. data/ext/generator/parser/commentformatter.h +45 -45
  391. data/ext/generator/parser/commentparser.cpp +109 -109
  392. data/ext/generator/parser/commentparser.h +84 -84
  393. data/ext/generator/parser/control.cpp +40 -40
  394. data/ext/generator/parser/control.h +51 -51
  395. data/ext/generator/parser/cppparser_export.h +33 -33
  396. data/ext/generator/parser/default_visitor.cpp +470 -470
  397. data/ext/generator/parser/default_visitor.h +116 -116
  398. data/ext/generator/parser/dumptree.cpp +146 -146
  399. data/ext/generator/parser/dumptree.h +50 -50
  400. data/ext/generator/parser/indexedstring.cpp +213 -213
  401. data/ext/generator/parser/indexedstring.h +147 -147
  402. data/ext/generator/parser/kdevelop-parser-rev +1 -1
  403. data/ext/generator/parser/kdevvarlengtharray.h +346 -346
  404. data/ext/generator/parser/lexer.cpp +964 -964
  405. data/ext/generator/parser/lexer.h +308 -308
  406. data/ext/generator/parser/listnode.cpp +20 -20
  407. data/ext/generator/parser/listnode.h +97 -97
  408. data/ext/generator/parser/memorypool.cpp +20 -20
  409. data/ext/generator/parser/memorypool.h +41 -41
  410. data/ext/generator/parser/name_compiler.cpp +190 -190
  411. data/ext/generator/parser/name_compiler.h +77 -77
  412. data/ext/generator/parser/parser.cpp +4708 -4708
  413. data/ext/generator/parser/parser.h +290 -290
  414. data/ext/generator/parser/parsesession.cpp +106 -106
  415. data/ext/generator/parser/parsesession.h +87 -87
  416. data/ext/generator/parser/problem.h +21 -21
  417. data/ext/generator/parser/rpp/CMakeLists.txt +45 -45
  418. data/ext/generator/parser/rpp/Makefile.am +13 -13
  419. data/ext/generator/parser/rpp/anchor.h +51 -51
  420. data/ext/generator/parser/rpp/appendedlist.h +363 -363
  421. data/ext/generator/parser/rpp/chartools.cpp +146 -146
  422. data/ext/generator/parser/rpp/chartools.h +99 -99
  423. data/ext/generator/parser/rpp/macrorepository.cpp +44 -44
  424. data/ext/generator/parser/rpp/macrorepository.h +59 -59
  425. data/ext/generator/parser/rpp/pp-configuration +86 -86
  426. data/ext/generator/parser/rpp/pp-engine.h +267 -267
  427. data/ext/generator/parser/rpp/pp-environment.cpp +271 -271
  428. data/ext/generator/parser/rpp/pp-environment.h +119 -119
  429. data/ext/generator/parser/rpp/pp-internal.cpp +38 -38
  430. data/ext/generator/parser/rpp/pp-internal.h +37 -37
  431. data/ext/generator/parser/rpp/pp-location.cpp +191 -191
  432. data/ext/generator/parser/rpp/pp-location.h +89 -89
  433. data/ext/generator/parser/rpp/pp-macro-expander.cpp +568 -568
  434. data/ext/generator/parser/rpp/pp-macro-expander.cpp.orig +558 -558
  435. data/ext/generator/parser/rpp/pp-macro-expander.h +130 -130
  436. data/ext/generator/parser/rpp/pp-macro.cpp +153 -153
  437. data/ext/generator/parser/rpp/pp-macro.h +176 -176
  438. data/ext/generator/parser/rpp/pp-scanner.cpp +311 -311
  439. data/ext/generator/parser/rpp/pp-scanner.h +97 -97
  440. data/ext/generator/parser/rpp/pp-stream.cpp +425 -425
  441. data/ext/generator/parser/rpp/pp-stream.h +183 -183
  442. data/ext/generator/parser/rpp/preprocessor.cpp +65 -65
  443. data/ext/generator/parser/rpp/preprocessor.h +80 -80
  444. data/ext/generator/parser/rpp/rpp.pri +2 -2
  445. data/ext/generator/parser/rpp/test/t001.cpp +23 -23
  446. data/ext/generator/parser/rpp/test/t002.cpp +15 -15
  447. data/ext/generator/parser/rpp/test/t003.cpp +10 -10
  448. data/ext/generator/parser/rpp/test/t004.cpp +9 -9
  449. data/ext/generator/parser/rpp/test/t005.cpp +10 -10
  450. data/ext/generator/parser/rpp/test/t006.cpp +10 -10
  451. data/ext/generator/parser/rpp/test/t007.cpp +6 -6
  452. data/ext/generator/parser/rpp/test/t008.cpp +6 -6
  453. data/ext/generator/parser/rpp/test/t009.cpp +5 -5
  454. data/ext/generator/parser/rpp/test/t010.cpp +15 -15
  455. data/ext/generator/parser/rpp/test/t011.cpp +9 -9
  456. data/ext/generator/parser/rpp/tests/CMakeLists.txt +17 -17
  457. data/ext/generator/parser/rpp/tests/main.cpp +69 -69
  458. data/ext/generator/parser/rxx.pri +50 -50
  459. data/ext/generator/parser/rxx_allocator.h +128 -128
  460. data/ext/generator/parser/safetycounter.h +57 -57
  461. data/ext/generator/parser/simplecursor.h +74 -74
  462. data/ext/generator/parser/stringhelpers.cpp +577 -577
  463. data/ext/generator/parser/stringhelpers.h +118 -118
  464. data/ext/generator/parser/symbol.h +140 -140
  465. data/ext/generator/parser/tests/CMakeLists.txt +46 -46
  466. data/ext/generator/parser/tests/test_generator.cpp +259 -259
  467. data/ext/generator/parser/tests/test_parser.cpp +474 -474
  468. data/ext/generator/parser/tests/test_pool.cpp +109 -109
  469. data/ext/generator/parser/tests/test_pool.h +35 -35
  470. data/ext/generator/parser/tests/testconfig.h.cmake +4 -4
  471. data/ext/generator/parser/tokens.cpp +367 -367
  472. data/ext/generator/parser/tokens.h +148 -148
  473. data/ext/generator/parser/type_compiler.cpp +135 -135
  474. data/ext/generator/parser/type_compiler.h +68 -68
  475. data/ext/generator/parser/visitor.cpp +115 -115
  476. data/ext/generator/parser/visitor.h +138 -138
  477. data/ext/generator/smoke.h +557 -557
  478. data/ext/generator/smokegen_string.h +43 -43
  479. data/ext/generator/type.cpp +204 -204
  480. data/ext/generator/type.h +497 -497
  481. data/ext/generator/type_compiler.cpp +277 -277
  482. data/ext/generator/type_compiler.h +80 -80
  483. data/ext/ruby/CMakeLists.txt +64 -64
  484. data/ext/ruby/qtdeclarative/CMakeLists.txt +17 -17
  485. data/ext/ruby/qtdeclarative/qtdeclarative.cpp +67 -67
  486. data/ext/ruby/qtdeclarative/qtdeclarative.rb +17 -17
  487. data/ext/ruby/qtdeclarative/qtdeclarativehandlers.cpp +36 -36
  488. data/ext/ruby/qtruby/AUTHORS +54 -54
  489. data/ext/ruby/qtruby/COPYING +355 -355
  490. data/ext/ruby/qtruby/COPYING.LIB +510 -510
  491. data/ext/ruby/qtruby/ChangeLog +3732 -3732
  492. data/ext/ruby/qtruby/INSTALL +79 -79
  493. data/ext/ruby/qtruby/README +264 -264
  494. data/ext/ruby/qtruby/TODO +8 -8
  495. data/ext/ruby/qtruby/bin/rbqtapi +152 -152
  496. data/ext/ruby/qtruby/rails_support/CMakeLists.txt +1 -1
  497. data/ext/ruby/qtruby/rails_support/active_item_model.rb +234 -234
  498. data/ext/ruby/qtruby/rails_support/active_table_model.rb +122 -122
  499. data/ext/ruby/qtruby/src/marshall_basetypes.h +208 -208
  500. data/ext/ruby/qtruby/src/marshall_complex.h +175 -175
  501. data/ext/ruby/qtruby/src/marshall_macros.h +647 -647
  502. data/ext/ruby/qtruby/src/marshall_types.cpp +815 -815
  503. data/ext/ruby/qtruby/src/marshall_types.h +240 -240
  504. data/ext/ruby/qtruby/src/qtruby.cpp +1 -1
  505. data/ext/ruby/qtruby/test/opoverloading.rb +46 -46
  506. data/ext/ruby/qtruby/test/unittests.rb +151 -151
  507. data/ext/ruby/qtruby/tools/rbrcc/main.cpp +173 -173
  508. data/ext/ruby/qtruby/tools/rbrcc/rbrcc.pro +14 -14
  509. data/ext/ruby/qtruby/tools/rbrcc/rcc.cpp +648 -648
  510. data/ext/ruby/qtruby/tools/rbrcc/rcc.h +165 -165
  511. data/ext/ruby/qtruby/tools/rbuic/LICENSE.GPL +280 -280
  512. data/ext/ruby/qtruby/tools/rbuic/TODO +4 -4
  513. data/ext/ruby/qtruby/tools/rbuic/customwidgetsinfo.cpp +106 -106
  514. data/ext/ruby/qtruby/tools/rbuic/customwidgetsinfo.h +95 -95
  515. data/ext/ruby/qtruby/tools/rbuic/databaseinfo.cpp +102 -102
  516. data/ext/ruby/qtruby/tools/rbuic/databaseinfo.h +85 -85
  517. data/ext/ruby/qtruby/tools/rbuic/driver.cpp +384 -384
  518. data/ext/ruby/qtruby/tools/rbuic/driver.h +141 -141
  519. data/ext/ruby/qtruby/tools/rbuic/rbuic.pri +23 -23
  520. data/ext/ruby/qtruby/tools/rbuic/rbuic4.pro +43 -43
  521. data/ext/ruby/qtruby/tools/rbuic/ruby/rbextractimages.cpp +150 -150
  522. data/ext/ruby/qtruby/tools/rbuic/ruby/rbextractimages.h +83 -83
  523. data/ext/ruby/qtruby/tools/rbuic/ruby/rbwritedeclaration.cpp +217 -217
  524. data/ext/ruby/qtruby/tools/rbuic/ruby/rbwritedeclaration.h +85 -85
  525. data/ext/ruby/qtruby/tools/rbuic/ruby/rbwriteicondata.cpp +185 -185
  526. data/ext/ruby/qtruby/tools/rbuic/ruby/rbwriteicondata.h +86 -86
  527. data/ext/ruby/qtruby/tools/rbuic/ruby/rbwriteicondeclaration.cpp +88 -88
  528. data/ext/ruby/qtruby/tools/rbuic/ruby/rbwriteicondeclaration.h +83 -83
  529. data/ext/ruby/qtruby/tools/rbuic/ruby/rbwriteiconinitialization.cpp +126 -126
  530. data/ext/ruby/qtruby/tools/rbuic/ruby/rbwriteiconinitialization.h +87 -87
  531. data/ext/ruby/qtruby/tools/rbuic/ruby/rbwriteinitialization.cpp +2478 -2478
  532. data/ext/ruby/qtruby/tools/rbuic/ruby/rbwriteinitialization.h +314 -314
  533. data/ext/ruby/qtruby/tools/rbuic/ruby/ruby.pri +18 -18
  534. data/ext/ruby/qtruby/tools/rbuic/treewalker.cpp +318 -318
  535. data/ext/ruby/qtruby/tools/rbuic/treewalker.h +139 -139
  536. data/ext/ruby/qtruby/tools/rbuic/ui4.cpp +7623 -7623
  537. data/ext/ruby/qtruby/tools/rbuic/ui4.h +3180 -3180
  538. data/ext/ruby/qtruby/tools/rbuic/utils.h +125 -125
  539. data/ext/ruby/qtruby/tools/rbuic/validator.cpp +100 -100
  540. data/ext/ruby/qtruby/tools/rbuic/validator.h +80 -80
  541. data/ext/ruby/qtscript/CMakeLists.txt +19 -19
  542. data/ext/ruby/qtscript/qtscript.cpp +83 -83
  543. data/ext/ruby/qtscript/qtscript.rb +40 -40
  544. data/ext/ruby/qtscript/qtscripthandlers.cpp +37 -37
  545. data/ext/ruby/qtscript/smokedata.cpp +1403 -1403
  546. data/ext/ruby/qttest/CMakeLists.txt +18 -18
  547. data/ext/ruby/qttest/ChangeLog +9 -9
  548. data/ext/ruby/qttest/examples/myfirsttest.rb +30 -30
  549. data/ext/ruby/qttest/qttest.cpp +83 -83
  550. data/ext/ruby/qttest/qttest.rb +166 -166
  551. data/ext/ruby/qttest/qttesthandlers.cpp +37 -37
  552. data/ext/ruby/qtuitools/CMakeLists.txt +16 -16
  553. data/ext/ruby/qtuitools/qtuitools.cpp +83 -83
  554. data/ext/ruby/qtuitools/qtuitools.rb +17 -17
  555. data/ext/ruby/qtuitools/qtuitoolshandlers.cpp +32 -32
  556. data/ext/ruby/qtwebkit/CMakeLists.txt +17 -17
  557. data/ext/ruby/qtwebkit/qtwebkit.cpp +67 -67
  558. data/ext/ruby/qtwebkit/qtwebkit.rb +17 -17
  559. data/ext/ruby/qtwebkit/qtwebkithandlers.cpp +40 -40
  560. data/ext/smoke/deptool/CMakeLists.txt +7 -7
  561. data/ext/smoke/deptool/main.cpp +128 -128
  562. data/ext/smoke/qtcore/CMakeLists.txt +88 -88
  563. data/ext/smoke/qtcore/QtGuess.txt +180 -180
  564. data/ext/smoke/qtcore/config.xml.cmake +10 -10
  565. data/ext/smoke/qtcore/qt-config.xml.cmake +21 -21
  566. data/ext/smoke/qtcore/qtcore_includes.h +1 -1
  567. data/ext/smoke/qtcore/smokeconfig.xml +193 -193
  568. data/ext/smoke/qtcore/tests/CMakeLists.txt +13 -13
  569. data/ext/smoke/qtcore/tests/test.cpp +846 -846
  570. data/ext/smoke/qtcore_smoke.h +16 -16
  571. data/ext/smoke/qtdbus/CMakeLists.txt +38 -38
  572. data/ext/smoke/qtdbus/config.xml.cmake +11 -11
  573. data/ext/smoke/qtdbus/qtdbus_includes.h +2 -2
  574. data/ext/smoke/qtdbus/smokeconfig.xml +65 -65
  575. data/ext/smoke/qtdbus_smoke.h +16 -16
  576. data/ext/smoke/qtdeclarative/CMakeLists.txt +45 -45
  577. data/ext/smoke/qtdeclarative/config.xml.cmake +12 -12
  578. data/ext/smoke/qtdeclarative/qtdeclarative_includes.h +3 -3
  579. data/ext/smoke/qtdeclarative/smokeconfig.xml +59 -59
  580. data/ext/smoke/qtdeclarative_smoke.h +16 -16
  581. data/ext/smoke/qtgui/CMakeLists.txt +76 -76
  582. data/ext/smoke/qtgui/config.xml.cmake +11 -11
  583. data/ext/smoke/qtgui/qtgui_includes.h +7 -7
  584. data/ext/smoke/qtgui/smokeconfig.xml +500 -500
  585. data/ext/smoke/qtgui_smoke.h +16 -16
  586. data/ext/smoke/qthelp/CMakeLists.txt +45 -45
  587. data/ext/smoke/qthelp/config.xml.cmake +13 -13
  588. data/ext/smoke/qthelp/qthelp_includes.h +3 -3
  589. data/ext/smoke/qthelp/smokeconfig.xml +54 -54
  590. data/ext/smoke/qthelp_smoke.h +16 -16
  591. data/ext/smoke/qtmultimedia/CMakeLists.txt +42 -42
  592. data/ext/smoke/qtmultimedia/config.xml.cmake +12 -12
  593. data/ext/smoke/qtmultimedia/qtmultimedia_includes.h +3 -3
  594. data/ext/smoke/qtmultimedia/smokeconfig.xml +51 -51
  595. data/ext/smoke/qtmultimedia_smoke.h +16 -16
  596. data/ext/smoke/qtnetwork/CMakeLists.txt +38 -38
  597. data/ext/smoke/qtnetwork/config.xml.cmake +11 -11
  598. data/ext/smoke/qtnetwork/qtnetwork_includes.h +2 -2
  599. data/ext/smoke/qtnetwork/smokeconfig.xml +81 -81
  600. data/ext/smoke/qtnetwork_smoke.h +16 -16
  601. data/ext/smoke/qtopengl/CMakeLists.txt +43 -43
  602. data/ext/smoke/qtopengl/config.xml.cmake +13 -13
  603. data/ext/smoke/qtopengl/qtopengl_includes.h +3 -3
  604. data/ext/smoke/qtopengl/smokeconfig.xml +58 -58
  605. data/ext/smoke/qtopengl_smoke.h +16 -16
  606. data/ext/smoke/qtscript/CMakeLists.txt +31 -31
  607. data/ext/smoke/qtscript/config.xml.cmake +11 -11
  608. data/ext/smoke/qtscript/qtscript_includes.h +14 -14
  609. data/ext/smoke/qtscript/smokeconfig.xml +39 -39
  610. data/ext/smoke/qtscript_smoke.h +16 -16
  611. data/ext/smoke/qtsql/CMakeLists.txt +45 -45
  612. data/ext/smoke/qtsql/config.xml.cmake +11 -11
  613. data/ext/smoke/qtsql/qtsql_includes.h +3 -3
  614. data/ext/smoke/qtsql/smokeconfig.xml +60 -60
  615. data/ext/smoke/qtsql_smoke.h +16 -16
  616. data/ext/smoke/qtsvg/CMakeLists.txt +43 -43
  617. data/ext/smoke/qtsvg/config.xml.cmake +12 -12
  618. data/ext/smoke/qtsvg/qtsvg_includes.h +3 -3
  619. data/ext/smoke/qtsvg/smokeconfig.xml +46 -46
  620. data/ext/smoke/qtsvg_smoke.h +16 -16
  621. data/ext/smoke/qttest/CMakeLists.txt +35 -35
  622. data/ext/smoke/qttest/config.xml.cmake +12 -12
  623. data/ext/smoke/qttest/qttest_includes.h +14 -14
  624. data/ext/smoke/qttest/smokeconfig.xml +36 -36
  625. data/ext/smoke/qttest_smoke.h +16 -16
  626. data/ext/smoke/qtuitools/CMakeLists.txt +30 -30
  627. data/ext/smoke/qtuitools/config.xml.cmake +12 -12
  628. data/ext/smoke/qtuitools/qtuitools_includes.h +1 -1
  629. data/ext/smoke/qtuitools/smokeconfig.xml +20 -20
  630. data/ext/smoke/qtuitools_smoke.h +16 -16
  631. data/ext/smoke/qtwebkit/CMakeLists.txt +36 -36
  632. data/ext/smoke/qtwebkit/config.xml.cmake +11 -11
  633. data/ext/smoke/qtwebkit/qtwebkit_includes.h +1 -1
  634. data/ext/smoke/qtwebkit/smokeconfig.xml +48 -48
  635. data/ext/smoke/qtwebkit_smoke.h +16 -16
  636. data/ext/smoke/qtxml/CMakeLists.txt +41 -41
  637. data/ext/smoke/qtxml/config.xml.cmake +11 -11
  638. data/ext/smoke/qtxml/qtxml_includes.h +2 -2
  639. data/ext/smoke/qtxml/smokeconfig.xml +70 -70
  640. data/ext/smoke/qtxml_smoke.h +16 -16
  641. data/ext/smoke/qtxmlpatterns/CMakeLists.txt +42 -42
  642. data/ext/smoke/qtxmlpatterns/config.xml.cmake +12 -12
  643. data/ext/smoke/qtxmlpatterns/qtxmlpatterns_includes.h +3 -3
  644. data/ext/smoke/qtxmlpatterns/smokeconfig.xml +80 -80
  645. data/ext/smoke/qtxmlpatterns_smoke.h +16 -16
  646. data/ext/smoke/smokeapi/CMakeLists.txt +9 -9
  647. data/ext/smoke/smokeapi/main.cpp +309 -309
  648. data/ext/smoke/smokebase/CMakeLists.txt +11 -11
  649. data/ext/smoke/smokebase/smokebase.cpp +6 -6
  650. data/ext/smoke/solid_smoke.h +16 -16
  651. data/lib/Qt.rb +1 -1
  652. data/lib/Qt4.rb +119 -111
  653. data/lib/qtbindings_version.rb +2 -2
  654. data/lib/qtdeclarative/qtdeclarative.rb +17 -17
  655. data/lib/qtscript/qtscript.rb +40 -40
  656. data/lib/qttest/qttest.rb +166 -166
  657. data/lib/qtuitools/qtuitools.rb +17 -17
  658. data/lib/qtwebkit/qtwebkit.rb +17 -17
  659. metadata +6 -7
@@ -1,558 +1,558 @@
1
- /*
2
- Copyright 2005 Roberto Raggi <roberto@kdevelop.org>
3
- Copyright 2006 Hamish Rodda <rodda@kde.org>
4
- Copyright 2007-2009 David Nolden <david.nolden.kdevelop@art-master.de>
5
-
6
- Permission to use, copy, modify, distribute, and sell this software and its
7
- documentation for any purpose is hereby granted without fee, provided that
8
- the above copyright notice appear in all copies and that both that
9
- copyright notice and this permission notice appear in supporting
10
- documentation.
11
-
12
- The above copyright notice and this permission notice shall be included in
13
- all copies or substantial portions of the Software.
14
-
15
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
- KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
19
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
20
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21
- */
22
-
23
- #include "pp-macro-expander.h"
24
-
25
- #include <QDate>
26
- #include <QTime>
27
- #include <QtDebug>
28
-
29
- #include "../problem.h"
30
- #include "../indexedstring.h"
31
-
32
- #include "pp-internal.h"
33
- #include "pp-engine.h"
34
- #include "pp-environment.h"
35
- #include "pp-location.h"
36
- #include "preprocessor.h"
37
- #include "chartools.h"
38
-
39
- const int maxMacroExpansionDepth = 50;
40
-
41
- QString joinIndexVector(const uint* arrays, uint size, QString between) {
42
- QString ret;
43
- FOREACH_CUSTOM(uint item, arrays, size) {
44
- if(!ret.isEmpty())
45
- ret += between;
46
- ret += IndexedString::fromIndex(item).str();
47
- }
48
- return ret;
49
- }
50
-
51
- QString joinIndexVector(const QVector<IndexedString>& list, QString between) {
52
- QString ret;
53
- foreach(const IndexedString& item, list) {
54
- if(!ret.isEmpty())
55
- ret += between;
56
- ret += item.str();
57
- }
58
- return ret;
59
- }
60
-
61
- void trim(QVector<uint>& array) {
62
- int lastValid = array.size()-1;
63
- for(; lastValid >= 0; --lastValid)
64
- if(array[lastValid] != indexFromCharacter(' '))
65
- break;
66
-
67
- array.resize(lastValid+1);
68
-
69
- int firstValid = 0;
70
- for(; firstValid < array.size(); ++firstValid)
71
- if(array[firstValid] != indexFromCharacter(' '))
72
- break;
73
- array = array.mid(firstValid);
74
- }
75
-
76
- using namespace rpp;
77
-
78
- pp_frame::pp_frame(pp_macro* __expandingMacro, const QList<pp_actual>& __actuals)
79
- : depth(0)
80
- , expandingMacro(__expandingMacro)
81
- , actuals(__actuals)
82
- {
83
- }
84
-
85
- pp_actual pp_macro_expander::resolve_formal(IndexedString name, Stream& input)
86
- {
87
- if (!m_frame)
88
- return pp_actual();
89
-
90
- Q_ASSERT(m_frame->expandingMacro != 0);
91
-
92
- const QVector<IndexedString>& formals = m_frame->expandingMacro->formals;
93
- uint formalsSize = formals.size();
94
-
95
- if(name.isEmpty()) {
96
- Problem *problem = new Problem;
97
- problem->file = m_engine->currentFileNameString();
98
- problem->position = input.originalInputPosition();
99
- problem->description = "Macro error";
100
- m_engine->problemEncountered(problem);
101
- return pp_actual();
102
- }
103
-
104
- for (uint index = 0; index < formalsSize; ++index) {
105
- if (name.index() == formals[index].index()) {
106
- if (index < (uint)m_frame->actuals.size()) {
107
- return m_frame->actuals[index];
108
- }
109
- else {
110
- Problem *problem = new Problem;
111
- problem->file = m_engine->currentFileNameString();
112
- problem->position = input.originalInputPosition();
113
- problem->description = QString("Call to macro %1 missing argument number %2").arg(name.str()).arg(index);
114
- problem->explanation = QString("Formals: %1").arg(joinIndexVector(formals, ", "));
115
- m_engine->problemEncountered(problem);
116
- }
117
- }
118
- }
119
-
120
- return pp_actual();
121
- }
122
-
123
- pp_macro_expander::pp_macro_expander(pp* engine, pp_frame* frame, bool inHeaderSection)
124
- : m_engine(engine)
125
- , m_frame(frame)
126
- , m_in_header_section(inHeaderSection)
127
- , m_search_significant_content(false)
128
- , m_found_significant_content(false)
129
- {
130
- if(m_in_header_section)
131
- m_search_significant_content = true; //Find the end of the header section
132
- }
133
-
134
- //A header-section ends when the first non-directive and non-comment occurs
135
- #define check_header_section \
136
- if( m_search_significant_content ) \
137
- { \
138
- \
139
- if(m_in_header_section) { \
140
- m_in_header_section = false; \
141
- m_engine->preprocessor()->headerSectionEnded(input); \
142
- } \
143
- m_found_significant_content = true; \
144
- m_search_significant_content = false; \
145
- if( input.atEnd() ) \
146
- continue; \
147
- } \
148
-
149
- struct EnableMacroExpansion {
150
- EnableMacroExpansion(Stream& _input, const SimpleCursor& expansionPosition) : input(_input), hadMacroExpansion(_input.macroExpansion().isValid()) {
151
-
152
- if(!hadMacroExpansion)
153
- _input.setMacroExpansion(expansionPosition);
154
- }
155
- ~EnableMacroExpansion() {
156
- if(!hadMacroExpansion)
157
- input.setMacroExpansion(SimpleCursor::invalid());
158
- }
159
- Stream& input;
160
- bool hadMacroExpansion;
161
- };
162
-
163
- IndexedString definedIndex = IndexedString("defined");
164
- IndexedString lineIndex = IndexedString("__LINE__");
165
- IndexedString fileIndex = IndexedString("__FILE__");
166
- IndexedString dateIndex = IndexedString("__DATE__");
167
- IndexedString timeIndex= IndexedString("__TIME__");
168
-
169
- void pp_macro_expander::operator()(Stream& input, Stream& output)
170
- {
171
- skip_blanks(input, output);
172
-
173
- while (!input.atEnd())
174
- {
175
- if (isComment(input))
176
- {
177
- skip_comment_or_divop(input, output, true);
178
- }else{
179
- if (input == '\n')
180
- {
181
- output << input;
182
-
183
- skip_blanks(++input, output);
184
-
185
- if (!input.atEnd() && input == '#')
186
- break;
187
- }
188
- else if (input == '#')
189
- {
190
- Q_ASSERT(isCharacter(input.current()));
191
- Q_ASSERT(IndexedString::fromIndex(input.current()).str() == "#");
192
-
193
- ++input;
194
-
195
- // search for the paste token
196
- if(input == '#') {
197
- ++input;
198
- skip_blanks (input, devnull());
199
-
200
- IndexedString previous = IndexedString::fromIndex(output.popLastOutput()); //Previous already has been expanded
201
- while(output.offset() > 0 && isCharacter(previous.index()) && characterFromIndex(previous.index()) == ' ')
202
- previous = IndexedString::fromIndex(output.popLastOutput());
203
-
204
- IndexedString add = IndexedString::fromIndex(skip_identifier (input));
205
-
206
- PreprocessedContents newExpanded;
207
-
208
- {
209
- //Expand "add", so it is eventually replaced by an actual
210
- PreprocessedContents actualText;
211
- actualText.append(add.index());
212
-
213
- {
214
- Stream as(&actualText);
215
- pp_macro_expander expand_actual(m_engine, m_frame);
216
- Stream nas(&newExpanded);
217
- expand_actual(as, nas);
218
- }
219
- }
220
-
221
- if(!newExpanded.isEmpty()) {
222
- IndexedString first = IndexedString::fromIndex(newExpanded.first());
223
- if(!isCharacter(first.index()) || QChar(characterFromIndex(first.index())).isLetterOrNumber() || characterFromIndex(first.index()) == '_') {
224
- //Merge the tokens
225
- newExpanded.first() = IndexedString(previous.byteArray() + first.byteArray()).index();
226
- }else{
227
- //Cannot merge, prepend the previous text
228
- newExpanded.prepend(previous.index());
229
- }
230
- }else{
231
- newExpanded.append(previous.index());
232
- }
233
-
234
- //Now expand the merged text completely into the output.
235
- pp_macro_expander final_expansion(m_engine, m_frame);
236
- Stream nas(&newExpanded, output.currentOutputAnchor());
237
- final_expansion(nas, output);
238
- continue;
239
- }
240
-
241
- skip_blanks(input, output);
242
-
243
- IndexedString identifier = IndexedString::fromIndex( skip_identifier(input) );
244
-
245
- Anchor inputPosition = input.inputPosition();
246
- SimpleCursor originalInputPosition = input.originalInputPosition();
247
- PreprocessedContents formal = resolve_formal(identifier, input).mergeText();
248
-
249
- //Escape so we don't break on '"'
250
- for(int a = formal.count()-1; a >= 0; --a) {
251
- if(formal[a] == indexFromCharacter('\"') || formal[a] == indexFromCharacter('\\'))
252
- formal.insert(a, indexFromCharacter('\\'));
253
- else if(formal[a] == indexFromCharacter('\n')) {
254
- //Replace newlines with "\n"
255
- formal[a] = indexFromCharacter('n');
256
- formal.insert(a, indexFromCharacter('\\'));
257
- }
258
-
259
- }
260
-
261
- Stream is(&formal, inputPosition);
262
- is.setOriginalInputPosition(originalInputPosition);
263
- skip_whitespaces(is, devnull());
264
-
265
- output << '\"';
266
-
267
- while (!is.atEnd()) {
268
- if (input == '"') {
269
- output << '\\' << is;
270
-
271
- } else if (input == '\n') {
272
- output << '"' << is << '"';
273
-
274
- } else {
275
- output << is;
276
- }
277
-
278
- skip_whitespaces(++is, output);
279
- }
280
-
281
- output << '\"';
282
- }
283
- else if (input == '\"')
284
- {
285
- check_header_section
286
-
287
- skip_string_literal(input, output);
288
- }
289
- else if (input == '\'')
290
- {
291
- check_header_section
292
-
293
- skip_char_literal(input, output);
294
- }
295
- else if (isSpace(input.current()))
296
- {
297
- do {
298
- if (input == '\n' || !isSpace(input.current()))
299
- break;
300
-
301
- output << input;
302
-
303
- } while (!(++input).atEnd());
304
- }
305
- else if (isNumber(input.current()))
306
- {
307
- check_header_section
308
-
309
- skip_number (input, output);
310
- }
311
- else if (isLetter(input.current()) || input == '_' || !isCharacter(input.current()))
312
- {
313
- check_header_section
314
-
315
- Anchor inputPosition = input.inputPosition();
316
- IndexedString name = IndexedString::fromIndex(skip_identifier (input));
317
-
318
- Anchor inputPosition2 = input.inputPosition();
319
- pp_actual actual = resolve_formal(name, input);
320
- if (actual.isValid()) {
321
- Q_ASSERT(actual.text.size() == actual.inputPosition.size());
322
-
323
- QList<PreprocessedContents>::const_iterator textIt = actual.text.constBegin();
324
- QList<Anchor>::const_iterator cursorIt = actual.inputPosition.constBegin();
325
-
326
- for( ; textIt != actual.text.constEnd(); ++textIt, ++cursorIt )
327
- {
328
- output.appendString(*cursorIt, *textIt);
329
- }
330
- output << ' '; //Insert a whitespace to omit implicit token merging
331
- output.mark(input.inputPosition());
332
-
333
- if(actual.text.isEmpty()) {
334
- int start = input.offset();
335
-
336
- skip_blanks(input, devnull());
337
- //Omit paste tokens behind empty used actuals, else we will merge with the previous text
338
- if(input == '#' && (++input) == '#') {
339
- ++input;
340
- //We have skipped a paste token
341
- }else{
342
- input.seek(start);
343
- }
344
- }
345
-
346
- continue;
347
- }
348
-
349
- // TODO handle inbuilt "defined" etc functions
350
-
351
- pp_macro* macro = m_engine->environment()->retrieveMacro(name, false);
352
-
353
- if (!macro || !macro->defined || macro->hidden || macro->function_like || m_engine->hideNextMacro())
354
- {
355
- m_engine->setHideNextMacro(name == definedIndex);
356
-
357
- if (name == lineIndex)
358
- output.appendString(inputPosition, convertFromByteArray(QString::number(input.inputPosition().line).toUtf8()));
359
- else if (name == fileIndex)
360
- output.appendString(inputPosition, convertFromByteArray(QString("\"%1\"").arg(m_engine->currentFileNameString()).toUtf8()));
361
- else if (name == dateIndex)
362
- output.appendString(inputPosition, convertFromByteArray(QDate::currentDate().toString("MMM dd yyyy").toUtf8()));
363
- else if (name == timeIndex)
364
- output.appendString(inputPosition, convertFromByteArray(QTime::currentTime().toString("hh:mm:ss").toUtf8()));
365
- else
366
- output.appendString(inputPosition, name);
367
- continue;
368
- }
369
-
370
- EnableMacroExpansion enable(output, input.inputPosition()); //Configure the output-stream so it marks all stored input-positions as transformed through a macro
371
-
372
- if (macro->definition.size()) {
373
- macro->hidden = true;
374
-
375
- pp_macro_expander expand_macro(m_engine);
376
- ///@todo UGLY conversion
377
- Stream ms((uint*)macro->definition.constData(), macro->definition.size(), Anchor(input.inputPosition(), true));
378
- ms.setOriginalInputPosition(input.originalInputPosition());
379
- PreprocessedContents expanded;
380
- {
381
- Stream es(&expanded);
382
- expand_macro(ms, es);
383
- }
384
-
385
- if (!expanded.isEmpty())
386
- {
387
- Stream es(&expanded, Anchor(input.inputPosition(), true));
388
- es.setOriginalInputPosition(input.originalInputPosition());
389
- skip_whitespaces(es, devnull());
390
- IndexedString identifier = IndexedString::fromIndex( skip_identifier(es) );
391
-
392
- output.appendString(Anchor(input.inputPosition(), true), expanded);
393
- output << ' '; //Prevent implicit token merging
394
- }
395
-
396
- macro->hidden = false;
397
- }
398
- }else if(input == '(') {
399
-
400
- //Eventually execute a function-macro
401
-
402
- IndexedString previous = IndexedString::fromIndex(indexFromCharacter(' ')); //Previous already has been expanded
403
- uint stepsBack = 0;
404
- while(isCharacter(previous.index()) && characterFromIndex(previous.index()) == ' ' && output.peekLastOutput(stepsBack)) {
405
- previous = IndexedString::fromIndex(output.peekLastOutput(stepsBack));
406
- ++stepsBack;
407
- }
408
-
409
- pp_macro* macro = m_engine->environment()->retrieveMacro(previous, false);
410
-
411
- if(!macro || !macro->function_like || !macro->defined || macro->hidden) {
412
- output << input;
413
- ++input;
414
- continue;
415
- }
416
-
417
- //In case expansion fails, we can skip back to this position
418
- int openingPosition = input.offset();
419
- Anchor openingPositionCursor = input.inputPosition();
420
-
421
- QList<pp_actual> actuals;
422
- ++input; // skip '('
423
-
424
- pp_macro_expander expand_actual(m_engine, m_frame);
425
-
426
- {
427
- PreprocessedContents actualText;
428
- skip_whitespaces(input, devnull());
429
- Anchor actualStart = input.inputPosition();
430
- {
431
- Stream as(&actualText);
432
- skip_argument_variadics(actuals, macro, input, as);
433
- }
434
- trim(actualText);
435
-
436
- pp_actual newActual;
437
- {
438
- PreprocessedContents newActualText;
439
- Stream as(&actualText, actualStart);
440
- as.setOriginalInputPosition(input.originalInputPosition());
441
-
442
- rpp::LocationTable table;
443
- table.anchor(0, actualStart, 0);
444
- Stream nas(&newActualText, actualStart, &table);
445
- expand_actual(as, nas);
446
-
447
- table.splitByAnchors(newActualText, actualStart, newActual.text, newActual.inputPosition);
448
- }
449
- newActual.forceValid = true;
450
-
451
- actuals.append(newActual);
452
- }
453
-
454
- // TODO: why separate from the above?
455
- while (!input.atEnd() && input == ',')
456
- {
457
- ++input; // skip ','
458
-
459
- {
460
- PreprocessedContents actualText;
461
- skip_whitespaces(input, devnull());
462
- Anchor actualStart = input.inputPosition();
463
- {
464
- Stream as(&actualText);
465
- skip_argument_variadics(actuals, macro, input, as);
466
- }
467
- trim(actualText);
468
-
469
- pp_actual newActual;
470
- {
471
- PreprocessedContents newActualText;
472
- Stream as(&actualText, actualStart);
473
- as.setOriginalInputPosition(input.originalInputPosition());
474
-
475
- PreprocessedContents actualText;
476
- rpp::LocationTable table;
477
- table.anchor(0, actualStart, 0);
478
- Stream nas(&newActualText, actualStart, &table);
479
- expand_actual(as, nas);
480
-
481
- table.splitByAnchors(newActualText, actualStart, newActual.text, newActual.inputPosition);
482
- }
483
- newActual.forceValid = true;
484
- actuals.append(newActual);
485
- }
486
- }
487
-
488
- if( input != ')' ) {
489
- //Failed to expand the macro. Output the macro name and continue normal
490
- //processing behind it.(Code completion depends on this behavior when expanding
491
- //incomplete input-lines)
492
- input.seek(openingPosition);
493
- input.setInputPosition(openingPositionCursor);
494
- //Move one character into the output, so we don't get an endless loop
495
- output << input;
496
- ++input;
497
- continue;
498
- }
499
-
500
- //Remove the name of the called macro
501
- while(stepsBack) {
502
- --stepsBack;
503
- output.popLastOutput();
504
- }
505
-
506
- //Q_ASSERT(!input.atEnd() && input == ')');
507
-
508
- ++input; // skip ')'
509
-
510
- #if 0 // ### enable me
511
- assert ((macro->variadics && macro->formals.size () >= actuals.size ())
512
- || macro->formals.size() == actuals.size());
513
- #endif
514
- EnableMacroExpansion enable(output, input.inputPosition()); //Configure the output-stream so it marks all stored input-positions as transformed through a macro
515
-
516
- pp_frame frame(macro, actuals);
517
- if(m_frame)
518
- frame.depth = m_frame->depth + 1;
519
-
520
- if(frame.depth >= maxMacroExpansionDepth)
521
- {
522
- qDebug() << "reached maximum macro-expansion depth while expanding" << macro->name.str();
523
- output << input;
524
- ++input;
525
- }else{
526
- pp_macro_expander expand_macro(m_engine, &frame);
527
- macro->hidden = true;
528
- ///@todo UGLY conversion
529
- Stream ms((uint*)macro->definition.constData(), macro->definition.size(), Anchor(input.inputPosition(), true));
530
- ms.setOriginalInputPosition(input.originalInputPosition());
531
- expand_macro(ms, output);
532
- output << ' '; //Prevent implicit token merging
533
- macro->hidden = false;
534
- }
535
- } else {
536
- output << input;
537
- ++input;
538
- }
539
- }
540
-
541
- }
542
- }
543
-
544
- void pp_macro_expander::skip_argument_variadics (const QList<pp_actual>& __actuals, pp_macro *__macro, Stream& input, Stream& output)
545
- {
546
- int first;
547
-
548
- do {
549
- first = input.offset();
550
- skip_argument(input, output);
551
-
552
- } while ( __macro->variadics
553
- && first != input.offset()
554
- && !input.atEnd()
555
- && input == '.'
556
- && (__actuals.size() + 1) == (int)__macro->formals.size());
557
- }
558
-
1
+ /*
2
+ Copyright 2005 Roberto Raggi <roberto@kdevelop.org>
3
+ Copyright 2006 Hamish Rodda <rodda@kde.org>
4
+ Copyright 2007-2009 David Nolden <david.nolden.kdevelop@art-master.de>
5
+
6
+ Permission to use, copy, modify, distribute, and sell this software and its
7
+ documentation for any purpose is hereby granted without fee, provided that
8
+ the above copyright notice appear in all copies and that both that
9
+ copyright notice and this permission notice appear in supporting
10
+ documentation.
11
+
12
+ The above copyright notice and this permission notice shall be included in
13
+ all copies or substantial portions of the Software.
14
+
15
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
+ KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
19
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
20
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21
+ */
22
+
23
+ #include "pp-macro-expander.h"
24
+
25
+ #include <QDate>
26
+ #include <QTime>
27
+ #include <QtDebug>
28
+
29
+ #include "../problem.h"
30
+ #include "../indexedstring.h"
31
+
32
+ #include "pp-internal.h"
33
+ #include "pp-engine.h"
34
+ #include "pp-environment.h"
35
+ #include "pp-location.h"
36
+ #include "preprocessor.h"
37
+ #include "chartools.h"
38
+
39
+ const int maxMacroExpansionDepth = 50;
40
+
41
+ QString joinIndexVector(const uint* arrays, uint size, QString between) {
42
+ QString ret;
43
+ FOREACH_CUSTOM(uint item, arrays, size) {
44
+ if(!ret.isEmpty())
45
+ ret += between;
46
+ ret += IndexedString::fromIndex(item).str();
47
+ }
48
+ return ret;
49
+ }
50
+
51
+ QString joinIndexVector(const QVector<IndexedString>& list, QString between) {
52
+ QString ret;
53
+ foreach(const IndexedString& item, list) {
54
+ if(!ret.isEmpty())
55
+ ret += between;
56
+ ret += item.str();
57
+ }
58
+ return ret;
59
+ }
60
+
61
+ void trim(QVector<uint>& array) {
62
+ int lastValid = array.size()-1;
63
+ for(; lastValid >= 0; --lastValid)
64
+ if(array[lastValid] != indexFromCharacter(' '))
65
+ break;
66
+
67
+ array.resize(lastValid+1);
68
+
69
+ int firstValid = 0;
70
+ for(; firstValid < array.size(); ++firstValid)
71
+ if(array[firstValid] != indexFromCharacter(' '))
72
+ break;
73
+ array = array.mid(firstValid);
74
+ }
75
+
76
+ using namespace rpp;
77
+
78
+ pp_frame::pp_frame(pp_macro* __expandingMacro, const QList<pp_actual>& __actuals)
79
+ : depth(0)
80
+ , expandingMacro(__expandingMacro)
81
+ , actuals(__actuals)
82
+ {
83
+ }
84
+
85
+ pp_actual pp_macro_expander::resolve_formal(IndexedString name, Stream& input)
86
+ {
87
+ if (!m_frame)
88
+ return pp_actual();
89
+
90
+ Q_ASSERT(m_frame->expandingMacro != 0);
91
+
92
+ const QVector<IndexedString>& formals = m_frame->expandingMacro->formals;
93
+ uint formalsSize = formals.size();
94
+
95
+ if(name.isEmpty()) {
96
+ Problem *problem = new Problem;
97
+ problem->file = m_engine->currentFileNameString();
98
+ problem->position = input.originalInputPosition();
99
+ problem->description = "Macro error";
100
+ m_engine->problemEncountered(problem);
101
+ return pp_actual();
102
+ }
103
+
104
+ for (uint index = 0; index < formalsSize; ++index) {
105
+ if (name.index() == formals[index].index()) {
106
+ if (index < (uint)m_frame->actuals.size()) {
107
+ return m_frame->actuals[index];
108
+ }
109
+ else {
110
+ Problem *problem = new Problem;
111
+ problem->file = m_engine->currentFileNameString();
112
+ problem->position = input.originalInputPosition();
113
+ problem->description = QString("Call to macro %1 missing argument number %2").arg(name.str()).arg(index);
114
+ problem->explanation = QString("Formals: %1").arg(joinIndexVector(formals, ", "));
115
+ m_engine->problemEncountered(problem);
116
+ }
117
+ }
118
+ }
119
+
120
+ return pp_actual();
121
+ }
122
+
123
+ pp_macro_expander::pp_macro_expander(pp* engine, pp_frame* frame, bool inHeaderSection)
124
+ : m_engine(engine)
125
+ , m_frame(frame)
126
+ , m_in_header_section(inHeaderSection)
127
+ , m_search_significant_content(false)
128
+ , m_found_significant_content(false)
129
+ {
130
+ if(m_in_header_section)
131
+ m_search_significant_content = true; //Find the end of the header section
132
+ }
133
+
134
+ //A header-section ends when the first non-directive and non-comment occurs
135
+ #define check_header_section \
136
+ if( m_search_significant_content ) \
137
+ { \
138
+ \
139
+ if(m_in_header_section) { \
140
+ m_in_header_section = false; \
141
+ m_engine->preprocessor()->headerSectionEnded(input); \
142
+ } \
143
+ m_found_significant_content = true; \
144
+ m_search_significant_content = false; \
145
+ if( input.atEnd() ) \
146
+ continue; \
147
+ } \
148
+
149
+ struct EnableMacroExpansion {
150
+ EnableMacroExpansion(Stream& _input, const SimpleCursor& expansionPosition) : input(_input), hadMacroExpansion(_input.macroExpansion().isValid()) {
151
+
152
+ if(!hadMacroExpansion)
153
+ _input.setMacroExpansion(expansionPosition);
154
+ }
155
+ ~EnableMacroExpansion() {
156
+ if(!hadMacroExpansion)
157
+ input.setMacroExpansion(SimpleCursor::invalid());
158
+ }
159
+ Stream& input;
160
+ bool hadMacroExpansion;
161
+ };
162
+
163
+ IndexedString definedIndex = IndexedString("defined");
164
+ IndexedString lineIndex = IndexedString("__LINE__");
165
+ IndexedString fileIndex = IndexedString("__FILE__");
166
+ IndexedString dateIndex = IndexedString("__DATE__");
167
+ IndexedString timeIndex= IndexedString("__TIME__");
168
+
169
+ void pp_macro_expander::operator()(Stream& input, Stream& output)
170
+ {
171
+ skip_blanks(input, output);
172
+
173
+ while (!input.atEnd())
174
+ {
175
+ if (isComment(input))
176
+ {
177
+ skip_comment_or_divop(input, output, true);
178
+ }else{
179
+ if (input == '\n')
180
+ {
181
+ output << input;
182
+
183
+ skip_blanks(++input, output);
184
+
185
+ if (!input.atEnd() && input == '#')
186
+ break;
187
+ }
188
+ else if (input == '#')
189
+ {
190
+ Q_ASSERT(isCharacter(input.current()));
191
+ Q_ASSERT(IndexedString::fromIndex(input.current()).str() == "#");
192
+
193
+ ++input;
194
+
195
+ // search for the paste token
196
+ if(input == '#') {
197
+ ++input;
198
+ skip_blanks (input, devnull());
199
+
200
+ IndexedString previous = IndexedString::fromIndex(output.popLastOutput()); //Previous already has been expanded
201
+ while(output.offset() > 0 && isCharacter(previous.index()) && characterFromIndex(previous.index()) == ' ')
202
+ previous = IndexedString::fromIndex(output.popLastOutput());
203
+
204
+ IndexedString add = IndexedString::fromIndex(skip_identifier (input));
205
+
206
+ PreprocessedContents newExpanded;
207
+
208
+ {
209
+ //Expand "add", so it is eventually replaced by an actual
210
+ PreprocessedContents actualText;
211
+ actualText.append(add.index());
212
+
213
+ {
214
+ Stream as(&actualText);
215
+ pp_macro_expander expand_actual(m_engine, m_frame);
216
+ Stream nas(&newExpanded);
217
+ expand_actual(as, nas);
218
+ }
219
+ }
220
+
221
+ if(!newExpanded.isEmpty()) {
222
+ IndexedString first = IndexedString::fromIndex(newExpanded.first());
223
+ if(!isCharacter(first.index()) || QChar(characterFromIndex(first.index())).isLetterOrNumber() || characterFromIndex(first.index()) == '_') {
224
+ //Merge the tokens
225
+ newExpanded.first() = IndexedString(previous.byteArray() + first.byteArray()).index();
226
+ }else{
227
+ //Cannot merge, prepend the previous text
228
+ newExpanded.prepend(previous.index());
229
+ }
230
+ }else{
231
+ newExpanded.append(previous.index());
232
+ }
233
+
234
+ //Now expand the merged text completely into the output.
235
+ pp_macro_expander final_expansion(m_engine, m_frame);
236
+ Stream nas(&newExpanded, output.currentOutputAnchor());
237
+ final_expansion(nas, output);
238
+ continue;
239
+ }
240
+
241
+ skip_blanks(input, output);
242
+
243
+ IndexedString identifier = IndexedString::fromIndex( skip_identifier(input) );
244
+
245
+ Anchor inputPosition = input.inputPosition();
246
+ SimpleCursor originalInputPosition = input.originalInputPosition();
247
+ PreprocessedContents formal = resolve_formal(identifier, input).mergeText();
248
+
249
+ //Escape so we don't break on '"'
250
+ for(int a = formal.count()-1; a >= 0; --a) {
251
+ if(formal[a] == indexFromCharacter('\"') || formal[a] == indexFromCharacter('\\'))
252
+ formal.insert(a, indexFromCharacter('\\'));
253
+ else if(formal[a] == indexFromCharacter('\n')) {
254
+ //Replace newlines with "\n"
255
+ formal[a] = indexFromCharacter('n');
256
+ formal.insert(a, indexFromCharacter('\\'));
257
+ }
258
+
259
+ }
260
+
261
+ Stream is(&formal, inputPosition);
262
+ is.setOriginalInputPosition(originalInputPosition);
263
+ skip_whitespaces(is, devnull());
264
+
265
+ output << '\"';
266
+
267
+ while (!is.atEnd()) {
268
+ if (input == '"') {
269
+ output << '\\' << is;
270
+
271
+ } else if (input == '\n') {
272
+ output << '"' << is << '"';
273
+
274
+ } else {
275
+ output << is;
276
+ }
277
+
278
+ skip_whitespaces(++is, output);
279
+ }
280
+
281
+ output << '\"';
282
+ }
283
+ else if (input == '\"')
284
+ {
285
+ check_header_section
286
+
287
+ skip_string_literal(input, output);
288
+ }
289
+ else if (input == '\'')
290
+ {
291
+ check_header_section
292
+
293
+ skip_char_literal(input, output);
294
+ }
295
+ else if (isSpace(input.current()))
296
+ {
297
+ do {
298
+ if (input == '\n' || !isSpace(input.current()))
299
+ break;
300
+
301
+ output << input;
302
+
303
+ } while (!(++input).atEnd());
304
+ }
305
+ else if (isNumber(input.current()))
306
+ {
307
+ check_header_section
308
+
309
+ skip_number (input, output);
310
+ }
311
+ else if (isLetter(input.current()) || input == '_' || !isCharacter(input.current()))
312
+ {
313
+ check_header_section
314
+
315
+ Anchor inputPosition = input.inputPosition();
316
+ IndexedString name = IndexedString::fromIndex(skip_identifier (input));
317
+
318
+ Anchor inputPosition2 = input.inputPosition();
319
+ pp_actual actual = resolve_formal(name, input);
320
+ if (actual.isValid()) {
321
+ Q_ASSERT(actual.text.size() == actual.inputPosition.size());
322
+
323
+ QList<PreprocessedContents>::const_iterator textIt = actual.text.constBegin();
324
+ QList<Anchor>::const_iterator cursorIt = actual.inputPosition.constBegin();
325
+
326
+ for( ; textIt != actual.text.constEnd(); ++textIt, ++cursorIt )
327
+ {
328
+ output.appendString(*cursorIt, *textIt);
329
+ }
330
+ output << ' '; //Insert a whitespace to omit implicit token merging
331
+ output.mark(input.inputPosition());
332
+
333
+ if(actual.text.isEmpty()) {
334
+ int start = input.offset();
335
+
336
+ skip_blanks(input, devnull());
337
+ //Omit paste tokens behind empty used actuals, else we will merge with the previous text
338
+ if(input == '#' && (++input) == '#') {
339
+ ++input;
340
+ //We have skipped a paste token
341
+ }else{
342
+ input.seek(start);
343
+ }
344
+ }
345
+
346
+ continue;
347
+ }
348
+
349
+ // TODO handle inbuilt "defined" etc functions
350
+
351
+ pp_macro* macro = m_engine->environment()->retrieveMacro(name, false);
352
+
353
+ if (!macro || !macro->defined || macro->hidden || macro->function_like || m_engine->hideNextMacro())
354
+ {
355
+ m_engine->setHideNextMacro(name == definedIndex);
356
+
357
+ if (name == lineIndex)
358
+ output.appendString(inputPosition, convertFromByteArray(QString::number(input.inputPosition().line).toUtf8()));
359
+ else if (name == fileIndex)
360
+ output.appendString(inputPosition, convertFromByteArray(QString("\"%1\"").arg(m_engine->currentFileNameString()).toUtf8()));
361
+ else if (name == dateIndex)
362
+ output.appendString(inputPosition, convertFromByteArray(QDate::currentDate().toString("MMM dd yyyy").toUtf8()));
363
+ else if (name == timeIndex)
364
+ output.appendString(inputPosition, convertFromByteArray(QTime::currentTime().toString("hh:mm:ss").toUtf8()));
365
+ else
366
+ output.appendString(inputPosition, name);
367
+ continue;
368
+ }
369
+
370
+ EnableMacroExpansion enable(output, input.inputPosition()); //Configure the output-stream so it marks all stored input-positions as transformed through a macro
371
+
372
+ if (macro->definition.size()) {
373
+ macro->hidden = true;
374
+
375
+ pp_macro_expander expand_macro(m_engine);
376
+ ///@todo UGLY conversion
377
+ Stream ms((uint*)macro->definition.constData(), macro->definition.size(), Anchor(input.inputPosition(), true));
378
+ ms.setOriginalInputPosition(input.originalInputPosition());
379
+ PreprocessedContents expanded;
380
+ {
381
+ Stream es(&expanded);
382
+ expand_macro(ms, es);
383
+ }
384
+
385
+ if (!expanded.isEmpty())
386
+ {
387
+ Stream es(&expanded, Anchor(input.inputPosition(), true));
388
+ es.setOriginalInputPosition(input.originalInputPosition());
389
+ skip_whitespaces(es, devnull());
390
+ IndexedString identifier = IndexedString::fromIndex( skip_identifier(es) );
391
+
392
+ output.appendString(Anchor(input.inputPosition(), true), expanded);
393
+ output << ' '; //Prevent implicit token merging
394
+ }
395
+
396
+ macro->hidden = false;
397
+ }
398
+ }else if(input == '(') {
399
+
400
+ //Eventually execute a function-macro
401
+
402
+ IndexedString previous = IndexedString::fromIndex(indexFromCharacter(' ')); //Previous already has been expanded
403
+ uint stepsBack = 0;
404
+ while(isCharacter(previous.index()) && characterFromIndex(previous.index()) == ' ' && output.peekLastOutput(stepsBack)) {
405
+ previous = IndexedString::fromIndex(output.peekLastOutput(stepsBack));
406
+ ++stepsBack;
407
+ }
408
+
409
+ pp_macro* macro = m_engine->environment()->retrieveMacro(previous, false);
410
+
411
+ if(!macro || !macro->function_like || !macro->defined || macro->hidden) {
412
+ output << input;
413
+ ++input;
414
+ continue;
415
+ }
416
+
417
+ //In case expansion fails, we can skip back to this position
418
+ int openingPosition = input.offset();
419
+ Anchor openingPositionCursor = input.inputPosition();
420
+
421
+ QList<pp_actual> actuals;
422
+ ++input; // skip '('
423
+
424
+ pp_macro_expander expand_actual(m_engine, m_frame);
425
+
426
+ {
427
+ PreprocessedContents actualText;
428
+ skip_whitespaces(input, devnull());
429
+ Anchor actualStart = input.inputPosition();
430
+ {
431
+ Stream as(&actualText);
432
+ skip_argument_variadics(actuals, macro, input, as);
433
+ }
434
+ trim(actualText);
435
+
436
+ pp_actual newActual;
437
+ {
438
+ PreprocessedContents newActualText;
439
+ Stream as(&actualText, actualStart);
440
+ as.setOriginalInputPosition(input.originalInputPosition());
441
+
442
+ rpp::LocationTable table;
443
+ table.anchor(0, actualStart, 0);
444
+ Stream nas(&newActualText, actualStart, &table);
445
+ expand_actual(as, nas);
446
+
447
+ table.splitByAnchors(newActualText, actualStart, newActual.text, newActual.inputPosition);
448
+ }
449
+ newActual.forceValid = true;
450
+
451
+ actuals.append(newActual);
452
+ }
453
+
454
+ // TODO: why separate from the above?
455
+ while (!input.atEnd() && input == ',')
456
+ {
457
+ ++input; // skip ','
458
+
459
+ {
460
+ PreprocessedContents actualText;
461
+ skip_whitespaces(input, devnull());
462
+ Anchor actualStart = input.inputPosition();
463
+ {
464
+ Stream as(&actualText);
465
+ skip_argument_variadics(actuals, macro, input, as);
466
+ }
467
+ trim(actualText);
468
+
469
+ pp_actual newActual;
470
+ {
471
+ PreprocessedContents newActualText;
472
+ Stream as(&actualText, actualStart);
473
+ as.setOriginalInputPosition(input.originalInputPosition());
474
+
475
+ PreprocessedContents actualText;
476
+ rpp::LocationTable table;
477
+ table.anchor(0, actualStart, 0);
478
+ Stream nas(&newActualText, actualStart, &table);
479
+ expand_actual(as, nas);
480
+
481
+ table.splitByAnchors(newActualText, actualStart, newActual.text, newActual.inputPosition);
482
+ }
483
+ newActual.forceValid = true;
484
+ actuals.append(newActual);
485
+ }
486
+ }
487
+
488
+ if( input != ')' ) {
489
+ //Failed to expand the macro. Output the macro name and continue normal
490
+ //processing behind it.(Code completion depends on this behavior when expanding
491
+ //incomplete input-lines)
492
+ input.seek(openingPosition);
493
+ input.setInputPosition(openingPositionCursor);
494
+ //Move one character into the output, so we don't get an endless loop
495
+ output << input;
496
+ ++input;
497
+ continue;
498
+ }
499
+
500
+ //Remove the name of the called macro
501
+ while(stepsBack) {
502
+ --stepsBack;
503
+ output.popLastOutput();
504
+ }
505
+
506
+ //Q_ASSERT(!input.atEnd() && input == ')');
507
+
508
+ ++input; // skip ')'
509
+
510
+ #if 0 // ### enable me
511
+ assert ((macro->variadics && macro->formals.size () >= actuals.size ())
512
+ || macro->formals.size() == actuals.size());
513
+ #endif
514
+ EnableMacroExpansion enable(output, input.inputPosition()); //Configure the output-stream so it marks all stored input-positions as transformed through a macro
515
+
516
+ pp_frame frame(macro, actuals);
517
+ if(m_frame)
518
+ frame.depth = m_frame->depth + 1;
519
+
520
+ if(frame.depth >= maxMacroExpansionDepth)
521
+ {
522
+ qDebug() << "reached maximum macro-expansion depth while expanding" << macro->name.str();
523
+ output << input;
524
+ ++input;
525
+ }else{
526
+ pp_macro_expander expand_macro(m_engine, &frame);
527
+ macro->hidden = true;
528
+ ///@todo UGLY conversion
529
+ Stream ms((uint*)macro->definition.constData(), macro->definition.size(), Anchor(input.inputPosition(), true));
530
+ ms.setOriginalInputPosition(input.originalInputPosition());
531
+ expand_macro(ms, output);
532
+ output << ' '; //Prevent implicit token merging
533
+ macro->hidden = false;
534
+ }
535
+ } else {
536
+ output << input;
537
+ ++input;
538
+ }
539
+ }
540
+
541
+ }
542
+ }
543
+
544
+ void pp_macro_expander::skip_argument_variadics (const QList<pp_actual>& __actuals, pp_macro *__macro, Stream& input, Stream& output)
545
+ {
546
+ int first;
547
+
548
+ do {
549
+ first = input.offset();
550
+ skip_argument(input, output);
551
+
552
+ } while ( __macro->variadics
553
+ && first != input.offset()
554
+ && !input.atEnd()
555
+ && input == '.'
556
+ && (__actuals.size() + 1) == (int)__macro->formals.size());
557
+ }
558
+