nadesiko3 3.6.28 → 3.6.31

package/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nadesiko3core",
-  "version": "3.6.28",
+  "version": "3.6.31",
   "description": "Japanese Programming Language Nadesiko v3 core",
   "main": "index.mjs",
   "type": "module",

package/core/src/nako_gen.mjs

@@ -983,17 +983,6 @@ export class NakoGen {
         }
         return code;
     }
-    convRefProp(node) {
-        const name = this._convGen(node.name, true);
-        const list = node.index;
-        if (!list || list.length <= 0) {
-            throw NakoSyntaxError.fromNode('プロパティがありません。', node);
-        }
-        const prop = list[0].value;
-        const code = `( (function(){ if (${name}.__getProp) { return ${name}.__getProp('${prop}', __self) } ` +
-            `else { return ${name}['${prop}'] } })() )`;
-        return code;
-    }
     convLetArray(node) {
         const id = this.loopId++;
         const valueNode = node.blocks[0];
@@ -1771,15 +1760,13 @@ export class NakoGen {
         if (!node.blocks || node.blocks.length == 0) {
             throw NakoSyntaxError.fromNode('代入する値がありません。', node);
         }
-        const astProp = node.index[0];
-        const astValue = node.blocks[0];
-        let prop = '';
-        if (astProp) {
-            prop = astProp.value;
-        }
-        else {
+        const propList = node.index;
+        const propTopAst = propList.pop();
+        if (propTopAst === undefined) {
             throw NakoSyntaxError.fromNode('代入する先のプロパティ名がありません。', node);
         }
+        const propTop = (typeof propTopAst.value === 'string') ? propTopAst.value : '';
+        const astValue = node.blocks[0];
         let value = null;
         // 値のプログラムを生成
         if (astValue) {
@@ -1796,12 +1783,56 @@ export class NakoGen {
         if (res === null) {
             throw NakoSyntaxError.fromNode(`変数『${name}』が見当たりません。`, node);
         }
+        // 変数のプロパティ
+        let nameJs = res.js;
+        if (propList.length > 0) {
+            for (const prop of propList) {
+                if (typeof prop.value === 'string') {
+                    nameJs += `['${prop.value}']`;
+                }
+                else {
+                    throw NakoSyntaxError.fromNode(`変数『${nameJs}』以下のプロパティにアクセスできません。`, node);
+                }
+            }
+        }
         // プロパティへの代入式を作る
-        const propVar = `${res.js}['${prop}']`;
-        code += `if (typeof ${res.js}.__setProp === 'function') { ${res.js}.__setProp('${prop}', ${value}, __self); } `;
-        code += `else { ${propVar} = ${value} };`;
+        code += `if (typeof ${nameJs}.__setProp === 'function') { ${nameJs}.__setProp('${propTop}', ${value}, __self); } `;
+        code += `else { ${nameJs}['${propTop}'] = ${value} };`;
         return ';' + this.convLineno(node, false) + code + '\n';
     }
+    // プロパティへの参照 (#1793)
+    convRefProp(node) {
+        const name = this._convGen(node.name, true);
+        const list = node.index;
+        if (!list || list.length <= 0) {
+            throw NakoSyntaxError.fromNode('プロパティがありません。', node);
+        }
+        let code;
+        const propList = list;
+        if (propList.length <= 1) {
+            const propKey = propList[0].value;
+            const code_call = `${name}.__getProp('${propKey}', __self)`;
+            const code_prop = `${name}['${propKey}']`;
+            const code_if = `if (${name}.__getProp) { return ${code_call} } else { return ${code_prop} }`;
+            code = `( (()=>{ ${code_if} })() )`;
+        }
+        else {
+            const arrs = [];
+            const keys = [];
+            for (let i = 0; i < propList.length; i++) {
+                const propKey = propList[i].value;
+                keys.push(`['${propKey}']`);
+                arrs.push(`'${propKey}'`);
+            }
+            const keyStr = keys.join('');
+            const arrStr = '[' + arrs.join(',') + ']';
+            const code_call = `${name}.__getProp(${arrStr}, __self)`;
+            const code_prop = `${name}${keyStr}`;
+            const code_if = `if (${name}.__getProp) { return ${code_call} } else { return ${code_prop} }`;
+            code = `( (()=>{ ${code_if} })() )`;
+        }
+        return code;
+    }
     convDefLocalVar(node) {
         const astValue = node.blocks[0];
         let value = '0';

package/core/src/nako_gen.mts

@@ -1059,19 +1059,6 @@ export class NakoGen {
     return code
   }
 
-  convRefProp (node: Ast): string {
-    const name = this._convGen(node.name as Ast, true)
-    const list: Ast[] | undefined = node.index
-    if (!list || list.length <= 0) {
-      throw NakoSyntaxError.fromNode('プロパティがありません。', node)
-    }
-    const prop = (list[0] as AstStrValue).value
-    const code =
-      `( (function(){ if (${name}.__getProp) { return ${name}.__getProp('${prop}', __self) } ` +
-      `else { return ${name}['${prop}'] } })() )`
-    return code
-  }
-
   convLetArray (node: AstLetArray): string {
     const id = this.loopId++
     const valueNode: Ast = node.blocks[0]
@@ -1834,14 +1821,11 @@ export class NakoGen {
   convLetProp(node: AstLet): string {
     if (!node.index || node.index.length == 0) { throw NakoSyntaxError.fromNode('代入する先のプロパティ名がありません。', node) }
     if (!node.blocks || node.blocks.length == 0) { throw NakoSyntaxError.fromNode('代入する値がありません。', node) }
-    const astProp = node.index[0]
+    const propList = node.index as AstStrValue[]
+    const propTopAst = propList.pop()
+    if (propTopAst === undefined) { throw NakoSyntaxError.fromNode('代入する先のプロパティ名がありません。', node) }
+    const propTop = (typeof propTopAst.value === 'string') ? propTopAst.value : ''
     const astValue = node.blocks[0]
-    let prop = ''
-    if (astProp) {
-      prop = (astProp as AstStrValue).value
-    } else {
-      throw NakoSyntaxError.fromNode('代入する先のプロパティ名がありません。', node)
-    }
     let value = null
     // 値のプログラムを生成
     if (astValue) {
@@ -1849,7 +1833,6 @@ export class NakoGen {
     } else {
       throw NakoSyntaxError.fromNode('代入する値がありません。', node)
     }
-
     // 変数名
     const name: string = node.name
     const res = this.findVar(name, value)
@@ -1858,12 +1841,55 @@ export class NakoGen {
     if (res === null) {
       throw NakoSyntaxError.fromNode(`変数『${name}』が見当たりません。`, node)
     }
+    // 変数のプロパティ
+    let nameJs = res.js
+    if (propList.length > 0) {
+      for (const prop of propList) {
+        if (typeof prop.value === 'string') {
+          nameJs += `['${prop.value}']`
+        } else {
+          throw NakoSyntaxError.fromNode(
+            `変数『${nameJs}』以下のプロパティにアクセスできません。`, node)
+        }
+      }
+    }
     // プロパティへの代入式を作る
-    const propVar = `${res.js}['${prop}']`
-    code += `if (typeof ${res.js}.__setProp === 'function') { ${res.js}.__setProp('${prop}', ${value}, __self); } `
-    code += `else { ${propVar} = ${value} };`
+    code += `if (typeof ${nameJs}.__setProp === 'function') { ${nameJs}.__setProp('${propTop}', ${value}, __self); } `
+    code += `else { ${nameJs}['${propTop}'] = ${value} };`
     return ';' + this.convLineno(node, false) + code + '\n'
   }
+  // プロパティへの参照 (#1793)
+  convRefProp(node: Ast): string {
+    const name = this._convGen(node.name as Ast, true)
+    const list: Ast[] | undefined = node.index
+    if (!list || list.length <= 0) {
+      throw NakoSyntaxError.fromNode('プロパティがありません。', node)
+    }
+    let code
+    const propList = list as AstStrValue[]
+    if (propList.length <= 1) {
+      const propKey = propList[0].value
+      const code_call = `${name}.__getProp('${propKey}', __self)`
+      const code_prop = `${name}['${propKey}']`
+      const code_if = `if (${name}.__getProp) { return ${code_call} } else { return ${code_prop} }`
+      code = `( (()=>{ ${code_if} })() )`
+    } else {
+      const arrs = []
+      const keys = []
+      for (let i = 0; i < propList.length; i++) {
+        const propKey = propList[i].value
+        keys.push(`['${propKey}']`)
+        arrs.push(`'${propKey}'`)
+      }
+      const keyStr = keys.join('')
+      const arrStr = '[' + arrs.join(',') + ']'
+      const code_call = `${name}.__getProp(${arrStr}, __self)`
+      const code_prop = `${name}${keyStr}`
+      const code_if = `if (${name}.__getProp) { return ${code_call} } else { return ${code_prop} }`
+      code = `( (()=>{ ${code_if} })() )`
+    }
+    return code
+  }
 
   convDefLocalVar(node: AstDefVar): string {
     const astValue = node.blocks[0]

package/core/src/nako_lex_rules.mjs

@@ -11,7 +11,10 @@ const wordSpecial = /^(かつ|または)/;
 const errorRead = (ch) => {
     return function () { throw new Error('突然の『' + ch + '』があります。'); };
 };
-export const unitRE = /^(円|ドル|元|歩|㎡|坪|度|℃|°|個|つ|本|冊|才|歳|匹|枚|皿|セット|羽|人|件|行|列|機|品|m|mm|cm|km|g|kg|t|px|dot|pt|em|b|mb|kb|gb)/;
+// 数値の後の単位は自動的に省略されるルール (#994)
+export const unitRE = /^(円|ドル|元|歩|㎡|坪|度|℃|°|個|つ|本|冊|才|歳|匹|枚|皿|セット|羽|人|件|行|列|機|品|m|mm|cm|km|g|kg|t|b|mb|kb|gb)/;
+// CSSの単位であれば自動的に文字列に変換するルール (#1811)
+export const cssUnitRE = /^(px|em|ex|rem|vw|vh|vmin|vmax)/;
 /** トークンに区切るルールの一覧 */
 export const rules = [
     // 上から順にマッチさせていく
@@ -81,7 +84,7 @@ export const rules = [
     { name: ')', pattern: /^\)/, readJosi: true },
     { name: '|', pattern: /^\|/ },
     { name: '??', pattern: /^\?\?/ }, // 「表示」のエイリアス #1745
-    { name: '$', pattern: /^\$/ }, // #1793 プロパティアクセス
+    { name: '$', pattern: /^(\$|\.)/ }, // プロパティアクセス (#1793)(#1807)
     { name: 'string', pattern: /^🌿/, cbParser: src => cbString('🌿', '🌿', src) },
     { name: 'string_ex', pattern: /^🌴/, cbParser: src => cbString('🌴', '🌴', src) },
     { name: 'string_ex', pattern: /^「/, cbParser: src => cbString('「', '」', src) },

package/core/src/nako_lex_rules.mts

@@ -15,7 +15,10 @@ const errorRead = (ch: string): any => {
   return function () { throw new Error('突然の『' + ch + '』があります。') }
 }
 
-export const unitRE = /^(円|ドル|元|歩|㎡|坪|度|℃|°|個|つ|本|冊|才|歳|匹|枚|皿|セット|羽|人|件|行|列|機|品|m|mm|cm|km|g|kg|t|px|dot|pt|em|b|mb|kb|gb)/
+// 数値の後の単位は自動的に省略されるルール (#994)
+export const unitRE = /^(円|ドル|元|歩|㎡|坪|度|℃|°|個|つ|本|冊|才|歳|匹|枚|皿|セット|羽|人|件|行|列|機|品|m|mm|cm|km|g|kg|t|b|mb|kb|gb)/
+// CSSの単位であれば自動的に文字列に変換するルール (#1811)
+export const cssUnitRE = /^(px|em|ex|rem|vw|vh|vmin|vmax)/
 
 export interface NakoLexParseResult {
   src: string;
@@ -101,7 +104,7 @@ export const rules: NakoLexRule[] = [
   { name: ')', pattern: /^\)/, readJosi: true },
   { name: '|', pattern: /^\|/ },
   { name: '??', pattern: /^\?\?/ }, // 「表示」のエイリアス #1745
-  { name: '$', pattern: /^\$/ }, // #1793 プロパティアクセス
+  { name: '$', pattern: /^(\$|\.)/ }, // プロパティアクセス (#1793)(#1807)
   { name: 'string', pattern: /^🌿/, cbParser: src => cbString('🌿', '🌿', src) },
   { name: 'string_ex', pattern: /^🌴/, cbParser: src => cbString('🌴', '🌴', src) },
   { name: 'string_ex', pattern: /^「/, cbParser: src => cbString('「', '」', src) },

package/core/src/nako_lexer.mjs

@@ -10,7 +10,7 @@ import { isIndentChars } from './nako_indent_chars.mjs';
 // 助詞の一覧
 import { josiRE, removeJosiMap, tararebaMap, josiListExport } from './nako_josi_list.mjs';
 // 字句解析ルールの一覧
-import { rules, unitRE } from './nako_lex_rules.mjs';
+import { rules, unitRE, cssUnitRE } from './nako_lex_rules.mjs';
 import { NakoLexerError, InternalLexerError } from './nako_errors.mjs';
 export class NakoLexer {
     /**
@@ -578,6 +578,7 @@ export class NakoLexer {
                 if (!m) {
                     continue;
                 }
+                let ruleName = rule.name;
                 ok = true;
                 // 空白ならスキップ
                 if (rule.name === 'space') {
@@ -676,6 +677,14 @@ export class NakoLexer {
                         src = src.substring(um[0].length);
                         column += m[0].length;
                     }
+                    // CSSの単位なら自動的に文字列として認識させる #1811
+                    const cssUnit = cssUnitRE.exec(src);
+                    if (cssUnit) {
+                        ruleName = 'string';
+                        src = src.substring(cssUnit[0].length);
+                        column += m[0].length;
+                        value += cssUnit[0];
+                    }
                 }
                 let josi = '';
                 if (rule.readJosi) {
@@ -699,7 +708,7 @@ export class NakoLexer {
                         }
                     }
                 }
-                switch (rule.name) {
+                switch (ruleName) {
                     case 'def_test': {
                         isDefTest = true;
                         break;
@@ -713,12 +722,12 @@ export class NakoLexer {
                     }
                 }
                 // ここまで‰(#682) を処理
-                if (rule.name === 'dec_lineno') {
+                if (ruleName === 'dec_lineno') {
                     line--;
                     continue;
                 }
                 result.push({
-                    type: rule.name,
+                    type: ruleName,
                     value,
                     indent,
                     line: lineCurrent,
@@ -729,7 +738,7 @@ export class NakoLexer {
                     preprocessedCodeLength: (srcLength - src.length) - srcOffset
                 });
                 // 改行のとき次の行のインデントを調べる。なお、改行の後は必ずcolumnが1になる。インデント構文のため、一行に2つ以上の文を含むときを考慮する。(core #66)
-                if (rule.name === 'eol' && column === 1) {
+                if (ruleName === 'eol' && column === 1) {
                     const ia = this.countIndent(src);
                     indent = ia[0];
                     column += ia[1];

package/core/src/nako_lexer.mts

@@ -14,7 +14,7 @@ import { isIndentChars } from './nako_indent_chars.mjs'
 import { josiRE, removeJosiMap, tararebaMap, josiListExport } from './nako_josi_list.mjs'
 
 // 字句解析ルールの一覧
-import { rules, unitRE, NakoLexParseResult } from './nako_lex_rules.mjs'
+import { rules, unitRE, cssUnitRE, NakoLexParseResult } from './nako_lex_rules.mjs'
 import { NakoLexerError, InternalLexerError } from './nako_errors.mjs'
 
 import { FuncList, FuncArgs, ExportMap, FuncListItem } from './nako_types.mjs'
@@ -563,6 +563,7 @@ export class NakoLexer {
         // 正規表現でマッチ
         const m = rule.pattern.exec(src)
         if (!m) { continue }
+        let ruleName = rule.name
         ok = true
         // 空白ならスキップ
         if (rule.name === 'space') {
@@ -673,6 +674,14 @@ export class NakoLexer {
             src = src.substring(um[0].length)
             column += m[0].length
           }
+          // CSSの単位なら自動的に文字列として認識させる #1811
+          const cssUnit = cssUnitRE.exec(src)
+          if (cssUnit) {
+            ruleName = 'string'
+            src = src.substring(cssUnit[0].length)
+            column += m[0].length
+            value += cssUnit[0]
+          }
         }
 
         let josi = ''
@@ -696,7 +705,7 @@ export class NakoLexer {
           }
         }
 
-        switch (rule.name) {
+        switch (ruleName) {
           case 'def_test': {
             isDefTest = true
             break
@@ -710,13 +719,13 @@ export class NakoLexer {
           }
         }
         // ここまで‰(#682) を処理
-        if (rule.name === 'dec_lineno') {
+        if (ruleName === 'dec_lineno') {
           line--
           continue
         }
 
         result.push({
-          type: rule.name,
+          type: ruleName,
           value,
           indent,
           line: lineCurrent,
@@ -727,7 +736,7 @@ export class NakoLexer {
           preprocessedCodeLength: (srcLength - src.length) - srcOffset
         })
         // 改行のとき次の行のインデントを調べる。なお、改行の後は必ずcolumnが1になる。インデント構文のため、一行に2つ以上の文を含むときを考慮する。(core #66)
-        if (rule.name === 'eol' && column === 1) {
+        if (ruleName === 'eol' && column === 1) {
           const ia = this.countIndent(src)
           indent = ia[0]
           column += ia[1]

package/core/src/nako_parser3.mjs

@@ -1789,25 +1789,34 @@ export class NakoParser extends NakoParserBase {
                 throw NakoSyntaxError.fromNode(`${this.nodeToStr(word, { depth: 1 }, false)}への代入文で計算式に以下の書き間違いがあります。\n${err.message}`, map);
             }
         }
-        // プロパティ代入文 (#1793)
-        if (this.check2(['word', '$', 'word', 'eq']) || this.check2(['word', '$', 'string', 'eq'])) {
-            const word = this.peek();
-            if (this.accept(['word', '$', 'word', 'eq', this.yCalc]) || this.accept(['word', '$', 'string', 'eq', this.yCalc])) {
-                const nameToken = this.getVarName(this.y[0]);
-                const propToken = this.y[2];
-                const valueToken = this.y[4];
-                return {
-                    type: 'let_prop',
-                    name: nameToken.value,
-                    index: [propToken],
-                    blocks: [valueToken],
-                    josi: '',
-                    ...map,
-                    end: this.peekSourceMap()
-                };
+        // オブジェクトプロパティ構文 代入文 (#1793)
+        if (this.check2(['word', '$', '*', '$', '*', '$', '*', '$', '*', 'eq']) || this.check2(['word', '$', '*', '$', '*', '$', '*', 'eq']) || this.check2(['word', '$', '*', '$', '*', 'eq']) || this.check2(['word', '$', '*', 'eq'])) {
+            const propList = [];
+            const word = this.getVarName(this.get());
+            for (;;) {
+                const flag = this.peek();
+                if (flag === null || flag.type !== '$') {
+                    break;
+                }
+                this.get(); // skip $
+                propList.push(this.get()); // property
             }
-            throw NakoSyntaxError.fromNode(`${this.nodeToStr(word, { depth: 1 }, false)}への代入文の計算式に書き間違いがあります。`, map);
+            this.get(); // skip eq
+            const valueToken = this.yCalc(); // calc
+            if (valueToken === null) {
+                throw NakoSyntaxError.fromNode(`${this.nodeToStr(word, { depth: 1 }, false)}への代入文の計算式に書き間違いがあります。`, map);
+            }
+            return {
+                type: 'let_prop',
+                name: word.value,
+                index: propList,
+                blocks: [valueToken],
+                josi: '',
+                ...map,
+                end: this.peekSourceMap()
+            };
         }
+        // オブジェクトプロパティ構文 ここまで
         // let_array ?
         if (this.check2(['word', '@'])) {
             const la = this.yLetArrayAt(map);
@@ -2600,15 +2609,21 @@ export class NakoParser extends NakoParserBase {
                 }
                 return ast;
             }
-            // word$prop
+            // オブジェクトプロパティ構文(参照) word$prop (#1793)
             if (word.josi === '' && (this.check2(['$', 'word']) || this.check2(['$', 'string']))) {
-                this.get(); // skip '$'
-                const prop = this.get();
+                const propList = [];
+                let josi = '';
+                while (this.check('$')) {
+                    this.get(); // skip '$'
+                    const prop = this.get();
+                    propList.push(prop);
+                    josi = prop.josi;
+                }
                 return {
                     type: 'ref_prop', // プロパティ参照
                     name: word,
-                    index: [prop],
-                    josi: prop.josi,
+                    index: propList,
+                    josi: josi,
                     ...map,
                     end: this.peekSourceMap()
                 };

package/core/src/nako_parser3.mts

@@ -1556,25 +1556,33 @@ export class NakoParser extends NakoParserBase {
         throw NakoSyntaxError.fromNode(`${this.nodeToStr(word, { depth: 1 }, false)}への代入文で計算式に以下の書き間違いがあります。\n${err.message}`, map)
       }
     }
-    // プロパティ代入文 (#1793)
-    if (this.check2(['word', '$', 'word', 'eq']) || this.check2(['word', '$', 'string', 'eq'])) {
-      const word = this.peek()
-      if (this.accept(['word', '$', 'word', 'eq', this.yCalc]) || this.accept(['word', '$', 'string', 'eq', this.yCalc])) {
-        const nameToken = this.getVarName(this.y[0])
-        const propToken = this.y[2]
-        const valueToken = this.y[4]
-        return {
-          type: 'let_prop',
-          name: (nameToken as AstStrValue).value,
-          index: [propToken],
-          blocks: [valueToken],
-          josi: '',
-          ...map,
-          end: this.peekSourceMap()
-        } as AstLet
+
+    // オブジェクトプロパティ構文 代入文 (#1793)
+    if (this.check2(['word', '$', '*', '$', '*', '$', '*', '$', '*', 'eq']) || this.check2(['word', '$', '*', '$', '*', '$', '*', 'eq']) || this.check2(['word', '$', '*', '$', '*', 'eq']) || this.check2(['word', '$', '*', 'eq'])) {
+      const propList = []
+      const word = this.getVarName(this.get() as Token)
+      for (;;) {
+        const flag = this.peek()
+        if (flag === null || flag.type !== '$') { break }
+        this.get() // skip $
+        propList.push(this.get() as Ast) // property
       }
-      throw NakoSyntaxError.fromNode(`${this.nodeToStr(word, { depth: 1 }, false)}への代入文の計算式に書き間違いがあります。`, map)
+      this.get() // skip eq
+      const valueToken = this.yCalc() // calc
+      if (valueToken === null) {
+        throw NakoSyntaxError.fromNode(`${this.nodeToStr(word, { depth: 1 }, false)}への代入文の計算式に書き間違いがあります。`, map)
+      }
+      return {
+        type: 'let_prop',
+        name: (word as AstStrValue).value,
+        index: propList,
+        blocks: [valueToken],
+        josi: '',
+        ...map,
+        end: this.peekSourceMap()
+      } as AstLet
     }
+    // オブジェクトプロパティ構文 ここまで
 
     // let_array ?
     if (this.check2(['word', '@'])) {
@@ -2311,15 +2319,21 @@ export class NakoParser extends NakoParserBase {
         return ast
       }
 
-      // word$prop
+      // オブジェクトプロパティ構文(参照) word$prop (#1793)
       if (word.josi === '' && (this.check2(['$', 'word']) || this.check2(['$', 'string']))) {
-        this.get() // skip '$'
-        const prop = this.get() as Token
+        const propList: Ast[] = []
+        let josi = ''
+        while (this.check('$')) {
+          this.get() // skip '$'
+          const prop = this.get() as Token
+          propList.push(prop as Ast)
+          josi = prop.josi
+        }
         return {
           type: 'ref_prop', // プロパティ参照
           name: word,
-          index: [prop as Ast],
-          josi: prop.josi,
+          index: propList,
+          josi: josi,
           ...map,
           end: this.peekSourceMap()
         }

package/core/test/basic_test.mjs

@@ -376,6 +376,10 @@ describe('basic', async () => {
     await cmp('A={"幅":30};A$幅=50;A$幅を表示', '50')
     await cmp('A={"高":30};A$高さ=50;A$高さを表示', '50') // 送り仮名の省略
   })
+  it('オブジェクトを手軽に設定する-ドットアクセス(#1807)', async () => {
+    await cmp('A={"高":30};A.高=50;A.高を表示', '50') // 
+    await cmp('A={"A":30,"B":50};A.A=500;A.Aを表示', '500') // 
+  })
   it('オブジェクトを手軽に設定する-プロパティ関数(#1793)', async () => {
     // プロパティの値を取得して10倍にして返す
     await cmp(
@@ -394,4 +398,13 @@ describe('basic', async () => {
     await cmp('A={"幅":30};A$"幅"=50;A$"幅"を表示', '50')
     await cmp('A={"高":30};A$"高"=50;A$"高"を表示', '50') // 送り仮名の省略
   })
+  it('オブジェクトプロパティ構文$でネスト可能にする #1805', async () => {
+    await cmp('A={"スタイル":{"幅":300}};A$スタイル$幅=1;A$スタイル$幅を表示', '1')
+    await cmp('A={"猫":{"三毛猫":1, "日本猫":2}};A$猫$日本猫=123;A$猫$日本猫を表示', '123')
+  })
+  it('CSSの単位付き数値を文字列として認識させる #1811', async () => {
+    await cmp('(TYPEOF(30px))を表示', 'string')
+    await cmp('A=30em;Aを表示', '30em')
+    await cmp('A=30px;AをJSONエンコードして表示', '"30px"')
+  })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nadesiko3",
-  "version": "3.6.28",
+  "version": "3.6.31",
   "description": "Japanese Programming Language",
   "type": "module",
   "main": "src/index.mjs",

package/release/_hash.txt

@@ -144,22 +144,22 @@ wnako3webworker.js:
   sha256(base64): zkHQ1vYOjoH4nffi+OulPeq/tql28XhdNuKpcaBCOKk=
   sha512(base64): cY0Mzrpoz/uEyY1n8MeJeWdDmm9vqI7dh28wEqJGtVRfYOJvDHiYDzzlfGndOWmzZmHUK6ZAE7YaUJ7zZxiZLw==
 version.js:
-  md5(hex): 829792071c675c496dfbd9a1b4789806
-  sha256(hex): ee04e83ef7c19f4a94f2bf53417e2e1131ab001dd767d984b1b0a0e7429b3fa9
-  sha256(base64): 7gToPvfBn0qU8r9TQX4uETGrAB3XZ9mEsbCg50KbP6k=
-  sha512(base64): u9FFKDXF26XCOVfT9Mh80T/aXrFQctrNIeRYxRqv6C0JIQ8lLm/Gd7PkvFmV2/WV224G9iBAJJr3t8+cdzNS5A==
+  md5(hex): f1362234962d1c50afbf9ce0aa23b7bc
+  sha256(hex): 9f7edac2f464dafd23f9cb9987936dd49c3c8c03429ac68da7493600d1c75f37
+  sha256(base64): n37awvRk2v0j+cuZh5Nt1Jw8jANCmsaNp0k2ANHHXzc=
+  sha512(base64): 0pMDIH7fqnXdu8+pGcl0z02O5rAzDFNzi2/j5E3N9kVMiNjwysNoaNzDVMTn7aBWF3c7JG1Pfb6Cz3aibNsp6Q==
 version_main.js:
-  md5(hex): 829792071c675c496dfbd9a1b4789806
-  sha256(hex): ee04e83ef7c19f4a94f2bf53417e2e1131ab001dd767d984b1b0a0e7429b3fa9
-  sha256(base64): 7gToPvfBn0qU8r9TQX4uETGrAB3XZ9mEsbCg50KbP6k=
-  sha512(base64): u9FFKDXF26XCOVfT9Mh80T/aXrFQctrNIeRYxRqv6C0JIQ8lLm/Gd7PkvFmV2/WV224G9iBAJJr3t8+cdzNS5A==
+  md5(hex): f1362234962d1c50afbf9ce0aa23b7bc
+  sha256(hex): 9f7edac2f464dafd23f9cb9987936dd49c3c8c03429ac68da7493600d1c75f37
+  sha256(base64): n37awvRk2v0j+cuZh5Nt1Jw8jANCmsaNp0k2ANHHXzc=
+  sha512(base64): 0pMDIH7fqnXdu8+pGcl0z02O5rAzDFNzi2/j5E3N9kVMiNjwysNoaNzDVMTn7aBWF3c7JG1Pfb6Cz3aibNsp6Q==
 wnako3.js:
-  md5(hex): 50f7a896ca27b00945f556861dd61dd1
-  sha256(hex): 28ba1d75eb5e5678a55444d581d0dfa489c8c926f0cd56f8d85dbf8771889fe1
-  sha256(base64): KLoddeteVnilVETVgdDfpInIySbwzVb42F2/h3GIn+E=
-  sha512(base64): V2TnS8xRh7eqbHoLzi6mP3MYwY48y7AUd2Ka+sv89BuWkr1nk1LF4vCEnQhYcQ32qclQlfRSAyYrmB0a9Nvz7g==
+  md5(hex): 2692c3fd365c8a3ff9a9d206af81000d
+  sha256(hex): 6324461eda1bbb9c5a4c7b6e5df90908f5e76a4cfdd14c83dc751e2534b0a9e3
+  sha256(base64): YyRGHtobu5xaTHtuXfkJCPXnakz90UyD3HUeJTSwqeM=
+  sha512(base64): r3o8nwLwABlWtdoD7i/tH/mzlYMw6fGDrSa6I/OYtilRaDnU/SpeROmVLwN+O5bEXAsdr+r6o5DQyafwG7HVrA==
 wnako3webworker.js:
-  md5(hex): ba03e9c7ff7c56d0535bb5627466937e
-  sha256(hex): fda46285e6457006b547147032863266a53fa74fed4c1495cda9bdbfbc898f30
-  sha256(base64): /aRiheZFcAa1RxRwMoYyZqU/p0/tTBSVzam9v7yJjzA=
-  sha512(base64): Hrhj1ySMaif/dpSxgw81MFETy5CiTsPQDgVUodAKWAdulumewUTBcP1yvkHzVwAho9fWWEqHrv1M0YY7IWpc2Q==
+  md5(hex): a7293f17a0350d541c40e563c69f71a1
+  sha256(hex): 38cbb6088ee124c3b36b20db3c1b8d7c4cd65b2b7914483817c63e150305b8fe
+  sha256(base64): OMu2CI7hJMOzayDbPBuNfEzWWyt5FEg4F8Y+FQMFuP4=
+  sha512(base64): 6WCJv1QD9Q0zjq6r46XBxw+YAkJGID0G8kY8RgP3OZF5WD5s4aDnomf6UqSUi9HL0vdtpi1WfzruoKdo3MSVPg==