Merge pull request #58 from Andndre/main

Implemented `for of loop`, `break`, and `continue`

Author: RioChndr

Command.md

@@ -83,6 +83,7 @@ Comparison :
 
 ### Loop
 
+#### **`For` loop**:
 ```
 fomo i endup 10
   kalo i lebih gede 3
@@ -98,6 +99,27 @@ for (let i = 0; i < 10; i++) {
 }
 ```
 
+#### **`For of` loop**:
+```
+fomo semua foo dari bar
+  spill foo
+udahan
+
+// transform to
+for (const foo of bar) {
+  console.log(foo);
+}
+```
+
+#### **`break`** and **`continue`**:
+```
+stop
+// break;
+
+skip
+// continue;
+```
+
 ### Function
 ```
 so about my_story

__test__/logics/parser/loopForOf.test.js

@@ -0,0 +1,25 @@
+const loopForOf = require('../../../lib/logics/parser/loopForOf');
+const getJsFormat = require('../test-parser-helper');
+
+describe('Test var assign', () => {
+	it('Should return null if not match', () => {
+		const test1 = loopForOf('fomo semu foo dari bar');
+		const test2 = loopForOf('fomo smua foo dar bar');
+		expect(test1).toBe(null);
+		expect(test2).toBe(null);
+	});
+
+	it('Should return correctly flexing', () => {
+		const jsFormat = getJsFormat(`
+      fomo semua foo dari bar
+        spill foo
+      udahan
+    `);
+		expect(jsFormat).not.toBeNull();
+		let shouldMatch = ['for (const foo of bar) {', 'console.log(foo)', '}'];
+		jsFormat.split('\n').every((v, i) => {
+			if (!shouldMatch[i]) return true;
+			return expect(v).toContain(shouldMatch[i]);
+		});
+	});
+});

lib/logics/index.js

@@ -7,6 +7,7 @@ const conditionElIf = require("./parser/conditionElIf");
 const conditionElse = require("./parser/conditionElse");
 const conditionClose = require("./parser/conditionClose");
 const loopFor = require("./parser/loopFor");
+const loopForOf = require("./parser/loopForOf");
 const functionDeclarationBegin = require("./parser/functionDeclarationBegin");
 const functionDeclarationEnd = require("./parser/functionDeclarationEnd");
 const functionCall = require("./parser/functionCall");
@@ -16,6 +17,8 @@ const catchFn = require("./parser/catchFn");
 const finallyFn = require("./parser/finallyFn");
 const functionDeclarationAsyncBegin = require("./parser/functionDeclarationAsyncBegin");
 const awaitProcess = require("./parser/awaitProcess");
+const breakStatement = require("./parser/break");
+const continueStatement = require("./parser/continue");
 
 function getCmd(cmdLines) {
   let parser = [
@@ -27,6 +30,7 @@ function getCmd(cmdLines) {
     conditionElIf,
     conditionElse,
     conditionClose,
+    loopForOf,
     loopFor,
     functionDeclarationBegin,
     functionDeclarationEnd,
@@ -36,8 +40,9 @@ function getCmd(cmdLines) {
     catchFn,
     finallyFn,
     functionDeclarationAsyncBegin,
-    awaitProcess
-
+    awaitProcess,
+    breakStatement,
+    continueStatement
   ];
 
   return cmdLines

lib/logics/parser/break.js

@@ -0,0 +1,12 @@
+const breakStatement = (msg) => {
+	let format = /stop/;
+	let match = msg.match(format);
+	if (!match) return null;
+  
+	return {
+	  exp: `break;`,
+	};
+  };
+  
+  module.exports = breakStatement;
+  

lib/logics/parser/constAssign.js

@@ -1,7 +1,7 @@
 const valueTransform = require("../../utils/valueTransform");
 
 const constAssign = (msg) => {
-  let format = /seriously ([a-zA-Z0-9]+) itu ([^\[\]\(\)\n]+)/;
+  let format = /seriously ([a-zA-Z_]+[a-zA-Z0-9_]*) itu ([^\[\]\(\)\n]+)/;
   let match = msg.match(format);
   if (!match) return null;
 

lib/logics/parser/continue.js

@@ -0,0 +1,12 @@
+const continueStatement = (msg) => {
+	let format = /skip/;
+	let match = msg.match(format);
+	if (!match) return null;
+  
+	return {
+	  exp: `continue;`,
+	};
+  };
+  
+  module.exports = continueStatement;
+  

lib/logics/parser/loopFor.js

@@ -1,12 +1,12 @@
 const loopFor = (msg) => {
-  let format = /fomo ([a-zA-Z0-9]+) endup ([a-zA-Z0-9]+)/;
-  let match = msg.match(format);
-  if (!match) return null;
+	let format = /fomo ([a-zA-Z0-9]+) endup ([a-zA-Z0-9]+)/;
+	let match = msg.match(format);
+	if (!match) return null;
 
-  return {
-    exp: `for(let ${match[1]} = 0; ${match[1]} <= ${match[2]}; ${match[1]}++)`,
-    openGroup: true,
-  };
+	return {
+		exp: `for(let ${match[1]} = 0; ${match[1]} <= ${match[2]}; ${match[1]}++)`,
+		openGroup: true,
+	};
 };
 
 module.exports = loopFor;

lib/logics/parser/loopForOf.js

@@ -0,0 +1,12 @@
+const loopForOf = (msg) => {
+	let format = /fomo semua ([a-zA-Z]+[a-zA-Z0-9]*) dari ([a-zA-Z]+[a-zA-Z0-9]*)/;
+	let match = msg.match(format);
+	if (!match) return null;
+
+	return {
+		exp: `for (const ${match[1]} of ${match[2]})`,
+		openGroup: true,
+	};
+};
+
+module.exports = loopForOf;

lib/logics/parser/varAssign.js

@@ -1,7 +1,7 @@
 const valueTransform = require("../../utils/valueTransform");
 
 const varAssign = (msg) => {
-  let format = /literally ([a-zA-Z0-9]+) itu ([^\[\]\(\)\n]+)/;
+  let format = /literally ([a-zA-Z_]+[a-zA-Z0-9_]*) itu ([^\[\]\(\)\n]+)/;
   let match = msg.match(format);
   if (!match) return null;
 

lib/logics/parser/varReassign.js

@@ -1,7 +1,7 @@
 const valueTransform = require("../../utils/valueTransform");
 
 const varReassign = (msg) => {
-  let format = /whichis ([a-zA-Z0-9]+) itu ([^\[\]\(\)\n]+)/;
+  let format = /whichis ([a-zA-Z_]+[a-zA-Z0-9_]*) itu ([^\[\]\(\)\n]+)/;
   let match = msg.match(format);
   if (!match) return null;