Merge pull request #66 from wcho21/dev

release 0.2.1
wcho21 · Feb 11, 2024 · bf38241 · bf38241
2 parents 25f6b81 + 989efdc
commit bf38241
Show file tree

Hide file tree

Showing 9 changed files with 134 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -13,8 +13,8 @@
 _KALANG: Korean Programming Language_.
 
 - < 0.03 MB.
-- Tested with >250 cases
-- Written in JavaScript, natively runs on web browsers.
+- Tested with >250 cases.
+- JavaScript-implemented, which runs natively on web browsers.
 - Minimal syntax with Korean keywords.
 
 Try _KALANG_ at [Playground][playground].
@@ -81,7 +81,7 @@ Defining and calling function:
 ```
 which yields `52`.
 
-Closure:
+Closure and currying:
 ```
 더하기 = 함수(숫자1) {
     결과 함수(숫자2) {
@@ -92,8 +92,10 @@ Closure:
 하나더하기 = 더하기(1)
 
 하나더하기(42)
+
+더하기(1)(42)
 ```
-which yields `43`.
+which yields `43` twice.
 
 
 

diff --git a/dist/index.min.js b/dist/index.min.js
diff --git a/docs/README.ko.md b/docs/README.ko.md
@@ -83,7 +83,7 @@ kal.execute("쓰기('사과')", stdout => stdouts.push(stdout)); // stdout === [
 ```
 결과는 `52`입니다.
 
-클로저:
+클로저 및 커링:
 ```
 더하기 = 함수(숫자1) {
     결과 함수(숫자2) {
@@ -94,8 +94,10 @@ kal.execute("쓰기('사과')", stdout => stdouts.push(stdout)); // stdout === [
 하나더하기 = 더하기(1)
 
 하나더하기(42)
+
+더하기(1)(42)
 ```
-결과는 `42`입니다.
+결과는 둘 다 `42`입니다.
 
 
 

diff --git a/src/evaluator/index.test.ts b/src/evaluator/index.test.ts
@@ -363,6 +363,11 @@ describe("evaluate()", () => {
         input: "더하기 = 함수(숫자1) { 결과 함수(숫자2) { 결과 숫자1+숫자2 } }  하나더하기 = 더하기(1)  하나더하기(4)",
         expected: 5,
       },
+      {
+        name: "curried function call",
+        input: "더하기 = 함수(숫자1) { 결과 함수(숫자2) { 결과 숫자1+숫자2 } }  더하기(4)(7)",
+        expected: 11,
+      },
     ];
 
     it.each(cases)("evaluate $name", testEvaluatingPrimitive);

diff --git a/src/index.test.ts b/src/index.test.ts
@@ -64,3 +64,15 @@ it("execute builtin function 쓰기()", () => {
 
   expect(stdouts).toEqual(["사과", "포도 바나나"]);
 });
+
+it("execute function", () => {
+  expect(execute("사과 = 함수(포도) { 결과 포도+1 } 사과(42)")).toBe("43");
+});
+
+it("execute closure", () => {
+  expect(execute("사과 = 함수(포도) { 결과 함수(바나나) { 결과 포도 + 바나나 } } 수박 = 사과(42) 수박(99)")).toBe("141");
+});
+
+it("execute curried function", () => {
+  expect(execute("사과 = 함수(포도) { 결과 함수(바나나) { 결과 포도 + 바나나 } } 사과(42)(99)")).toBe("141");
+});
diff --git a/src/lexer/index.test.ts b/src/lexer/index.test.ts
@@ -547,6 +547,75 @@ describe("getSourceToken()", () => {
           },
         ]
       },
+      {
+        input: "사과(1)(2)",
+        expectedTokens: [
+          {
+            type: "identifier",
+            value: "사과",
+            range: {
+              begin: { row: 0, col: 0 },
+              end: { row: 0, col: 1 },
+            },
+          },
+          {
+            type: "group delimiter",
+            value: "(",
+            range: {
+              begin: { row: 0, col: 2 },
+              end: { row: 0, col: 2 },
+            },
+          },
+          {
+            type: "number literal",
+            value: "1",
+            range: {
+              begin: { row: 0, col: 3 },
+              end: { row: 0, col: 3 },
+            },
+          },
+          {
+            type: "group delimiter",
+            value: ")",
+            range: {
+              begin: { row: 0, col: 4 },
+              end: { row: 0, col: 4 },
+            },
+          },
+          {
+            type: "group delimiter",
+            value: "(",
+            range: {
+              begin: { row: 0, col: 5 },
+              end: { row: 0, col: 5 },
+            },
+          },
+          {
+            type: "number literal",
+            value: "2",
+            range: {
+              begin: { row: 0, col: 6 },
+              end: { row: 0, col: 6 },
+            },
+          },
+          {
+            type: "group delimiter",
+            value: ")",
+            range: {
+              begin: { row: 0, col: 7 },
+              end: { row: 0, col: 7 },
+            },
+          },
+          {
+            type: "end",
+            value: "$end",
+            range: {
+              begin: { row: 0, col: 8 },
+              end: { row: 0, col: 8 },
+            },
+          },
+        ]
+      },
     ];
 
     it.each(cases)("get tokens from input '$input'", ({ input, expectedTokens }) => {

diff --git a/src/parser/index.test.ts b/src/parser/index.test.ts
@@ -596,6 +596,40 @@ describe("parseSource()", () => {
             ],
           },
         },
+        {
+          name: "call curried function",
+          input: "사과(1)(2)",
+          expected: {
+            type: "program",
+            statements: [
+              {
+                type: "expression statement",
+                expression: {
+                  type: "call",
+                  func: {
+                    type: "call",
+                    func: {
+                      type: "identifier",
+                      value: "사과",
+                    },
+                    args: [
+                      {
+                        type: "number",
+                        value: 1,
+                      },
+                    ],
+                  },
+                  args: [
+                    {
+                      type: "number",
+                      value: 2,
+                    },
+                  ],
+                },
+              },
+            ],
+          },
+        },
       ];
 
       it.each(cases)("$name", testSuccess);

diff --git a/src/parser/index.ts b/src/parser/index.ts
@@ -184,7 +184,7 @@ export default class Parser {
     const { type, value } = this.reader.read();
 
     if (type === "group delimiter" && value === "(") {
-      if (left.type !== "function" && left.type !== "identifier") {
+      if (left.type !== "function" && left.type !== "identifier" && left.type !== "call") {
         return null;
       }
 
@@ -202,7 +202,7 @@ export default class Parser {
     return null;
   }
 
-  private parseCall(left: Node.FunctionNode | Node.IdentifierNode): Node.CallNode {
+  private parseCall(left: Node.FunctionNode | Node.IdentifierNode | Node.CallNode): Node.CallNode {
     this.advanceOrThrow("group delimiter", "(", BadGroupDelimiterError);
 
     const secondToken = this.reader.read();

diff --git a/src/parser/syntax-node/expression/index.ts b/src/parser/syntax-node/expression/index.ts
@@ -41,7 +41,7 @@ export interface FunctionNode extends SyntaxNodeBase<"function"> {
   body: BlockNode,
 };
 export interface CallNode extends SyntaxNodeBase<"call"> {
-  func: IdentifierNode | FunctionNode,
+  func: IdentifierNode | FunctionNode | CallNode,
   args: ExpressionNode[],
 };
 export interface AssignmentNode extends SyntaxNodeBase<"assignment"> {