Add to create object

Author: taisukef

Parser.js

@@ -13,7 +13,7 @@ const reserved_none_blacketmode = [
 ];
 
 const isNumber = (c) => "0123456789".indexOf(c) >= 0;
-const isOperator = (c) => "+-*/%=!<>,".indexOf(c) >= 0;
+const isOperator = (c) => "+-*/%=!<>,.:".indexOf(c) >= 0;
 const isWhite = (c) => " \t\n".indexOf(c) >= 0;
 
 export class Parser {
@@ -273,6 +273,36 @@ export class Parser {
         elements,
       };
     }
+    if (t1.type == "{") {
+      const properties = [];
+      for (;;) {
+        const t2 = this.getToken();
+        console.log("t2", t2);
+        if (t2.type == "}") break;
+        if (t2.type != "var") throw new Error("オブジェクトの定義には名前が必要です");
+        const name = t2.name;
+        const t4 = this.getToken();
+        console.log("t4", t4);
+        if (t4.operator != ":") throw new Error("オブジェクトの定義は名前の後に : が必要です");
+        const value = this.getExpression();
+        properties.push({
+          type: "Property",
+          key: {
+            type: "Identifier",
+            name,
+          },
+          value,
+        });
+        const t3 = this.getToken();
+        if (t3.type == "}") break;
+        if (t3.type != "operator" && t3.operator != ",") throw new Error("オブジェクトの定義は , で区切る必要があります");
+      }
+      console.log(properties);
+      return {
+        type: "ObjectExpression",
+        properties,
+      };
+    }
     if (t1.type == "num" || t1.type == "string") {
       return {
         type: "Literal",

Runtime.js

@@ -50,9 +50,9 @@ class Scope {
     }
     throw new Error("定義されていない変数 " + name + " が使われました");
   }
-  getVarArray(name) {
+  getVarObject(name) {
     const v = this.getVar(name);
-    if (Array.isArray(v)) return v;
+    if (typeof v == "object") return v;
     const v2 = new Array();
     v2.defaultValue = v;
     this.setVar(name, v2);
@@ -123,7 +123,7 @@ export class Runtime {
               if (!scope.isDefined(name)) {
                 scope.setVar(name, []);
               }
-              const v = scope.getVarArray(name);
+              const v = scope.getVarObject(name);
               if (idxes.length == 0) {
                 return v;
               } else if (idxes.length == 1 && typeof v == "string") {
@@ -344,7 +344,7 @@ export class Runtime {
           if (!scope.isDefined(name)) {
             throw new Error("初期化されていない配列 " + name + " が使われました");
           }
-          const v = scope.getVarArray(name);
+          const v = scope.getVarObject(name);
           if (idxes.length == 0) {
             return v;
           } else if (idxes.length == 1 && typeof v == "string") {
@@ -388,6 +388,12 @@ export class Runtime {
         res.push(await this.calcExpression(i, scope));
       }
       return res;
+    } else if (ast.type == "ObjectExpression") {
+      const res = {};
+      for (const i of ast.properties) {
+        res[i.key.name] = await this.calcExpression(i.value, scope);
+      }
+      return res;
     } else if (ast.type == "BinaryExpression" || ast.type == "LogicalExpression") {
       const n = await this.calcExpression(ast.left, scope);
       const m = await this.calcExpression(ast.right, scope);

examples.csv

@@ -25,3 +25,4 @@ commontest2025-1_ja.dncl,23. common test 2025 1 (日本語変数)
 commontest2025-2.dncl,24. common test 2025 2
 commontest2025-2_ja.dncl,25. common test 2025 2 (日本語変数)
 import.dncl,26. import functions
+object.dncl,27. オブジェクトの生成

examples/object.dncl

@@ -0,0 +1,2 @@
+# 27. オブジェクトの生成
+a = { a: 3, b: "ABC" }