feat: add XOR operator support and update related documentation

otnc · otnc · commit fabe36f837fc · 2026-02-15T22:21:32.000+09:00
diff --git a/README-ja.md b/README-ja.md
@@ -39,6 +39,7 @@
 | `^8`    | `(`        | | `^,`    | `<`        |
 | `^9`    | `)`        | | `^.`    | `>`        |
 | `^-`    | `=`        | | `^/`    | `?`        |
+| `^0`    | `^` (XOR)  | | | |
 
 テンプレート式: `^4^[` → `${`
 
@@ -57,8 +58,8 @@ nsc create
 
 ```nsjs
 // src/index.nsjs
-const name ^- ^2NoShift.js^2;
-console.log^8^2Hello from ^2 ^; name ^; ^2!^2^9;
+const name ^- ^2^3no^3shift.js^2;
+console.log^8^2^3hello from ^2 ^; name ^; ^2!^2^9;
 ```
 
 コンパイル後:
diff --git a/README.md b/README.md
@@ -40,6 +40,7 @@ Typing shifted symbols (`!`, `"`, `(`, `)`, `{`, `}` …) is tiring.
 | `^8`    | `(`        | | `^,`    | `<`        |
 | `^9`    | `)`        | | `^.`    | `>`        |
 | `^-`    | `=`        | | `^/`    | `?`        |
+| `^0`    | `^` (XOR)  | | | |
 
 Template expression: `^4^[` → `${`
 
@@ -58,8 +59,8 @@ nsc create
 
 ```nsjs
 // src/index.nsjs
-const name ^- ^2NoShift.js^2;
-console.log^8^2Hello from ^2 ^; name ^; ^2!^2^9;
+const name ^- ^2^3no^3shift.js^2;
+console.log^8^2^3hello from ^2 ^; name ^; ^2!^2^9;
 ```
 
 Compiles to:
diff --git a/npm/README-ja.md b/npm/README-ja.md
@@ -99,6 +99,7 @@ nsc init
 | `^8`    | `(`        | | `^,`    | `<`        |
 | `^9`    | `)`        | | `^.`    | `>`        |
 | `^-`    | `=`        | | `^/`    | `?`        |
+| `^0`    | `^` (XOR)  | | | |
 
 テンプレート式: `^4^[` → `${`
 
@@ -109,7 +110,7 @@ nsc init
 ### Hello World
 
 ```nsjs
-console.log^8^2Hello, World!^2^9;
+console.log^8^2^3hello, ^3world!^2^9;
 ```
 
 ```js
@@ -174,10 +175,10 @@ console.log(result); // 8
 
 ```nsjs
 // ダブルクォート文字列
-const s1 ^- ^2Hello^2;
+const s1 ^- ^2^3hello^2;
 
 // シングルクォート文字列
-const s2 ^- ^7World^7;
+const s2 ^- ^7^3world^7;
 
 // テンプレートリテラル
 const s3 ^- ^@^4^[s1^] ^4^[s2^]^@;
@@ -189,7 +190,7 @@ const s4 ^- ^2quote: \^2^2;
 ```js
 const s1 = "Hello";
 const s2 = 'World';
-const s3 = `Hello World`;
+const s3 = `${s1} ${s2}`;
 const s4 = "quote: ^2";
 ```
 
@@ -228,7 +229,7 @@ class ^3animal ^[
   ^]
 ^]
 
-const dog ^- new ^3animal^8^2Dog^2^9;
+const dog ^- new ^3animal^8^2^3dog^2^9;
 dog.speak^8^9;
 ```
 
diff --git a/npm/README.md b/npm/README.md
@@ -100,6 +100,7 @@ Generated automatically by `nsc init` or `nsc create`.
 | `^8`    | `(`        | | `^,`    | `<`        |
 | `^9`    | `)`        | | `^.`    | `>`        |
 | `^-`    | `=`        | | `^/`    | `?`        |
+| `^0`    | `^` (XOR)  | | | |
 
 Template expression: `^4^[` → `${`
 
@@ -110,7 +111,7 @@ Template expression: `^4^[` → `${`
 ### Hello World
 
 ```nsjs
-console.log^8^2Hello, World!^2^9;
+console.log^8^2^3hello, ^3world!^2^9;
 ```
 
 ```js
@@ -175,10 +176,10 @@ console.log(result); // 8
 
 ```nsjs
 // Double-quote string
-const s1 ^- ^2Hello^2;
+const s1 ^- ^2^3hello^2;
 
 // Single-quote string
-const s2 ^- ^7World^7;
+const s2 ^- ^7^3world^7;
 
 // Template literal
 const s3 ^- ^@^4^[s1^] ^4^[s2^]^@;
@@ -190,7 +191,7 @@ const s4 ^- ^2quote: \^2^2;
 ```js
 const s1 = "Hello";
 const s2 = 'World';
-const s3 = `Hello World`;
+const s3 = `${s1} ${s2}`;
 const s4 = "quote: ^2";
 ```
 
@@ -229,7 +230,7 @@ class ^3animal ^[
   ^]
 ^]
 
-const dog ^- new ^3animal^8^2Dog^2^9;
+const dog ^- new ^3animal^8^2^3dog^2^9;
 dog.speak^8^9;
 ```
 
diff --git a/npm/commands/create.js b/npm/commands/create.js
@@ -97,7 +97,7 @@ export default async function create(projectNameArg, options = {}) {
   await fs.mkdir("src", { recursive: true });
   await fs.writeFile(
     "src/index.nsjs",
-    "console.log^8^2^3hello, ^3world^1^2^9;\n",
+    "console.log^8^2^3hello, ^3world!^2^9;\n",
   );
 
   // .gitignore
diff --git a/npm/package-lock.json b/npm/package-lock.json
diff --git a/npm/package.json b/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "noshift.js",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Joke language.",
   "bin": {
     "nsc": "./bin/cli.js"
diff --git a/npm/src/convert.js b/npm/src/convert.js
@@ -4,6 +4,7 @@
 const noShiftMap = {
   // "^@^@^@": "```", // マルチバックチック
   "^4^[": "${", // テンプレート式展開開始
+  "^0": "^",
   "^1": "!",
   "^2": '"',
   "^4": "$",
diff --git a/pages/src/data/symbols.ts b/pages/src/data/symbols.ts
@@ -8,6 +8,7 @@ export const symbolMap = [
   { shifted: "'", noshift: "^7" },
   { shifted: "(", noshift: "^8" },
   { shifted: ")", noshift: "^9" },
+  { shifted: "^ (Caret/XOR)", noshift: "^0", special: true },
   { shifted: "=", noshift: "^-" },
   { shifted: "~", noshift: "^^" },
   { shifted: "|", noshift: "^\\" },
diff --git a/pages/src/i18n/translations.ts b/pages/src/i18n/translations.ts
@@ -116,6 +116,9 @@ export const ui = {
     "syntax.helloTitle": "Hello World",
     "syntax.helloInput": "Input:",
     "syntax.helloOutput": "Output:",
+    "syntax.bitwiseTitle": "Bitwise & Shift Operations",
+    "syntax.bitwiseDesc":
+      "JavaScript's bitwise operators work in NoShift.js using existing <code>^</code> sequences. The XOR operator (<code>^</code>) uses <code>^0</code> since the caret character is the NoShift.js prefix:",
 
     // Capitalize
     "cap.title": "Capitalize Modifier (^3)",
@@ -378,6 +381,9 @@ export const ui = {
     "syntax.helloTitle": "Hello World",
     "syntax.helloInput": "入力:",
     "syntax.helloOutput": "出力:",
+    "syntax.bitwiseTitle": "ビット演算・シフト演算",
+    "syntax.bitwiseDesc":
+      "JavaScript のビット演算子は NoShift.js の既存の <code>^</code> シーケンスで記述できます。XOR 演算子（<code>^</code>）は <code>^0</code> を使います（キャレットは NoShift.js のプレフィックスであるため）:",
 
     // Capitalize
     "cap.title": "大文字化修飾子 (^3)",
diff --git a/pages/src/pages/[lang]/capitalize.astro b/pages/src/pages/[lang]/capitalize.astro
@@ -71,12 +71,12 @@ const { lang } = Astro.params as { lang: Lang };
   <p set:html={t(lang, "cap.constDesc")} />
   <CodeBlock
     lang="nsjs"
-    code={`const ^3m^3a^3x_^3s^3i^3z^3e ^- 1024;\nconsole.log^8^3m^3a^3x_^3s^3i^3z^3e^9;`}
+    code={`const ^3m^3a^3x^3c^3o^3u^3n^3t ^- 1024;\nconsole.log^8^3m^3a^3x^3c^3o^3u^3n^3t^9;`}
   />
   <p>{lang === "ja" ? "コンパイル後:" : "Compiles to:"}</p>
   <CodeBlock
     lang="javascript"
-    code={`const MAX_SIZE = 1024;\nconsole.log(MAX_SIZE);`}
+    code={`const MAXCOUNT = 1024;\nconsole.log(MAXCOUNT);`}
   />
 
   <h2>{t(lang, "cap.stringTitle")}</h2>
diff --git a/pages/src/pages/[lang]/syntax.astro b/pages/src/pages/[lang]/syntax.astro
@@ -14,9 +14,6 @@ const half = Math.ceil(symbolMap.length / 2);
 const leftSymbols = symbolMap.slice(0, half);
 const rightSymbols = symbolMap.slice(half);
 
-const bt = "`";
-const escapeExample = `^2^5^2 --> "^5"\n^7^5^7 --> '^5'\n^@^5^@ --> ${bt}^5${bt}`;
-const templateExample = `^@^5^4^[^2Hello World!^2^]^@ --> ${bt}^5\${"Hello World!"}${bt}`;
 const templateExprLabel =
   lang === "ja" ? "テンプレート式" : "Template expression";
 ---
@@ -85,15 +82,31 @@ const templateExprLabel =
 
   <h2>{t(lang, "syntax.escapeTitle")}</h2>
   <p set:html={t(lang, "syntax.escapeDesc")} />
-  <CodeBlock lang="nsjs" code={escapeExample} />
+  <CodeBlock lang="nsjs" code={`^2^5^2\n^7^5^7\n^@^5^@`} />
+  <p>{lang === "ja" ? "コンパイル後:" : "Compiles to:"}</p>
+  <CodeBlock lang="javascript" code={`"^5"\n'^5'\n\`^5\``} />
 
   <h2>{t(lang, "syntax.templateTitle")}</h2>
   <p set:html={t(lang, "syntax.templateDesc")} />
-  <CodeBlock lang="nsjs" code={templateExample} />
+  <CodeBlock lang="nsjs" code={`^@^5^4^[^2Hello World!^2^]^@`} />
+  <p>{lang === "ja" ? "コンパイル後:" : "Compiles to:"}</p>
+  <CodeBlock lang="javascript" code={`\`^5\${"Hello World!"}\``} />
+
+  <h2>{t(lang, "syntax.bitwiseTitle")}</h2>
+  <p set:html={t(lang, "syntax.bitwiseDesc")} />
+  <CodeBlock
+    lang="nsjs"
+    code={`// XOR: ^0 --> ^\nconst a ^- 5 ^0 3;\n\n// XOR assignment: ^0^- --> ^=\nlet b ^- 7;\nb ^0^- 3;\n\n// AND: ^6, OR: ^\\, NOT: ^^\nconst c ^- 5 ^6 3;\nconst d ^- 5 ^\\ 3;\nconst e ^- ^^5;\n\n// Left shift: ^,^,  Right shift: ^.^.\nconst f ^- 1 ^,^, 3;\nconst g ^- 8 ^.^. 1;\nconst h ^- -1 ^.^.^. 0;`}
+  />
+  <p>{lang === "ja" ? "コンパイル後:" : "Compiles to:"}</p>
+  <CodeBlock
+    lang="javascript"
+    code={`// XOR: ^0 --> ^\nconst a = 5 ^ 3;\n\n// XOR assignment: ^0^- --> ^=\nlet b = 7;\nb ^= 3;\n\n// AND: ^6, OR: ^\\, NOT: ^^\nconst c = 5 & 3;\nconst d = 5 | 3;\nconst e = ~5;\n\n// Left shift: ^,^,  Right shift: ^.^.\nconst f = 1 << 3;\nconst g = 8 >> 1;\nconst h = -1 >>> 0;`}
+  />
 
   <h2>{t(lang, "syntax.helloTitle")}</h2>
   <p>{t(lang, "syntax.helloInput")}</p>
-  <CodeBlock lang="nsjs" code="console.log^8^2^3hello ^3world^1^2^9;" />
+  <CodeBlock lang="nsjs" code="console.log^8^2^3hello ^3world!^2^9;" />
   <p>{t(lang, "syntax.helloOutput")}</p>
   <CodeBlock lang="javascript" code={`console.log("Hello World!");`} />
 </DocsLayout>
diff --git a/pages/src/pages/index.astro b/pages/src/pages/index.astro
@@ -180,7 +180,7 @@ const lang: Lang = "en";
           lang="nsjs"
           code={`// src/index.nsjs
 const name ^- ^2^3no^3shift.js^2;
-console.log^8^2^3hello from ^2 ^; name ^; ^2^1^2^9;`}
+console.log^8^2^3hello from ^2 ^; name ^; ^2!^2^9;`}
         />
 
         <p id="compiles-to">{t("en", "home.compilesTo")}</p>
diff --git a/prettier-plugin/src/convert.js b/prettier-plugin/src/convert.js
@@ -8,6 +8,7 @@
 // ======
 const noShiftMap = {
   "^4^[": "${", // テンプレート式展開開始
+  "^0": "^",
   "^1": "!",
   "^2": '"',
   "^4": "$",
diff --git a/prettier-plugin/src/reverse.js b/prettier-plugin/src/reverse.js
@@ -32,6 +32,7 @@ const jsToNsMap = {
   "<": "^,",
   ">": "^.",
   "?": "^/",
+  "^": "^0",
 };
 
 const STATE = {
diff --git a/vscode-extension/README-ja.md b/vscode-extension/README-ja.md
@@ -26,7 +26,7 @@
 - **文字列リテラル**: `^2...^2` (ダブルクォート)、`^7...^7` (シングルクォート)、`^@...^@` (テンプレートリテラル)
 - **テンプレート式**: `^4^[...^]` 内をネストされたコードとして着色
 - **組み込みオブジェクト**: `console`, `Math`, `Promise`, `Array` など
-- **コメント**: `//` 行コメント・`/* */` ブロックコメント
+- **コメント**: `//` 行コメント・`/^: ^:/` ブロックコメント
 
 ### ファイルアイコン
 
@@ -70,7 +70,7 @@
 | 拡張子 | `.nsjs` |
 | 言語 ID | `noshift` |
 | 行コメント | `//` |
-| ブロックコメント | `/* */` |
+| ブロックコメント | `/^: ^:/` |
 | ブラケットペア | `^[` / `^]`, `^8` / `^9`, `[` / `]` |
 | 自動クローズ | `^2`, `^7`, `^@`, `^[`, `^8` |
 
diff --git a/vscode-extension/README.md b/vscode-extension/README.md
@@ -26,7 +26,7 @@ Full syntax highlighting for `.nsjs` files.
 - **String literals**: `^2...^2` (double-quote), `^7...^7` (single-quote), `^@...^@` (template literal)
 - **Template expressions**: Code inside `^4^[...^]` highlighted as nested expressions
 - **Built-in objects**: `console`, `Math`, `Promise`, `Array`, etc.
-- **Comments**: `//` line comments and `/* */` block comments
+- **Comments**: `//` line comments and `/^: ^:/` block comments
 
 ### File Icon
 
@@ -70,7 +70,7 @@ Result: ^[|^]   (| = cursor position)
 | Extension | `.nsjs` |
 | Language ID | `noshift` |
 | Line comment | `//` |
-| Block comment | `/* */` |
+| Block comment | `/^: ^:/` |
 | Bracket pairs | `^[` / `^]`, `^8` / `^9`, `[` / `]` |
 | Auto-close | `^2`, `^7`, `^@`, `^[`, `^8` |
 
diff --git a/vscode-extension/package.json b/vscode-extension/package.json
@@ -2,7 +2,7 @@
   "name": "noshift-vscode",
   "displayName": "NoShift.js",
   "description": "Syntax highlighting + auto-complete for NoShift.js (.nsjs) files",
-  "version": "0.4.4",
+  "version": "0.5.0",
   "publisher": "otoneko1102",
   "engines": {
     "vscode": "^1.70.0"
diff --git a/vscode-extension/syntaxes/noshift.tmLanguage.json b/vscode-extension/syntaxes/noshift.tmLanguage.json
@@ -115,7 +115,7 @@
         {
           "comment": "NoShift sequences for shift-required symbols (excludes string/bracket delimiters: ^2 ^7 ^@ ^8 ^9 ^[ ^])",
           "name": "keyword.operator.noshift",
-          "match": "\\^(?:1|4|5|6|-|\\^|\\\\|;|:|,|\\.|/)"
+          "match": "\\^(?:0|1|4|5|6|-|\\^|\\\\|;|:|,|\\.|/)"
         }
       ]
     },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "noshift.js",`
`3`		`- "version": "0.7.0",`
	`3`	`+ "version": "0.8.0",`
`4`	`4`	`"description": "Joke language.",`
`5`	`5`	`"bin": {`
`6`	`6`	`"nsc": "./bin/cli.js"`