Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into mask

  • Loading branch information...
commit 22708e1d2a25bed237ad31593fd8923dfae9bc81 2 parents 6abb3c9 + e3156ea
@gnarf gnarf authored
Showing with 27,893 additions and 784 deletions.
  1. +2 −0  .gitignore
  2. +126 −165 build/build.xml
  3. BIN  build/build/google-compiler-20110320.jar
  4. +5,504 −0 build/build/lib/jslint.js
  5. +1,315 −0 build/build/lib/parse-js.js
  6. +1,666 −0 build/build/lib/process.js
  7. +22 −0 build/build/lib/squeeze-more.js
  8. +3 −0  build/build/minify-js.sh
  9. +41 −0 build/build/sizer.js
  10. +285 −0 build/build/uglify.js
  11. +1 −1  demos/accordion/collapsible.html
  12. +1 −1  demos/accordion/custom-icons.html
  13. +1 −1  demos/accordion/default.html
  14. +1 −1  demos/accordion/fillspace.html
  15. +1 −1  demos/accordion/hoverintent.html
  16. +1 −1  demos/accordion/mouseover.html
  17. +1 −1  demos/accordion/no-auto-height.html
  18. +1 −1  demos/accordion/sortable.html
  19. +1 −1  demos/addClass/default.html
  20. +1 −1  demos/animate/default.html
  21. +1 −1  demos/autocomplete/categories.html
  22. +1 −1  demos/autocomplete/combobox.html
  23. +1 −1  demos/autocomplete/custom-data.html
  24. +1 −1  demos/autocomplete/default.html
  25. +1 −1  demos/autocomplete/folding.html
  26. +1 −1  demos/autocomplete/maxheight.html
  27. +1 −1  demos/autocomplete/multiple-remote.html
  28. +1 −1  demos/autocomplete/multiple.html
  29. +1 −1  demos/autocomplete/remote-jsonp.html
  30. +1 −1  demos/autocomplete/remote-with-cache.html
  31. +1 −1  demos/autocomplete/remote.html
  32. +1 −1  demos/autocomplete/xml.html
  33. +1 −1  demos/button/checkbox.html
  34. +1 −1  demos/button/default.html
  35. +1 −1  demos/button/icons.html
  36. +1 −1  demos/button/radio.html
  37. +1 −1  demos/button/splitbutton.html
  38. +1 −1  demos/button/toolbar.html
  39. +1 −1  demos/datepicker/alt-field.html
  40. +1 −1  demos/datepicker/animation.html
  41. +1 −1  demos/datepicker/buttonbar.html
  42. +1 −1  demos/datepicker/date-formats.html
  43. +1 −1  demos/datepicker/date-range.html
  44. +1 −1  demos/datepicker/default.html
  45. +1 −1  demos/datepicker/dropdown-month-year.html
  46. +1 −1  demos/datepicker/icon-trigger.html
  47. +1 −1  demos/datepicker/inline.html
  48. +1 −1  demos/datepicker/localization.html
  49. +1 −1  demos/datepicker/min-max.html
  50. +1 −1  demos/datepicker/multiple-calendars.html
  51. +1 −1  demos/datepicker/other-months.html
  52. +1 −1  demos/datepicker/show-week.html
  53. +1 −1  demos/dialog/animated.html
  54. +1 −1  demos/dialog/default.html
  55. +1 −1  demos/dialog/modal-confirmation.html
  56. +1 −1  demos/dialog/modal-form.html
  57. +1 −1  demos/dialog/modal-message.html
  58. +1 −1  demos/dialog/modal.html
  59. +1 −1  demos/draggable/constrain-movement.html
  60. +1 −1  demos/draggable/cursor-style.html
  61. +1 −1  demos/draggable/default.html
  62. +1 −1  demos/draggable/delay-start.html
  63. +1 −1  demos/draggable/events.html
  64. +1 −1  demos/draggable/handle.html
  65. +1 −1  demos/draggable/revert.html
  66. +1 −1  demos/draggable/scroll.html
  67. +1 −1  demos/draggable/snap-to.html
  68. +1 −1  demos/draggable/sortable.html
  69. +1 −1  demos/draggable/visual-feedback.html
  70. +1 −1  demos/droppable/accepted-elements.html
  71. +1 −1  demos/droppable/default.html
  72. +1 −1  demos/droppable/photo-manager.html
  73. +1 −1  demos/droppable/propagation.html
  74. +1 −1  demos/droppable/revert.html
  75. +1 −1  demos/droppable/shopping-cart.html
  76. +1 −1  demos/droppable/visual-feedback.html
  77. +1 −1  demos/effect/default.html
  78. +1 −1  demos/effect/easing.html
  79. +1 −1  demos/hide/default.html
  80. +1 −1  demos/index.html
  81. +7 −7 demos/menu/contextmenu.html
  82. +1 −1  demos/menu/default.html
  83. +1 −1  demos/menu/navigationmenu.html
  84. +1 −1  demos/menu/topalignmenu.html
  85. +1 −1  demos/menubar/default.html
  86. +1 −1  demos/popup/animation.html
  87. +1 −1  demos/popup/default.html
  88. +1 −0  demos/popup/index.html
  89. +1 −1  demos/popup/popup-menu-table.html
  90. +10 −16 demos/popup/popup-menu.html
  91. +61 −0 demos/popup/tooltip.html
  92. +1 −1  demos/position/cycler.html
  93. +1 −1  demos/position/default.html
  94. +1 −1  demos/progressbar/animated.html
  95. +1 −1  demos/progressbar/default.html
  96. +1 −1  demos/progressbar/resize.html
  97. +1 −1  demos/removeClass/default.html
  98. +1 −1  demos/resizable/animate.html
  99. +1 −1  demos/resizable/aspect-ratio.html
  100. +1 −1  demos/resizable/constrain-area.html
  101. +1 −1  demos/resizable/default.html
  102. +1 −1  demos/resizable/delay-start.html
  103. +1 −1  demos/resizable/helper.html
  104. +1 −1  demos/resizable/max-min.html
  105. +1 −1  demos/resizable/snap-to-grid.html
  106. +1 −1  demos/resizable/synchronous-resize.html
  107. +1 −1  demos/resizable/textarea.html
  108. +1 −1  demos/resizable/visual-feedback.html
  109. +1 −1  demos/selectable/default.html
  110. +1 −1  demos/selectable/display-grid.html
  111. +1 −1  demos/selectable/serialize.html
  112. +1 −1  demos/show/default.html
  113. +1 −1  demos/slider/colorpicker.html
  114. +1 −1  demos/slider/default.html
  115. +1 −1  demos/slider/hotelrooms.html
  116. +1 −1  demos/slider/multiple-vertical.html
  117. +1 −1  demos/slider/range-vertical.html
  118. +1 −1  demos/slider/range.html
  119. +1 −1  demos/slider/rangemax.html
  120. +1 −1  demos/slider/rangemin.html
  121. +1 −1  demos/slider/side-scroll.html
  122. +1 −1  demos/slider/slider-vertical.html
  123. +1 −1  demos/slider/steps.html
  124. +1 −1  demos/slider/tabs.html
  125. +1 −1  demos/sortable/connect-lists-through-tabs.html
  126. +1 −1  demos/sortable/connect-lists.html
  127. +1 −1  demos/sortable/default.html
  128. +1 −1  demos/sortable/delay-start.html
  129. +1 −1  demos/sortable/display-grid.html
  130. +1 −1  demos/sortable/empty-lists.html
  131. +1 −1  demos/sortable/items.html
  132. +1 −1  demos/sortable/placeholder.html
  133. +1 −1  demos/sortable/portlets.html
  134. +1 −1  demos/spinner/currency.html
  135. +1 −1  demos/spinner/decimal.html
  136. +1 −1  demos/spinner/default.html
  137. +1 −1  demos/spinner/latlong.html
  138. +1 −1  demos/spinner/overflow.html
  139. +1 −1  demos/spinner/time.html
  140. +1 −1  demos/switchClass/default.html
  141. +1 −1  demos/tabs/ajax.html
  142. +1 −1  demos/tabs/bottom.html
  143. +1 −1  demos/tabs/collapsible.html
  144. +1 −1  demos/tabs/cookie.html
  145. +1 −1  demos/tabs/default.html
  146. +1 −1  demos/tabs/manipulation.html
  147. +1 −1  demos/tabs/mouseover.html
  148. +1 −1  demos/tabs/sortable.html
  149. +1 −1  demos/tabs/vertical.html
  150. +1 −1  demos/toggle/default.html
  151. +1 −1  demos/toggleClass/default.html
  152. +1 −1  demos/tooltip/custom-animation.html
  153. +1 −1  demos/tooltip/custom-content.html
  154. +1 −1  demos/tooltip/default.html
  155. +1 −1  demos/tooltip/forms.html
  156. +9 −7 demos/tooltip/tracking.html
  157. +1 −1  demos/tooltip/video-player.html
  158. +1 −1  demos/widget/default.html
  159. +9,046 −0 jquery-1.6.4.js
  160. +1 −1  tests/index.html
  161. +226 −163 jquery-1.6.2.js → tests/jquery-1.6.3.js
  162. +9,046 −0 tests/jquery-1.6.4.js
  163. +1 −1  tests/jquery.js
  164. +1 −1  tests/static/button/default.html
  165. +1 −1  tests/static/datepicker/datepicker.html
  166. +1 −1  tests/static/datepicker/default.html
  167. +1 −1  tests/static/icons.html
  168. +1 −1  tests/static/slider/default.html
  169. +1 −1  tests/static/slider/default_vertical.html
  170. +1 −1  tests/static/slider/slider_horizontal.html
  171. +1 −1  tests/static/slider/slider_horizontal_range.html
  172. +1 −1  tests/static/slider/slider_horizontal_range_max.html
  173. +1 −1  tests/static/slider/slider_horizontal_range_min.html
  174. +1 −1  tests/static/slider/slider_vertical.html
  175. +1 −1  tests/static/slider/slider_vertical_range.html
  176. +1 −1  tests/static/slider/slider_vertical_range_max.html
  177. +1 −1  tests/static/slider/slider_vertical_range_min.html
  178. +1 −1  tests/unit/accordion/all.html
  179. +1 −1  tests/unit/all.html
  180. +1 −1  tests/unit/autocomplete/all.html
  181. +1 −1  tests/unit/autocomplete/autocomplete_options.js
  182. +1 −1  tests/unit/button/all.html
  183. +1 −1  tests/unit/core/all.html
  184. +1 −1  tests/unit/datepicker/all.html
  185. +1 −1  tests/unit/dialog/all.html
  186. +1 −1  tests/unit/draggable/all.html
  187. +1 −1  tests/unit/droppable/all.html
  188. +1 −1  tests/unit/effects/all.html
  189. +10 −0 tests/unit/effects/effects.html
  190. +79 −61 tests/unit/effects/effects_core.js
  191. +2 −0  tests/unit/effects/effects_scale.js
  192. +1 −1  tests/unit/menu/all.html
  193. +1 −0  tests/unit/menu/menu_defaults.js
  194. +1 −1  tests/unit/position/all.html
  195. +1 −1  tests/unit/progressbar/all.html
  196. +1 −1  tests/unit/resizable/all.html
  197. +1 −1  tests/unit/selectable/all.html
  198. +1 −1  tests/unit/slider/all.html
  199. +1 −1  tests/unit/sortable/all.html
  200. +1 −1  tests/unit/spinner/all.html
  201. +1 −0  tests/unit/spinner/spinner.html
  202. +1 −0  tests/unit/spinner/spinner_defaults.js
  203. +28 −0 tests/unit/spinner/spinner_options.js
  204. +1 −1  tests/unit/subsuite.js
  205. +1 −1  tests/unit/tabs/all.html
  206. +2 −1  tests/unit/tabs/tabs_events.js
  207. +1 −1  tests/unit/tooltip/all.html
  208. +1 −1  tests/unit/tooltip/tooltip_defaults.js
  209. +3 −1 tests/unit/tooltip/tooltip_events.js
  210. +1 −1  tests/unit/widget/all.html
  211. +1 −1  tests/visual/addClass/addClass_queue.html
  212. +1 −1  tests/visual/button/button.html
  213. +1 −1  tests/visual/button/button_disabled_true.html
  214. +1 −1  tests/visual/button/button_input_type_checkbox.html
  215. +1 −1  tests/visual/button/button_option_disabled_true.html
  216. +1 −1  tests/visual/button/button_performance.html
  217. +1 −1  tests/visual/button/button_ticket_5254.html
  218. +1 −1  tests/visual/button/button_ticket_5261.html
  219. +1 −1  tests/visual/button/button_ticket_5278.html
  220. +1 −1  tests/visual/compound/accordion_dialog.html
  221. +1 −1  tests/visual/compound/accordion_tabs.html
  222. +1 −1  tests/visual/compound/datepicker_dialog.html
  223. +1 −1  tests/visual/compound/draggable_accordion.html
  224. +1 −1  tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html
  225. +1 −1  tests/visual/compound/sortable_accordion_sortable_tabs.html
  226. +1 −1  tests/visual/compound/tabs_tabs.html
  227. +1 −1  tests/visual/compound/tabs_tooltips.html
  228. +1 −1  tests/visual/compound/widgets_in_dialog.html
  229. +1 −1  tests/visual/datepicker/datepicker.html
  230. +1 −1  tests/visual/datepicker/datepicker_multi_inline.html
  231. +1 −1  tests/visual/datepicker/datepicker_ticket_4071.html
  232. +1 −1  tests/visual/datepicker/datepicker_ticket_4240.html
  233. +1 −1  tests/visual/datepicker/datepicker_ticket_4443.html
  234. +1 −1  tests/visual/datepicker/datepicker_ticket_5676.html
  235. +1 −1  tests/visual/datepicker/datepicker_ticket_7552.html
  236. +1 −1  tests/visual/datepicker/multimonth.html
  237. +1 −1  tests/visual/datepicker/viewport.html
  238. +1 −1  tests/visual/dialog/dialog_on_page_with_large_dom.html
  239. +1 −1  tests/visual/draggable/draggable.html
  240. +1 −1  tests/visual/draggable/draggable.scroll.html
  241. +1 −1  tests/visual/draggable/draggable_option_containment_array.html
  242. +1 −1  tests/visual/draggable/draggable_option_cursorAt_object.html
  243. +1 −1  tests/visual/draggable/draggable_option_handle_selector.html
  244. +1 −1  tests/visual/draggable/draggable_option_iframeFix_false.html
  245. +1 −1  tests/visual/draggable/draggable_option_iframeFix_selector.html
  246. +1 −1  tests/visual/draggable/draggable_option_iframeFix_true.html
  247. +1 −1  tests/visual/droppable/droppable.html
  248. +1 −1  tests/visual/droppable/droppable_option_accept_default.html
  249. +1 −1  tests/visual/droppable/droppable_option_accept_function.html
  250. +1 −1  tests/visual/droppable/droppable_option_accept_selector.html
  251. +1 −1  tests/visual/droppable/droppable_ticket_4087.html
  252. +1 −1  tests/visual/droppable/droppable_ticket_4088.html
  253. +1 −1  tests/visual/effects/effects.all.html
  254. +1 −1  tests/visual/effects/effects.scale.html
  255. +1 −1  tests/visual/menu/drilldown.html
  256. +2 −2 tests/visual/menu/menu.html
  257. +1 −1  tests/visual/menu/tablemenu.html
  258. +1 −1  tests/visual/position/position.html
  259. +1 −1  tests/visual/position/position_fit.html
  260. +1 −1  tests/visual/position/position_flip.html
  261. +1 −1  tests/visual/position/position_flipfit.html
  262. +1 −1  tests/visual/position/position_margin.html
  263. +1 −1  tests/visual/position/position_within.html
  264. +1 −1  tests/visual/resizable/resizable.html
  265. +1 −1  tests/visual/resizable/resizable_option_alsoResize_child.html
  266. +1 −1  tests/visual/resizable/resizable_option_aspectRatio_0.5.html
  267. +1 −1  tests/visual/resizable/resizable_option_aspectRatio_1.0.html
  268. +1 −1  tests/visual/resizable/resizable_option_aspectRatio_1.5.html
  269. +1 −1  tests/visual/resizable/resizable_option_aspectRatio_preserve_maxHeight_150.html
  270. +1 −1  tests/visual/resizable/resizable_option_aspectRatio_preserve_maxWidth_150.html
  271. +1 −1  tests/visual/resizable/resizable_option_aspectRatio_preserve_minHeight_50.html
  272. +1 −1  tests/visual/resizable/resizable_option_aspectRatio_preserve_minWidth_50.html
  273. +1 −1  tests/visual/resizable/resizable_option_aspectRatio_preserve_w100xh100.html
  274. +1 −1  tests/visual/resizable/resizable_option_aspectRatio_preserve_w100xh50.html
  275. +1 −1  tests/visual/resizable/resizable_option_aspectRatio_preserve_w50xh100.html
  276. +1 −1  tests/visual/resizable/resizable_ticket_3053.html
  277. +1 −1  tests/visual/resizable/resizable_ticket_4199.html
  278. +1 −1  tests/visual/resizable/resizable_ticket_4217.html
  279. +1 −1  tests/visual/resizable/resizable_ticket_4940.html
  280. +1 −1  tests/visual/resizable/resizable_ticket_5335.html
  281. +1 −1  tests/visual/selectable/selectable.html
  282. +1 −1  tests/visual/selectable/selectable_ticket_4341.html
  283. +1 −1  tests/visual/sortable/sortable.html
  284. +1 −1  tests/visual/sortable/sortable_massive_scale.html
  285. +1 −1  tests/visual/sortable/sortable_option_revert_false.html
  286. +1 −1  tests/visual/sortable/sortable_option_revert_true.html
  287. +1 −1  tests/visual/sortable/sortable_ticket_4231.html
  288. +1 −1  tests/visual/sortable/sortable_ticket_5355.html
  289. +1 −1  tests/visual/theme.html
  290. +1 −1  tests/visual/tooltip/animations.html
  291. +1 −1  tests/visual/tooltip/callout.html
  292. +1 −1  tests/visual/tooltip/tooltip.html
  293. +20 −20 ui/jquery.effects.core.js
  294. +3 −18 ui/jquery.effects.scale.js
  295. +5 −5 ui/jquery.ui.accordion.js
  296. +36 −17 ui/jquery.ui.autocomplete.js
  297. +2 −2 ui/jquery.ui.button.js
  298. +8 −10 ui/jquery.ui.dialog.js
  299. +44 −7 ui/jquery.ui.menu.js
  300. +12 −18 ui/jquery.ui.menubar.js
Sorry, we could not display the entire diff because too many files (305) changed.
View
2  .gitignore
@@ -1,4 +1,6 @@
build/dist
+build/size
+build/build/.sizecache.json
docs
.project
*~
View
291 build/build.xml
@@ -9,13 +9,13 @@
-->
<project name="jquery-ui" default="deploy-release" basedir=".">
-
+
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
<classpath>
<pathelement location="build/ant-contrib-0.6.jar"/>
</classpath>
</taskdef>
-
+
<property file="ant.properties" />
<loadfile failonerror="no" srcFile="../version.txt" property="release.version">
@@ -30,8 +30,8 @@
<property name="src.dir" value="${ui.dir}/ui/" />
<property name="theme.dir" value="${ui.dir}/themes/base/" />
<property name="docs.dir" value="${dist.dir}/docs/" />
-
<property name="min.dir" value="${dist.dir}/ui/minified" />
+ <property name="size.dir" value="size" />
<property name="concatenated" value="jquery-ui" />
<property name="concatenated.i18n" value="jquery-ui-i18n" />
@@ -39,47 +39,26 @@
<property name="core.files" value="jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.effects.core.js" />
<property name="core.files.min" value="jquery.ui.core.min.js, jquery.ui.widget.min.js, jquery.ui.mouse.min.js, jquery.ui.draggable.min.js, jquery.ui.droppable.min.js, jquery.ui.resizable.min.js, jquery.ui.selectable.min.js, jquery.ui.sortable.min.js, jquery.effects.core.min.js" />
- <property description="Google Closure" name="closure-jar" value="${build.dir}/google-compiler-20110320.jar" />
<property description="YUI Compressor" name="yuicompressor-jar" value="${build.dir}/yuicompressor-2.4.2.jar" />
-
+
<target name="deploy-release" depends="clean, docs-download, copy, minify, replace-version, prepend-header, zip" description="Release builder">
</target>
-
+
<target name="replace-version">
<replaceregexp match="@VERSION" replace="${release.version}" flags="g" byline="true">
- <fileset dir="${dist.dir}/ui/" includes="*.js"/>
+ <fileset dir="${dist.dir}/ui/" includes="*.js"/>
<fileset dir="${dist.dir}/ui/minified/" includes="*.js"/>
<fileset dir="${dist.dir}/themes/" includes="**/*.css"/>
</replaceregexp>
<echo message="Replaced all @VERSION to ${release.version}." />
</target>
-
+
<target name="prepend-header">
<copy todir="${dist.dir}/headers/">
- <fileset dir="${dist.dir}/ui/" includes="*.js" />
- </copy>
- <replaceregexp match="^(\/\*.*?\*\/\s).+" replace="\1" flags="s">
- <fileset dir="${dist.dir}/headers/" includes="*.js"/>
- </replaceregexp>
- <for param="file">
- <path><fileset dir="${min.dir}/" includes="*.js" /></path>
- <sequential>
- <propertyregex override="yes" property="target" input="@{file}" regexp=".*[\\/](.+)\.min\.js$" replace="\1"/>
- <concat destfile="${dist.dir}/ui-headered/${target}.min.js">
- <header file="${dist.dir}/headers/${target}.js" />
- <fileset file="@{file}" />
- </concat>
- </sequential>
- </for>
- <copy todir="${min.dir}" overwrite="true">
- <fileset dir="${dist.dir}/ui-headered/" includes="*.js" />
- </copy>
-
- <copy todir="${dist.dir}/headers/">
<fileset dir="${dist.dir}/themes/base" includes="*.css" />
</copy>
<replaceregexp match="^(\/\*.*?\*\/\s).+" replace="\1" flags="s">
- <fileset dir="${dist.dir}/headers/" includes="*.css"/>
+ <fileset dir="${dist.dir}/headers/" includes="*.css"/>
</replaceregexp>
<for param="file">
<path><fileset dir="${dist.dir}/themes/base/minified" includes="*.css" /></path>
@@ -94,29 +73,6 @@
<copy todir="${dist.dir}/themes/base/minified" overwrite="true">
<fileset dir="${dist.dir}/ui-headered/" includes="*.css" />
</copy>
-
- <!-- once more for the i18n files -->
- <!-- need to clean up headers in those files first
- <copy todir="${dist.dir}/headers/i18n/">
- <fileset dir="${dist.dir}/ui/i18n/" includes="*.js" />
- </copy>
- <replaceregexp match="^(\/\*.*?\*\/\s).+" replace="\1" flags="s">
- <fileset dir="${dist.dir}/headers/i18n/" includes="*.js"/>
- </replaceregexp>
- <for param="file">
- <path><fileset dir="${min.dir}/i18n/" includes="*.js" /></path>
- <sequential>
- <propertyregex override="yes" property="target" input="@{file}" regexp=".*[\\/](.+)\.min\.js$" replace="\1"/>
- <concat destfile="${dist.dir}/ui-headered/i18n/${target}.min.js">
- <header file="${dist.dir}/headers/i18n/${target}.js" />
- <fileset file="@{file}" />
- </concat>
- </sequential>
- </for>
- <copy todir="${min.dir}/i18n/">
- <fileset dir="${dist.dir}/ui-headered/i18n/" includes="*.js" />
- </copy>
- -->
<delete dir="${dist.dir}/headers/" />
<delete dir="${dist.dir}/ui-headered/" />
@@ -160,62 +116,41 @@
<mkdir dir="${min.dir}" />
<mkdir dir="${min.dir}/i18n/" />
<mkdir dir="${dist.dir}/themes/base/minified" />
+ <parallel threadsperprocessor="1">
+ <apply executable="build/minify-js.sh">
+ <fileset dir="${dist.dir}/ui" includes="**.js" />
+ <srcfile />
+ <mapper type="glob" from="*.js" to="${min.dir}/*.min.js" />
+ <targetfile/>
+ </apply>
+ <apply executable="java" parallel="false">
+ <fileset dir="${dist.dir}/themes/base" includes="*.css" />
+ <arg line="-jar" />
+ <arg path="${yuicompressor-jar}" />
+ <arg line="--charset utf-8" />
+ <arg line="-v" />
+ <srcfile />
+ <arg line="-o" />
+ <mapper type="glob" from="*.css" to="${dist.dir}/themes/base/minified/*.min.css" />
+ <targetfile/>
+ </apply>
+ </parallel>
- <parallel threadsperprocessor="1">
-
- <apply executable="java" parallel="false">
- <fileset dir="${dist.dir}/ui" includes="*.js" />
- <arg line="-jar" />
- <arg path="${closure-jar}" />
- <arg value="--warning_level" />
- <arg value="QUIET" />
- <arg value="--js_output_file" />
- <targetfile />
- <arg value="--js" />
- <mapper type="glob" from="*.js" to="${min.dir}/*.min.js" />
- </apply>
-
- <apply executable="java" parallel="false">
- <fileset dir="${dist.dir}/ui/i18n" includes="*.js" />
- <arg line="-jar" />
- <arg path="${closure-jar}" />
- <arg value="--warning_level" />
- <arg value="QUIET" />
- <arg value="--js_output_file" />
- <targetfile />
- <arg value="--js" />
- <mapper type="glob" from="*.js" to="${min.dir}/i18n/*.min.js" />
- </apply>
-
- <apply executable="java" parallel="false">
- <fileset dir="${dist.dir}/themes/base" includes="*.css" />
- <arg line="-jar" />
- <arg path="${yuicompressor-jar}" />
- <arg line="--charset utf-8" />
- <arg line="-v" />
- <srcfile />
- <arg line="-o" />
- <mapper type="glob" from="*.css" to="${dist.dir}/themes/base/minified/*.min.css" />
- <targetfile/>
- </apply>
-
- </parallel>
-
<replaceregexp match=".css" replace=".min.css" flags="g">
<fileset dir="${dist.dir}/themes/base/minified/">
<include name="*.base.min.css"/>
<include name="*.all.min.css"/>
</fileset>
</replaceregexp>
-
+
<!-- make a copy of all theme images to ensure that relative paths in minified css files work -->
<copy todir="${dist.dir}/themes/base/minified/images" >
<fileset dir="${ui.dir}/themes/base/images" />
</copy>
-
+
<echo message="Minified ui/ built." />
</target>
-
+
<target description="Copy needed folders" name="copy">
<echo message="Copying files" />
<mkdir dir="${dist.dir}" />
@@ -253,67 +188,65 @@
</copy>
<echo message="Files copied." />
</target>
-
+
<target name="clean">
- <delete dir="dist" />
- </target>
-
+ <delete dir="dist" />
+ </target>
+
<target name="docs-download">
<mkdir dir="${docs.dir}" />
<property name="url" value="http://docs.jquery.com/action/render/UI/API/${release.version}/" />
-
- <parallel threadcount="8">
-
- <get src="${url}Draggable" dest="${docs.dir}draggable.html" />
- <get src="${url}Droppable" dest="${docs.dir}droppable.html" />
- <get src="${url}Resizable" dest="${docs.dir}resizable.html" />
- <get src="${url}Selectable" dest="${docs.dir}selectable.html" />
- <get src="${url}Sortable" dest="${docs.dir}sortable.html" />
-
- <get src="${url}Accordion" dest="${docs.dir}accordion.html" />
- <get src="${url}Autocomplete" dest="${docs.dir}autocomplete.html" />
- <get src="${url}Button" dest="${docs.dir}button.html" />
- <get src="${url}Datepicker" dest="${docs.dir}datepicker.html" />
- <get src="${url}Dialog" dest="${docs.dir}dialog.html" />
- <get src="${url}Menu" dest="${docs.dir}menu.html" />
- <get src="${url}Progressbar" dest="${docs.dir}progressbar.html" />
- <get src="${url}Slider" dest="${docs.dir}slider.html" />
- <get src="${url}Spinner" dest="${docs.dir}spinner.html" />
- <get src="${url}Tooltip" dest="${docs.dir}tooltip.html" />
- <get src="${url}Tabs" dest="${docs.dir}tabs.html" />
-
- <get src="${url}Position" dest="${docs.dir}position.html" />
-
- <get src="http://docs.jquery.com/action/render/UI/Effects/animate" dest="${docs.dir}animate.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/addClass" dest="${docs.dir}addClass.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/effect" dest="${docs.dir}effect.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/hide" dest="${docs.dir}hide.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/removeClass" dest="${docs.dir}removeClass.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/show" dest="${docs.dir}show.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/switchClass" dest="${docs.dir}switchClass.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/toggle" dest="${docs.dir}toggle.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/toggleClass" dest="${docs.dir}toggleClass.html" />
-
-
- <get src="http://docs.jquery.com/action/render/UI/Effects/Blind" dest="${docs.dir}effect-blind.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Clip" dest="${docs.dir}effect-clip.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Drop" dest="${docs.dir}effect-drop.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Explode" dest="${docs.dir}effect-explode.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Fade" dest="${docs.dir}effect-fade.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Fold" dest="${docs.dir}effect-fold.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Puff" dest="${docs.dir}effect-puff.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Slide" dest="${docs.dir}effect-slide.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Scale" dest="${docs.dir}effect-scale.html" />
-
- <get src="http://docs.jquery.com/action/render/UI/Effects/Bounce" dest="${docs.dir}effect-bounce.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Highlight" dest="${docs.dir}effect-highlight.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Pulsate" dest="${docs.dir}effect-pulsate.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Shake" dest="${docs.dir}effect-shake.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Size" dest="${docs.dir}effect-size.html" />
- <get src="http://docs.jquery.com/action/render/UI/Effects/Transfer" dest="${docs.dir}effect-transfer.html" />
- </parallel>
+ <parallel threadcount="8">
+ <get src="${url}Draggable" dest="${docs.dir}draggable.html" />
+ <get src="${url}Droppable" dest="${docs.dir}droppable.html" />
+ <get src="${url}Resizable" dest="${docs.dir}resizable.html" />
+ <get src="${url}Selectable" dest="${docs.dir}selectable.html" />
+ <get src="${url}Sortable" dest="${docs.dir}sortable.html" />
+
+ <get src="${url}Accordion" dest="${docs.dir}accordion.html" />
+ <get src="${url}Autocomplete" dest="${docs.dir}autocomplete.html" />
+ <get src="${url}Button" dest="${docs.dir}button.html" />
+ <get src="${url}Datepicker" dest="${docs.dir}datepicker.html" />
+ <get src="${url}Dialog" dest="${docs.dir}dialog.html" />
+ <get src="${url}Menu" dest="${docs.dir}menu.html" />
+ <get src="${url}Progressbar" dest="${docs.dir}progressbar.html" />
+ <get src="${url}Slider" dest="${docs.dir}slider.html" />
+ <get src="${url}Spinner" dest="${docs.dir}spinner.html" />
+ <get src="${url}Tooltip" dest="${docs.dir}tooltip.html" />
+ <get src="${url}Tabs" dest="${docs.dir}tabs.html" />
+
+ <get src="${url}Position" dest="${docs.dir}position.html" />
+
+ <get src="http://docs.jquery.com/action/render/UI/Effects/animate" dest="${docs.dir}animate.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/addClass" dest="${docs.dir}addClass.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/effect" dest="${docs.dir}effect.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/hide" dest="${docs.dir}hide.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/removeClass" dest="${docs.dir}removeClass.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/show" dest="${docs.dir}show.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/switchClass" dest="${docs.dir}switchClass.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/toggle" dest="${docs.dir}toggle.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/toggleClass" dest="${docs.dir}toggleClass.html" />
+
+
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Blind" dest="${docs.dir}effect-blind.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Clip" dest="${docs.dir}effect-clip.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Drop" dest="${docs.dir}effect-drop.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Explode" dest="${docs.dir}effect-explode.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Fade" dest="${docs.dir}effect-fade.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Fold" dest="${docs.dir}effect-fold.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Puff" dest="${docs.dir}effect-puff.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Slide" dest="${docs.dir}effect-slide.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Scale" dest="${docs.dir}effect-scale.html" />
+
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Bounce" dest="${docs.dir}effect-bounce.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Highlight" dest="${docs.dir}effect-highlight.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Pulsate" dest="${docs.dir}effect-pulsate.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Shake" dest="${docs.dir}effect-shake.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Size" dest="${docs.dir}effect-size.html" />
+ <get src="http://docs.jquery.com/action/render/UI/Effects/Transfer" dest="${docs.dir}effect-transfer.html" />
+ </parallel>
</target>
-
+
<target name="themes-download">
<!-- to create/update query strings for the theme-file, execute this in Firebug on /download page:
$("select option[value!=none]").map(function() { $(this).parent().val(this.value).change(); return $(this).parents("form").serialize(); }).get().join(",");
@@ -324,12 +257,11 @@
<for list="${urls}" param="url">
<sequential>
<get src="http://ui-dev.jquery.com/download/?@{url}" dest="${zip}" />
- <unzip src="${zip}"
- dest="${dist.dir}themes/">
- <patternset>
- <include name="development-bundle/themes/**"/>
- <exclude name="development-bundle/themes/base/**"/>
- </patternset>
+ <unzip src="${zip}" dest="${dist.dir}themes/">
+ <patternset>
+ <include name="development-bundle/themes/**"/>
+ <exclude name="development-bundle/themes/base/**"/>
+ </patternset>
<mapper type="glob" from="development-bundle/themes/*" to="*" />
</unzip>
<delete file="${zip}" />
@@ -351,15 +283,44 @@
<target name="whitespace">
<replaceregexp match="[\t ]+$" replace="" flags="g" byline="true">
- <fileset dir="${src.dir}" includes="*.js"/>
- <fileset dir="${src.dir}/i18n/" includes="*.js"/>
+ <fileset dir="${src.dir}" includes="*.js"/>
+ <fileset dir="${src.dir}/i18n/" includes="*.js"/>
</replaceregexp>
<echo message="All trailing spaces removed." />
</target>
-
+
+ <target name="size" depends="copy, minify, replace-version, prepend-header" description="Report sizes of files">
+ <echo message="Collecting files to size" />
+ <mkdir dir="${size.dir}" />
+ <copy todir="${size.dir}">
+ <fileset dir="${dist.dir}/ui" includes="*.js" />
+ <fileset dir="${dist.dir}/ui/i18n" includes="*.js" />
+ <fileset dir="${dist.dir}/ui/minified" includes="*.js" />
+ <fileset dir="${dist.dir}/ui/minified/i18n" includes="*.js" />
+ <fileset dir="${dist.dir}/themes/base" includes="*.css" />
+ <fileset dir="${dist.dir}/themes/base/minified" includes="*.css" />
+ </copy>
+ <echo message="GZipping Minified" />
+ <apply executable="gzip">
+ <fileset dir="${size.dir}" includes="*.min.js" />
+ <fileset dir="${size.dir}" includes="*.min.css" />
+ <arg value="-c" />
+ <srcfile />
+ <redirector>
+ <outputmapper id="out" type="glob" from="*" to="${size.dir}/*.gz"/>
+ </redirector>
+ </apply>
+ <echo message="Comparing file size with previous build" />
+ <exec executable="bash">
+ <arg value="-c" />
+ <arg value="wc -c ${size.dir}/* | `which node nodejs` build/sizer.js" />
+ </exec>
+ <delete dir="${size.dir}" />
+ </target>
+
<target name="cdn">
- <delete dir="${cdndist.dir}" />
- <mkdir dir="${cdndist.dir}" />
+ <delete dir="${cdndist.dir}" />
+ <mkdir dir="${cdndist.dir}" />
<copy todir="${cdndist.dir}">
<fileset dir=".." includes="AUTHORS.txt, GPL-LICENSE.txt, MIT-LICENSE.txt, version.txt" />
</copy>
@@ -378,9 +339,9 @@
<fileset dir="${cdndist.dir}" />
</checksum>
<for param="file">
- <path><fileset dir="${cdndist.dir}" includes="**/" excludes="**/*.MD5" /></path>
+ <path><fileset dir="${cdndist.dir}" includes="**/" excludes="**/*.MD5" /></path>
<sequential>
- <!-- @{file} is an absolute path, use that ugly regexes to make it relative -->
+ <!-- @{file} is an absolute path, use that ugly regexes to make it relative -->
<propertyregex override="yes" property="relativepath" input="@{file}" regexp=".+?cdn[\\/](.+)$" replace="\1"/>
<propertyregex override="yes" property="relativepath" input="${relativepath}" regexp="\\" replace="/" global="true" />
<concat destfile="${cdndist.dir}/MANIFEST" append="yes">${relativepath} </concat>
@@ -394,6 +355,6 @@
<zip destfile="${dist.dir}/../${release.filename}-mscdn.zip">
<zipfileset dir="dist/${release.filename}-cdn/" />
</zip>
- </target>
+ </target>
</project>
View
BIN  build/build/google-compiler-20110320.jar
Binary file not shown
View
5,504 build/build/lib/jslint.js
5,504 additions, 0 deletions not shown
View
1,315 build/build/lib/parse-js.js
@@ -0,0 +1,1315 @@
+/***********************************************************************
+
+ A JavaScript tokenizer / parser / beautifier / compressor.
+
+ This version is suitable for Node.js. With minimal changes (the
+ exports stuff) it should work on any JS platform.
+
+ This file contains the tokenizer/parser. It is a port to JavaScript
+ of parse-js [1], a JavaScript parser library written in Common Lisp
+ by Marijn Haverbeke. Thank you Marijn!
+
+ [1] http://marijn.haverbeke.nl/parse-js/
+
+ Exported functions:
+
+ - tokenizer(code) -- returns a function. Call the returned
+ function to fetch the next token.
+
+ - parse(code) -- returns an AST of the given JavaScript code.
+
+ -------------------------------- (C) ---------------------------------
+
+ Author: Mihai Bazon
+ <mihai.bazon@gmail.com>
+ http://mihai.bazon.net/blog
+
+ Distributed under the BSD license:
+
+ Copyright 2010 (c) Mihai Bazon <mihai.bazon@gmail.com>
+ Based on parse-js (http://marijn.haverbeke.nl/parse-js/).
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ * Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the following
+ disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials
+ provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ ***********************************************************************/
+
+/* -----[ Tokenizer (constants) ]----- */
+
+var KEYWORDS = array_to_hash([
+ "break",
+ "case",
+ "catch",
+ "const",
+ "continue",
+ "default",
+ "delete",
+ "do",
+ "else",
+ "finally",
+ "for",
+ "function",
+ "if",
+ "in",
+ "instanceof",
+ "new",
+ "return",
+ "switch",
+ "throw",
+ "try",
+ "typeof",
+ "var",
+ "void",
+ "while",
+ "with"
+]);
+
+var RESERVED_WORDS = array_to_hash([
+ "abstract",
+ "boolean",
+ "byte",
+ "char",
+ "class",
+ "debugger",
+ "double",
+ "enum",
+ "export",
+ "extends",
+ "final",
+ "float",
+ "goto",
+ "implements",
+ "import",
+ "int",
+ "interface",
+ "long",
+ "native",
+ "package",
+ "private",
+ "protected",
+ "public",
+ "short",
+ "static",
+ "super",
+ "synchronized",
+ "throws",
+ "transient",
+ "volatile"
+]);
+
+var KEYWORDS_BEFORE_EXPRESSION = array_to_hash([
+ "return",
+ "new",
+ "delete",
+ "throw",
+ "else",
+ "case"
+]);
+
+var KEYWORDS_ATOM = array_to_hash([
+ "false",
+ "null",
+ "true",
+ "undefined"
+]);
+
+var OPERATOR_CHARS = array_to_hash(characters("+-*&%=<>!?|~^"));
+
+var RE_HEX_NUMBER = /^0x[0-9a-f]+$/i;
+var RE_OCT_NUMBER = /^0[0-7]+$/;
+var RE_DEC_NUMBER = /^\d*\.?\d*(?:e[+-]?\d*(?:\d\.?|\.?\d)\d*)?$/i;
+
+var OPERATORS = array_to_hash([
+ "in",
+ "instanceof",
+ "typeof",
+ "new",
+ "void",
+ "delete",
+ "++",
+ "--",
+ "+",
+ "-",
+ "!",
+ "~",
+ "&",
+ "|",
+ "^",
+ "*",
+ "/",
+ "%",
+ ">>",
+ "<<",
+ ">>>",
+ "<",
+ ">",
+ "<=",
+ ">=",
+ "==",
+ "===",
+ "!=",
+ "!==",
+ "?",
+ "=",
+ "+=",
+ "-=",
+ "/=",
+ "*=",
+ "%=",
+ ">>=",
+ "<<=",
+ ">>>=",
+ "|=",
+ "^=",
+ "&=",
+ "&&",
+ "||"
+]);
+
+var WHITESPACE_CHARS = array_to_hash(characters(" \n\r\t\u200b"));
+
+var PUNC_BEFORE_EXPRESSION = array_to_hash(characters("[{}(,.;:"));
+
+var PUNC_CHARS = array_to_hash(characters("[]{}(),;:"));
+
+var REGEXP_MODIFIERS = array_to_hash(characters("gmsiy"));
+
+/* -----[ Tokenizer ]----- */
+
+// regexps adapted from http://xregexp.com/plugins/#unicode
+var UNICODE = {
+ letter: new RegExp("[\\u0041-\\u005A\\u0061-\\u007A\\u00AA\\u00B5\\u00BA\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0370-\\u0374\\u0376\\u0377\\u037A-\\u037D\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481\\u048A-\\u0523\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0621-\\u064A\\u066E\\u066F\\u0671-\\u06D3\\u06D5\\u06E5\\u06E6\\u06EE\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5\\u07B1\\u07CA-\\u07EA\\u07F4\\u07F5\\u07FA\\u0904-\\u0939\\u093D\\u0950\\u0958-\\u0961\\u0971\\u0972\\u097B-\\u097F\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC\\u09DD\\u09DF-\\u09E1\\u09F0\\u09F1\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0\\u0AE1\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B35-\\u0B39\\u0B3D\\u0B5C\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C33\\u0C35-\\u0C39\\u0C3D\\u0C58\\u0C59\\u0C60\\u0C61\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0\\u0CE1\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D28\\u0D2A-\\u0D39\\u0D3D\\u0D60\\u0D61\\u0D7A-\\u0D7F\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01-\\u0E30\\u0E32\\u0E33\\u0E40-\\u0E46\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD-\\u0EB0\\u0EB2\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EC6\\u0EDC\\u0EDD\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8B\\u1000-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065\\u1066\\u106E-\\u1070\\u1075-\\u1081\\u108E\\u10A0-\\u10C5\\u10D0-\\u10FA\\u10FC\\u1100-\\u1159\\u115F-\\u11A2\\u11A8-\\u11F9\\u1200-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u1676\\u1681-\\u169A\\u16A0-\\u16EA\\u1700-\\u170C\\u170E-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17D7\\u17DC\\u1820-\\u1877\\u1880-\\u18A8\\u18AA\\u1900-\\u191C\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19A9\\u19C1-\\u19C7\\u1A00-\\u1A16\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0\\u1BAE\\u1BAF\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C7D\\u1D00-\\u1DBF\\u1E00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u2071\\u207F\\u2090-\\u2094\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2183\\u2184\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2C6F\\u2C71-\\u2C7D\\u2C80-\\u2CE4\\u2D00-\\u2D25\\u2D30-\\u2D65\\u2D6F\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2E2F\\u3005\\u3006\\u3031-\\u3035\\u303B\\u303C\\u3041-\\u3096\\u309D-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31B7\\u31F0-\\u31FF\\u3400\\u4DB5\\u4E00\\u9FC3\\uA000-\\uA48C\\uA500-\\uA60C\\uA610-\\uA61F\\uA62A\\uA62B\\uA640-\\uA65F\\uA662-\\uA66E\\uA67F-\\uA697\\uA717-\\uA71F\\uA722-\\uA788\\uA78B\\uA78C\\uA7FB-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA90A-\\uA925\\uA930-\\uA946\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAC00\\uD7A3\\uF900-\\uFA2D\\uFA30-\\uFA6A\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF21-\\uFF3A\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC]"),
+ non_spacing_mark: new RegExp("[\\u0300-\\u036F\\u0483-\\u0487\\u0591-\\u05BD\\u05BF\\u05C1\\u05C2\\u05C4\\u05C5\\u05C7\\u0610-\\u061A\\u064B-\\u065E\\u0670\\u06D6-\\u06DC\\u06DF-\\u06E4\\u06E7\\u06E8\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u07A6-\\u07B0\\u07EB-\\u07F3\\u0816-\\u0819\\u081B-\\u0823\\u0825-\\u0827\\u0829-\\u082D\\u0900-\\u0902\\u093C\\u0941-\\u0948\\u094D\\u0951-\\u0955\\u0962\\u0963\\u0981\\u09BC\\u09C1-\\u09C4\\u09CD\\u09E2\\u09E3\\u0A01\\u0A02\\u0A3C\\u0A41\\u0A42\\u0A47\\u0A48\\u0A4B-\\u0A4D\\u0A51\\u0A70\\u0A71\\u0A75\\u0A81\\u0A82\\u0ABC\\u0AC1-\\u0AC5\\u0AC7\\u0AC8\\u0ACD\\u0AE2\\u0AE3\\u0B01\\u0B3C\\u0B3F\\u0B41-\\u0B44\\u0B4D\\u0B56\\u0B62\\u0B63\\u0B82\\u0BC0\\u0BCD\\u0C3E-\\u0C40\\u0C46-\\u0C48\\u0C4A-\\u0C4D\\u0C55\\u0C56\\u0C62\\u0C63\\u0CBC\\u0CBF\\u0CC6\\u0CCC\\u0CCD\\u0CE2\\u0CE3\\u0D41-\\u0D44\\u0D4D\\u0D62\\u0D63\\u0DCA\\u0DD2-\\u0DD4\\u0DD6\\u0E31\\u0E34-\\u0E3A\\u0E47-\\u0E4E\\u0EB1\\u0EB4-\\u0EB9\\u0EBB\\u0EBC\\u0EC8-\\u0ECD\\u0F18\\u0F19\\u0F35\\u0F37\\u0F39\\u0F71-\\u0F7E\\u0F80-\\u0F84\\u0F86\\u0F87\\u0F90-\\u0F97\\u0F99-\\u0FBC\\u0FC6\\u102D-\\u1030\\u1032-\\u1037\\u1039\\u103A\\u103D\\u103E\\u1058\\u1059\\u105E-\\u1060\\u1071-\\u1074\\u1082\\u1085\\u1086\\u108D\\u109D\\u135F\\u1712-\\u1714\\u1732-\\u1734\\u1752\\u1753\\u1772\\u1773\\u17B7-\\u17BD\\u17C6\\u17C9-\\u17D3\\u17DD\\u180B-\\u180D\\u18A9\\u1920-\\u1922\\u1927\\u1928\\u1932\\u1939-\\u193B\\u1A17\\u1A18\\u1A56\\u1A58-\\u1A5E\\u1A60\\u1A62\\u1A65-\\u1A6C\\u1A73-\\u1A7C\\u1A7F\\u1B00-\\u1B03\\u1B34\\u1B36-\\u1B3A\\u1B3C\\u1B42\\u1B6B-\\u1B73\\u1B80\\u1B81\\u1BA2-\\u1BA5\\u1BA8\\u1BA9\\u1C2C-\\u1C33\\u1C36\\u1C37\\u1CD0-\\u1CD2\\u1CD4-\\u1CE0\\u1CE2-\\u1CE8\\u1CED\\u1DC0-\\u1DE6\\u1DFD-\\u1DFF\\u20D0-\\u20DC\\u20E1\\u20E5-\\u20F0\\u2CEF-\\u2CF1\\u2DE0-\\u2DFF\\u302A-\\u302F\\u3099\\u309A\\uA66F\\uA67C\\uA67D\\uA6F0\\uA6F1\\uA802\\uA806\\uA80B\\uA825\\uA826\\uA8C4\\uA8E0-\\uA8F1\\uA926-\\uA92D\\uA947-\\uA951\\uA980-\\uA982\\uA9B3\\uA9B6-\\uA9B9\\uA9BC\\uAA29-\\uAA2E\\uAA31\\uAA32\\uAA35\\uAA36\\uAA43\\uAA4C\\uAAB0\\uAAB2-\\uAAB4\\uAAB7\\uAAB8\\uAABE\\uAABF\\uAAC1\\uABE5\\uABE8\\uABED\\uFB1E\\uFE00-\\uFE0F\\uFE20-\\uFE26]"),
+ space_combining_mark: new RegExp("[\\u0903\\u093E-\\u0940\\u0949-\\u094C\\u094E\\u0982\\u0983\\u09BE-\\u09C0\\u09C7\\u09C8\\u09CB\\u09CC\\u09D7\\u0A03\\u0A3E-\\u0A40\\u0A83\\u0ABE-\\u0AC0\\u0AC9\\u0ACB\\u0ACC\\u0B02\\u0B03\\u0B3E\\u0B40\\u0B47\\u0B48\\u0B4B\\u0B4C\\u0B57\\u0BBE\\u0BBF\\u0BC1\\u0BC2\\u0BC6-\\u0BC8\\u0BCA-\\u0BCC\\u0BD7\\u0C01-\\u0C03\\u0C41-\\u0C44\\u0C82\\u0C83\\u0CBE\\u0CC0-\\u0CC4\\u0CC7\\u0CC8\\u0CCA\\u0CCB\\u0CD5\\u0CD6\\u0D02\\u0D03\\u0D3E-\\u0D40\\u0D46-\\u0D48\\u0D4A-\\u0D4C\\u0D57\\u0D82\\u0D83\\u0DCF-\\u0DD1\\u0DD8-\\u0DDF\\u0DF2\\u0DF3\\u0F3E\\u0F3F\\u0F7F\\u102B\\u102C\\u1031\\u1038\\u103B\\u103C\\u1056\\u1057\\u1062-\\u1064\\u1067-\\u106D\\u1083\\u1084\\u1087-\\u108C\\u108F\\u109A-\\u109C\\u17B6\\u17BE-\\u17C5\\u17C7\\u17C8\\u1923-\\u1926\\u1929-\\u192B\\u1930\\u1931\\u1933-\\u1938\\u19B0-\\u19C0\\u19C8\\u19C9\\u1A19-\\u1A1B\\u1A55\\u1A57\\u1A61\\u1A63\\u1A64\\u1A6D-\\u1A72\\u1B04\\u1B35\\u1B3B\\u1B3D-\\u1B41\\u1B43\\u1B44\\u1B82\\u1BA1\\u1BA6\\u1BA7\\u1BAA\\u1C24-\\u1C2B\\u1C34\\u1C35\\u1CE1\\u1CF2\\uA823\\uA824\\uA827\\uA880\\uA881\\uA8B4-\\uA8C3\\uA952\\uA953\\uA983\\uA9B4\\uA9B5\\uA9BA\\uA9BB\\uA9BD-\\uA9C0\\uAA2F\\uAA30\\uAA33\\uAA34\\uAA4D\\uAA7B\\uABE3\\uABE4\\uABE6\\uABE7\\uABE9\\uABEA\\uABEC]"),
+ connector_punctuation: new RegExp("[\\u005F\\u203F\\u2040\\u2054\\uFE33\\uFE34\\uFE4D-\\uFE4F\\uFF3F]")
+};
+
+function is_letter(ch) {
+ return UNICODE.letter.test(ch);
+};
+
+function is_digit(ch) {
+ ch = ch.charCodeAt(0);
+ return ch >= 48 && ch <= 57; //XXX: find out if "UnicodeDigit" means something else than 0..9
+};
+
+function is_alphanumeric_char(ch) {
+ return is_digit(ch) || is_letter(ch);
+};
+
+function is_unicode_combining_mark(ch) {
+ return UNICODE.non_spacing_mark.test(ch) || UNICODE.space_combining_mark.test(ch);
+};
+
+function is_unicode_connector_punctuation(ch) {
+ return UNICODE.connector_punctuation.test(ch);
+};
+
+function is_identifier_start(ch) {
+ return ch == "$" || ch == "_" || is_letter(ch);
+};
+
+function is_identifier_char(ch) {
+ return is_identifier_start(ch)
+ || is_unicode_combining_mark(ch)
+ || is_digit(ch)
+ || is_unicode_connector_punctuation(ch)
+ || ch == "\u200c" // zero-width non-joiner <ZWNJ>
+ || ch == "\u200d" // zero-width joiner <ZWJ> (in my ECMA-262 PDF, this is also 200c)
+ ;
+};
+
+function parse_js_number(num) {
+ if (RE_HEX_NUMBER.test(num)) {
+ return parseInt(num.substr(2), 16);
+ } else if (RE_OCT_NUMBER.test(num)) {
+ return parseInt(num.substr(1), 8);
+ } else if (RE_DEC_NUMBER.test(num)) {
+ return parseFloat(num);
+ }
+};
+
+function JS_Parse_Error(message, line, col, pos) {
+ this.message = message;
+ this.line = line;
+ this.col = col;
+ this.pos = pos;
+ try {
+ ({})();
+ } catch(ex) {
+ this.stack = ex.stack;
+ };
+};
+
+JS_Parse_Error.prototype.toString = function() {
+ return this.message + " (line: " + this.line + ", col: " + this.col + ", pos: " + this.pos + ")" + "\n\n" + this.stack;
+};
+
+function js_error(message, line, col, pos) {
+ throw new JS_Parse_Error(message, line, col, pos);
+};
+
+function is_token(token, type, val) {
+ return token.type == type && (val == null || token.value == val);
+};
+
+var EX_EOF = {};
+
+function tokenizer($TEXT) {
+
+ var S = {
+ text : $TEXT.replace(/\r\n?|[\n\u2028\u2029]/g, "\n").replace(/^\uFEFF/, ''),
+ pos : 0,
+ tokpos : 0,
+ line : 0,
+ tokline : 0,
+ col : 0,
+ tokcol : 0,
+ newline_before : false,
+ regex_allowed : false,
+ comments_before : []
+ };
+
+ function peek() { return S.text.charAt(S.pos); };
+
+ function next(signal_eof) {
+ var ch = S.text.charAt(S.pos++);
+ if (signal_eof && !ch)
+ throw EX_EOF;
+ if (ch == "\n") {
+ S.newline_before = true;
+ ++S.line;
+ S.col = 0;
+ } else {
+ ++S.col;
+ }
+ return ch;
+ };
+
+ function eof() {
+ return !S.peek();
+ };
+
+ function find(what, signal_eof) {
+ var pos = S.text.indexOf(what, S.pos);
+ if (signal_eof && pos == -1) throw EX_EOF;
+ return pos;
+ };
+
+ function start_token() {
+ S.tokline = S.line;
+ S.tokcol = S.col;
+ S.tokpos = S.pos;
+ };
+
+ function token(type, value, is_comment) {
+ S.regex_allowed = ((type == "operator" && !HOP(UNARY_POSTFIX, value)) ||
+ (type == "keyword" && HOP(KEYWORDS_BEFORE_EXPRESSION, value)) ||
+ (type == "punc" && HOP(PUNC_BEFORE_EXPRESSION, value)));
+ var ret = {
+ type : type,
+ value : value,
+ line : S.tokline,
+ col : S.tokcol,
+ pos : S.tokpos,
+ nlb : S.newline_before
+ };
+ if (!is_comment) {
+ ret.comments_before = S.comments_before;
+ S.comments_before = [];
+ }
+ S.newline_before = false;
+ return ret;
+ };
+
+ function skip_whitespace() {
+ while (HOP(WHITESPACE_CHARS, peek()))
+ next();
+ };
+
+ function read_while(pred) {
+ var ret = "", ch = peek(), i = 0;
+ while (ch && pred(ch, i++)) {
+ ret += next();
+ ch = peek();
+ }
+ return ret;
+ };
+
+ function parse_error(err) {
+ js_error(err, S.tokline, S.tokcol, S.tokpos);
+ };
+
+ function read_num(prefix) {
+ var has_e = false, after_e = false, has_x = false, has_dot = prefix == ".";
+ var num = read_while(function(ch, i){
+ if (ch == "x" || ch == "X") {
+ if (has_x) return false;
+ return has_x = true;
+ }
+ if (!has_x && (ch == "E" || ch == "e")) {
+ if (has_e) return false;
+ return has_e = after_e = true;
+ }
+ if (ch == "-") {
+ if (after_e || (i == 0 && !prefix)) return true;
+ return false;
+ }
+ if (ch == "+") return after_e;
+ after_e = false;
+ if (ch == ".") {
+ if (!has_dot && !has_x)
+ return has_dot = true;
+ return false;
+ }
+ return is_alphanumeric_char(ch);
+ });
+ if (prefix)
+ num = prefix + num;
+ var valid = parse_js_number(num);
+ if (!isNaN(valid)) {
+ return token("num", valid);
+ } else {
+ parse_error("Invalid syntax: " + num);
+ }
+ };
+
+ function read_escaped_char() {
+ var ch = next(true);
+ switch (ch) {
+ case "n" : return "\n";
+ case "r" : return "\r";
+ case "t" : return "\t";
+ case "b" : return "\b";
+ case "v" : return "\v";
+ case "f" : return "\f";
+ case "0" : return "\0";
+ case "x" : return String.fromCharCode(hex_bytes(2));
+ case "u" : return String.fromCharCode(hex_bytes(4));
+ default : return ch;
+ }
+ };
+
+ function hex_bytes(n) {
+ var num = 0;
+ for (; n > 0; --n) {
+ var digit = parseInt(next(true), 16);
+ if (isNaN(digit))
+ parse_error("Invalid hex-character pattern in string");
+ num = (num << 4) | digit;
+ }
+ return num;
+ };
+
+ function read_string() {
+ return with_eof_error("Unterminated string constant", function(){
+ var quote = next(), ret = "";
+ for (;;) {
+ var ch = next(true);
+ if (ch == "\\") ch = read_escaped_char();
+ else if (ch == quote) break;
+ ret += ch;
+ }
+ return token("string", ret);
+ });
+ };
+
+ function read_line_comment() {
+ next();
+ var i = find("\n"), ret;
+ if (i == -1) {
+ ret = S.text.substr(S.pos);
+ S.pos = S.text.length;
+ } else {
+ ret = S.text.substring(S.pos, i);
+ S.pos = i;
+ }
+ return token("comment1", ret, true);
+ };
+
+ function read_multiline_comment() {
+ next();
+ return with_eof_error("Unterminated multiline comment", function(){
+ var i = find("*/", true),
+ text = S.text.substring(S.pos, i),
+ tok = token("comment2", text, true);
+ S.pos = i + 2;
+ S.line += text.split("\n").length - 1;
+ S.newline_before = text.indexOf("\n") >= 0;
+
+ // https://github.com/mishoo/UglifyJS/issues/#issue/100
+ if (/^@cc_on/i.test(text)) {
+ warn("WARNING: at line " + S.line);
+ warn("*** Found \"conditional comment\": " + text);
+ warn("*** UglifyJS DISCARDS ALL COMMENTS. This means your code might no longer work properly in Internet Explorer.");
+ }
+
+ return tok;
+ });
+ };
+
+ function read_name() {
+ var backslash = false, name = "", ch;
+ while ((ch = peek()) != null) {
+ if (!backslash) {
+ if (ch == "\\") backslash = true, next();
+ else if (is_identifier_char(ch)) name += next();
+ else break;
+ }
+ else {
+ if (ch != "u") parse_error("Expecting UnicodeEscapeSequence -- uXXXX");
+ ch = read_escaped_char();
+ if (!is_identifier_char(ch)) parse_error("Unicode char: " + ch.charCodeAt(0) + " is not valid in identifier");
+ name += ch;
+ backslash = false;
+ }
+ }
+ return name;
+ };
+
+ function read_regexp() {
+ return with_eof_error("Unterminated regular expression", function(){
+ var prev_backslash = false, regexp = "", ch, in_class = false;
+ while ((ch = next(true))) if (prev_backslash) {
+ regexp += "\\" + ch;
+ prev_backslash = false;
+ } else if (ch == "[") {
+ in_class = true;
+ regexp += ch;
+ } else if (ch == "]" && in_class) {
+ in_class = false;
+ regexp += ch;
+ } else if (ch == "/" && !in_class) {
+ break;
+ } else if (ch == "\\") {
+ prev_backslash = true;
+ } else {
+ regexp += ch;
+ }
+ var mods = read_name();
+ return token("regexp", [ regexp, mods ]);
+ });
+ };
+
+ function read_operator(prefix) {
+ function grow(op) {
+ if (!peek()) return op;
+ var bigger = op + peek();
+ if (HOP(OPERATORS, bigger)) {
+ next();
+ return grow(bigger);
+ } else {
+ return op;
+ }
+ };
+ return token("operator", grow(prefix || next()));
+ };
+
+ function handle_slash() {
+ next();
+ var regex_allowed = S.regex_allowed;
+ switch (peek()) {
+ case "/":
+ S.comments_before.push(read_line_comment());
+ S.regex_allowed = regex_allowed;
+ return next_token();
+ case "*":
+ S.comments_before.push(read_multiline_comment());
+ S.regex_allowed = regex_allowed;
+ return next_token();
+ }
+ return S.regex_allowed ? read_regexp() : read_operator("/");
+ };
+
+ function handle_dot() {
+ next();
+ return is_digit(peek())
+ ? read_num(".")
+ : token("punc", ".");
+ };
+
+ function read_word() {
+ var word = read_name();
+ return !HOP(KEYWORDS, word)
+ ? token("name", word)
+ : HOP(OPERATORS, word)
+ ? token("operator", word)
+ : HOP(KEYWORDS_ATOM, word)
+ ? token("atom", word)
+ : token("keyword", word);
+ };
+
+ function with_eof_error(eof_error, cont) {
+ try {
+ return cont();
+ } catch(ex) {
+ if (ex === EX_EOF) parse_error(eof_error);
+ else throw ex;
+ }
+ };
+
+ function next_token(force_regexp) {
+ if (force_regexp)
+ return read_regexp();
+ skip_whitespace();
+ start_token();
+ var ch = peek();
+ if (!ch) return token("eof");
+ if (is_digit(ch)) return read_num();
+ if (ch == '"' || ch == "'") return read_string();
+ if (HOP(PUNC_CHARS, ch)) return token("punc", next());
+ if (ch == ".") return handle_dot();
+ if (ch == "/") return handle_slash();
+ if (HOP(OPERATOR_CHARS, ch)) return read_operator();
+ if (ch == "\\" || is_identifier_start(ch)) return read_word();
+ parse_error("Unexpected character '" + ch + "'");
+ };
+
+ next_token.context = function(nc) {
+ if (nc) S = nc;
+ return S;
+ };
+
+ return next_token;
+
+};
+
+/* -----[ Parser (constants) ]----- */
+
+var UNARY_PREFIX = array_to_hash([
+ "typeof",
+ "void",
+ "delete",
+ "--",
+ "++",
+ "!",
+ "~",
+ "-",
+ "+"
+]);
+
+var UNARY_POSTFIX = array_to_hash([ "--", "++" ]);
+
+var ASSIGNMENT = (function(a, ret, i){
+ while (i < a.length) {
+ ret[a[i]] = a[i].substr(0, a[i].length - 1);
+ i++;
+ }
+ return ret;
+})(
+ ["+=", "-=", "/=", "*=", "%=", ">>=", "<<=", ">>>=", "|=", "^=", "&="],
+ { "=": true },
+ 0
+);
+
+var PRECEDENCE = (function(a, ret){
+ for (var i = 0, n = 1; i < a.length; ++i, ++n) {
+ var b = a[i];
+ for (var j = 0; j < b.length; ++j) {
+ ret[b[j]] = n;
+ }
+ }
+ return ret;
+})(
+ [
+ ["||"],
+ ["&&"],
+ ["|"],
+ ["^"],
+ ["&"],
+ ["==", "===", "!=", "!=="],
+ ["<", ">", "<=", ">=", "in", "instanceof"],
+ [">>", "<<", ">>>"],
+ ["+", "-"],
+ ["*", "/", "%"]
+ ],
+ {}
+);
+
+var STATEMENTS_WITH_LABELS = array_to_hash([ "for", "do", "while", "switch" ]);
+
+var ATOMIC_START_TOKEN = array_to_hash([ "atom", "num", "string", "regexp", "name" ]);
+
+/* -----[ Parser ]----- */
+
+function NodeWithToken(str, start, end) {
+ this.name = str;
+ this.start = start;
+ this.end = end;
+};
+
+NodeWithToken.prototype.toString = function() { return this.name; };
+
+function parse($TEXT, exigent_mode, embed_tokens) {
+
+ var S = {
+ input : typeof $TEXT == "string" ? tokenizer($TEXT, true) : $TEXT,
+ token : null,
+ prev : null,
+ peeked : null,
+ in_function : 0,
+ in_loop : 0,
+ labels : []
+ };
+
+ S.token = next();
+
+ function is(type, value) {
+ return is_token(S.token, type, value);
+ };
+
+ function peek() { return S.peeked || (S.peeked = S.input()); };
+
+ function next() {
+ S.prev = S.token;
+ if (S.peeked) {
+ S.token = S.peeked;
+ S.peeked = null;
+ } else {
+ S.token = S.input();
+ }
+ return S.token;
+ };
+
+ function prev() {
+ return S.prev;
+ };
+
+ function croak(msg, line, col, pos) {
+ var ctx = S.input.context();
+ js_error(msg,
+ line != null ? line : ctx.tokline,
+ col != null ? col : ctx.tokcol,
+ pos != null ? pos : ctx.tokpos);
+ };
+
+ function token_error(token, msg) {
+ croak(msg, token.line, token.col);
+ };
+
+ function unexpected(token) {
+ if (token == null)
+ token = S.token;
+ token_error(token, "Unexpected token: " + token.type + " (" + token.value + ")");
+ };
+
+ function expect_token(type, val) {
+ if (is(type, val)) {
+ return next();
+ }
+ token_error(S.token, "Unexpected token " + S.token.type + ", expected " + type);
+ };
+
+ function expect(punc) { return expect_token("punc", punc); };
+
+ function can_insert_semicolon() {
+ return !exigent_mode && (
+ S.token.nlb || is("eof") || is("punc", "}")
+ );
+ };
+
+ function semicolon() {
+ if (is("punc", ";")) next();
+ else if (!can_insert_semicolon()) unexpected();
+ };
+
+ function as() {
+ return slice(arguments);
+ };
+
+ function parenthesised() {
+ expect("(");
+ var ex = expression();
+ expect(")");
+ return ex;
+ };
+
+ function add_tokens(str, start, end) {
+ return str instanceof NodeWithToken ? str : new NodeWithToken(str, start, end);
+ };
+
+ function maybe_embed_tokens(parser) {
+ if (embed_tokens) return function() {
+ var start = S.token;
+ var ast = parser.apply(this, arguments);
+ ast[0] = add_tokens(ast[0], start, prev());
+ return ast;
+ };
+ else return parser;
+ };
+
+ var statement = maybe_embed_tokens(function() {
+ if (is("operator", "/")) {
+ S.peeked = null;
+ S.token = S.input(true); // force regexp
+ }
+ switch (S.token.type) {
+ case "num":
+ case "string":
+ case "regexp":
+ case "operator":
+ case "atom":
+ return simple_statement();
+
+ case "name":
+ return is_token(peek(), "punc", ":")
+ ? labeled_statement(prog1(S.token.value, next, next))
+ : simple_statement();
+
+ case "punc":
+ switch (S.token.value) {
+ case "{":
+ return as("block", block_());
+ case "[":
+ case "(":
+ return simple_statement();
+ case ";":
+ next();
+ return as("block");
+ default:
+ unexpected();
+ }
+
+ case "keyword":
+ switch (prog1(S.token.value, next)) {
+ case "break":
+ return break_cont("break");
+
+ case "continue":
+ return break_cont("continue");
+
+ case "debugger":
+ semicolon();
+ return as("debugger");
+
+ case "do":
+ return (function(body){
+ expect_token("keyword", "while");
+ return as("do", prog1(parenthesised, semicolon), body);
+ })(in_loop(statement));
+
+ case "for":
+ return for_();
+
+ case "function":
+ return function_(true);
+
+ case "if":
+ return if_();
+
+ case "return":
+ if (S.in_function == 0)
+ croak("'return' outside of function");
+ return as("return",
+ is("punc", ";")
+ ? (next(), null)
+ : can_insert_semicolon()
+ ? null
+ : prog1(expression, semicolon));
+
+ case "switch":
+ return as("switch", parenthesised(), switch_block_());
+
+ case "throw":
+ return as("throw", prog1(expression, semicolon));
+
+ case "try":
+ return try_();
+
+ case "var":
+ return prog1(var_, semicolon);
+
+ case "const":
+ return prog1(const_, semicolon);
+
+ case "while":
+ return as("while", parenthesised(), in_loop(statement));
+
+ case "with":
+ return as("with", parenthesised(), statement());
+
+ default:
+ unexpected();
+ }
+ }
+ });
+
+ function labeled_statement(label) {
+ S.labels.push(label);
+ var start = S.token, stat = statement();
+ if (exigent_mode && !HOP(STATEMENTS_WITH_LABELS, stat[0]))
+ unexpected(start);
+ S.labels.pop();
+ return as("label", label, stat);
+ };
+
+ function simple_statement() {
+ return as("stat", prog1(expression, semicolon));
+ };
+
+ function break_cont(type) {
+ var name = is("name") ? S.token.value : null;
+ if (name != null) {
+ next();
+ if (!member(name, S.labels))
+ croak("Label " + name + " without matching loop or statement");
+ }
+ else if (S.in_loop == 0)
+ croak(type + " not inside a loop or switch");
+ semicolon();
+ return as(type, name);
+ };
+
+ function for_() {
+ expect("(");
+ var init = null;
+ if (!is("punc", ";")) {
+ init = is("keyword", "var")
+ ? (next(), var_(true))
+ : expression(true, true);
+ if (is("operator", "in"))
+ return for_in(init);
+ }
+ return regular_for(init);
+ };
+
+ function regular_for(init) {
+ expect(";");
+ var test = is("punc", ";") ? null : expression();
+ expect(";");
+ var step = is("punc", ")") ? null : expression();
+ expect(")");
+ return as("for", init, test, step, in_loop(statement));
+ };
+
+ function for_in(init) {
+ var lhs = init[0] == "var" ? as("name", init[1][0]) : init;
+ next();
+ var obj = expression();
+ expect(")");
+ return as("for-in", init, lhs, obj, in_loop(statement));
+ };
+
+ var function_ = maybe_embed_tokens(function(in_statement) {
+ var name = is("name") ? prog1(S.token.value, next) : null;
+ if (in_statement && !name)
+ unexpected();
+ expect("(");
+ return as(in_statement ? "defun" : "function",
+ name,
+ // arguments
+ (function(first, a){
+ while (!is("punc", ")")) {
+ if (first) first = false; else expect(",");
+ if (!is("name")) unexpected();
+ a.push(S.token.value);
+ next();
+ }
+ next();
+ return a;
+ })(true, []),
+ // body
+ (function(){
+ ++S.in_function;
+ var loop = S.in_loop;
+ S.in_loop = 0;
+ var a = block_();
+ --S.in_function;
+ S.in_loop = loop;
+ return a;
+ })());
+ });
+
+ function if_() {
+ var cond = parenthesised(), body = statement(), belse;
+ if (is("keyword", "else")) {
+ next();
+ belse = statement();
+ }
+ return as("if", cond, body, belse);
+ };
+
+ function block_() {
+ expect("{");
+ var a = [];
+ while (!is("punc", "}")) {
+ if (is("eof")) unexpected();
+ a.push(statement());
+ }
+ next();
+ return a;
+ };
+
+ var switch_block_ = curry(in_loop, function(){
+ expect("{");
+ var a = [], cur = null;
+ while (!is("punc", "}")) {
+ if (is("eof")) unexpected();
+ if (is("keyword", "case")) {
+ next();
+ cur = [];
+ a.push([ expression(), cur ]);
+ expect(":");
+ }
+ else if (is("keyword", "default")) {
+ next();
+ expect(":");
+ cur = [];
+ a.push([ null, cur ]);
+ }
+ else {
+ if (!cur) unexpected();
+ cur.push(statement());
+ }
+ }
+ next();
+ return a;
+ });
+
+ function try_() {
+ var body = block_(), bcatch, bfinally;
+ if (is("keyword", "catch")) {
+ next();
+ expect("(");
+ if (!is("name"))
+ croak("Name expected");
+ var name = S.token.value;
+ next();
+ expect(")");
+ bcatch = [ name, block_() ];
+ }
+ if (is("keyword", "finally")) {
+ next();
+ bfinally = block_();
+ }
+ if (!bcatch && !bfinally)
+ croak("Missing catch/finally blocks");
+ return as("try", body, bcatch, bfinally);
+ };
+
+ function vardefs(no_in) {
+ var a = [];
+ for (;;) {
+ if (!is("name"))
+ unexpected();
+ var name = S.token.value;
+ next();
+ if (is("operator", "=")) {
+ next();
+ a.push([ name, expression(false, no_in) ]);
+ } else {
+ a.push([ name ]);
+ }
+ if (!is("punc", ","))
+ break;
+ next();
+ }
+ return a;
+ };
+
+ function var_(no_in) {
+ return as("var", vardefs(no_in));
+ };
+
+ function const_() {
+ return as("const", vardefs());
+ };
+
+ function new_() {
+ var newexp = expr_atom(false), args;
+ if (is("punc", "(")) {
+ next();
+ args = expr_list(")");
+ } else {
+ args = [];
+ }
+ return subscripts(as("new", newexp, args), true);
+ };
+
+ var expr_atom = maybe_embed_tokens(function(allow_calls) {
+ if (is("operator", "new")) {
+ next();
+ return new_();
+ }
+ if (is("operator") && HOP(UNARY_PREFIX, S.token.value)) {
+ return make_unary("unary-prefix",
+ prog1(S.token.value, next),
+ expr_atom(allow_calls));
+ }
+ if (is("punc")) {
+ switch (S.token.value) {
+ case "(":
+ next();
+ return subscripts(prog1(expression, curry(expect, ")")), allow_calls);
+ case "[":
+ next();
+ return subscripts(array_(), allow_calls);
+ case "{":
+ next();
+ return subscripts(object_(), allow_calls);
+ }
+ unexpected();
+ }
+ if (is("keyword", "function")) {
+ next();
+ return subscripts(function_(false), allow_calls);
+ }
+ if (HOP(ATOMIC_START_TOKEN, S.token.type)) {
+ var atom = S.token.type == "regexp"
+ ? as("regexp", S.token.value[0], S.token.value[1])
+ : as(S.token.type, S.token.value);
+ return subscripts(prog1(atom, next), allow_calls);
+ }
+ unexpected();
+ });
+
+ function expr_list(closing, allow_trailing_comma, allow_empty) {
+ var first = true, a = [];
+ while (!is("punc", closing)) {
+ if (first) first = false; else expect(",");
+ if (allow_trailing_comma && is("punc", closing)) break;
+ if (is("punc", ",") && allow_empty) {
+ a.push([ "atom", "undefined" ]);
+ } else {
+ a.push(expression(false));
+ }
+ }
+ next();
+ return a;
+ };
+
+ function array_() {
+ return as("array", expr_list("]", !exigent_mode, true));
+ };
+
+ function object_() {
+ var first = true, a = [];
+ while (!is("punc", "}")) {
+ if (first) first = false; else expect(",");
+ if (!exigent_mode && is("punc", "}"))
+ // allow trailing comma
+ break;
+ var type = S.token.type;
+ var name = as_property_name();
+ if (type == "name" && (name == "get" || name == "set") && !is("punc", ":")) {
+ a.push([ as_name(), function_(false), name ]);
+ } else {
+ expect(":");
+ a.push([ name, expression(false) ]);
+ }
+ }
+ next();
+ return as("object", a);
+ };
+
+ function as_property_name() {
+ switch (S.token.type) {
+ case "num":
+ case "string":
+ return prog1(S.token.value, next);
+ }
+ return as_name();
+ };
+
+ function as_name() {
+ switch (S.token.type) {
+ case "name":
+ case "operator":
+ case "keyword":
+ case "atom":
+ return prog1(S.token.value, next);
+ default:
+ unexpected();
+ }
+ };
+
+ function subscripts(expr, allow_calls) {
+ if (is("punc", ".")) {
+ next();
+ return subscripts(as("dot", expr, as_name()), allow_calls);
+ }
+ if (is("punc", "[")) {
+ next();
+ return subscripts(as("sub", expr, prog1(expression, curry(expect, "]"))), allow_calls);
+ }
+ if (allow_calls && is("punc", "(")) {
+ next();
+ return subscripts(as("call", expr, expr_list(")")), true);
+ }
+ if (allow_calls && is("operator") && HOP(UNARY_POSTFIX, S.token.value)) {
+ return prog1(curry(make_unary, "unary-postfix", S.token.value, expr),
+ next);
+ }
+ return expr;
+ };
+
+ function make_unary(tag, op, expr) {
+ if ((op == "++" || op == "--") && !is_assignable(expr))
+ croak("Invalid use of " + op + " operator");
+ return as(tag, op, expr);
+ };
+
+ function expr_op(left, min_prec, no_in) {
+ var op = is("operator") ? S.token.value : null;
+ if (op && op == "in" && no_in) op = null;
+ var prec = op != null ? PRECEDENCE[op] : null;
+ if (prec != null && prec > min_prec) {
+ next();
+ var right = expr_op(expr_atom(true), prec, no_in);
+ return expr_op(as("binary", op, left, right), min_prec, no_in);
+ }
+ return left;
+ };
+
+ function expr_ops(no_in) {
+ return expr_op(expr_atom(true), 0, no_in);
+ };
+
+ function maybe_conditional(no_in) {
+ var expr = expr_ops(no_in);
+ if (is("operator", "?")) {
+ next();
+ var yes = expression(false);
+ expect(":");
+ return as("conditional", expr, yes, expression(false, no_in));
+ }
+ return expr;
+ };
+
+ function is_assignable(expr) {
+ if (!exigent_mode) return true;
+ switch (expr[0]) {
+ case "dot":
+ case "sub":
+ case "new":
+ case "call":
+ return true;
+ case "name":
+ return expr[1] != "this";
+ }
+ };
+
+ function maybe_assign(no_in) {
+ var left = maybe_conditional(no_in), val = S.token.value;
+ if (is("operator") && HOP(ASSIGNMENT, val)) {
+ if (is_assignable(left)) {
+ next();
+ return as("assign", ASSIGNMENT[val], left, maybe_assign(no_in));
+ }
+ croak("Invalid assignment");
+ }
+ return left;
+ };
+
+ var expression = maybe_embed_tokens(function(commas, no_in) {
+ if (arguments.length == 0)
+ commas = true;
+ var expr = maybe_assign(no_in);
+ if (commas && is("punc", ",")) {
+ next();
+ return as("seq", expr, expression(true, no_in));
+ }
+ return expr;
+ });
+
+ function in_loop(cont) {
+ try {
+ ++S.in_loop;
+ return cont();
+ } finally {
+ --S.in_loop;
+ }
+ };
+
+ return as("toplevel", (function(a){
+ while (!is("eof"))
+ a.push(statement());
+ return a;
+ })([]));
+
+};
+