@ianlangs/mathscript 1.1.2 → 1.2.0

package/package.json

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

package/src/node.js

@@ -1,6 +1,15 @@
-#!/bin/env node
-import T from './transpile.js'
-import fs from 'fs'
-const __code__ = fs.readFileSync(process.argv[2], 'utf-8')
+#!/usr/bin/env node
+import fs from "fs"
+import T from "./transpile.js"
 
-eval(T.transpile(__code__, ...(T.Consts)))
+const file = process.argv[2]
+if (!file) {
+  console.error("Usage: ms-node <file.ms>")
+  process.exit(1)
+}
+
+
+const source = fs.readFileSync(file, "utf-8")
+const js = T.transpile(source, ...(T.Consts))
+const run = new Function(js)
+run()

package/src/transpile.js

@@ -1,16 +1,83 @@
 const Consts = [
-    [/::\s*[^\s\(\)]*/g, ""],
-    [/mut\s+([a-zA-Z_]\w*)\s*=\s*(.+)/g, "let $1= (()=>{let v=$2; return {get:()=>v,set:n=>v=n}})()"],
-    [/immut\s+([a-zA-Z_]\w*)/g, "delete $1.set"],
-    ["using", "require"],
-    [/fn/g, "function"],
+  [/::\s*[^\s\(\)]*/g, ""],
+  [/mut\s+([a-zA-Z_]\w*)\s*=\s*(.+)/g, "let $1 = (()=>{let v=$2; return {get:()=>v,set:n=>v=n}})()"],
+  [/immut\s+([a-zA-Z_]\w*)/g, "delete $1.set"],
+  [/using\(/g, "require("],
+  [/fn/g, "function"],
 ]
 
-function transpile(code, ...consts) {
-    for (let [i, j] of consts) {
-        code = code.replace(i, j)
+function analyzeMS(code) {
+  const lines = code.split("\n")
+  const scopes = [new Map()] // nombre -> { mut: boolean, kind }
+
+  function findVar(name) {
+    for (let s of scopes) {
+      if (s.has(name)) return s.get(name)
+    }
+    return null
+  }
+
+  lines.forEach((line, i) => {
+    const ln = i + 1
+    const trimmed = line.trim()
+
+    if (trimmed.includes("{")) scopes.unshift(new Map())
+    if (trimmed.includes("}")) scopes.shift()
+
+    // mut x = ...
+    const mutMatch = line.match(/^\s*mut\s+([a-zA-Z_]\w*)/)
+    if (mutMatch) {
+      const name = mutMatch[1]
+      scopes[0].set(name, { mut: true, kind: "mut" })
+      return
+    }
+
+    // let x = ...
+    const letMatch = line.match(/^\s*let\s+([a-zA-Z_]\w*)/)
+    if (letMatch) {
+      const name = letMatch[1]
+      scopes[0].set(name, { mut: false, kind: "let" })
+      return
+    }
+
+    // const x = ...
+    const constMatch = line.match(/^\s*const\s+([a-zA-Z_]\w*)/)
+    if (constMatch) {
+      const name = constMatch[1]
+      scopes[0].set(name, { mut: false, kind: "const" })
+      return
     }
-    return code
+
+    // immut x
+    const im = line.match(/^\s*immut\s+([a-zA-Z_]\w*)/)
+    if (im) {
+      const name = im[1]
+      const v = findVar(name)
+
+      if (!v) {
+        throw new Error(`MS Compile Error (line ${ln}): '${name}' is not declared`)
+      }
+
+      if (!v.mut) {
+        throw new Error(
+          `MS Compile Error (line ${ln}): '${name}' is not mutable (declared as ${v.kind})`
+        )
+      }
+
+      v.mut = false
+      return
+    }
+  })
+}
+
+
+function transpile(code, ...consts) {
+  analyzeMS(code)
+
+  for (let [i, j] of consts) {
+    code = code.replace(i, j)
+  }
+  return code
 }
 
-export default {transpile, Consts}
+export default { transpile, Consts }

package/tests/using.js

@@ -1,4 +1,3 @@
-//const fs = require('fs') inea borrada para poder subir all modulo
-import fs from 'fs' //linea parra que siga andando
+const fs = require('fs')
 const files = fs.readdirSync('.')
 console.log(files.length) // número de archivos en la carpeta

package/tests/vars.js

@@ -1,5 +1,5 @@
 // Mutable
-let x= (()=>{let v=5; return {get:()=>v,set:n=>v=n}})()
+let x = (()=>{let v=5; return {get:()=>v,set:n=>v=n}})()
 console.log(x.get()) // 5
 x.set(10)
 console.log(x.get()) // 10
@@ -15,7 +15,7 @@ try {
 // Variable
 let y = "hola"
 console.log(y) // "hola"
-delete y.set // no cambia nada
+// delete y.set // error no es mutable
 
 
 // Const

package/tests/vars.ms

@@ -15,7 +15,7 @@ try {
 // Variable
 let y = "hola"
 console.log(y) // "hola"
-immut y // no cambia nada
+// immut y // error no es mutable
 
 
 // Const