1.1.0

carson-katri · carson-katri · commit b1e35551b4a7 · 2018-08-18T07:49:14.000-04:00
diff --git a/1.1.0/ast/syntax.json b/1.1.0/ast/syntax.json
@@ -9,6 +9,18 @@
       "type": "WHITESPACE",
       "parser": null
     },
+    {
+      "type": "IMPORT",
+      "parser": "./syntax/imports"
+    },
+    {
+      "type": "CLASS",
+      "parser": "./syntax/class"
+    },
+    {
+      "type": "CLASS_INSTANCE",
+      "parser": "./syntax/class"
+    },
     {
       "type": "FUNCTION",
       "parser": "./syntax/fun"
diff --git a/1.1.0/ast/syntax/class.js b/1.1.0/ast/syntax/class.js
@@ -0,0 +1,40 @@
+const { log, err, warn, info, json, success } = require('../../helpers/logger');
+
+module.exports = (peek, consume, peekBack, recall, nextLine, parse) => {
+  console.log(peek());
+  if (peek().type == "CLASS") {
+    // Class creation
+    consume();
+    if (peek().type != "ID")
+      err(`Expected 'ID' but got '${consume().type}'`);
+    let className = consume().value;
+    console.log(peek());
+    if (peek().type != "BRACE_OPEN")
+      err(`Expected '{' but got '${consume().type}'`);
+    consume();
+    let code = [];
+    do {
+      let parsed = parse(peek());
+      if (parsed)
+        code.push(parsed);
+    } while (peek().type != "BRACE_CLOSE");
+    consume();
+    return {
+      type: 'CLASS',
+      name: className,
+      code: code
+    };
+  } else {
+    // New class instance
+    consume();
+    if (peek().type != "ID")
+      err(`Expected 'ID' but got '${consume().type}'`);
+    let initializer = parse(peek());
+    console.log(peek());
+    return {
+      type: 'CLASS_INSTANCE',
+      name: initializer.function,
+      args: initializer.args
+    };
+  }
+}
diff --git a/1.1.0/ast/syntax/fun.js b/1.1.0/ast/syntax/fun.js
@@ -27,7 +27,15 @@ module.exports = (peek, consume, peekBack, recall, nextLine, parse) => {
       if (peek().type != "TYPE")
         err(`Expected type but got '${peek().type}'`);
       arg.type = consume().value;
+
+      if ((peek()||{type:null}).type == "ASSIGN") {
+        consume();
+        arg.default = parse(peek());
+      }
+
       fun.args.push(arg);
+      if ((peek()||{type:null}).type == "COMMA")
+        consume();
     } while (peek().type != "PAREN_CLOSE");
   }
   consume();
diff --git a/1.1.0/ast/syntax/imports.js b/1.1.0/ast/syntax/imports.js
@@ -0,0 +1,20 @@
+const { log, err, warn, info, json, success } = require('../../helpers/logger');
+const { resolve } = require('path');
+const fs = require('fs');
+
+module.exports = (peek, consume, peekBack, recall, nextLine, parse) => {
+  consume();
+  let path = peek().value.substr(1, peek().value.length - 2);
+  if (!path.includes('.saur')) {
+    // It's a built-in library:
+    path = resolve(__dirname, '../../lib/', path + '.saur');
+    if (!fs.existsSync(path)) {
+      err(`The library '${peek().value}' cannot be found. Did you mean to reference a local '.saur' file?`);
+    }
+  }
+  consume();
+  return {
+    type: "IMPORT",
+    path: path
+  }
+}
diff --git a/1.1.0/ast/syntax/repeat.js b/1.1.0/ast/syntax/repeat.js
@@ -31,6 +31,9 @@ module.exports = (peek, consume, peekBack, recall, nextLine, parse) => {
     consume();
   } while ((peek()||{type:null}).type == "NEWLINE");
   consume();
+  do {
+    consume();
+  } while ((peek()||{type:null}).type == "NEWLINE");
 
   // We can iterate an array by using `with`. This is the equivalent to doing `for (let item in array)`
   if ((peek()||{type:null}).type == "REPEAT_WITH") {
diff --git a/1.1.0/helpers/logger.js b/1.1.0/helpers/logger.js
@@ -5,12 +5,12 @@ function timestamp() {
   let date = new Date();
   return '['.gray + ((date.getHours() % 12) + ':' + date.getMinutes() + ':' + date.getSeconds()).magenta + ']'.gray;
 }*/
-prefix = "[".gray + "saur".magenta + "]".gray;
+prefix = "[" + "saur".gray + "]";
 
 module.exports = {
   setPrefix: function(str, intensity) {
     let colored = intensity == 0 ? str.yellow : intensity == 1 ? str.green : str.green.bold;
-    prefix = "[".gray + colored + "]".gray;
+    prefix = "[" + str.gray + "]";
   },
   log: function(msg) {
     console.log(prefix, msg);
diff --git a/1.1.0/lexer/rules.json b/1.1.0/lexer/rules.json
@@ -9,10 +9,30 @@
       "match": "^(\n|\\;)",
       "type": "NEWLINE"
     },
+    {
+      "match": "^\\/\\/.*",
+      "type": "COMMENT"
+    },
     {
       "match": "^\\s+",
       "type": "WHITESPACE"
     },
+    {
+      "match": "^\\@import",
+      "type": "IMPORT"
+    },
+    {
+      "match": "^class",
+      "type": "CLASS"
+    },
+    {
+      "match": "^new",
+      "type": "CLASS_INSTANCE"
+    },
+    {
+      "match": "^loop",
+      "type": "MAIN_LOOP"
+    },
     {
       "match": "^fun",
       "type": "FUNCTION"
diff --git a/1.1.0/lib/browser.saur b/1.1.0/lib/browser.saur
@@ -0,0 +1,7 @@
+@import "./browser/page.saur"
+@import "./browser/storage.saur"
+
+@export Page
+
+storage: Storage = new Storage()
+@export storage
diff --git a/1.1.0/lib/browser/http.saur b/1.1.0/lib/browser/http.saur
@@ -0,0 +1,6 @@
+fun HttpGET(url: String, callback: Any) {
+  request: Any = new XMLHttpRequest();
+  request.addEventListener("load", callback)
+  request.open("GET", url)
+  request.send()
+}
diff --git a/1.1.0/lib/browser/page.saur b/1.1.0/lib/browser/page.saur
@@ -0,0 +1,15 @@
+class Page {
+  // The HTML code
+  html: String
+
+  // Template is an array of tuples (a dictionary of sort)
+  // It looks like this:
+  // [["title", "Hello World"], ["description", "This is an example app"]]
+  // This will look for any {{title}} and {{description}} tags in the HTML and replace it
+  fun render(template: Any, soFar: String = "", i: Int = 0) > String {
+    if (i < template.length) {
+      replaced: String = html.replace(template[i][0], tempalte[i][1])
+      return render(template, replaced, i + 1)
+    }
+  }
+}
diff --git a/1.1.0/lib/browser/storage.saur b/1.1.0/lib/browser/storage.saur
@@ -0,0 +1,8 @@
+class Storage {
+  fun getItem(key: String) > String {
+    return localStorage.getItem(key)
+  }
+  fun setItem(key: String, value: String) {
+    localStorage.setItem(key, value)
+  }
+}
diff --git a/1.1.0/lib/common.saur b/1.1.0/lib/common.saur
@@ -0,0 +1,3 @@
+fun println(message: Any) {
+  console.log(message)
+}
diff --git a/1.1.0/transpiler/transpiler.js b/1.1.0/transpiler/transpiler.js
@@ -23,6 +23,7 @@ class Transpiler {
         if (parserFile.transpiler) {
           const parser = require(parserFile.transpiler);
           code += parser(statement);
+          code += '\n';
         } else {
           err(`No transpiler found for statement of type '${statement.type}'`);
         }
diff --git a/1.1.0/transpiler/transpilers.json b/1.1.0/transpiler/transpilers.json
@@ -1,10 +1,22 @@
 {
   "version": "1.1.0",
   "transpilers": [
+    {
+      "type": "IMPORT",
+      "transpiler": "./transpilers/import.js"
+    },
     {
       "type": "NEW_VARIABLE",
       "transpiler": "./transpilers/var.js"
     },
+    {
+      "type": "CLASS",
+      "transpiler": "./transpilers/class.js"
+    },
+    {
+      "type": "CLASS_INSTANCE",
+      "transpiler": "./transpilers/class.js"
+    },
     {
       "type": "VARIABLE",
       "transpiler": "./transpilers/var.js"
diff --git a/1.1.0/transpiler/transpilers/call.js b/1.1.0/transpiler/transpilers/call.js
@@ -3,5 +3,6 @@ const Transpiler = require('../transpiler');
 module.exports = statement => {
   let args = [];
   statement.args.forEach(arg => args.push((new Transpiler([arg])).compile()));
-  return `${statement.function}(${args.join(', ')})`;
+  let argList = args.map(arg => `(${arg})`);
+  return `${statement.function}${argList.join('')};`;
 }
diff --git a/1.1.0/transpiler/transpilers/class.js b/1.1.0/transpiler/transpilers/class.js
@@ -0,0 +1,4 @@
+module.exports = statement => {
+  console.log(statement);
+  return "\n";
+}
diff --git a/1.1.0/transpiler/transpilers/fun.js b/1.1.0/transpiler/transpilers/fun.js
@@ -2,7 +2,13 @@ const Transpiler = require('../transpiler');
 
 module.exports = statement => {
   let args = [];
-  statement.args.forEach(arg => args.push(arg.name));
+  statement.args.forEach(arg => {
+    if (arg.default)
+      args.push(`${arg.name} = ${(new Transpiler([arg.default])).compile()}`);
+    else
+      args.push(arg.name);
+  });
   let code = (new Transpiler(statement.code)).compile();
-  return `function ${statement.name}(${args.join(', ')}) { ${code} }`;
+  // We use fat arrow syntax for currying later:
+  return `const ${statement.name} = (${args.join(') => (')}) => { ${code} }`;
 }
diff --git a/1.1.0/transpiler/transpilers/import.js b/1.1.0/transpiler/transpilers/import.js
@@ -0,0 +1,19 @@
+const Lexer = require('../../lexer/lexer');
+const AST = require('../../ast/ast');
+const Transpiler = require('../transpiler');
+
+const fs = require('fs');
+
+module.exports = statement => {
+  let file = statement.path;
+  let code = fs.readFileSync(file, 'utf8');
+
+  let lex = new Lexer(code);
+  let tree = new AST(lex.lex());
+
+  return `
+/* --- ${file} --- */
+${(new Transpiler(tree.tree)).compile()}
+
+`;
+}
diff --git a/cli/index.js b/cli/index.js
@@ -9,6 +9,8 @@ const ora = require('ora');
 
 const defaultCompiler = '1.1.0';
 
+const appLoop = `if (appLoop) { let loopParams = []; setInterval(_ => { appLoop().apply(this, loopParams); }, 0.1); }`;
+
 function error(msg) {
   console.log(msg.red.bold);
   process.exit();
@@ -69,8 +71,8 @@ function build(file, outFile, compiler) {
   info("Read \`.saur\' file");
   let lex = new Lexer(code);
   let tree = new AST(lex.lex());
-  let js = new Transpiler(tree);
-  fs.writeFileSync(outFile, js.compile());
+  let js = new Transpiler(tree.tree);
+  fs.writeFileSync(outFile, js.compile() + appLoop);
   success("Saved to " + outFile);
 }
 
diff --git a/example.js b/example.js
diff --git a/examples/classTest.saur b/examples/classTest.saur
@@ -0,0 +1,11 @@
+@import "common"
+
+class MyClass {
+  fun init() {
+    return [["property", 100], ["property2", 200]]
+  }
+}
+
+fun appLoop() {
+  
+}
diff --git a/examples/compiled/classTest.js b/examples/compiled/classTest.js
@@ -0,0 +1,12 @@
+
+/* --- /Users/Ryan/Desktop/LazyScript/1.1.0/lib/common.saur --- */
+const println = (message) => { console.log(message
+);
+ }
+
+
+
+
+
+const appLoop = () => {  }
+if (appLoop) { let loopParams = []; setInterval(_ => { appLoop().apply(this, loopParams); }, 0.1); }
diff --git a/examples/compiled/todos.js b/examples/compiled/todos.js
@@ -0,0 +1,40 @@
+
+/* --- /Users/Ryan/Desktop/LazyScript/1.1.0/lib/common.saur --- */
+const println = (message) => { console.log(message
+);
+ }
+
+
+
+const makeTitle = (todos) => { return todos.length
+ + " Todos\n----------"
+
+;
+ }
+const drawTodos = (title) => (todos) => { println(title
+);
+for (let i = 0; i < todos.length
+; i++) { println(todos[i
+]
+);
+ };
+println("\n\n"
+);
+ }
+const appLoop = (data = ["Task 1"
+, "Task 2"
+, "Task 3"
+]
+) => (draw = drawTodos
+) => { const title = makeTitle(data
+);
+;
+draw(title
+)(data
+);
+return [data
+, draw
+]
+;
+ }
+if (appLoop) { let loopParams = []; setInterval(_ => { appLoop().apply(this, loopParams); }, 0.1); }
diff --git a/examples/salary.saur b/examples/salary.saur
diff --git a/examples/todo.saur b/examples/todo.saur
