oclang 1.2.2 → 1.2.3

package/CHANGELOG.md

@@ -16,10 +16,13 @@ PATCH version when you make backwards-compatible bug fixes.
 
 - OCM mode added
 
-#### 1.2.1 - Uploading error
+#### 1.2.3 - AST Structure
+
+- AST Structure updated
+
+#### 1.2.1 & 1.2.2 - Uploading error
 
 - Uploading error in 1.2.0
-- Updated the CLI ```ocm init``` command
 
 ### 1.1.0 - REPL
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oclang",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "A programming language",
   "author": "LuisRG-L, Orange Cat",
   "license": "MIT",

package/src/core/ast/astBuilder.ts

@@ -1,166 +1,28 @@
-import { createCoreContext, type CoreContext } from "../context/coreContext.js";
-import { ValueType } from "../../shared/models/value.js";
-import { StatementKind } from "./types/base/index.js";
 import type { AnyStatement, PrintStatement } from "./types/statements/index.js";
+import { ioStatements } from "./statements/io.js";
+import { variableStatements } from "./statements/vars.js";
+import { functionStatements } from "./statements/function.js";
 
 export type BuildType = AnyStatement | null;
 
+
+const possibleStatements = [
+	...ioStatements,
+	...variableStatements,
+	...functionStatements,
+]
 export function buildAst(cst: any): AnyStatement[] {
 	const statements = cst.children.statement ?? [];
 	const ast: AnyStatement[] = [];
 
-	for (const statement of statements) {
+	for (const statement of possibleStatements) {
 		let __tmp: BuildType = null;
 		const __$tmp = () => { if (__tmp) ast.push(__tmp); }
-		__tmp = printStatement(statement);
-		__$tmp();
-		__tmp = variableStatement(statement);
-		__$tmp();
-		__tmp = functionStatement(statement);
-		__$tmp();
-		__tmp = callStatement(statement);
-		__$tmp();
-	}
-
-	return ast;
-}
-
-export type FBuilder = (statement: any) => AnyStatement | null;
-
-const printStatement: FBuilder = (statement: any) => {
-	const printStmt = statement.children.printStatement?.[0];
-	if (printStmt) {
-		const strToken = printStmt.children.StringLiteral?.[0];
-		if (strToken) {
-			return {
-				kind: StatementKind.PrintStatement,
-				sourceInfo: {
-					tokens: printStmt.children,
-					cstNode: printStmt,
-					startLine: printStmt.startLine,
-					endLine: printStmt.endLine,
-					startColumn: printStmt.startColumn,
-					endColumn: printStmt.endColumn,
-				},
-				value: {
-					value: strToken.image,
-					type: ValueType.String,
-				}
-			} as PrintStatement;
-		}
-
-		const idToken = printStmt.children.Identifier?.[0];
-		if (idToken) {
-			return {
-				kind: StatementKind.PrintStatement,
-				sourceInfo: {
-					tokens: printStmt.children,
-					cstNode: printStmt,
-					startLine: printStmt.startLine,
-					endLine: printStmt.endLine,
-					startColumn: printStmt.startColumn,
-					endColumn: printStmt.endColumn,
-				},
-				value: {
-					value: idToken.image,
-					type: ValueType.Identifier,
-				}
-			}
-		}
-	}
-	return null;
-}
-
-const variableStatement: FBuilder = (statement: any) => {
-	const varStmt = statement.children.variableStatement?.[0];
-	if (varStmt) {
-		const typeToken = varStmt.children.VarType?.[0];
-		const idToken = varStmt.children.Identifier?.[0];
-		const valueToken =
-			varStmt.children.StringLiteral?.[0] ??
-			varStmt.children.NumberLiteral?.[0] ??
-			varStmt.children.BooleanLiteral?.[0];
-
-		if (!typeToken || !idToken || !valueToken) return null;
-
-		const setToken = varStmt.children.Set?.[0];
-		const constToken = varStmt.children.Const?.[0];
-
-		const type = typeToken.image as ValueType;
-		const id = idToken.image;
-		const value: string = valueToken.image;
-		return {
-			kind: StatementKind.VariableStatement,
-			sourceInfo: {
-				tokens: varStmt.children,
-				cstNode: varStmt,
-				startLine: varStmt.startLine,
-				endLine: varStmt.endLine,
-				startColumn: varStmt.startColumn,
-				endColumn: varStmt.endColumn,
-			},
-			id,
-			var: {
-				type,
-				value,
-				props: {
-					isConst: !!constToken,
-				}
-			},
-			set: !!setToken,
+		for (const builder of statements) {
+			__tmp = builder(statement);
+			__$tmp();
 		}
 	}
-	return null;
-}
 
-const functionStatement: FBuilder = (statement: any) => {
-	const funcStmt = statement.children.functionStatement?.[0];
-	if (funcStmt) {
-		const idToken = funcStmt.children.Identifier?.[0];
-		if (!idToken) return null;
-		const id = idToken.image;
-
-		const body = buildAst(funcStmt) ;
-
-		return {
-			kind: StatementKind.FunctionStatement,
-			sourceInfo: {
-				tokens: funcStmt.children,
-				cstNode: funcStmt,
-				startLine: funcStmt.startLine,
-				endLine: funcStmt.endLine,
-				startColumn: funcStmt.startColumn,
-				endColumn: funcStmt.endColumn,
-			},
-			id,
-			func: {
-				body,
-				scope: createCoreContext(),
-			}
-		}
-	}
-	return null
-}
-
-const callStatement: FBuilder = (statement: any) => {
-	const callStmt = statement.children.callStatement?.[0];
-	if (callStmt) {
-		const idToken = callStmt.children.Identifier?.[0];
-		if (!idToken) return null;
-		const id = idToken.image;
-
-		return {
-			kind: StatementKind.CallStatement,
-			sourceInfo: {
-				tokens: callStmt.children,
-				cstNode: callStmt,
-				startLine: callStmt.startLine,
-				endLine: callStmt.endLine,
-				startColumn: callStmt.startColumn,
-				endColumn: callStmt.endColumn,
-			},
-			id,
-		};
-	}
-	return null;
-};
+	return ast;
+}

package/src/core/ast/statements/base.ts

@@ -0,0 +1,3 @@
+import type { AnyStatement } from "../types/statements";
+
+export type FBuilder = (statement: any) => AnyStatement | null;

package/src/core/ast/statements/function.ts

@@ -0,0 +1,58 @@
+import { createCoreContext } from "../../context/coreContext";
+import { buildAst } from "../astBuilder";
+import { StatementKind } from "../types/base";
+import type { FBuilder } from "./base";
+
+const functionStatement: FBuilder = (statement: any) => {
+	const funcStmt = statement.children.functionStatement?.[0];
+	if (funcStmt) {
+		const idToken = funcStmt.children.Identifier?.[0];
+		if (!idToken) return null;
+		const id = idToken.image;
+
+		const body = buildAst(funcStmt);
+
+		return {
+			kind: StatementKind.FunctionStatement,
+			sourceInfo: {
+				tokens: funcStmt.children,
+				cstNode: funcStmt,
+				startLine: funcStmt.startLine,
+				endLine: funcStmt.endLine,
+				startColumn: funcStmt.startColumn,
+				endColumn: funcStmt.endColumn,
+			},
+			id,
+			func: {
+				body,
+				scope: createCoreContext(),
+			},
+		};
+	}
+	return null;
+};
+
+const callStatement: FBuilder = (statement: any) => {
+	const callStmt = statement.children.callStatement?.[0];
+	if (callStmt) {
+		const idToken = callStmt.children.Identifier?.[0];
+		if (!idToken) return null;
+		const id = idToken.image;
+
+		return {
+			kind: StatementKind.CallStatement,
+			sourceInfo: {
+				tokens: callStmt.children,
+				cstNode: callStmt,
+				startLine: callStmt.startLine,
+				endLine: callStmt.endLine,
+				startColumn: callStmt.startColumn,
+				endColumn: callStmt.endColumn,
+			},
+			id,
+		};
+	}
+	return null;
+};
+
+export const functionStatements = [functionStatement, callStatement];

package/src/core/ast/statements/io.ts

@@ -0,0 +1,51 @@
+import { ValueType } from "../../../shared/models/value";
+import { StatementKind } from "../types/base";
+import type { PrintStatement } from "../types/statements";
+import type { FBuilder } from "./base";
+
+const printStatement: FBuilder = (statement: any) => {
+	const printStmt = statement.children.printStatement?.[0];
+	if (printStmt) {
+		const strToken = printStmt.children.StringLiteral?.[0];
+		if (strToken) {
+			return {
+				kind: StatementKind.PrintStatement,
+				sourceInfo: {
+					tokens: printStmt.children,
+					cstNode: printStmt,
+					startLine: printStmt.startLine,
+					endLine: printStmt.endLine,
+					startColumn: printStmt.startColumn,
+					endColumn: printStmt.endColumn,
+				},
+				value: {
+					value: strToken.image,
+					type: ValueType.String,
+				},
+			} as PrintStatement;
+		}
+
+		const idToken = printStmt.children.Identifier?.[0];
+		if (idToken) {
+			return {
+				kind: StatementKind.PrintStatement,
+				sourceInfo: {
+					tokens: printStmt.children,
+					cstNode: printStmt,
+					startLine: printStmt.startLine,
+					endLine: printStmt.endLine,
+					startColumn: printStmt.startColumn,
+					endColumn: printStmt.endColumn,
+				},
+				value: {
+					value: idToken.image,
+					type: ValueType.Identifier,
+				},
+			};
+		}
+	}
+	return null;
+};
+
+
+export const ioStatements = [printStatement];

package/src/core/ast/statements/vars.ts

@@ -0,0 +1,47 @@
+import type { ValueType } from "../../../shared/models/value";
+import { StatementKind } from "../types/base";
+import type { FBuilder } from "./base";
+
+const variableStatement: FBuilder = (statement: any) => {
+	const varStmt = statement.children.variableStatement?.[0];
+	if (varStmt) {
+		const typeToken = varStmt.children.VarType?.[0];
+		const idToken = varStmt.children.Identifier?.[0];
+		const valueToken =
+			varStmt.children.StringLiteral?.[0] ??
+			varStmt.children.NumberLiteral?.[0] ??
+			varStmt.children.BooleanLiteral?.[0];
+
+		if (!typeToken || !idToken || !valueToken) return null;
+
+		const setToken = varStmt.children.Set?.[0];
+		const constToken = varStmt.children.Const?.[0];
+
+		const type = typeToken.image as ValueType;
+		const id = idToken.image;
+		const value: string = valueToken.image;
+		return {
+			kind: StatementKind.VariableStatement,
+			sourceInfo: {
+				tokens: varStmt.children,
+				cstNode: varStmt,
+				startLine: varStmt.startLine,
+				endLine: varStmt.endLine,
+				startColumn: varStmt.startColumn,
+				endColumn: varStmt.endColumn,
+			},
+			id,
+			var: {
+				type,
+				value,
+				props: {
+					isConst: !!constToken,
+				},
+			},
+			set: !!setToken,
+		};
+	}
+	return null;
+};
+
+export const variableStatements = [variableStatement];

package/src/core/lexer/tokens/keywords.ts

@@ -2,4 +2,6 @@ import { createToken } from "chevrotain";
 
 export const Output = createToken({ name: "Output", pattern: /print/ });
 
-export const keywords = [Output];
+export const Import = createToken({ name: "Import", pattern: /import/ });
+
+export const keywords = [Output, Import];

package/src/core/parser/parser.ts

@@ -16,6 +16,12 @@ export class OcatParser extends CstParser {
 
 	public statement = this.RULE("statement", () => {
 		this.OR([
+			{
+				ALT: () =>
+					this.SUBRULE(this.importStatement, {
+						LABEL: "importStatement",
+					}),
+			},
 			{
 				ALT: () =>
 					this.SUBRULE(this.printStatement, {
@@ -43,6 +49,11 @@ export class OcatParser extends CstParser {
 		]);
 	});
 
+	public importStatement = this.RULE("importStatement", () => {
+		this.CONSUME(token.Import);
+		this.CONSUME(token.StringLiteral);
+	});
+
 	public printStatement = this.RULE("printStatement", () => {
 		this.CONSUME(token.Output);
 		this.CONSUME(token.LeftParen);