nadesiko3 3.3.45 → 3.3.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (329) hide show
  1. package/LICENSE +21 -21
  2. package/README.md +143 -132
  3. package/batch/browsers.template.md +3 -3
  4. package/batch/build_browsers.nako3 +72 -72
  5. package/batch/build_command.nako3 +44 -44
  6. package/batch/build_nako_version.nako3 +42 -42
  7. package/batch/calc_hash.nako3 +29 -29
  8. package/batch/cmd_txt2json.nako3 +74 -74
  9. package/batch/command.txt +270 -338
  10. package/batch/command_nakopad.txt +9 -69
  11. package/batch/download-extlib.nako3 +43 -43
  12. package/batch/gen_command_nakopad.nako3 +57 -57
  13. package/batch/jsplugin2text.nako3 +285 -285
  14. package/batch/pickup_command.nako3 +110 -110
  15. package/batch/pickup_reserved_words.nako3 +11 -11
  16. package/batch/publish_version.nako3 +46 -46
  17. package/batch/show_agents.js +14 -14
  18. package/batch/turtle2js.nako3 +21 -21
  19. package/bin/cnako3 +10 -10
  20. package/core/.editorconfig +6 -0
  21. package/core/.eslintrc.cjs +33 -0
  22. package/core/.github/dependabot.yml +7 -0
  23. package/core/.github/workflows/nodejs.yml +37 -0
  24. package/core/.github/workflows/super-linter.yml +61 -0
  25. package/core/.github/workflows/textlint.yml +199 -0
  26. package/core/LICENSE +21 -0
  27. package/core/README.md +66 -0
  28. package/core/batch/build_nako_version.nako3 +42 -0
  29. package/core/command/snako.mjs +105 -0
  30. package/core/command/snako.mts +116 -0
  31. package/core/index.mjs +21 -0
  32. package/core/index.mts +21 -0
  33. package/core/package.json +47 -0
  34. package/core/sample/hello.nako3 +7 -0
  35. package/core/sample/hoge.mjs +4 -0
  36. package/core/sample/hoge.mts +6 -0
  37. package/core/src/nako3.mjs +858 -0
  38. package/core/src/nako3.mts +967 -0
  39. package/core/src/nako_colors.mjs +78 -0
  40. package/core/src/nako_colors.mts +86 -0
  41. package/core/src/nako_core_version.mjs +8 -0
  42. package/core/src/nako_core_version.mts +19 -0
  43. package/core/src/nako_csv.mjs +185 -0
  44. package/core/src/nako_csv.mts +188 -0
  45. package/core/src/nako_errors.mjs +173 -0
  46. package/core/src/nako_errors.mts +197 -0
  47. package/core/src/nako_from_dncl.mjs +255 -0
  48. package/core/src/nako_from_dncl.mts +250 -0
  49. package/core/src/nako_gen.mjs +1648 -0
  50. package/core/src/nako_gen.mts +1719 -0
  51. package/core/src/nako_gen_async.mjs +1659 -0
  52. package/core/src/nako_gen_async.mts +1732 -0
  53. package/core/src/nako_global.mjs +107 -0
  54. package/core/src/nako_global.mts +138 -0
  55. package/core/src/nako_indent.mjs +445 -0
  56. package/core/src/nako_indent.mts +492 -0
  57. package/core/src/nako_josi_list.mjs +38 -0
  58. package/core/src/nako_josi_list.mts +45 -0
  59. package/core/src/nako_lex_rules.mjs +253 -0
  60. package/core/src/nako_lex_rules.mts +260 -0
  61. package/core/src/nako_lexer.mjs +609 -0
  62. package/core/src/nako_lexer.mts +612 -0
  63. package/core/src/nako_logger.mjs +199 -0
  64. package/core/src/nako_logger.mts +232 -0
  65. package/core/src/nako_parser3.mjs +2439 -0
  66. package/core/src/nako_parser3.mts +2195 -0
  67. package/core/src/nako_parser_base.mjs +370 -0
  68. package/core/src/nako_parser_base.mts +370 -0
  69. package/core/src/nako_parser_const.mjs +37 -0
  70. package/core/src/nako_parser_const.mts +37 -0
  71. package/core/src/nako_prepare.mjs +304 -0
  72. package/core/src/nako_prepare.mts +315 -0
  73. package/core/src/nako_reserved_words.mjs +38 -0
  74. package/core/src/nako_reserved_words.mts +38 -0
  75. package/core/src/nako_source_mapping.mjs +207 -0
  76. package/core/src/nako_source_mapping.mts +262 -0
  77. package/core/src/nako_test.mjs +37 -0
  78. package/core/src/nako_types.mjs +25 -0
  79. package/core/src/nako_types.mts +151 -0
  80. package/core/src/plugin_csv.mjs +49 -0
  81. package/core/src/plugin_csv.mts +50 -0
  82. package/core/src/plugin_math.mjs +328 -0
  83. package/core/src/plugin_math.mts +326 -0
  84. package/core/src/plugin_promise.mjs +91 -0
  85. package/core/src/plugin_promise.mts +91 -0
  86. package/core/src/plugin_system.mjs +2832 -0
  87. package/core/src/plugin_system.mts +2690 -0
  88. package/core/src/plugin_test.mjs +34 -0
  89. package/core/src/plugin_test.mts +34 -0
  90. package/core/test/array_test.mjs +34 -0
  91. package/core/test/basic_test.mjs +344 -0
  92. package/core/test/calc_test.mjs +140 -0
  93. package/core/test/core_module_test.mjs +23 -0
  94. package/core/test/debug_test.mjs +16 -0
  95. package/core/test/dncl_test.mjs +94 -0
  96. package/core/test/error_message_test.mjs +210 -0
  97. package/core/test/error_test.mjs +16 -0
  98. package/core/test/flow_test.mjs +373 -0
  99. package/core/test/func_call.mjs +160 -0
  100. package/core/test/func_test.mjs +149 -0
  101. package/core/test/indent_test.mjs +364 -0
  102. package/core/test/lex_test.mjs +168 -0
  103. package/core/test/literal_test.mjs +73 -0
  104. package/core/test/nako_lexer_test.mjs +35 -0
  105. package/core/test/nako_logger_test.mjs +76 -0
  106. package/core/test/nako_logger_test.mts +78 -0
  107. package/core/test/plugin_csv_test.mjs +38 -0
  108. package/core/test/plugin_promise_test.mjs +18 -0
  109. package/core/test/plugin_system_test.mjs +630 -0
  110. package/core/test/prepare_test.mjs +96 -0
  111. package/core/test/re_test.mjs +22 -0
  112. package/core/test/side_effects_test.mjs +92 -0
  113. package/core/test/variable_scope_test.mjs +149 -0
  114. package/core/tsconfig.json +101 -0
  115. package/demo/ace_editor.html +89 -89
  116. package/demo/ace_editor_tabs.html +161 -161
  117. package/demo/basic.html +71 -71
  118. package/demo/browsers.html +9 -10
  119. package/demo/css/basic.css +3 -3
  120. package/demo/css/common.css +157 -157
  121. package/demo/css/editor.css +8 -8
  122. package/demo/css/flow.css +3 -3
  123. package/demo/css/index.css +3 -3
  124. package/demo/flow.html +98 -98
  125. package/demo/graph.html +53 -53
  126. package/demo/image/nakopad-icon256.png +0 -0
  127. package/demo/index.html +133 -133
  128. package/demo/js/common.js +17 -17
  129. package/demo/js/turtle3d_test.js +44 -44
  130. package/demo/js/turtle_test.js +45 -45
  131. package/demo/nako3/calc.nako3 +4 -4
  132. package/demo/runscript.html +47 -47
  133. package/demo/runscript2.html +33 -33
  134. package/demo/runscript3.html +35 -35
  135. package/demo/runscript4.html +33 -33
  136. package/demo/turtle.html +58 -58
  137. package/demo/turtle2.html +141 -141
  138. package/demo/turtle3.html +279 -279
  139. package/demo/turtle3d.html +58 -58
  140. package/demo/turtle3d2.html +107 -107
  141. package/demo/version.html +24 -24
  142. package/doc/SETUP.md +157 -157
  143. package/doc/about.md +17 -17
  144. package/doc/browsers.md +26 -26
  145. package/doc/docgen.md +21 -21
  146. package/doc/editor.md +44 -44
  147. package/doc/files.md +39 -39
  148. package/doc/plugins.md +234 -234
  149. package/doc/release.md +79 -79
  150. package/doc/textlint.md +43 -43
  151. package/doc/win32.md +57 -57
  152. package/package.json +195 -192
  153. package/release/_hash.txt +28 -28
  154. package/release/_script-tags.txt +14 -14
  155. package/release/command.json +1 -1
  156. package/release/command.json.js +1 -1
  157. package/release/command_cnako3.json +1 -1
  158. package/release/command_list.json +1 -1
  159. package/release/editor.js +1 -1
  160. package/release/nako_gen_async.js +1 -1
  161. package/release/plugin_csv.js +1 -1
  162. package/release/stats.json +1 -1
  163. package/release/version.js +1 -1
  164. package/release/wnako3.js +1 -1
  165. package/release/wnako3webworker.js +1 -1
  166. package/src/browsers.txt +11 -12
  167. package/src/browsers_agents.json +2 -2
  168. package/src/browsers_agents.mjs +1 -1
  169. package/src/cnako3.mjs +17 -10
  170. package/src/cnako3.mts +18 -12
  171. package/src/cnako3mod.mjs +707 -687
  172. package/src/cnako3mod.mts +712 -696
  173. package/src/commander_ja.mjs +164 -164
  174. package/src/commander_ja.mts +161 -161
  175. package/src/enako3.mjs +68 -69
  176. package/src/era.mjs +22 -22
  177. package/src/image_turtle-elephant.mjs +2 -5
  178. package/src/image_turtle-panda.mjs +2 -5
  179. package/src/image_turtle64.mjs +2 -5
  180. package/src/index.mjs +9 -9
  181. package/src/index.mts +10 -11
  182. package/src/nako3editorfix.sfd +106 -106
  183. package/src/nako_version.mjs +8 -8
  184. package/src/nako_version.mts +2 -2
  185. package/src/plugin_browser.mjs +213 -212
  186. package/src/plugin_browser.mts +206 -205
  187. package/src/plugin_browser_ajax.mjs +399 -399
  188. package/src/plugin_browser_audio.mjs +109 -109
  189. package/src/plugin_browser_canvas.mjs +449 -449
  190. package/src/plugin_browser_chart.mjs +294 -294
  191. package/src/plugin_browser_color.mjs +49 -49
  192. package/src/plugin_browser_crypto.mjs +26 -26
  193. package/src/plugin_browser_dialog.mjs +53 -53
  194. package/src/plugin_browser_dom_basic.mjs +336 -336
  195. package/src/plugin_browser_dom_event.mjs +193 -193
  196. package/src/plugin_browser_dom_parts.mjs +396 -396
  197. package/src/plugin_browser_geolocation.mjs +51 -51
  198. package/src/plugin_browser_hotkey.mjs +25 -25
  199. package/src/plugin_browser_html.mjs +59 -59
  200. package/src/plugin_browser_in_worker.mjs +45 -45
  201. package/src/plugin_browser_location.mjs +21 -21
  202. package/src/plugin_browser_speech.mjs +111 -111
  203. package/src/plugin_browser_storage.mjs +121 -121
  204. package/src/plugin_browser_system.mjs +31 -31
  205. package/src/plugin_browser_websocket.mjs +73 -73
  206. package/src/plugin_caniuse.mjs +29 -29
  207. package/src/plugin_datetime.mjs +394 -394
  208. package/src/plugin_httpserver.mjs +277 -0
  209. package/src/plugin_httpserver.mts +286 -0
  210. package/src/plugin_kansuji.mjs +224 -224
  211. package/src/plugin_keigo.mjs +55 -55
  212. package/src/plugin_markup.mjs +32 -32
  213. package/src/plugin_node.mjs +1047 -1047
  214. package/src/plugin_node.mts +980 -980
  215. package/src/plugin_turtle.mjs +647 -647
  216. package/src/plugin_webworker.mjs +334 -334
  217. package/src/plugin_weykturtle3d.mjs +1214 -1214
  218. package/src/plugin_worker.mjs +95 -95
  219. package/src/repl.nako3 +63 -63
  220. package/src/wnako3.mjs +12 -12
  221. package/src/wnako3.mts +11 -11
  222. package/src/wnako3_editor.css +215 -215
  223. package/src/wnako3_editor.mjs +1542 -1542
  224. package/src/wnako3_editor.mts +1657 -1656
  225. package/src/wnako3mod.mjs +213 -213
  226. package/src/wnako3mod.mts +214 -214
  227. package/src/wnako3webworker.mjs +69 -68
  228. package/test/ace_editor/karma.config.js +94 -94
  229. package/test/ace_editor/test/.babelrc.json +3 -3
  230. package/test/ace_editor/test/ace_editor_test.js +178 -178
  231. package/test/ace_editor/test/html/custom_context.html +139 -139
  232. package/test/async/async_basic_test.mjs +122 -122
  233. package/test/browser/karma.config.js +221 -221
  234. package/test/browser/test/.babelrc.json +3 -3
  235. package/test/browser/test/compare_util.js +50 -50
  236. package/test/browser/test/html/div_basic.html +2 -2
  237. package/test/browser/test/html/event_dom_form.html +4 -4
  238. package/test/browser/test/html/event_dom_scrolldiv.html +5 -5
  239. package/test/browser/test/import_plugin_checker.js +24 -24
  240. package/test/browser/test/plugin_browser_test.js +51 -51
  241. package/test/browser/test/plugin_browser_test_ajax.js +123 -123
  242. package/test/browser/test/plugin_browser_test_color.js +18 -18
  243. package/test/browser/test/plugin_browser_test_dialog.js +72 -72
  244. package/test/browser/test/plugin_browser_test_dom_event.js +598 -598
  245. package/test/browser/test/plugin_browser_test_dom_parts.js +125 -125
  246. package/test/browser/test/plugin_browser_test_system.js +9 -9
  247. package/test/browser/test/plugin_turtle_test.js +817 -817
  248. package/test/browser/test/plugin_webworker_test.js +86 -86
  249. package/test/browser/test/require_test.js +68 -68
  250. package/test/bundled/karma.config.base.js +117 -117
  251. package/test/bundled/karma.config.js +86 -86
  252. package/test/bundled/test/.babelrc.json +3 -3
  253. package/test/bundled/test/bundled_test.js +69 -69
  254. package/test/bundled/test/html/custom_context.html +65 -65
  255. package/test/bundled/test/html/custom_debug.html +66 -66
  256. package/test/bundled/test4b.cmd +52 -52
  257. package/test/bundled/test_base/.babelrc.json +3 -3
  258. package/test/bundled/test_base/_checktool_test.js +25 -25
  259. package/test/bundled/test_base/basic_ajax_test.js +56 -56
  260. package/test/bundled/test_base/basic_async_test.js +18 -18
  261. package/test/bundled/test_base/basic_test.js +153 -153
  262. package/test/bundled/test_base/calc_test.js +132 -132
  263. package/test/bundled/test_base/css/browsers_box.css +114 -114
  264. package/test/bundled/test_base/html/custom_context.html +69 -69
  265. package/test/bundled/test_base/html/custom_debug.html +71 -71
  266. package/test/bundled/test_base/js/browsers_box.js +72 -72
  267. package/test/bundled/test_base/plugin_csv_test.js +37 -37
  268. package/test/bundled/test_base/plugin_datetime_test.js +115 -115
  269. package/test/bundled/test_base/plugin_kansuji_test.js +49 -49
  270. package/test/bundled/test_base/plugin_system_test.js +410 -410
  271. package/test/bundled/test_base/plugin_webworker_test.js +53 -53
  272. package/test/bundled/test_base/test_utils.js +191 -191
  273. package/test/common/plugin_browser_test.mjs +22 -24
  274. package/test/common/plugin_browser_ut_audio_test.mjs +108 -108
  275. package/test/common/plugin_browser_ut_color_test.mjs +21 -21
  276. package/test/common/plugin_browser_ut_dialog_test.mjs +100 -100
  277. package/test/common/plugin_browser_ut_html_test.mjs +13 -13
  278. package/test/common/plugin_browser_ut_system_test.mjs +10 -10
  279. package/test/common/plugin_markup_test.mjs +23 -23
  280. package/test/jsconfig.json +19 -19
  281. package/test/karma.config.js +91 -91
  282. package/test/node/async_test.mjs +96 -82
  283. package/test/node/commander_ja_test.mjs +89 -89
  284. package/test/node/error_message_test.mjs +243 -253
  285. package/test/node/kai_test.nako3 +6 -6
  286. package/test/node/node_test.mjs +60 -60
  287. package/test/node/plugin_broken.js.txt +3 -3
  288. package/test/node/plugin_browser_ut_ajax_test.mjs.todo +357 -357
  289. package/test/node/plugin_browser_ut_location_test.mjs +42 -42
  290. package/test/node/plugin_markup_test.mjs +47 -46
  291. package/test/node/plugin_math_test.mjs +45 -44
  292. package/test/node/plugin_node_test.mjs +98 -97
  293. package/test/node/plugin_test.mjs +44 -43
  294. package/test/node/relative_import_test_1.nako3 +1 -1
  295. package/test/node/relative_import_test_2.nako3 +2 -2
  296. package/test/node/require_nako3_test.mjs +67 -66
  297. package/test/node/requiretest.nako3 +4 -4
  298. package/test/node/requiretest_indirect.nako3 +1 -1
  299. package/test/node/requiretest_name.nako3 +5 -5
  300. package/test/node/runtime_error.nako3 +2 -2
  301. package/test/node/scope1.nako3 +10 -10
  302. package/test/node/scope2.nako3 +12 -12
  303. package/test/node/side_effects_test.mjs +39 -119
  304. package/test/node/sjis.txt +5 -5
  305. package/test/node/syntax_error.nako3 +1 -1
  306. package/test/node/wnako3_editor_test.mjs +384 -384
  307. package/tools/README.md +12 -7
  308. package/tools/check_new_version.nako3 +25 -25
  309. package/tools/nako3edit/html/daisyui/LICENSE +22 -22
  310. package/tools/nako3edit/html/daisyui/version_2.14.1 +1 -1
  311. package/tools/nako3edit/html/edit.html +170 -170
  312. package/tools/nako3edit/html/edit_plugin.js +6 -6
  313. package/tools/nako3edit/html/files.html +125 -125
  314. package/tools/nako3edit/html/nako3edit.css +65 -65
  315. package/tools/nako3edit/index.mjs +248 -244
  316. package/tools/nako3server/index.html +10 -0
  317. package/tools/nako3server/index.mjs +116 -116
  318. package/tools/nako3server/index.nako3 +34 -0
  319. package/release/nako_gen_async.js.LICENSE.txt +0 -35
  320. package/release/plugin_caniuse.js.LICENSE.txt +0 -11
  321. package/release/plugin_csv.js.LICENSE.txt +0 -15
  322. package/release/plugin_datetime.js.LICENSE.txt +0 -15
  323. package/release/plugin_kansuji.js.LICENSE.txt +0 -3
  324. package/release/plugin_markup.js.LICENSE.txt +0 -11
  325. package/release/plugin_turtle.js.LICENSE.txt +0 -15
  326. package/release/plugin_webworker.js.LICENSE.txt +0 -3
  327. package/release/plugin_weykturtle3d.js.LICENSE.txt +0 -3
  328. package/release/wnako3webworker.js.LICENSE.txt +0 -131
  329. package/tools/nako3edit/a.sqlite3 +0 -0
@@ -1,140 +1,140 @@
1
- <!DOCTYPE html>
2
- <html>
3
- <head>
4
- <meta charset="UTF-8">
5
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
6
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
7
- <title>Nadesiko3 Editor</title>
8
- <link rel="stylesheet" href="/src/wnako3_editor.css">
9
- <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/ace.js" integrity="sha512-GZ1RIgZaSc8rnco/8CXfRdCpDxRCphenIiZ2ztLy3XQfCbQUSCuk8IudvNHxkRA3oUg6q0qejgN/qqyG1duv5Q==" crossorigin="anonymous"></script>
10
- <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/ext-language_tools.min.js" integrity="sha512-8qx1DL/2Wsrrij2TWX5UzvEaYOFVndR7BogdpOyF4ocMfnfkw28qt8ULkXD9Tef0bLvh3TpnSAljDC7uyniEuQ==" crossorigin="anonymous"></script>
11
- <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/ext-options.min.js" integrity="sha512-oHR+WVzBiVZ6njlMVlDDLUIOLRDfUUfRQ55PfkZvgjwuvGqL4ohCTxaahJIxTmtya4jgyk0zmOxDMuLzbfqQDA==" crossorigin="anonymous"></script>
12
- <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/ext-code_lens.min.js" integrity="sha512-gsDyyKTnOmSWRDzUbpYcPjzVsEyFGSWeWefzVKvbMULPR2ElIlKKsOtU3ycfybN9kncZXKLFSsUiG3cgJUbc/g==" crossorigin="anonymous"></script>
13
- <script src="/release/wnako3.js"></script>
14
- <script src="/release/version.js"></script>
15
- <script src="/release/plugin_markup.js"></script>
16
- <script src="/release/plugin_csv.js"></script>
17
- <script src="/release/plugin_kansuji.js"></script>
18
- <script src="/release/plugin_datetime.js"></script>
19
- <script src="/release/plugin_turtle.js"></script>
20
- <script src="/release/plugin_caniuse.js"></script>
21
- <script src="/release/plugin_webworker.js"></script>
22
-
23
- <!-- mochaを一番最後に読み込む必要がある -->
24
- <script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/8.3.0/mocha.min.js" integrity="sha512-LA/TpBXau/JNubKzHQhdi5vGkRLyQjs1vpuk2W1nc8WNgf/pCqBplD8MzlzeKJQTZPvkEZi0HqBDfRC2EyLMXw==" crossorigin="anonymous"></script>
25
- </head>
26
- <body>
27
- 単純な例
28
- <div id="editor1" data-nako3-force-syntax-highlighting="true">もしはいならば
29
- 「こんにちは」を表示
30
- ここまで
31
- </div>
32
- <div id="editor1-output"></div>
33
- インデント構文
34
- <div id="editor2" data-nako3-force-syntax-highlighting="true">!インデント構文
35
- Nを1から3まで繰り返す
36
- Nを表示
37
-
38
- 「1行目
39
- 2行目」を表示
40
-
41
- /*
42
- 範囲コメント
43
- */
44
- </div>
45
- 平らなプログラム
46
- <div id="editor3" data-nako3-force-syntax-highlighting="true">
47
- A=1
48
- Aを表示
49
- </div>
50
- コンパイルエラーの表示
51
- <div id="editor4" data-nako3-force-syntax-highlighting="true">
52
- 「{」を表示
53
- </div>
54
- readonly
55
- <div id="editor5" data-nako3-readonly="true" data-nako3-force-syntax-highlighting="true">1+2を表示</div>
56
- コンパイルエラーの表示の無効化
57
- <div id="editor6" data-nako3-disable-marker="true" data-nako3-force-syntax-highlighting="true">
58
- 「{」を表示
59
- </div>
60
- 実行時エラーの表示
61
- <div id="editor7" data-nako3-force-syntax-highlighting="true">「」を表示
62
- 1のエラー発生
63
- </div>
64
- <div id="editor7-output"></div>
65
- ソースコードの取り込み
66
- <div id="editor8" data-nako3-force-syntax-highlighting="true">!「http://localhost:9876/test/requiretest.nako3」を取り込む
67
- 1と2を痕跡演算する
68
- </div>
69
- <div id="editor8-output"></div>
70
- 警告の表示
71
- <div id="editor9" data-nako3-force-syntax-highlighting="true">aを表示</div>
72
- <div id="editor9-output"></div>
73
- setTimeoutで起きたエラーの表示
74
- <div id="editor10" data-nako3-force-syntax-highlighting="true">0.01秒後には
75
- 1のエラー発生
76
- ここまで
77
- </div>
78
- 字句解析エラーの表示
79
- <div id="editor11" data-nako3-force-syntax-highlighting="true">「{」
80
- </div>
81
- <div id="editor11-output"></div>
82
- 文字入力のテスト用
83
- <div id="editor-input-test"></div>
84
- <div>
85
- プログラムの実行
86
- </div>
87
- テストの定義にcode lensを表示する
88
- <div id="editor12">●テスト:足すとは
89
- 1のエラー発生
90
- ここまで
91
-
92
- ●テスト:引くとは
93
- ここまで
94
- </div>
95
- <script>
96
- const editor1 = navigator.nako3.setupEditor("editor1")
97
- navigator.nako3.setupEditor("editor2")
98
- navigator.nako3.setupEditor("editor3")
99
- navigator.nako3.setupEditor("editor4")
100
- navigator.nako3.setupEditor("editor5")
101
- navigator.nako3.setupEditor("editor6")
102
- const editor7 = navigator.nako3.setupEditor("editor7")
103
- const editor8 = navigator.nako3.setupEditor("editor8")
104
- const editor9 = navigator.nako3.setupEditor("editor9")
105
- const editor10 = navigator.nako3.setupEditor("editor10")
106
- const editor11 = navigator.nako3.setupEditor("editor11")
107
- const editor12 = navigator.nako3.setupEditor("editor12")
108
- window.editor12 = editor12
109
- editor12.codeLensListeners.push({ name: 'test', callback: (testName) => { window.codeLensClicked = testName } })
110
- // editor-input-test はテスト内で初期化する
111
-
112
- // プログラムを実行する。順番に実行しないとloadDependenciesの間にloggerが別のエディタによって置き換えられてしまい、エラーを正しく表示できない。
113
- const main = async () => {
114
- await editor1.run({ outputContainer: document.getElementById("editor1-output") }).promise
115
- await editor7.run({ preCode: 'A=1\n', outputContainer: document.getElementById("editor7-output") }).promise
116
- await editor8.run({ outputContainer: document.getElementById("editor8-output")}).promise
117
- await editor9.run({ outputContainer: document.getElementById("editor9-output")}).promise
118
- await editor10.run({}).promise
119
- await new Promise((resolve) => setTimeout(resolve, 500)) // editor10で実行時エラーが飛ぶまで待つ
120
- await editor11.run({ outputContainer: document.getElementById("editor11-output")}).promise
121
- window.ok = true
122
- }
123
- main().catch((err) => { console.error(err) })
124
-
125
- </script>
126
- <script src="context.js"></script>
127
- <script type="text/javascript">
128
- %CLIENT_CONFIG%
129
- window.__karma__.setupContext(window);
130
- %MAPPINGS%
131
- </script>
132
- %SCRIPTS%
133
- <script type="module">
134
- window.__karma__.loaded();
135
- </script>
136
- <script nomodule>
137
- window.__karma__.loaded();
138
- </script>
139
- </body>
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <meta charset="UTF-8">
5
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
6
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
7
+ <title>Nadesiko3 Editor</title>
8
+ <link rel="stylesheet" href="/src/wnako3_editor.css">
9
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/ace.js" integrity="sha512-GZ1RIgZaSc8rnco/8CXfRdCpDxRCphenIiZ2ztLy3XQfCbQUSCuk8IudvNHxkRA3oUg6q0qejgN/qqyG1duv5Q==" crossorigin="anonymous"></script>
10
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/ext-language_tools.min.js" integrity="sha512-8qx1DL/2Wsrrij2TWX5UzvEaYOFVndR7BogdpOyF4ocMfnfkw28qt8ULkXD9Tef0bLvh3TpnSAljDC7uyniEuQ==" crossorigin="anonymous"></script>
11
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/ext-options.min.js" integrity="sha512-oHR+WVzBiVZ6njlMVlDDLUIOLRDfUUfRQ55PfkZvgjwuvGqL4ohCTxaahJIxTmtya4jgyk0zmOxDMuLzbfqQDA==" crossorigin="anonymous"></script>
12
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/ext-code_lens.min.js" integrity="sha512-gsDyyKTnOmSWRDzUbpYcPjzVsEyFGSWeWefzVKvbMULPR2ElIlKKsOtU3ycfybN9kncZXKLFSsUiG3cgJUbc/g==" crossorigin="anonymous"></script>
13
+ <script src="/release/wnako3.js"></script>
14
+ <script src="/release/version.js"></script>
15
+ <script src="/release/plugin_markup.js"></script>
16
+ <script src="/release/plugin_csv.js"></script>
17
+ <script src="/release/plugin_kansuji.js"></script>
18
+ <script src="/release/plugin_datetime.js"></script>
19
+ <script src="/release/plugin_turtle.js"></script>
20
+ <script src="/release/plugin_caniuse.js"></script>
21
+ <script src="/release/plugin_webworker.js"></script>
22
+
23
+ <!-- mochaを一番最後に読み込む必要がある -->
24
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/8.3.0/mocha.min.js" integrity="sha512-LA/TpBXau/JNubKzHQhdi5vGkRLyQjs1vpuk2W1nc8WNgf/pCqBplD8MzlzeKJQTZPvkEZi0HqBDfRC2EyLMXw==" crossorigin="anonymous"></script>
25
+ </head>
26
+ <body>
27
+ 単純な例
28
+ <div id="editor1" data-nako3-force-syntax-highlighting="true">もしはいならば
29
+ 「こんにちは」を表示
30
+ ここまで
31
+ </div>
32
+ <div id="editor1-output"></div>
33
+ インデント構文
34
+ <div id="editor2" data-nako3-force-syntax-highlighting="true">!インデント構文
35
+ Nを1から3まで繰り返す
36
+ Nを表示
37
+
38
+ 「1行目
39
+ 2行目」を表示
40
+
41
+ /*
42
+ 範囲コメント
43
+ */
44
+ </div>
45
+ 平らなプログラム
46
+ <div id="editor3" data-nako3-force-syntax-highlighting="true">
47
+ A=1
48
+ Aを表示
49
+ </div>
50
+ コンパイルエラーの表示
51
+ <div id="editor4" data-nako3-force-syntax-highlighting="true">
52
+ 「{」を表示
53
+ </div>
54
+ readonly
55
+ <div id="editor5" data-nako3-readonly="true" data-nako3-force-syntax-highlighting="true">1+2を表示</div>
56
+ コンパイルエラーの表示の無効化
57
+ <div id="editor6" data-nako3-disable-marker="true" data-nako3-force-syntax-highlighting="true">
58
+ 「{」を表示
59
+ </div>
60
+ 実行時エラーの表示
61
+ <div id="editor7" data-nako3-force-syntax-highlighting="true">「」を表示
62
+ 1のエラー発生
63
+ </div>
64
+ <div id="editor7-output"></div>
65
+ ソースコードの取り込み
66
+ <div id="editor8" data-nako3-force-syntax-highlighting="true">!「http://localhost:9876/test/requiretest.nako3」を取り込む
67
+ 1と2を痕跡演算する
68
+ </div>
69
+ <div id="editor8-output"></div>
70
+ 警告の表示
71
+ <div id="editor9" data-nako3-force-syntax-highlighting="true">aを表示</div>
72
+ <div id="editor9-output"></div>
73
+ setTimeoutで起きたエラーの表示
74
+ <div id="editor10" data-nako3-force-syntax-highlighting="true">0.01秒後には
75
+ 1のエラー発生
76
+ ここまで
77
+ </div>
78
+ 字句解析エラーの表示
79
+ <div id="editor11" data-nako3-force-syntax-highlighting="true">「{」
80
+ </div>
81
+ <div id="editor11-output"></div>
82
+ 文字入力のテスト用
83
+ <div id="editor-input-test"></div>
84
+ <div>
85
+ プログラムの実行
86
+ </div>
87
+ テストの定義にcode lensを表示する
88
+ <div id="editor12">●テスト:足すとは
89
+ 1のエラー発生
90
+ ここまで
91
+
92
+ ●テスト:引くとは
93
+ ここまで
94
+ </div>
95
+ <script>
96
+ const editor1 = navigator.nako3.setupEditor("editor1")
97
+ navigator.nako3.setupEditor("editor2")
98
+ navigator.nako3.setupEditor("editor3")
99
+ navigator.nako3.setupEditor("editor4")
100
+ navigator.nako3.setupEditor("editor5")
101
+ navigator.nako3.setupEditor("editor6")
102
+ const editor7 = navigator.nako3.setupEditor("editor7")
103
+ const editor8 = navigator.nako3.setupEditor("editor8")
104
+ const editor9 = navigator.nako3.setupEditor("editor9")
105
+ const editor10 = navigator.nako3.setupEditor("editor10")
106
+ const editor11 = navigator.nako3.setupEditor("editor11")
107
+ const editor12 = navigator.nako3.setupEditor("editor12")
108
+ window.editor12 = editor12
109
+ editor12.codeLensListeners.push({ name: 'test', callback: (testName) => { window.codeLensClicked = testName } })
110
+ // editor-input-test はテスト内で初期化する
111
+
112
+ // プログラムを実行する。順番に実行しないとloadDependenciesの間にloggerが別のエディタによって置き換えられてしまい、エラーを正しく表示できない。
113
+ const main = async () => {
114
+ await editor1.run({ outputContainer: document.getElementById("editor1-output") }).promise
115
+ await editor7.run({ preCode: 'A=1\n', outputContainer: document.getElementById("editor7-output") }).promise
116
+ await editor8.run({ outputContainer: document.getElementById("editor8-output")}).promise
117
+ await editor9.run({ outputContainer: document.getElementById("editor9-output")}).promise
118
+ await editor10.run({}).promise
119
+ await new Promise((resolve) => setTimeout(resolve, 500)) // editor10で実行時エラーが飛ぶまで待つ
120
+ await editor11.run({ outputContainer: document.getElementById("editor11-output")}).promise
121
+ window.ok = true
122
+ }
123
+ main().catch((err) => { console.error(err) })
124
+
125
+ </script>
126
+ <script src="context.js"></script>
127
+ <script type="text/javascript">
128
+ %CLIENT_CONFIG%
129
+ window.__karma__.setupContext(window);
130
+ %MAPPINGS%
131
+ </script>
132
+ %SCRIPTS%
133
+ <script type="module">
134
+ window.__karma__.loaded();
135
+ </script>
136
+ <script nomodule>
137
+ window.__karma__.loaded();
138
+ </script>
139
+ </body>
140
140
  </html>
@@ -1,122 +1,122 @@
1
- import assert from 'assert'
2
- import { NakoCompiler } from '../../src/nako3.mjs'
3
-
4
- describe('aysnc_basic_test', () => {
5
- // @ts-ignore
6
- const nako = new NakoCompiler()
7
- const cmp = (/** @type {string} */code, /** @type {string} */res) => {
8
- code = '!非同期モード\n' + code
9
- nako.logger.debug('code=' + code)
10
- assert.strictEqual(nako.run(code, '').log, res)
11
- }
12
- // --- test ---
13
- it('print simple', () => {
14
- cmp('3を表示', '3')
15
- })
16
- it('calc simple', () => {
17
- cmp('3*2を表示', '6')
18
- })
19
- it('let simple', () => {
20
- cmp('n=3;nを表示', '3')
21
- cmp('n=3;m=8;n*mを表示', '24')
22
- })
23
- // 関数
24
- it('js func simple c type', () => {
25
- cmp('n=INT(3.14);nを表示', '3')
26
- cmp('INT(3.14)を表示', '3')
27
- })
28
- it('js func replace', () => {
29
- cmp('「a,b,c」の「,」を「:」へ置換。それを表示。', 'a:b:c')
30
- })
31
- it('js func replace 連文', () => {
32
- cmp('「a,b,c」の「,」を「:」へ置換して表示。', 'a:b:c')
33
- })
34
- it('関数定義', () => {
35
- cmp('●(AとBの)積算処理とは\nA*Bで戻る。。。3と5の積算処理を表示', '15')
36
- cmp('●(AにBを)加算処理とは\nAにBを足す。。。3に5を加算処理して表示', '8')
37
- })
38
- it('無名関数定義', () => {
39
- cmp('A=●(AとBの)\nA/Bで戻る。。。A(9,3)を表示', '3')
40
- })
41
- it('関数定義(再帰)', () => {
42
- cmp('総数=0;●(Nの)再帰加算処理とは\nもしN<0ならば総数を戻す;総数=総数+N;(N-1)の再帰加算処理を戻す。。。10の再帰加算処理を表示', '55')
43
- })
44
- it('フィボナッチテスト(関数の再帰)', () => {
45
- cmp(
46
- '●FIB(N)とは\n' +
47
- '  もしN<=2ならば、(N-1)で戻る\n' +
48
- '  それ=FIB(N-1)+FIB(N-2)\n' +
49
- 'ここまで。\n' +
50
- 'FIB(15)を表示', '377')
51
- })
52
- // 条件分岐
53
- it('もし', () => {
54
- cmp('N=1;もしN=1ならば「OK」と表示。', 'OK')
55
- cmp('N=2;もしN=1ならば「NG」と表示。違えば「OK」と表示', 'OK')
56
- cmp('N=10;もしN>=5ならば「A」と表示。違えば「B」と表示', 'A')
57
- cmp('N=1;もしN>=5ならば「A」と表示。違えば「B」と表示', 'B')
58
- })
59
- it('もし、複数行', () => {
60
- cmp('N=1;もし、Nが3以上ならば\n"A"を表示\n違えば\n"B"を表示\n。。。', 'B')
61
- })
62
- it('もし、連続', () => {
63
- cmp('N=1;もしN=1ならば「OK」と表示。', 'OK')
64
- cmp('N=2;もしN=1ならば「1」と表示。違えばもしN=2ならば「2」と表示。違えばもしN=3ならば「3」と表示。違えば「その他」と表示。', '2')
65
- cmp('N=4;もしN=1ならば「1」と表示。違えばもしN=2ならば「2」と表示。違えばもしN=3ならば「3」と表示。違えば「その他」と表示。', 'その他')
66
- })
67
- it('条件分岐', () => {
68
- cmp('N=3;Nで条件分岐;1ならば"1"と表示💧2ならば"2"と表示💧3ならば"3"と表示💧違えば"*"と表示💧💧', '3')
69
- cmp('N=55;Nで条件分岐;1ならば"1"と表示💧2ならば"2"と表示💧3ならば"3"と表示💧違えば"*"と表示💧💧', '*')
70
- })
71
- // JSON
72
- it('JSON', () => {
73
- cmp('N=[10,20,30];N[0]を表示', '10')
74
- cmp('N={"mon":1,"tue":2,"wed":3};N["wed"]を表示', '3')
75
- cmp('N={"mon":[1,2,3],"tue":[4,5,6]};N["mon"][2]を表示', '3')
76
- })
77
- // 繰り返し
78
- it('繰り返し', () => {
79
- cmp('C=0;Nを1から10まで繰り返す;C=C+N;ここまで;Cを表示;', '55')
80
- cmp('C=0;10回,C=C+回数;Cを表示', '55')
81
- cmp('C=0;N=10;Nが0以上の間;C=C+N;N=N-1;ここまで;Cを表示', '55')
82
- cmp('C=0;N=[1,2,3,4,5,6,7,8,9,10];Nを反復;C=C+対象;ここまで;Cを表示', '55')
83
- })
84
- // 文字列の展開
85
- it('文字列の展開', () => {
86
- cmp('a=30;「abc{a}abc」を表示', 'abc30abc')
87
- cmp('a=30;「abc{a}abc」を表示', 'abc30abc')
88
- })
89
- // 定数
90
- it('システム定数', () => {
91
- cmp('ナデシコエンジンを表示', 'nadesi.com/v3')
92
- })
93
- it('助詞の後に句読点', () => {
94
- cmp('「こんにちは」と、表示。', 'こんにちは')
95
- })
96
- it('代入文', () => {
97
- cmp('3000を値段に代入。値段を表示', '3000')
98
- cmp('値段に3000を代入。値段を表示', '3000')
99
- cmp('々=3000。々を表示', '3000')
100
- cmp('々に3000を代入。々を表示', '3000')
101
- })
102
- it('連文後の代入文', () => {
103
- cmp('「aabbcc」の「aa」を「」に置換してFに代入。Fを表示', 'bbcc')
104
- cmp('「aabbcc」の「aa」を「」に置換して「bb」を「」に置換してFに代入。Fを表示', 'cc')
105
- })
106
- it('〜を〜に定める', () => {
107
- cmp('Aを0.8に定めてAを表示', '0.8')
108
- })
109
- it('文字列 - &と改行', () => {
110
- cmp('「aaa」& _\n「bbb」を表示。', 'aaabbb')
111
- cmp('A= 1 + 1 + 1 + 1 + 1 + _\n1 + 1\nAを表示', '7')
112
- cmp('A= 1 + 1 + 1 + 1 + 1 + _\r\n1 + 1 + 1\r\nAを表示', '8')
113
- cmp('A= 1 + 1 + 1 + 1 + 1 + _ \r\n1 + 3 \r\nAを表示', '9')
114
- cmp('A = 1 + _\n' +
115
- ' 5 + _\n' +
116
- ' 10\n' +
117
- 'Aを表示。', '16')
118
- })
119
- it('名前に数字を持つ変数を使う', () => {
120
- cmp('A1=30;B1=20;「{A1}{B1}」を表示。', '3020')
121
- })
122
- })
1
+ import assert from 'assert'
2
+ import { NakoCompiler } from '../../core/src/nako3.mjs'
3
+
4
+ describe('aysnc_basic_test', () => {
5
+ // @ts-ignore
6
+ const cmp = (/** @type {string} */code, /** @type {string} */res) => {
7
+ code = '!非同期モード\n' + code
8
+ const nako = new NakoCompiler()
9
+ nako.getLogger().debug('code=' + code)
10
+ assert.strictEqual(nako.run(code, '').log, res)
11
+ }
12
+ // --- test ---
13
+ it('print simple', () => {
14
+ cmp('3を表示', '3')
15
+ })
16
+ it('calc simple', () => {
17
+ cmp('3*2を表示', '6')
18
+ })
19
+ it('let simple', () => {
20
+ cmp('n=3;nを表示', '3')
21
+ cmp('n=3;m=8;n*mを表示', '24')
22
+ })
23
+ // 関数
24
+ it('js func simple c type', () => {
25
+ cmp('n=INT(3.14);nを表示', '3')
26
+ cmp('INT(3.14)を表示', '3')
27
+ })
28
+ it('js func replace', () => {
29
+ cmp('「a,b,c」の「,」を「:」へ置換。それを表示。', 'a:b:c')
30
+ })
31
+ it('js func replace 連文', () => {
32
+ cmp('「a,b,c」の「,」を「:」へ置換して表示。', 'a:b:c')
33
+ })
34
+ it('関数定義', () => {
35
+ cmp('●(AとBの)積算処理とは\nA*Bで戻る。。。3と5の積算処理を表示', '15')
36
+ cmp('●(AにBを)加算処理とは\nAにBを足す。。。3に5を加算処理して表示', '8')
37
+ })
38
+ it('無名関数定義', () => {
39
+ cmp('A=●(AとBの)\nA/Bで戻る。。。A(9,3)を表示', '3')
40
+ })
41
+ it('関数定義(再帰)', () => {
42
+ cmp('総数=0;●(Nの)再帰加算処理とは\nもしN<0ならば総数を戻す;総数=総数+N;(N-1)の再帰加算処理を戻す。。。10の再帰加算処理を表示', '55')
43
+ })
44
+ it('フィボナッチテスト(関数の再帰)', () => {
45
+ cmp(
46
+ '●FIB(N)とは\n' +
47
+ '  もしN<=2ならば、(N-1)で戻る\n' +
48
+ '  それ=FIB(N-1)+FIB(N-2)\n' +
49
+ 'ここまで。\n' +
50
+ 'FIB(15)を表示', '377')
51
+ })
52
+ // 条件分岐
53
+ it('もし', () => {
54
+ cmp('N=1;もしN=1ならば「OK」と表示。', 'OK')
55
+ cmp('N=2;もしN=1ならば「NG」と表示。違えば「OK」と表示', 'OK')
56
+ cmp('N=10;もしN>=5ならば「A」と表示。違えば「B」と表示', 'A')
57
+ cmp('N=1;もしN>=5ならば「A」と表示。違えば「B」と表示', 'B')
58
+ })
59
+ it('もし、複数行', () => {
60
+ cmp('N=1;もし、Nが3以上ならば\n"A"を表示\n違えば\n"B"を表示\n。。。', 'B')
61
+ })
62
+ it('もし、連続', () => {
63
+ cmp('N=1;もしN=1ならば「OK」と表示。', 'OK')
64
+ cmp('N=2;もしN=1ならば「1」と表示。違えばもしN=2ならば「2」と表示。違えばもしN=3ならば「3」と表示。違えば「その他」と表示。', '2')
65
+ cmp('N=4;もしN=1ならば「1」と表示。違えばもしN=2ならば「2」と表示。違えばもしN=3ならば「3」と表示。違えば「その他」と表示。', 'その他')
66
+ })
67
+ it('条件分岐', () => {
68
+ cmp('N=3;Nで条件分岐;1ならば"1"と表示💧2ならば"2"と表示💧3ならば"3"と表示💧違えば"*"と表示💧💧', '3')
69
+ cmp('N=55;Nで条件分岐;1ならば"1"と表示💧2ならば"2"と表示💧3ならば"3"と表示💧違えば"*"と表示💧💧', '*')
70
+ })
71
+ // JSON
72
+ it('JSON', () => {
73
+ cmp('N=[10,20,30];N[0]を表示', '10')
74
+ cmp('N={"mon":1,"tue":2,"wed":3};N["wed"]を表示', '3')
75
+ cmp('N={"mon":[1,2,3],"tue":[4,5,6]};N["mon"][2]を表示', '3')
76
+ })
77
+ // 繰り返し
78
+ it('繰り返し', () => {
79
+ cmp('C=0;Nを1から10まで繰り返す;C=C+N;ここまで;Cを表示;', '55')
80
+ cmp('C=0;10回,C=C+回数;Cを表示', '55')
81
+ cmp('C=0;N=10;Nが0以上の間;C=C+N;N=N-1;ここまで;Cを表示', '55')
82
+ cmp('C=0;N=[1,2,3,4,5,6,7,8,9,10];Nを反復;C=C+対象;ここまで;Cを表示', '55')
83
+ })
84
+ // 文字列の展開
85
+ it('文字列の展開', () => {
86
+ cmp('a=30;「abc{a}abc」を表示', 'abc30abc')
87
+ cmp('a=30;「abc{a}abc」を表示', 'abc30abc')
88
+ })
89
+ // 定数
90
+ it('システム定数', () => {
91
+ cmp('ナデシコエンジンを表示', 'nadesi.com/v3')
92
+ })
93
+ it('助詞の後に句読点', () => {
94
+ cmp('「こんにちは」と、表示。', 'こんにちは')
95
+ })
96
+ it('代入文', () => {
97
+ cmp('3000を値段に代入。値段を表示', '3000')
98
+ cmp('値段に3000を代入。値段を表示', '3000')
99
+ cmp('々=3000。々を表示', '3000')
100
+ cmp('々に3000を代入。々を表示', '3000')
101
+ })
102
+ it('連文後の代入文', () => {
103
+ cmp('「aabbcc」の「aa」を「」に置換してFに代入。Fを表示', 'bbcc')
104
+ cmp('「aabbcc」の「aa」を「」に置換して「bb」を「」に置換してFに代入。Fを表示', 'cc')
105
+ })
106
+ it('〜を〜に定める', () => {
107
+ cmp('Aを0.8に定めてAを表示', '0.8')
108
+ })
109
+ it('文字列 - &と改行', () => {
110
+ cmp('「aaa」& _\n「bbb」を表示。', 'aaabbb')
111
+ cmp('A= 1 + 1 + 1 + 1 + 1 + _\n1 + 1\nAを表示', '7')
112
+ cmp('A= 1 + 1 + 1 + 1 + 1 + _\r\n1 + 1 + 1\r\nAを表示', '8')
113
+ cmp('A= 1 + 1 + 1 + 1 + 1 + _ \r\n1 + 3 \r\nAを表示', '9')
114
+ cmp('A = 1 + _\n' +
115
+ ' 5 + _\n' +
116
+ ' 10\n' +
117
+ 'Aを表示。', '16')
118
+ })
119
+ it('名前に数字を持つ変数を使う', () => {
120
+ cmp('A1=30;B1=20;「{A1}{B1}」を表示。', '3020')
121
+ })
122
+ })