@ianlangs/mathscript 1.6.3 → 1.7.1

package/README.md

@@ -43,12 +43,7 @@ function f(x) {
 var x1 = value
 let x2 = value
 const x3 = value
-mut x4 = value
 
-//luego
-immut x4
+//luego, solo con let
+immut x2
 ```
-
-### tipado
-
-el tipado es opcional, y solo es notacion, porque ms es tipado y no compilado

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@ianlangs/mathscript",
-  "version": "1.6.3",
+  "version": "1.7.1",
   "description": "superset de js",
   "main": "src/transpile.js",
   "scripts": {

package/src/transpile.js

@@ -1,93 +1,84 @@
+// transpile.js
 export function transpile(code, filename = "<input>") {
-    code = code.replace("using(", "require(").replace(/::[^=\n\(\)]*/g, "").replace(/\bfn\b/g, "function")
-    const lines = code.split('\n')
-    const vars = new Map()
-    const output = []
+    const lines = code.split('\n');
+    const vars = new Map();
+    const output = [];
 
     function error(line, msg) {
-        console.error(`\n[MS ERROR] ${filename}:${line}\n  ${msg}\n`)
-        process.exit(1)
+        console.error(`\n[MS ERROR] ${filename}:${line}\n  ${msg}\n`);
+        process.exit(1);
     }
 
     for (let i = 0; i < lines.length; i++) {
-        const raw = lines[i]
-        const line = raw.trim()
-        const ln = i + 1
+        const raw = lines[i];
+        const line = raw.trim();
+        const ln = i + 1;
 
         if (!line) {
-            output.push(raw)
-            continue
+            output.push(raw);
+            continue;
         }
 
-        // mut x = value
-        let m = line.match(/^mut\s+([a-zA-Z_]\w*)\s*=\s*(.+)$/)
+        // let x = value
+        let m = line.match(/^let\s+([a-zA-Z_]\w*)\s*=\s*(.+)$/);
         if (m) {
-            const name = m[1]
-            const value = m[2]
+            const name = m[1];
+            const value = m[2];
 
             if (vars.has(name)) {
-                error(ln, `'${name}' ya está declarada`)
+                error(ln, `'${name}' ya está declarada`);
             }
 
-            vars.set(name, { mutable: true })
-            output.push(`let ${name} = ${value}`)
-            continue
+            vars.set(name, { mutable: true });
+            output.push(raw);
+            continue;
         }
 
         // immut x
-        m = line.match(/^immut\s+([a-zA-Z_]\w*)$/)
+        m = line.match(/^immut\s+([a-zA-Z_]\w*)$/);
         if (m) {
-            const name = m[1]
+            const name = m[1];
 
             if (!vars.has(name)) {
-                error(ln, `'${name}' no está declarada`)
+                error(ln, `'${name}' no está declarada`);
             }
 
-            const info = vars.get(name)
+            const info = vars.get(name);
             if (!info.mutable) {
-                error(ln, `'${name}' no es mutable`)
+                error(ln, `'${name}' no es mutable`);
             }
 
-            info.mutable = false
-            continue
+            info.mutable = false;
+            continue;
         }
 
         // x = y
-        m = line.match(/^([a-zA-Z_]\w*)\s*=\s*(.+)$/)
+        m = line.match(/^([a-zA-Z_]\w*)\s*=\s*(.+)$/);
         if (m) {
-            const name = m[1]
-
+            const name = m[1];
             if (vars.has(name)) {
-                const info = vars.get(name)
+                const info = vars.get(name);
                 if (!info.mutable) {
-                    error(ln, `'${name}' es inmutable`)
+                    error(ln, `'${name}' es inmutable`);
                 }
             }
-
-            output.push(raw)
-            continue
-        }
-
-        // let x =
-        m = line.match(/^let\s+([a-zA-Z_]\w*)\s*=/)
-        if (m) {
-            vars.set(m[1], { mutable: true })
-            output.push(raw)
-            continue
+            output.push(raw);
+            continue;
         }
 
-        // const x =
-        m = line.match(/^const\s+([a-zA-Z_]\w*)\s*=/)
+        // const x = ...
+        m = line.match(/^const\s+([a-zA-Z_]\w*)\s*=/);
         if (m) {
-            vars.set(m[1], { mutable: false })
-            output.push(raw)
-            continue
+            vars.set(m[1], { mutable: false });
+            output.push(raw);
+            continue;
         }
 
-        output.push(raw)
+        // fn -> function, usin -> require
+        output.push(line.replace(/\bfn\b/g, "function").replace("using(", "require("));
     }
 
-    return output.join('\n')
+    return output.join('\n');
 }
 
-export default { transpile }
+export default { transpile };

package/src/web-t.js

@@ -1,43 +1,63 @@
-import { transpile } from "./web-t.js"
-
-const editor = document.getElementById("editor")
-const runButton = document.getElementById("runButton")
-const consoleDiv = document.getElementById("console")
-
-function clearConsole() {
-    consoleDiv.innerHTML = ""
-}
-
-function logToConsole(msg) {
-    const line = document.createElement("div")
-    line.textContent = msg
-    consoleDiv.appendChild(line)
-}
-
-runButton.addEventListener("click", () => {
-    clearConsole()
-
-    const code = editor.value
-
-    const result = transpile(code, "playground.ms")
-
-    if (result.errors.length > 0) {
-        result.errors.forEach(err => logToConsole(err))
-        return
+// web-transpile.js
+export function transpileWeb(code, filename = "<input>") {
+    const lines = code.split('\n');
+    const vars = new Map();
+    const output = [];
+
+    function error(line, msg) {
+        throw new Error(`[MS ERROR] ${filename}:${line}\n  ${msg}`);
     }
 
-    // Capturar console.log
-    const originalLog = console.log
-    console.log = (...args) => {
-        logToConsole(args.join(" "))
-        originalLog(...args)
+    for (let i = 0; i < lines.length; i++) {
+        const raw = lines[i];
+        const line = raw.trim();
+        const ln = i + 1;
+
+        if (!line) {
+            output.push(raw);
+            continue;
+        }
+
+        let m = line.match(/^let\s+([a-zA-Z_]\w*)\s*=\s*(.+)$/);
+        if (m) {
+            const name = m[1];
+            if (vars.has(name)) error(ln, `'${name}' ya está declarada`);
+            vars.set(name, { mutable: true });
+            output.push(raw);
+            continue;
+        }
+
+        m = line.match(/^immut\s+([a-zA-Z_]\w*)$/);
+        if (m) {
+            const name = m[1];
+            if (!vars.has(name)) error(ln, `'${name}' no está declarada`);
+            const info = vars.get(name);
+            if (!info.mutable) error(ln, `'${name}' no es mutable`);
+            info.mutable = false;
+            continue;
+        }
+
+        m = line.match(/^([a-zA-Z_]\w*)\s*=\s*(.+)$/);
+        if (m) {
+            const name = m[1];
+            if (vars.has(name) && !vars.get(name).mutable) {
+                error(ln, `'${name}' es inmutable`);
+            }
+            output.push(raw);
+            continue;
+        }
+
+        m = line.match(/^const\s+([a-zA-Z_]\w*)\s*=/);
+        if (m) {
+            vars.set(m[1], { mutable: false });
+            output.push(raw);
+            continue;
+        }
+
+        output.push(line.replace(/\bfn\b/g, "function"));
     }
 
-    try {
-        eval(result.code)
-    } catch (e) {
-        logToConsole("[RUNTIME ERROR] " + e.message)
-    }
+    return output.join('\n');
+}
 
-    console.log = originalLog
-})
+export default { transpileWeb };

package/tests/funcs.js

@@ -1,11 +1,11 @@
 function suma(a, b) {
-    return a + b
+return a + b
 }
 
 console.log(suma(3, 4)) // 7
 
-function saludo(nombre ) {
-    return "Hola " + nombre
+function saludo(nombre) {
+return "Hola " + nombre
 }
 
 console.log(saludo("Ian")) // "Hola Ian"

package/tests/funcs.ms

@@ -4,7 +4,7 @@ fn suma(a, b) {
 
 console.log(suma(3, 4)) // 7
 
-fn saludo(nombre::string) {
+fn saludo(nombre) {
     return "Hola " + nombre
 }
 

package/tests/using.js

@@ -1,3 +1,3 @@
-const fs = require('fs')
+const fs = using('fs')
 const files = fs.readdirSync('.')
 console.log(files.length) // número de archivos en la carpeta

package/tests/vars.js

@@ -5,18 +5,9 @@ x = 10
 console.log(x) // 10
 
 // Inmutable
-try {
-    //x = 20 // debería dar error
-} catch(e) {
-    console.log("error mutabilidad") // esperado
-}
-
-// Variable
-let y = "hola"
-console.log(y) // "hola"
-// immut y // error no es mutable
-
+//x = 20 //  error
 
 // Const
 const z = 2
-// z = 3 //error
+// z = 3 //error
+// immut z // error

package/tests/vars.ms

@@ -1,5 +1,5 @@
 // Mutable
-mut x = 5
+let x = 5
 console.log(x) // 5
 x = 10
 console.log(x) // 10
@@ -8,12 +8,7 @@ console.log(x) // 10
 immut x
 //x = 20 //  error
 
-// Variable
-let y = "hola"
-console.log(y) // "hola"
-// immut y // error no es mutable
-
-
 // Const
 const z = 2
-// z = 3 //error
+// z = 3 //error
+// immut z // error