nadesiko3 3.3.49 → 3.3.50

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 (342) hide show
  1. package/LICENSE +21 -21
  2. package/README.md +143 -143
  3. package/batch/.DS_Store +0 -0
  4. package/batch/browsers.template.md +3 -3
  5. package/batch/build_browsers.nako3 +72 -72
  6. package/batch/build_command.nako3 +44 -44
  7. package/batch/build_nako_version.nako3 +42 -42
  8. package/batch/calc_hash.nako3 +29 -29
  9. package/batch/cmd_txt2json.nako3 +74 -74
  10. package/batch/command.txt +79 -0
  11. package/batch/command_nakopad.txt +69 -0
  12. package/batch/download-extlib.nako3 +43 -43
  13. package/batch/gen_command_nakopad.nako3 +57 -57
  14. package/batch/jsplugin2text.nako3 +285 -285
  15. package/batch/pickup_command.nako3 +110 -110
  16. package/batch/pickup_reserved_words.nako3 +11 -11
  17. package/batch/publish_version.nako3 +46 -46
  18. package/batch/show_agents.js +14 -14
  19. package/batch/turtle2js.nako3 +21 -21
  20. package/bin/cnako3 +10 -10
  21. package/core/LICENSE +21 -21
  22. package/core/README.md +66 -66
  23. package/core/batch/build_nako_version.nako3 +42 -42
  24. package/core/command/snako.mjs +105 -105
  25. package/core/command/snako.mts +116 -116
  26. package/core/index.mjs +21 -21
  27. package/core/package.json +47 -47
  28. package/core/sample/hello.nako3 +7 -7
  29. package/core/sample/hoge.mjs +4 -4
  30. package/core/sample/hoge.mts +6 -6
  31. package/core/src/nako3.mjs +864 -858
  32. package/core/src/nako3.mts +976 -967
  33. package/core/src/nako_colors.mjs +78 -78
  34. package/core/src/nako_colors.mts +86 -86
  35. package/core/src/nako_core_version.mjs +8 -8
  36. package/core/src/nako_core_version.mts +19 -19
  37. package/core/src/nako_csv.mjs +185 -185
  38. package/core/src/nako_csv.mts +188 -188
  39. package/core/src/nako_errors.mjs +173 -173
  40. package/core/src/nako_errors.mts +197 -197
  41. package/core/src/nako_from_dncl.mjs +255 -255
  42. package/core/src/nako_from_dncl.mts +250 -250
  43. package/core/src/nako_gen.mjs +1647 -1648
  44. package/core/src/nako_gen.mts +1718 -1719
  45. package/core/src/nako_gen_async.mjs +1659 -1659
  46. package/core/src/nako_gen_async.mts +1732 -1732
  47. package/core/src/nako_global.mjs +107 -107
  48. package/core/src/nako_global.mts +138 -138
  49. package/core/src/nako_indent.mjs +445 -445
  50. package/core/src/nako_indent.mts +492 -492
  51. package/core/src/nako_josi_list.mjs +38 -38
  52. package/core/src/nako_josi_list.mts +45 -45
  53. package/core/src/nako_lex_rules.mjs +253 -253
  54. package/core/src/nako_lex_rules.mts +260 -260
  55. package/core/src/nako_lexer.mjs +609 -609
  56. package/core/src/nako_lexer.mts +612 -612
  57. package/core/src/nako_logger.mjs +199 -199
  58. package/core/src/nako_logger.mts +232 -232
  59. package/core/src/nako_parser3.mjs +2439 -2439
  60. package/core/src/nako_parser3.mts +2195 -2195
  61. package/core/src/nako_parser_base.mjs +370 -370
  62. package/core/src/nako_parser_base.mts +370 -370
  63. package/core/src/nako_parser_const.mjs +37 -37
  64. package/core/src/nako_parser_const.mts +37 -37
  65. package/core/src/nako_prepare.mjs +304 -304
  66. package/core/src/nako_prepare.mts +315 -315
  67. package/core/src/nako_reserved_words.mjs +38 -38
  68. package/core/src/nako_reserved_words.mts +38 -38
  69. package/core/src/nako_source_mapping.mjs +207 -207
  70. package/core/src/nako_source_mapping.mts +262 -262
  71. package/core/src/nako_test.mjs +37 -37
  72. package/core/src/nako_types.mjs +25 -25
  73. package/core/src/nako_types.mts +151 -151
  74. package/core/src/plugin_csv.mjs +49 -49
  75. package/core/src/plugin_csv.mts +50 -50
  76. package/core/src/plugin_math.mjs +328 -328
  77. package/core/src/plugin_math.mts +326 -326
  78. package/core/src/plugin_promise.mjs +91 -91
  79. package/core/src/plugin_promise.mts +91 -91
  80. package/core/src/plugin_system.mjs +2832 -2832
  81. package/core/src/plugin_system.mts +2690 -2690
  82. package/core/src/plugin_test.mjs +34 -34
  83. package/core/src/plugin_test.mts +34 -34
  84. package/demo/.DS_Store +0 -0
  85. package/demo/ace_editor.html +89 -89
  86. package/demo/ace_editor_tabs.html +161 -161
  87. package/demo/basic.html +71 -71
  88. package/demo/browsers.html +10 -9
  89. package/demo/css/basic.css +3 -3
  90. package/demo/css/common.css +157 -157
  91. package/demo/css/editor.css +8 -8
  92. package/demo/css/flow.css +3 -3
  93. package/demo/css/index.css +3 -3
  94. package/demo/extlib/.DS_Store +0 -0
  95. package/demo/flow.html +98 -98
  96. package/demo/graph.html +53 -53
  97. package/demo/image/nakopad-icon256.png +0 -0
  98. package/demo/index.html +133 -133
  99. package/demo/js/common.js +17 -17
  100. package/demo/js/turtle3d_test.js +44 -44
  101. package/demo/js/turtle_test.js +45 -45
  102. package/demo/nako3/calc.nako3 +4 -4
  103. package/demo/runscript.html +47 -47
  104. package/demo/runscript2.html +33 -33
  105. package/demo/runscript3.html +35 -35
  106. package/demo/runscript4.html +33 -33
  107. package/demo/turtle.html +58 -58
  108. package/demo/turtle2.html +141 -141
  109. package/demo/turtle3.html +279 -279
  110. package/demo/turtle3d.html +58 -58
  111. package/demo/turtle3d2.html +107 -107
  112. package/demo/version.html +24 -24
  113. package/doc/SETUP.md +157 -157
  114. package/doc/about.md +17 -17
  115. package/doc/browsers.md +26 -26
  116. package/doc/docgen.md +21 -21
  117. package/doc/editor.md +44 -44
  118. package/doc/files.md +39 -39
  119. package/doc/plugins.md +234 -234
  120. package/doc/release.md +79 -79
  121. package/doc/textlint.md +43 -43
  122. package/doc/win32.md +57 -57
  123. package/package.json +195 -195
  124. package/release/_hash.txt +28 -28
  125. package/release/_script-tags.txt +14 -14
  126. package/release/command.json +1 -1
  127. package/release/command.json.js +1 -1
  128. package/release/command_cnako3.json +1 -1
  129. package/release/command_list.json +1 -1
  130. package/release/editor.js +1 -1
  131. package/release/nako_gen_async.js +1 -1
  132. package/release/nako_gen_async.js.LICENSE.txt +35 -0
  133. package/release/plugin_caniuse.js.LICENSE.txt +11 -0
  134. package/release/plugin_csv.js +1 -1
  135. package/release/plugin_csv.js.LICENSE.txt +15 -0
  136. package/release/plugin_datetime.js.LICENSE.txt +15 -0
  137. package/release/plugin_kansuji.js.LICENSE.txt +3 -0
  138. package/release/plugin_markup.js.LICENSE.txt +11 -0
  139. package/release/plugin_turtle.js.LICENSE.txt +15 -0
  140. package/release/plugin_webworker.js.LICENSE.txt +3 -0
  141. package/release/plugin_weykturtle3d.js.LICENSE.txt +3 -0
  142. package/release/stats.json +1 -1
  143. package/release/version.js +1 -1
  144. package/release/wnako3.js +1 -1
  145. package/release/wnako3webworker.js +1 -1
  146. package/release/wnako3webworker.js.LICENSE.txt +131 -0
  147. package/src/.DS_Store +0 -0
  148. package/src/browsers.txt +12 -11
  149. package/src/browsers_agents.json +2 -2
  150. package/src/browsers_agents.mjs +1 -1
  151. package/src/cnako3.mjs +17 -17
  152. package/src/cnako3.mts +18 -18
  153. package/src/cnako3mod.mjs +707 -707
  154. package/src/cnako3mod.mts +712 -712
  155. package/src/commander_ja.mjs +164 -164
  156. package/src/commander_ja.mts +161 -161
  157. package/src/enako3.mjs +68 -68
  158. package/src/era.mjs +22 -22
  159. package/src/image_turtle-elephant.mjs +2 -2
  160. package/src/image_turtle-panda.mjs +2 -2
  161. package/src/image_turtle64.mjs +2 -2
  162. package/src/index.mjs +9 -9
  163. package/src/index.mts +10 -10
  164. package/src/nako3editorfix.sfd +106 -106
  165. package/src/nako_version.mjs +8 -8
  166. package/src/nako_version.mts +2 -2
  167. package/src/plugin_browser.mjs +213 -213
  168. package/src/plugin_browser.mts +206 -206
  169. package/src/plugin_browser_ajax.mjs +399 -399
  170. package/src/plugin_browser_audio.mjs +109 -109
  171. package/src/plugin_browser_canvas.mjs +449 -449
  172. package/src/plugin_browser_chart.mjs +294 -294
  173. package/src/plugin_browser_color.mjs +49 -49
  174. package/src/plugin_browser_crypto.mjs +26 -26
  175. package/src/plugin_browser_dialog.mjs +53 -53
  176. package/src/plugin_browser_dom_basic.mjs +336 -336
  177. package/src/plugin_browser_dom_event.mjs +193 -193
  178. package/src/plugin_browser_dom_parts.mjs +396 -396
  179. package/src/plugin_browser_geolocation.mjs +51 -51
  180. package/src/plugin_browser_hotkey.mjs +25 -25
  181. package/src/plugin_browser_html.mjs +59 -59
  182. package/src/plugin_browser_in_worker.mjs +45 -45
  183. package/src/plugin_browser_location.mjs +21 -21
  184. package/src/plugin_browser_speech.mjs +111 -111
  185. package/src/plugin_browser_storage.mjs +121 -121
  186. package/src/plugin_browser_system.mjs +31 -31
  187. package/src/plugin_browser_websocket.mjs +73 -73
  188. package/src/plugin_caniuse.mjs +29 -29
  189. package/src/plugin_datetime.mjs +394 -394
  190. package/src/plugin_httpserver.mjs +277 -277
  191. package/src/plugin_httpserver.mts +286 -286
  192. package/src/plugin_kansuji.mjs +224 -224
  193. package/src/plugin_keigo.mjs +55 -55
  194. package/src/plugin_markup.mjs +32 -32
  195. package/src/plugin_node.mjs +1047 -1047
  196. package/src/plugin_node.mts +980 -980
  197. package/src/plugin_turtle.mjs +647 -647
  198. package/src/plugin_webworker.mjs +334 -334
  199. package/src/plugin_weykturtle3d.mjs +1214 -1214
  200. package/src/plugin_worker.mjs +95 -95
  201. package/src/repl.nako3 +63 -63
  202. package/src/wnako3.mjs +12 -12
  203. package/src/wnako3.mts +11 -11
  204. package/src/wnako3_editor.css +215 -215
  205. package/src/wnako3_editor.mjs +1542 -1542
  206. package/src/wnako3_editor.mts +1658 -1657
  207. package/src/wnako3mod.mjs +213 -213
  208. package/src/wnako3mod.mts +214 -214
  209. package/src/wnako3webworker.mjs +69 -69
  210. package/test/.DS_Store +0 -0
  211. package/test/ace_editor/karma.config.js +94 -94
  212. package/test/ace_editor/test/.babelrc.json +3 -3
  213. package/test/ace_editor/test/ace_editor_test.js +178 -178
  214. package/test/ace_editor/test/html/custom_context.html +139 -139
  215. package/test/async/async_basic_test.mjs +122 -122
  216. package/test/browser/.DS_Store +0 -0
  217. package/test/browser/karma.config.js +221 -221
  218. package/test/browser/test/.babelrc.json +3 -3
  219. package/test/browser/test/compare_util.js +50 -50
  220. package/test/browser/test/html/div_basic.html +2 -2
  221. package/test/browser/test/html/event_dom_form.html +4 -4
  222. package/test/browser/test/html/event_dom_scrolldiv.html +5 -5
  223. package/test/browser/test/import_plugin_checker.js +24 -24
  224. package/test/browser/test/plugin_browser_test.js +51 -51
  225. package/test/browser/test/plugin_browser_test_ajax.js +123 -123
  226. package/test/browser/test/plugin_browser_test_color.js +18 -18
  227. package/test/browser/test/plugin_browser_test_dialog.js +72 -72
  228. package/test/browser/test/plugin_browser_test_dom_event.js +598 -598
  229. package/test/browser/test/plugin_browser_test_dom_parts.js +125 -125
  230. package/test/browser/test/plugin_browser_test_system.js +9 -9
  231. package/test/browser/test/plugin_turtle_test.js +817 -817
  232. package/test/browser/test/plugin_webworker_test.js +86 -86
  233. package/test/browser/test/require_test.js +68 -68
  234. package/test/bundled/.DS_Store +0 -0
  235. package/test/bundled/karma.config.base.js +117 -117
  236. package/test/bundled/karma.config.js +86 -86
  237. package/test/bundled/test/.babelrc.json +3 -3
  238. package/test/bundled/test/bundled_test.js +69 -69
  239. package/test/bundled/test/html/custom_context.html +65 -65
  240. package/test/bundled/test/html/custom_debug.html +66 -66
  241. package/test/bundled/test4b.cmd +52 -52
  242. package/test/bundled/test_base/.DS_Store +0 -0
  243. package/test/bundled/test_base/.babelrc.json +3 -3
  244. package/test/bundled/test_base/_checktool_test.js +25 -25
  245. package/test/bundled/test_base/basic_ajax_test.js +56 -56
  246. package/test/bundled/test_base/basic_async_test.js +18 -18
  247. package/test/bundled/test_base/basic_test.js +153 -153
  248. package/test/bundled/test_base/calc_test.js +132 -132
  249. package/test/bundled/test_base/css/browsers_box.css +114 -114
  250. package/test/bundled/test_base/html/custom_context.html +69 -69
  251. package/test/bundled/test_base/html/custom_debug.html +71 -71
  252. package/test/bundled/test_base/js/browsers_box.js +72 -72
  253. package/test/bundled/test_base/plugin_csv_test.js +37 -37
  254. package/test/bundled/test_base/plugin_datetime_test.js +115 -115
  255. package/test/bundled/test_base/plugin_kansuji_test.js +49 -49
  256. package/test/bundled/test_base/plugin_system_test.js +410 -410
  257. package/test/bundled/test_base/plugin_webworker_test.js +53 -53
  258. package/test/bundled/test_base/test_utils.js +191 -191
  259. package/test/common/.DS_Store +0 -0
  260. package/test/common/plugin_browser_test.mjs +22 -22
  261. package/test/common/plugin_browser_ut_audio_test.mjs +108 -108
  262. package/test/common/plugin_browser_ut_color_test.mjs +21 -21
  263. package/test/common/plugin_browser_ut_dialog_test.mjs +100 -100
  264. package/test/common/plugin_browser_ut_html_test.mjs +13 -13
  265. package/test/common/plugin_browser_ut_system_test.mjs +10 -10
  266. package/test/common/plugin_markup_test.mjs +23 -23
  267. package/test/jsconfig.json +19 -19
  268. package/test/karma.config.js +91 -91
  269. package/test/node/.DS_Store +0 -0
  270. package/test/node/async_test.mjs +96 -96
  271. package/test/node/commander_ja_test.mjs +89 -89
  272. package/test/node/error_message_test.mjs +243 -243
  273. package/test/node/kai_test.nako3 +6 -6
  274. package/test/node/node_test.mjs +60 -60
  275. package/test/node/plugin_broken.js.txt +3 -3
  276. package/test/node/plugin_browser_ut_ajax_test.mjs.todo +357 -357
  277. package/test/node/plugin_browser_ut_location_test.mjs +42 -42
  278. package/test/node/plugin_markup_test.mjs +47 -47
  279. package/test/node/plugin_math_test.mjs +45 -45
  280. package/test/node/plugin_node_test.mjs +98 -98
  281. package/test/node/plugin_test.mjs +44 -44
  282. package/test/node/relative_import_test_1.nako3 +1 -1
  283. package/test/node/relative_import_test_2.nako3 +2 -2
  284. package/test/node/require_nako3_test.mjs +67 -67
  285. package/test/node/requiretest.nako3 +4 -4
  286. package/test/node/requiretest_indirect.nako3 +1 -1
  287. package/test/node/requiretest_name.nako3 +5 -5
  288. package/test/node/runtime_error.nako3 +2 -2
  289. package/test/node/scope1.nako3 +10 -10
  290. package/test/node/scope2.nako3 +12 -12
  291. package/test/node/side_effects_test.mjs +39 -39
  292. package/test/node/sjis.txt +5 -5
  293. package/test/node/syntax_error.nako3 +1 -1
  294. package/test/node/wnako3_editor_test.mjs +384 -384
  295. package/tools/.DS_Store +0 -0
  296. package/tools/README.md +12 -12
  297. package/tools/check_new_version.nako3 +25 -25
  298. package/tools/nako3edit/.DS_Store +0 -0
  299. package/tools/nako3edit/a.sqlite3 +0 -0
  300. package/tools/nako3edit/html/.DS_Store +0 -0
  301. package/tools/nako3edit/html/daisyui/LICENSE +22 -22
  302. package/tools/nako3edit/html/daisyui/version_2.14.1 +1 -1
  303. package/tools/nako3edit/html/edit.html +170 -170
  304. package/tools/nako3edit/html/edit_plugin.js +6 -6
  305. package/tools/nako3edit/html/files.html +125 -125
  306. package/tools/nako3edit/html/nako3edit.css +65 -65
  307. package/tools/nako3edit/index.mjs +248 -248
  308. package/tools/nako3server/index.html +10 -10
  309. package/tools/nako3server/index.mjs +116 -116
  310. package/tools/nako3server/index.nako3 +34 -34
  311. package/core/.editorconfig +0 -6
  312. package/core/.eslintrc.cjs +0 -33
  313. package/core/.github/dependabot.yml +0 -7
  314. package/core/.github/workflows/nodejs.yml +0 -37
  315. package/core/.github/workflows/super-linter.yml +0 -61
  316. package/core/.github/workflows/textlint.yml +0 -199
  317. package/core/index.mts +0 -21
  318. package/core/test/array_test.mjs +0 -34
  319. package/core/test/basic_test.mjs +0 -344
  320. package/core/test/calc_test.mjs +0 -140
  321. package/core/test/core_module_test.mjs +0 -23
  322. package/core/test/debug_test.mjs +0 -16
  323. package/core/test/dncl_test.mjs +0 -94
  324. package/core/test/error_message_test.mjs +0 -210
  325. package/core/test/error_test.mjs +0 -16
  326. package/core/test/flow_test.mjs +0 -373
  327. package/core/test/func_call.mjs +0 -160
  328. package/core/test/func_test.mjs +0 -149
  329. package/core/test/indent_test.mjs +0 -364
  330. package/core/test/lex_test.mjs +0 -168
  331. package/core/test/literal_test.mjs +0 -73
  332. package/core/test/nako_lexer_test.mjs +0 -35
  333. package/core/test/nako_logger_test.mjs +0 -76
  334. package/core/test/nako_logger_test.mts +0 -78
  335. package/core/test/plugin_csv_test.mjs +0 -38
  336. package/core/test/plugin_promise_test.mjs +0 -18
  337. package/core/test/plugin_system_test.mjs +0 -630
  338. package/core/test/prepare_test.mjs +0 -96
  339. package/core/test/re_test.mjs +0 -22
  340. package/core/test/side_effects_test.mjs +0 -92
  341. package/core/test/variable_scope_test.mjs +0 -149
  342. package/core/tsconfig.json +0 -101
@@ -1,445 +1,445 @@
1
- import { NakoIndentError } from './nako_errors.mjs';
2
- import { NakoPrepare, checkNakoMode } from './nako_prepare.mjs';
3
- // インデント構文のキーワード
4
- const INDENT_MODE_KEYWORDS = ['!インデント構文', '!ここまでだるい'];
5
- /**
6
- * インデント構文指定があればコードを変換する
7
- * @param {string} code
8
- * @param {string} filename
9
- */
10
- function convert(code, filename = 'main.nako3') {
11
- // インデント構文の適用が必要か?
12
- if (checkNakoMode(code, INDENT_MODE_KEYWORDS)) {
13
- return convertGo(code, filename);
14
- }
15
- return { code, insertedLines: [], deletedLines: [] };
16
- }
17
- /**
18
- * インデント構文指定があるかチェックする
19
- * @param {string} code
20
- * @returns {boolean}
21
- */
22
- function isIndentSyntaxEnabled(code) {
23
- return checkNakoMode(code, INDENT_MODE_KEYWORDS);
24
- }
25
- // ありえない改行マークを定義
26
- const SpecialRetMark = '🌟🌟改行🌟🌟s4j#WjcSb😀/FcX3🌟🌟';
27
- /**
28
- * ソースコードのある1行の中のコメントを全て取り除く。
29
- * 事前にreplaceRetMarkによって文字列や範囲コメント内の改行文字が置換されている必要がある。
30
- * @param {string} src
31
- * @return {string}
32
- */
33
- function removeCommentsFromLine(src) {
34
- const prepare = NakoPrepare.getInstance(); // `※`, `//`, `/*` といったパターン全てに対応するために必要
35
- const len = src.length;
36
- let result = '';
37
- let eos = '';
38
- let i = 0;
39
- let isComment = false;
40
- while (i < len) {
41
- const c = src.charAt(i);
42
- const ch2 = src.substring(i, 2);
43
- const cPrepared = prepare.convert1ch(c);
44
- const ch2Prepared = ch2.split('').map((c) => prepare.convert1ch(c)).join('');
45
- // eosか?
46
- if (eos !== '') {
47
- // srcのi文字目以降がeosで始まるなら文字列を終了、そうでなければ1文字進める
48
- if (eos === (eos.length === 1 ? cPrepared : ch2Prepared)) {
49
- if (!isComment) {
50
- result += src.substr(i, eos.length);
51
- }
52
- i += eos.length;
53
- isComment = false;
54
- eos = '';
55
- }
56
- else {
57
- if (!isComment) {
58
- result += c;
59
- }
60
- i++;
61
- }
62
- continue;
63
- }
64
- // 文字列の改行も無視する
65
- switch (cPrepared) {
66
- case '"':
67
- case '\'':
68
- eos = c;
69
- result += c;
70
- i++;
71
- continue;
72
- case '「':
73
- eos = '」';
74
- result += c;
75
- i++;
76
- continue;
77
- case '『':
78
- eos = '』';
79
- result += c;
80
- i++;
81
- continue;
82
- case '“':
83
- eos = '”';
84
- result += c;
85
- i++;
86
- continue;
87
- case '{':
88
- eos = '}';
89
- result += c;
90
- i++;
91
- continue;
92
- case '[':
93
- eos = ']';
94
- result += c;
95
- i++;
96
- continue;
97
- }
98
- switch (ch2) {
99
- case '🌴':
100
- eos = '🌴';
101
- result += ch2;
102
- i += 2;
103
- continue;
104
- case '🌿':
105
- eos = '🌿';
106
- result += ch2;
107
- i += 2;
108
- continue;
109
- }
110
- // 行コメント
111
- if (cPrepared === '#') {
112
- eos = '\n';
113
- isComment = true;
114
- i++;
115
- continue;
116
- }
117
- if (ch2Prepared === '//') {
118
- eos = '\n';
119
- isComment = true;
120
- i += 2;
121
- continue;
122
- }
123
- // 範囲コメント
124
- if (ch2Prepared === '/*') {
125
- eos = '*/';
126
- isComment = true;
127
- i += 2;
128
- continue;
129
- }
130
- result += c;
131
- i++;
132
- }
133
- return result;
134
- }
135
- /**
136
- * @param {string} code
137
- * @param {string} filename
138
- * @returns {{ code: string, insertedLines: number[], deletedLines: { lineNumber: number, len: number }[] }}
139
- */
140
- function convertGo(code, filename) {
141
- const insertedLines = [];
142
- const deletedLines = [];
143
- const END = 'ここまで‰';
144
- const code2 = replaceRetMark(code); // 文字列の中などの改行を置換
145
- const lines = code2.split('\n');
146
- const lines2 = [];
147
- const indentStack = [];
148
- let lastIndent = 0;
149
- let lineCount = -1;
150
- lines.forEach((line) => {
151
- lineCount += line.split(SpecialRetMark).length;
152
- // trim line
153
- // eslint-disable-next-line no-irregular-whitespace
154
- if (/^[  ・\t]*$/.test(line)) {
155
- deletedLines.push({ lineNumber: lines2.length, len: line.length });
156
- return;
157
- }
158
- // eslint-disable-next-line no-irregular-whitespace
159
- const lineTrimed = removeCommentsFromLine(line).replace(/^[  ・\t]+/, '').replace(/\s+$/, '');
160
- if (lineTrimed === '') {
161
- lines2.push(line);
162
- return;
163
- }
164
- if (lineTrimed === 'ここまで') {
165
- throw new NakoIndentError('インデント構文が有効化されているときに『ここまで』を使うことはできません。', lineCount, filename);
166
- }
167
- // check indent
168
- const indent = countIndent(line);
169
- if (lastIndent === indent) {
170
- lines2.push(line);
171
- return;
172
- }
173
- // indent
174
- if (lastIndent < indent) {
175
- indentStack.push(lastIndent);
176
- lastIndent = indent;
177
- lines2.push(line);
178
- return;
179
- }
180
- // unindent
181
- if (lastIndent > indent) {
182
- // 5回
183
- // 3回
184
- // 1を表示
185
- // |
186
- // |
187
- lastIndent = indent;
188
- while (indentStack.length > 0) {
189
- const n = indentStack.pop() || 0;
190
- if (n === indent) {
191
- if (lineTrimed.substring(0, 3) !== '違えば') {
192
- insertedLines.push(lines2.length);
193
- lines2.push(makeIndent(n) + END);
194
- }
195
- lines2.push(line);
196
- return;
197
- }
198
- if (indent < n) {
199
- insertedLines.push(lines2.length);
200
- lines2.push(makeIndent(n) + END);
201
- continue;
202
- }
203
- }
204
- }
205
- });
206
- // 残りのインデントを処理
207
- while (indentStack.length > 0) {
208
- const n = indentStack.pop() || 0;
209
- insertedLines.push(lines2.length);
210
- lines2.push(makeIndent(n) + END);
211
- }
212
- // 特別マーカーを改行に置換
213
- const lines3 = [];
214
- for (let i = 0; i < lines2.length; i++) {
215
- if (lines2[i].includes(SpecialRetMark)) {
216
- const lines4 = lines2[i].split(SpecialRetMark);
217
- // 置換されたマーカーの数だけ、それ以降の行数をずらす。
218
- // unindentによって挿入された行がSpecialRetMarkを含むことはない。
219
- for (let j = 0; j < insertedLines.length; j++) {
220
- if (lines3.length < insertedLines[j]) {
221
- insertedLines[j] += lines4.length - 1;
222
- }
223
- }
224
- for (let j = 0; j < deletedLines.length; j++) {
225
- if (lines3.length < deletedLines[j].lineNumber) {
226
- deletedLines[j].lineNumber += lines4.length - 1;
227
- }
228
- }
229
- lines3.push(...lines4);
230
- }
231
- else {
232
- lines3.push(lines2[i]);
233
- }
234
- }
235
- return { code: lines3.join('\n'), insertedLines, deletedLines };
236
- }
237
- /**
238
- * count分だけ字下げする
239
- * @param {number} count
240
- */
241
- function makeIndent(count) {
242
- let s = '';
243
- for (let i = 0; i < count; i++) {
244
- s += ' ';
245
- }
246
- return s;
247
- }
248
- /**
249
- * インデント部分を取り出す
250
- * @param {string} line
251
- */
252
- function getIndent(line) {
253
- // eslint-disable-next-line no-irregular-whitespace
254
- const m = /^([  ・\t]*)/.exec(removeCommentsFromLine(line));
255
- if (!m) {
256
- return '';
257
- }
258
- return m[1];
259
- }
260
- /**
261
- * インデントの個数を数える
262
- * @param {string} line
263
- */
264
- function countIndent(line) {
265
- let cnt = 0;
266
- for (let i = 0; i < line.length; i++) {
267
- const ch = line.charAt(i);
268
- if (ch === ' ') {
269
- cnt++;
270
- continue;
271
- }
272
- if (ch === ' ') {
273
- cnt += 2;
274
- continue;
275
- }
276
- if (ch === '・') {
277
- cnt += 2;
278
- continue;
279
- }
280
- if (ch === '\t') {
281
- cnt += 4;
282
- continue;
283
- }
284
- break;
285
- }
286
- return cnt;
287
- }
288
- /**
289
- * @param {string} src
290
- * @returns {string}
291
- */
292
- function replaceRetMark(src) {
293
- const prepare = NakoPrepare.getInstance(); // `※`, `//`, `/*` といったパターン全てに対応するために必要
294
- const len = src.length;
295
- let result = '';
296
- let eos = '';
297
- let i = 0;
298
- while (i < len) {
299
- const c = src.charAt(i);
300
- const ch2 = src.substr(i, 2);
301
- const cPrepared = prepare.convert1ch(c);
302
- const ch2Prepared = ch2.split('').map((c) => prepare.convert1ch(c)).join('');
303
- // eosか?
304
- if (eos !== '') {
305
- // srcのi文字目以降がeosで始まるなら文字列を終了、そうでなければ1文字進める
306
- if (eos === (eos.length === 1 ? cPrepared : ch2Prepared)) {
307
- result += src.substr(i, eos.length);
308
- i += eos.length;
309
- eos = '';
310
- }
311
- else {
312
- if (c === '\n') {
313
- result += SpecialRetMark;
314
- }
315
- else {
316
- result += c;
317
- }
318
- i++;
319
- }
320
- continue;
321
- }
322
- // 文字列の改行も無視する
323
- switch (cPrepared) {
324
- case '"':
325
- case '\'':
326
- eos = c;
327
- result += c;
328
- i++;
329
- continue;
330
- case '「':
331
- eos = '」';
332
- result += c;
333
- i++;
334
- continue;
335
- case '『':
336
- eos = '』';
337
- result += c;
338
- i++;
339
- continue;
340
- case '“':
341
- eos = '”';
342
- result += c;
343
- i++;
344
- continue;
345
- case '{':
346
- eos = '}';
347
- result += c;
348
- i++;
349
- continue;
350
- case '[':
351
- eos = ']';
352
- result += c;
353
- i++;
354
- continue;
355
- }
356
- switch (ch2) {
357
- case '🌴':
358
- eos = '🌴';
359
- result += ch2;
360
- i += 2;
361
- continue;
362
- case '🌿':
363
- eos = '🌿';
364
- result += ch2;
365
- i += 2;
366
- continue;
367
- }
368
- // 行コメント
369
- if (cPrepared === '#') {
370
- eos = '\n';
371
- result += c;
372
- i++;
373
- continue;
374
- }
375
- if (ch2Prepared === '//') {
376
- eos = '\n';
377
- result += ch2;
378
- i += 2;
379
- continue;
380
- }
381
- // 範囲コメント
382
- if (ch2Prepared === '/*') {
383
- eos = '*/';
384
- result += ch2;
385
- i += 2;
386
- continue;
387
- }
388
- result += c;
389
- i++;
390
- }
391
- return result;
392
- }
393
- /**
394
- * コードのインデントの構造を取得する。
395
- * 空白行や複数行にまたがる構文を考慮する。
396
- * インデント構文が有効化されていない場合にも使われる。
397
- * @param {string} code
398
- */
399
- export function getBlockStructure(code) {
400
- const result = {
401
- lines: [],
402
- pairs: [],
403
- parents: [],
404
- spaces: [] // 各行のインデントの文字列
405
- };
406
- const lines = replaceRetMark(code).split('\n');
407
- const stack = [];
408
- let lineCount = 0;
409
- let prev = countIndent(lines[0]);
410
- for (const line of lines) {
411
- const numLines = line.split(SpecialRetMark).length;
412
- const line2 = removeCommentsFromLine(line);
413
- // eslint-disable-next-line no-irregular-whitespace
414
- const current = (line2.replace(/^[  ・\t]+/, '') === '')
415
- ? prev
416
- : countIndent(line2);
417
- result.lines.push(...Array(numLines).fill(current));
418
- result.spaces.push(...Array(numLines).fill(getIndent(line2)));
419
- if (prev < current) {
420
- stack.push(lineCount - 1);
421
- }
422
- else if (prev > current) {
423
- const last = stack.pop();
424
- if (last !== undefined) {
425
- result.pairs.push([last, lineCount]);
426
- }
427
- }
428
- const parent = stack[stack.length - 1] !== undefined ? stack[stack.length - 1] : null;
429
- result.parents.push(...Array(numLines).fill(parent));
430
- prev = current;
431
- lineCount += numLines;
432
- }
433
- // スタックが余ったらコードの末尾とペアにする。
434
- for (const item of stack) {
435
- result.pairs.push([item, lineCount]);
436
- }
437
- return result;
438
- }
439
- export default {
440
- convert,
441
- getBlockStructure,
442
- getIndent,
443
- countIndent,
444
- isIndentSyntaxEnabled
445
- };
1
+ import { NakoIndentError } from './nako_errors.mjs';
2
+ import { NakoPrepare, checkNakoMode } from './nako_prepare.mjs';
3
+ // インデント構文のキーワード
4
+ const INDENT_MODE_KEYWORDS = ['!インデント構文', '!ここまでだるい'];
5
+ /**
6
+ * インデント構文指定があればコードを変換する
7
+ * @param {string} code
8
+ * @param {string} filename
9
+ */
10
+ function convert(code, filename = 'main.nako3') {
11
+ // インデント構文の適用が必要か?
12
+ if (checkNakoMode(code, INDENT_MODE_KEYWORDS)) {
13
+ return convertGo(code, filename);
14
+ }
15
+ return { code, insertedLines: [], deletedLines: [] };
16
+ }
17
+ /**
18
+ * インデント構文指定があるかチェックする
19
+ * @param {string} code
20
+ * @returns {boolean}
21
+ */
22
+ function isIndentSyntaxEnabled(code) {
23
+ return checkNakoMode(code, INDENT_MODE_KEYWORDS);
24
+ }
25
+ // ありえない改行マークを定義
26
+ const SpecialRetMark = '🌟🌟改行🌟🌟s4j#WjcSb😀/FcX3🌟🌟';
27
+ /**
28
+ * ソースコードのある1行の中のコメントを全て取り除く。
29
+ * 事前にreplaceRetMarkによって文字列や範囲コメント内の改行文字が置換されている必要がある。
30
+ * @param {string} src
31
+ * @return {string}
32
+ */
33
+ function removeCommentsFromLine(src) {
34
+ const prepare = NakoPrepare.getInstance(); // `※`, `//`, `/*` といったパターン全てに対応するために必要
35
+ const len = src.length;
36
+ let result = '';
37
+ let eos = '';
38
+ let i = 0;
39
+ let isComment = false;
40
+ while (i < len) {
41
+ const c = src.charAt(i);
42
+ const ch2 = src.substring(i, 2);
43
+ const cPrepared = prepare.convert1ch(c);
44
+ const ch2Prepared = ch2.split('').map((c) => prepare.convert1ch(c)).join('');
45
+ // eosか?
46
+ if (eos !== '') {
47
+ // srcのi文字目以降がeosで始まるなら文字列を終了、そうでなければ1文字進める
48
+ if (eos === (eos.length === 1 ? cPrepared : ch2Prepared)) {
49
+ if (!isComment) {
50
+ result += src.substr(i, eos.length);
51
+ }
52
+ i += eos.length;
53
+ isComment = false;
54
+ eos = '';
55
+ }
56
+ else {
57
+ if (!isComment) {
58
+ result += c;
59
+ }
60
+ i++;
61
+ }
62
+ continue;
63
+ }
64
+ // 文字列の改行も無視する
65
+ switch (cPrepared) {
66
+ case '"':
67
+ case '\'':
68
+ eos = c;
69
+ result += c;
70
+ i++;
71
+ continue;
72
+ case '「':
73
+ eos = '」';
74
+ result += c;
75
+ i++;
76
+ continue;
77
+ case '『':
78
+ eos = '』';
79
+ result += c;
80
+ i++;
81
+ continue;
82
+ case '“':
83
+ eos = '”';
84
+ result += c;
85
+ i++;
86
+ continue;
87
+ case '{':
88
+ eos = '}';
89
+ result += c;
90
+ i++;
91
+ continue;
92
+ case '[':
93
+ eos = ']';
94
+ result += c;
95
+ i++;
96
+ continue;
97
+ }
98
+ switch (ch2) {
99
+ case '🌴':
100
+ eos = '🌴';
101
+ result += ch2;
102
+ i += 2;
103
+ continue;
104
+ case '🌿':
105
+ eos = '🌿';
106
+ result += ch2;
107
+ i += 2;
108
+ continue;
109
+ }
110
+ // 行コメント
111
+ if (cPrepared === '#') {
112
+ eos = '\n';
113
+ isComment = true;
114
+ i++;
115
+ continue;
116
+ }
117
+ if (ch2Prepared === '//') {
118
+ eos = '\n';
119
+ isComment = true;
120
+ i += 2;
121
+ continue;
122
+ }
123
+ // 範囲コメント
124
+ if (ch2Prepared === '/*') {
125
+ eos = '*/';
126
+ isComment = true;
127
+ i += 2;
128
+ continue;
129
+ }
130
+ result += c;
131
+ i++;
132
+ }
133
+ return result;
134
+ }
135
+ /**
136
+ * @param {string} code
137
+ * @param {string} filename
138
+ * @returns {{ code: string, insertedLines: number[], deletedLines: { lineNumber: number, len: number }[] }}
139
+ */
140
+ function convertGo(code, filename) {
141
+ const insertedLines = [];
142
+ const deletedLines = [];
143
+ const END = 'ここまで‰';
144
+ const code2 = replaceRetMark(code); // 文字列の中などの改行を置換
145
+ const lines = code2.split('\n');
146
+ const lines2 = [];
147
+ const indentStack = [];
148
+ let lastIndent = 0;
149
+ let lineCount = -1;
150
+ lines.forEach((line) => {
151
+ lineCount += line.split(SpecialRetMark).length;
152
+ // trim line
153
+ // eslint-disable-next-line no-irregular-whitespace
154
+ if (/^[  ・\t]*$/.test(line)) {
155
+ deletedLines.push({ lineNumber: lines2.length, len: line.length });
156
+ return;
157
+ }
158
+ // eslint-disable-next-line no-irregular-whitespace
159
+ const lineTrimed = removeCommentsFromLine(line).replace(/^[  ・\t]+/, '').replace(/\s+$/, '');
160
+ if (lineTrimed === '') {
161
+ lines2.push(line);
162
+ return;
163
+ }
164
+ if (lineTrimed === 'ここまで') {
165
+ throw new NakoIndentError('インデント構文が有効化されているときに『ここまで』を使うことはできません。', lineCount, filename);
166
+ }
167
+ // check indent
168
+ const indent = countIndent(line);
169
+ if (lastIndent === indent) {
170
+ lines2.push(line);
171
+ return;
172
+ }
173
+ // indent
174
+ if (lastIndent < indent) {
175
+ indentStack.push(lastIndent);
176
+ lastIndent = indent;
177
+ lines2.push(line);
178
+ return;
179
+ }
180
+ // unindent
181
+ if (lastIndent > indent) {
182
+ // 5回
183
+ // 3回
184
+ // 1を表示
185
+ // |
186
+ // |
187
+ lastIndent = indent;
188
+ while (indentStack.length > 0) {
189
+ const n = indentStack.pop() || 0;
190
+ if (n === indent) {
191
+ if (lineTrimed.substring(0, 3) !== '違えば') {
192
+ insertedLines.push(lines2.length);
193
+ lines2.push(makeIndent(n) + END);
194
+ }
195
+ lines2.push(line);
196
+ return;
197
+ }
198
+ if (indent < n) {
199
+ insertedLines.push(lines2.length);
200
+ lines2.push(makeIndent(n) + END);
201
+ continue;
202
+ }
203
+ }
204
+ }
205
+ });
206
+ // 残りのインデントを処理
207
+ while (indentStack.length > 0) {
208
+ const n = indentStack.pop() || 0;
209
+ insertedLines.push(lines2.length);
210
+ lines2.push(makeIndent(n) + END);
211
+ }
212
+ // 特別マーカーを改行に置換
213
+ const lines3 = [];
214
+ for (let i = 0; i < lines2.length; i++) {
215
+ if (lines2[i].includes(SpecialRetMark)) {
216
+ const lines4 = lines2[i].split(SpecialRetMark);
217
+ // 置換されたマーカーの数だけ、それ以降の行数をずらす。
218
+ // unindentによって挿入された行がSpecialRetMarkを含むことはない。
219
+ for (let j = 0; j < insertedLines.length; j++) {
220
+ if (lines3.length < insertedLines[j]) {
221
+ insertedLines[j] += lines4.length - 1;
222
+ }
223
+ }
224
+ for (let j = 0; j < deletedLines.length; j++) {
225
+ if (lines3.length < deletedLines[j].lineNumber) {
226
+ deletedLines[j].lineNumber += lines4.length - 1;
227
+ }
228
+ }
229
+ lines3.push(...lines4);
230
+ }
231
+ else {
232
+ lines3.push(lines2[i]);
233
+ }
234
+ }
235
+ return { code: lines3.join('\n'), insertedLines, deletedLines };
236
+ }
237
+ /**
238
+ * count分だけ字下げする
239
+ * @param {number} count
240
+ */
241
+ function makeIndent(count) {
242
+ let s = '';
243
+ for (let i = 0; i < count; i++) {
244
+ s += ' ';
245
+ }
246
+ return s;
247
+ }
248
+ /**
249
+ * インデント部分を取り出す
250
+ * @param {string} line
251
+ */
252
+ function getIndent(line) {
253
+ // eslint-disable-next-line no-irregular-whitespace
254
+ const m = /^([  ・\t]*)/.exec(removeCommentsFromLine(line));
255
+ if (!m) {
256
+ return '';
257
+ }
258
+ return m[1];
259
+ }
260
+ /**
261
+ * インデントの個数を数える
262
+ * @param {string} line
263
+ */
264
+ function countIndent(line) {
265
+ let cnt = 0;
266
+ for (let i = 0; i < line.length; i++) {
267
+ const ch = line.charAt(i);
268
+ if (ch === ' ') {
269
+ cnt++;
270
+ continue;
271
+ }
272
+ if (ch === ' ') {
273
+ cnt += 2;
274
+ continue;
275
+ }
276
+ if (ch === '・') {
277
+ cnt += 2;
278
+ continue;
279
+ }
280
+ if (ch === '\t') {
281
+ cnt += 4;
282
+ continue;
283
+ }
284
+ break;
285
+ }
286
+ return cnt;
287
+ }
288
+ /**
289
+ * @param {string} src
290
+ * @returns {string}
291
+ */
292
+ function replaceRetMark(src) {
293
+ const prepare = NakoPrepare.getInstance(); // `※`, `//`, `/*` といったパターン全てに対応するために必要
294
+ const len = src.length;
295
+ let result = '';
296
+ let eos = '';
297
+ let i = 0;
298
+ while (i < len) {
299
+ const c = src.charAt(i);
300
+ const ch2 = src.substr(i, 2);
301
+ const cPrepared = prepare.convert1ch(c);
302
+ const ch2Prepared = ch2.split('').map((c) => prepare.convert1ch(c)).join('');
303
+ // eosか?
304
+ if (eos !== '') {
305
+ // srcのi文字目以降がeosで始まるなら文字列を終了、そうでなければ1文字進める
306
+ if (eos === (eos.length === 1 ? cPrepared : ch2Prepared)) {
307
+ result += src.substr(i, eos.length);
308
+ i += eos.length;
309
+ eos = '';
310
+ }
311
+ else {
312
+ if (c === '\n') {
313
+ result += SpecialRetMark;
314
+ }
315
+ else {
316
+ result += c;
317
+ }
318
+ i++;
319
+ }
320
+ continue;
321
+ }
322
+ // 文字列の改行も無視する
323
+ switch (cPrepared) {
324
+ case '"':
325
+ case '\'':
326
+ eos = c;
327
+ result += c;
328
+ i++;
329
+ continue;
330
+ case '「':
331
+ eos = '」';
332
+ result += c;
333
+ i++;
334
+ continue;
335
+ case '『':
336
+ eos = '』';
337
+ result += c;
338
+ i++;
339
+ continue;
340
+ case '“':
341
+ eos = '”';
342
+ result += c;
343
+ i++;
344
+ continue;
345
+ case '{':
346
+ eos = '}';
347
+ result += c;
348
+ i++;
349
+ continue;
350
+ case '[':
351
+ eos = ']';
352
+ result += c;
353
+ i++;
354
+ continue;
355
+ }
356
+ switch (ch2) {
357
+ case '🌴':
358
+ eos = '🌴';
359
+ result += ch2;
360
+ i += 2;
361
+ continue;
362
+ case '🌿':
363
+ eos = '🌿';
364
+ result += ch2;
365
+ i += 2;
366
+ continue;
367
+ }
368
+ // 行コメント
369
+ if (cPrepared === '#') {
370
+ eos = '\n';
371
+ result += c;
372
+ i++;
373
+ continue;
374
+ }
375
+ if (ch2Prepared === '//') {
376
+ eos = '\n';
377
+ result += ch2;
378
+ i += 2;
379
+ continue;
380
+ }
381
+ // 範囲コメント
382
+ if (ch2Prepared === '/*') {
383
+ eos = '*/';
384
+ result += ch2;
385
+ i += 2;
386
+ continue;
387
+ }
388
+ result += c;
389
+ i++;
390
+ }
391
+ return result;
392
+ }
393
+ /**
394
+ * コードのインデントの構造を取得する。
395
+ * 空白行や複数行にまたがる構文を考慮する。
396
+ * インデント構文が有効化されていない場合にも使われる。
397
+ * @param {string} code
398
+ */
399
+ export function getBlockStructure(code) {
400
+ const result = {
401
+ lines: [],
402
+ pairs: [],
403
+ parents: [],
404
+ spaces: [] // 各行のインデントの文字列
405
+ };
406
+ const lines = replaceRetMark(code).split('\n');
407
+ const stack = [];
408
+ let lineCount = 0;
409
+ let prev = countIndent(lines[0]);
410
+ for (const line of lines) {
411
+ const numLines = line.split(SpecialRetMark).length;
412
+ const line2 = removeCommentsFromLine(line);
413
+ // eslint-disable-next-line no-irregular-whitespace
414
+ const current = (line2.replace(/^[  ・\t]+/, '') === '')
415
+ ? prev
416
+ : countIndent(line2);
417
+ result.lines.push(...Array(numLines).fill(current));
418
+ result.spaces.push(...Array(numLines).fill(getIndent(line2)));
419
+ if (prev < current) {
420
+ stack.push(lineCount - 1);
421
+ }
422
+ else if (prev > current) {
423
+ const last = stack.pop();
424
+ if (last !== undefined) {
425
+ result.pairs.push([last, lineCount]);
426
+ }
427
+ }
428
+ const parent = stack[stack.length - 1] !== undefined ? stack[stack.length - 1] : null;
429
+ result.parents.push(...Array(numLines).fill(parent));
430
+ prev = current;
431
+ lineCount += numLines;
432
+ }
433
+ // スタックが余ったらコードの末尾とペアにする。
434
+ for (const item of stack) {
435
+ result.pairs.push([item, lineCount]);
436
+ }
437
+ return result;
438
+ }
439
+ export default {
440
+ convert,
441
+ getBlockStructure,
442
+ getIndent,
443
+ countIndent,
444
+ isIndentSyntaxEnabled
445
+ };