🛠️ ʀᴇꜰᴀᴄᴛᴏʀ — Simplify and replace TokenStream function

CiroZDP · CiroZDP · commit a61cb6c6bf4c · 2025-04-29T23:51:44.000+02:00
diff --git a/playground/index.html b/playground/index.html
@@ -45,7 +45,7 @@
     <script type="module" src="static/js/panic.js"></script>
 
     <!-- Utilities -->
-    <script type="module" src="static/js/ast/templates/variable.template.js"></script>
+    <script type="module" src="static/js/ast/constructors.js"></script>
     <script type="module" src="static/js/ast/patterns/functionCall.pattern.js"></script>
     <script type="module" src="static/js/ast/patterns/operator.pattern.js"></script>
 
diff --git a/playground/static/js/ast/constructors.js b/playground/static/js/ast/constructors.js
@@ -0,0 +1,76 @@
+export function RTValue(content, type) {
+    this.type = 'Value';
+    this.content = content;
+    if (content === undefined)
+    {
+        this.type = 'EmptyValue';
+        this.valType = '?'; // Optional type
+    }
+    else this.valType = type ?? inferType(content);
+}
+
+export function RTExpression(content) {
+    this.type = 'Expression';
+    this.content = content;
+}
+
+export function RTVariable(name, value, constant = false) {
+    this.type = 'Variable';
+    this.name = name;
+    this.constant = constant;
+    this.value = value ?? new RTValue();
+
+    // TODO: Add initialization
+    this.declaration = () => {
+        let obj = {
+            ...this,
+            type: 'VariableDeclaration',
+            varType: this.value.valType
+        };
+        delete obj['declaration'];
+        delete obj['value'];
+        return obj;
+    };
+}
+
+export function RTAssignment(targetVar, value) {
+    if (targetVar.constant)
+        return /*panic(),*/ false;
+
+    return {
+        eval: () => { targetVar.value = value; },
+        initialization: () => {
+            let obj = {
+                targetVar: targetVar.declaration(),
+                value
+            }
+
+            delete obj['targetVar']['type'];
+            return obj;
+        }
+    };
+}
+
+function inferType(value) {
+    if (!isNaN(value)) {
+        let possibleTypes = ['uint', 'int'];
+        const number = parseInt(value);
+        if (number < 0)
+            possibleTypes.splice(0, 1); // It's not possible to be unsigned
+
+        if (possibleTypes.length === 0)
+            return false; // TODO: error handling
+
+        return possibleTypes[0];
+    }
+
+    if (value.isSurroundedBy('"'))
+        return 'String';
+
+    return 'ID';
+}
+
+window.RTValue = RTValue;
+window.RTExpression = RTExpression;
+window.RTVariable = RTVariable;
+window.RTAssignment = RTAssignment;
diff --git a/playground/static/js/ast/parsers/function.parser.js b/playground/static/js/ast/parsers/function.parser.js
@@ -28,7 +28,7 @@ export class ASTFunctionParser {
 
         this.stream.expect('fn');
 
-        if (!this.stream.peekTypeEquals("ID"))
+        if (qrtTypeOf(this.stream.peek()) !== "ID")
             return this.stream.error(Errors.AST.Fn_MissingIdentifier);
 
         func.name = this.stream.pop();
@@ -42,11 +42,12 @@ export class ASTFunctionParser {
             return this.stream.error(Errors.AST.Fn_MalformedArgs);
 
         while (!this.stream.next(")")) {
-            if (!this.stream.peekTypeEquals(["TYPE", "ID"]))
+            if (qrtTypeOf(this.stream.peek()) !== 'TYPE'
+                && qrtTypeOf(this.stream.peek()) !== 'ID')
                 return this.stream.error(Errors.TYPECHECK.Fn_InvalidArgType);
 
             const name = this.stream.pop();
-            if (!this.stream.peekTypeEquals("ID"))
+            if (qrtTypeOf(this.stream.peek()) !== 'ID')
                 return this.stream.error(Errors.AST.Fn_InvalidArgName);
 
             const value = this.stream.pop();
@@ -58,7 +59,9 @@ export class ASTFunctionParser {
     }
 
     parseReturnType(func) {
-        if (this.stream.peekTypeEquals(["ID", "TYPE"])) { // TODO: use RTTypeOf
+        if (qrtTypeOf(this.stream.peek()) === 'TYPE'
+                || qrtTypeOf(this.stream.peek()) === 'ID')
+        {
             func.returnType = this.stream.pop();
             return true;
         }
diff --git a/playground/static/js/ast/parsers/variable.parser.js b/playground/static/js/ast/parsers/variable.parser.js
@@ -16,7 +16,7 @@ export class ASTVariableParser {
         if (!this.stream.expect('let'))
             return this.stream.error(Errors.AST.Let_MalformedDeclaration);
 
-        if (!this.stream.peekTypeEquals('ID'))
+        if (qrtTypeOf(this.stream.peek()) !== 'ID')
             return this.stream.error(Errors.AST.Let_MissingIdentifier);
 
         variable.name = this.stream.pop();
@@ -25,7 +25,7 @@ export class ASTVariableParser {
 
         // Type declaration
         if (this.stream.next(':')) {
-            if (!this.stream.peekTypeEquals("TYPE"))
+            if (qrtTypeOf(this.stream.peek()) !== 'TYPE')
                 return this.stream.error(Errors.TYPECHECK.Let_InvalidType);
 
             variable.varType = this.stream.pop();
diff --git a/playground/static/js/compiler/interpreter.js b/playground/static/js/compiler/interpreter.js
@@ -31,40 +31,40 @@ class Interpreter {
         switch (statement.type) {
 
             case 'VariableDeclaration':
-                if (statement.value) {
-                    let contains = "<RT_UNDEFINED>" /*, valueType*/;
-                    if (statement.value.isSurroundedBy('"')) {
-                        //valueType = 'STR_LITERAL';
-                        contains = statement.value.unwrap();
-
-                    } else {
-                        //valueType = 'NUM_LITERAL';
-                        contains = parseInt(statement.value);
-                    }
-                    console.log(contains);
-                    this.env.id[statement.name] = contains;
-
+                if (!statement.value)
+                    break;
+
+                let contains = "<RT_UNDEFINED>" /*, valueType*/;
+                if (statement.value.isSurroundedBy('"')) {
+                    //valueType = 'STR_LITERAL';
+                    contains = statement.value.unwrap();
+                } else {
+                    //valueType = 'NUM_LITERAL';
+                    contains = parseInt(statement.value);
                 }
+
+                console.log(contains);
+                this.env.id[statement.name] = contains;
                 break;
 
             case 'FunctionDeclaration':
-                if (statement.name === 'main') {
-                    for (const bodyNode of statement.body) {
-                        this.evaluate(bodyNode);
-                    }
-                }
-                break;
+                if (statement.name !== 'main')
+                    break;
 
-            case 'FunctionCall':
-                if (statement.name === 'println') {
-                    const output = document.getElementById('output');
-                    const value = statement.args[0].isSurroundedBy('"') ?
-                        statement.args[0].unwrap() :
-                        this.env.id[statement.args[0]];
-                    output.innerHTML += value + '\n';
+                for (const bodyNode of statement.body) {
+                    this.evaluate(bodyNode);
                 }
                 break;
 
+            case 'FunctionCall':
+                if (statement.name !== 'println')
+                    break;
+
+                const output = document.getElementById('output');
+                const value = statement.args[0].isSurroundedBy('"') ?
+                    statement.args[0].unwrap() :
+                    this.env.id[statement.args[0]];
+                output.innerHTML += value + '\n';
         }
     }
 
diff --git a/playground/static/js/compiler/util/tokenstream.js b/playground/static/js/compiler/util/tokenstream.js
@@ -1,4 +1,4 @@
-import { detectTokenType } from '../../tokens/types.js'
+import { qrtTypeOf } from '../../tokens/types.js'
 import { CodeStream } from './codestream.js'
 
 export class TokenStream {
@@ -10,13 +10,6 @@ export class TokenStream {
         this.index   = 0;
     }
 
-    peekTypeEquals(type) {
-        if (!Array.isArray(type))
-            return detectTokenType(this.peek()) === type;
-
-        return type.some(t => this.peekTypeEquals(t));
-    }
-
     pop() {
         return this.tokens[this.index++];
     }
diff --git a/playground/static/js/tokens/types.js b/playground/static/js/tokens/types.js
@@ -37,10 +37,10 @@ const types = {
 
 }
 
-export function detectTokenType(s) {
+export function qrtTypeOf(s) {
     let t = "ID";
 
-    if (s[0] === '"') 
+    if (s[0] === '"')
     {
         t = "STR_LITERAL";
     } else if (!(isNaN(parseInt(s)) && isNaN(parseFloat(s)))) {
@@ -58,3 +58,5 @@ export function detectTokenType(s) {
     return t;
 }
 
+window.qrtTypeOf = qrtTypeOf;
+

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,10 @@ const types = {`
`37`	`37`
`38`	`38`	`}`
`39`	`39`
`40`		`-export function detectTokenType(s) {`
	`40`	`+export function qrtTypeOf(s) {`
`41`	`41`	`let t = "ID";`
`42`	`42`
`43`		`- if (s[0] === '"')`
	`43`	`+ if (s[0] === '"')`
`44`	`44`	`{`
`45`	`45`	`t = "STR_LITERAL";`
`46`	`46`	`} else if (!(isNaN(parseInt(s)) && isNaN(parseFloat(s)))) {`
`@@ -58,3 +58,5 @@ export function detectTokenType(s) {`
`58`	`58`	`return t;`
`59`	`59`	`}`
`60`	`60`
	`61`	`+window.qrtTypeOf = qrtTypeOf;`
	`62`	`+`