convert to es6 modules

server/bin/www

@@ -8,6 +8,7 @@ var app = require('../app');
 var debug = require('debug')('server:server');
 var http = require('http');
 
+
 /**
  * Get port from environment and store in Express.
  */

server/closures.js

@@ -18,11 +18,11 @@
  * The second phase will be done to the CPS language and closures will actually lambda-lifted out potentially.
  */
 
-var rep = require("./representation.js");
-var errors = require("./errors.js");
-var parser = require("./parse.js");
-var $ = require("./tools.js");
-var _ = require("underscore");
+import rep from "./representation.js";
+import errors from "./errors.js";
+import parser from "./parse.js";
+import $ from "./tools.js";
+import _ from "underscore";
 
 var notEmpty = _.compose($.not, _.partial(_.equal, []));
 
@@ -153,6 +153,6 @@ function test(src) {
 }
 
 //console.log(test("if something then if a then if b then c else d else rtrrt else some_other_thing"));
-module.exports = {
+export default {
   annotate_fvs : annotate_fvs_all
 };

server/cps.js

@@ -1 +1 @@
-var typ = require("representation.js");
+import typ from "representation.js";

server/desugar.js

@@ -4,9 +4,9 @@
  * much simpler and easier to type-check, optimize, and evaluate
  */
 
-var typ = require("./representation.js");
-var errors = require("./errors.js");
-var _ = require("underscore");
+import typ from "./representation.js";
+import errors from "./errors.js";
+import _ from "underscore";
 
 function isAtomicNumber(stx) {
   return stx.exprType == "Integer" || stx.exprType == "Float";
@@ -137,7 +137,7 @@ function desugar(stx, typeEnv) {
   }
 }
 
-module.exports = { desugar : desugar };
+export default { desugar : desugar };
 //var test = typ.ListT([1,2,3]);
 
 //console.log(desugarList(test));

server/environments.js

@@ -3,8 +3,8 @@
  * with a few built-in (a standard Prelude environment)
  */
 
-var errors = require("./errors.js");
-var rep = require("./representation.js");
+import errors from "./errors.js";
+import rep from "./representation.js";
 
 // creates a new environment initialized with the pairs in values
 function makeEnv(name, values) {
@@ -27,7 +27,7 @@ function lookup(name, env) {
   return value;
 }
 
-module.exports = {
+export default {
   lookup : lookup,
   makeEnv : makeEnv
 };

server/errors.js

@@ -31,7 +31,7 @@ function JInternalError(message) {
   return this;
 }
 
-module.exports =
+export default
   {JSyntaxError : JSyntaxError,
    JTypeError : JTypeError,
    JInternalError : JInternalError

server/free_vars.js

@@ -18,11 +18,11 @@
  * The second phase will be done to the CPS language and closures will actually lambda-lifted out potentially.
  */
 
-var rep = require("./representation.js");
-var errors = require("./errors.js");
-var parser = require("./parse.js");
-var $ = require("./tools.js");
-var _ = require("underscore");
+import rep from "./representation.js";
+import errors from "./errors.js";
+import parser from "./parse.js";
+import $ from "./tools.js";
+import _ from "underscore";
 
 var notEmpty = _.compose($.not, _.partial(_.equal, []));
 

server/package.json

@@ -12,6 +12,7 @@
     "express": "~4.15.2",
     "morgan": "~1.8.1",
     "pug": "~2.0.0-beta11",
+    "riot": "^3.6.0",
     "rollup-plugin-buble": "^0.15.0",
     "rollup-plugin-commonjs": "^8.0.2",
     "rollup-plugin-node-resolve": "^3.0.0",

server/parse.js

@@ -1,11 +1,11 @@
-var typ = require("./representation.js");
-var $ = require("./tools.js");
-var _ = require("underscore");
-var tokenizer = require("./tokenize.js");
-var desugarer = require("./desugar.js");
-var pprint = require("./pprint.js");
-var error = require("./errors.js");
-var closure = require("./closures.js");
+import typ from "./representation.js";
+import $ from "./tools.js";
+import _ from "underscore";
+import tokenizer from "./tokenize.js";
+import desugarer from "./desugar.js";
+import pprint from "./pprint.js";
+import error from "./errors.js";
+import closure from "./closures.js";
 var print = console.log;
 
 function sourcePos(tokens, linenum, charnum) {
@@ -829,7 +829,7 @@ function parseFull(tokenized) {
   }
 }
 
-module.exports = { parse : function(str) {
+export default { parse : function(str) {
                               return parseFull(tokenizer.tokenize(str));
                             },
                   tokenize : tokenizer.tokenize,

server/pprint.js

@@ -99,4 +99,4 @@ function pprint(expr) {
   }
 }
 
-module.exports = {pprint : pprint};
+export default {pprint : pprint};

server/prelude.js

@@ -118,6 +118,6 @@ defop 3 Left (a | b)
 defop 3 Left (a & b)
   (bitwiseAnd a b)`;
 
-module.exports = {
+export default {
   "src" : src
 };

server/representation.js

@@ -1,5 +1,5 @@
-var errors = require("./errors.js");
-var _ = require("underscore");
+import errors from "./errors.js";
+import _ from "underscore";
 
 var Expression = {
   display :
@@ -374,7 +374,7 @@ var OPInfo = {
           "->" : [1, "Right"]
          };
 
-module.exports =
+export default
    {
      IntT   : IntT,
      FloatT : FloatT,

server/rollup.config.js

@@ -10,7 +10,9 @@ export default {
   plugins: [
     riot(),
     nodeResolve({ jsnext: true }),
-    commonjs(),
+    commonjs({
+      './vm.js' : ['evaluateString']
+    }),
     buble()
   ],
   format: 'iife'

server/routes/index.js

@@ -1,12 +1,10 @@
 var express = require('express');
 var router = express.Router();
-var vm = require("../vm.js");
 
 /* GET home page. */
 router.get('/', function(req, res, next) {
   var query_params = req.query;
-  var evaluated = vm.evaluate(query_params.source);
-  res.render('index', { title: 'Express', output: JSON.stringify(evaluated)});
+  res.render('index', { title: 'Express', output: ""});
 });
 
 module.exports = router;

server/tags/jlambda.js

@@ -1,3 +1,4 @@
-var vm = require("../vm.js");
+import riot from 'riot';
+import './test.tag';
 
-console.log(vm.evaluate("(+ 2 3)"));
+riot.mount("test");

server/tags/test.tag

@@ -0,0 +1,20 @@
+<test>
+  <input
+    ref="input"
+    type="text">
+  </input>
+  <button
+    onclick={evaluate}>
+    Evaluate it
+  </button>
+
+<script>
+import vm from '../vm.js';
+
+evaluate() {
+  var input = this.refs.input;
+  alert(vm.evaluateString(input.value));
+}
+
+</script>
+</test>

server/test.js

@@ -1,17 +1,17 @@
-var parser = require("./parse.js");
-var cexps = require("./cexps.js");
-var closures = require("./closure_conversion.js");
-var desugar = require("./desugar.js");
-var environments = require("./environments.js");
-var errors = require("./errors.js");
-var tokens = require("./tokenize.js");
-var tools = require("./tools.js");
-var typecheck = require("./typecheck.js");
-var representation = require("./representation.js");
-var _ = require("underscore");
-
-var qc = require("quickcheck");
-var assert = require("assert");
+import parser from "./parse.js";
+import cexps from "./cexps.js";
+import closures from "./closure_conversion.js";
+import desugar from "./desugar.js";
+import environments from "./environments.js";
+import errors from "./errors.js";
+import tokens from "./tokenize.js";
+import tools from "./tools.js";
+import typecheck from "./typecheck.js";
+import representation from "./representation.js";
+import _ from "underscore";
+
+import qc from "quickcheck";
+import assert from "assert";
 
 
 /* my own generators */

server/tokenize.js

@@ -1,9 +1,10 @@
-var rep = require("./representation.js");
-var $ = require("./tools.js");
-var error = require("./errors.js");
+import rep from "./representation.js";
+import $ from "./tools.js";
+import error from "./errors.js";
+import _ from "underscore";
+import prelude from "./prelude.js";
+
 var operators = Object.keys(rep.OPInfo);
-var _ = require("underscore");
-var prelude = require("./prelude.js");
 
 function isDigit(c) {
   if (!c)
@@ -426,5 +427,5 @@ function tokenizeFull(input) {
   return tokenizeHelp(input, matchop, true);
 }
 
-module.exports = {tokenize : tokenizeFull,
+export default {tokenize : tokenizeFull,
                   isIdentifier : isIdentifier};

server/tools.js

@@ -1,4 +1,4 @@
-var _ = require("underscore");
+import _ from "underscore";
 
 function empty(xs) {
   return _.size(xs) < 1;
@@ -93,7 +93,7 @@ function debugPrint(stx) {
 }
 
 
-module.exports = {
+export default {
   not  : not,
   groupOps : groupOps,
   opMatch : operatorMatch,

server/typecheck.js

@@ -10,8 +10,8 @@
  * to an environment mapping identifiers to types
  */
 
-var rep = require("./representation.js");
-var env = require("./environments.js");
+import rep from "./representation.js";
+import env from "./environments.js";
 
 /*
  * Map all bindings with explicit type annotations in the environment

server/views/index.pug

@@ -4,4 +4,5 @@ block content
   h1= title
   p Welcome to #{title}
   p #{output}
+  test
   script(src='bundle.js', type='text/javascript')

server/vm.js

@@ -1,8 +1,8 @@
-var typ = require("./representation.js");
-var parse = require("./parse.js");
-var tokenizer = require("./tokenize.js");
-var pprint = require("./pprint.js");
-var env = require("./environments.js");
+import typ from "./representation.js";
+import parse from "./parse.js";
+import tokenizer from "./tokenize.js";
+import pprint from "./pprint.js";
+import env from "./environments.js";
 
 var testenv = env.makeEnv("toplevel",
                       [
@@ -73,6 +73,6 @@ function evaluate(ast, environment) {
   }
 }
 
-module.exports = {
-  evaluate : evaluateString
+export default {
+  evaluateString : evaluateString
 };