Hacks

nuprl · Mar 4, 2018 · 01e47a9 · 01e47a9
1 parent 462cdd0
commit 01e47a9
Show file tree

Hide file tree

Showing 10 changed files with 138 additions and 52 deletions.
diff --git a/stopify-compiler-cloud-function/test.js b/stopify-compiler-cloud-function/test.js
diff --git a/stopify-compiler-cloud-function/ts/index.ts b/stopify-compiler-cloud-function/ts/index.ts
@@ -104,7 +104,8 @@ genericCompiler('pyjs', `${thirdPartyCompilers}/pyjs`, {
   es: 'sane',
   hofs: 'builtin',
   jsArgs: 'faithful',
-  requireRuntime: false
+  requireRuntime: false,
+  eval: false
 });
 
 genericCompiler('emscripten', `${thirdPartyCompilers}/emscripten`, {
@@ -115,7 +116,8 @@ genericCompiler('emscripten', `${thirdPartyCompilers}/emscripten`, {
   es: 'sane',
   hofs: 'builtin',
   jsArgs: 'simple',
-  requireRuntime: false
+  requireRuntime: false,
+  eval: false
 });
 
 genericCompiler('bucklescript', `${thirdPartyCompilers}/bucklescript`, {
@@ -126,7 +128,8 @@ genericCompiler('bucklescript', `${thirdPartyCompilers}/bucklescript`, {
   es: 'sane',
   hofs: 'builtin',
   jsArgs: 'simple',
-  requireRuntime: false
+  requireRuntime: false,
+  eval: false
 });
 
 genericCompiler('scalajs',  `${thirdPartyCompilers}/scalajs`, {
@@ -137,7 +140,8 @@ genericCompiler('scalajs',  `${thirdPartyCompilers}/scalajs`, {
   es: 'sane',
   hofs: 'builtin',
   jsArgs: 'simple',
-  requireRuntime: false
+  requireRuntime: false,
+  eval: false
 });
 
 genericCompiler('clojurescript', `${thirdPartyCompilers}/clojurescript`, {
@@ -148,7 +152,8 @@ genericCompiler('clojurescript', `${thirdPartyCompilers}/clojurescript`, {
   es: 'sane',
   hofs: 'builtin',
   jsArgs: 'simple',
-  requireRuntime: false
+  requireRuntime: false,
+  eval: false
 });
 
 genericCompiler('dart2js',  `${thirdPartyCompilers}/dart2js`, {
@@ -159,5 +164,99 @@ genericCompiler('dart2js',  `${thirdPartyCompilers}/dart2js`, {
   es: 'sane',
   hofs: 'builtin',
   jsArgs: 'simple',
-  requireRuntime: false
+  requireRuntime: false,
+  eval: false
+});
+
+stopify.post('/pyjs-fast', bodyParser.text({ type: '*/*' }), async (req, resp) => {
+    try {
+      resp.set('Access-Control-Allow-Origin', '*');
+      resp.set('Access-Control-Allow-Methods', 'POST');
+
+      const { filename, exists } = await checkCache('pyjs-fast', req.body);
+      if (exists) {
+        return resp.send(filename);
+      }
+      console.info(`Compiling PyJS (fast) program (${req.body.length} bytes)`);
+      const url = `${thirdPartyCompilers}/pyjs-fast`;
+      const jsCode = await request.post(url, { headers, body: req.body });
+      console.info(`Stopifying program (${jsCode.length} bytes)`);
+      const dir = await tmpDir();
+      try {
+        const jsPath = `${dir}/original.js`;
+        await fs.writeFile(jsPath, jsCode + '\npygwtOnLoad();');
+        const stopifiedJsCode = await stopifyCompiler.stopify(jsPath, {
+          compileFunction: 'module',
+          getters: false,
+          debug: false,
+          captureMethod: 'lazy',
+          newMethod: 'wrapper',
+          es: 'sane',
+          hofs: 'builtin',
+          jsArgs: 'faithful',
+          requireRuntime: false,
+          eval: false
+        });
+        const prelude = await fs.readFile(__dirname + '/../pyjs_prelude.lazy.wrapper.faithful.js');
+        await bucket.file(filename).save(prelude + stopifiedJsCode + `
+          $__R.delimit(function () {
+            $S.onEnd();
+          });`
+          );
+        return resp.send(filename);
+      }
+      finally {
+        await fs.remove(dir);
+      }
+    }
+    catch (exn) {
+      resp.statusCode = 503;
+      const reason =
+        (exn.name === 'StatusCodeError' ? exn.response.body : exn).toString();
+      console.error(`Error: ${reason}`);
+      return resp.send(reason.toString());
+    }
+});
+
+stopify.post('/js', bodyParser.text({ type: '*/*' }), async (req, resp) => {
+  try {
+    resp.set('Access-Control-Allow-Origin', '*');
+    resp.set('Access-Control-Allow-Methods', 'POST');
+
+    const { filename, exists } = await checkCache('js', req.body);
+    if (exists) {
+      return resp.send(filename);
+    }
+    console.info(`Compiling JavaScript program (${req.body.length} bytes)`);
+    const jsCode = req.body;
+    const dir = await tmpDir();
+    try {
+      const jsPath = `${dir}/original.js`;
+      await fs.writeFile(jsPath, jsCode);
+      const stopifiedJsCode = await stopifyCompiler.stopify(jsPath, {
+        compileFunction: false,
+        getters: false,
+        debug: true,
+        captureMethod: 'lazy',
+        newMethod: 'wrapper',
+        es: 'sane',
+        hofs: 'builtin',
+        jsArgs: 'faithful',
+        requireRuntime: false,
+        eval: false
+      });
+      await bucket.file(filename).save(stopifiedJsCode);
+      return resp.send(filename);
+    }
+    finally {
+      await fs.remove(dir);
+    }
+  }
+  catch (exn) {
+    resp.statusCode = 503;
+    const reason =
+      (exn.name === 'StatusCodeError' ? exn.response.body : exn).toString();
+    console.error(`Error: ${reason}`);
+    return resp.send(reason.toString());
+  }
 });
diff --git a/stopify-compiler-cloud-function/ts/testServer.ts b/stopify-compiler-cloud-function/ts/testServer.ts
@@ -3,5 +3,5 @@ import * as index from './index';
 
 const app = express();
 app.use(index.stopifyTesting);
-app.listen(8080, '0.0.0.0');
+app.listen(8081, '0.0.0.0');
 
diff --git a/stopify-continuations/src/callcc/boxAssignables.ts b/stopify-continuations/src/callcc/boxAssignables.ts
@@ -218,7 +218,7 @@ const visitor = {
       // topFunction. It shouldn't be boxed since we want to preserve its
       // signature.
       if (vars.includes(path.node.id.name) &&
-          !(state.opts.compileFunction && (<any>path.node).topFunction)) {
+          !(state.opts.compileFunction === true && (<any>path.node).topFunction)) {
         const fun = t.functionExpression(
           fastFreshId.fresh('fun'),
           path.node.params,

diff --git a/stopify-continuations/src/callcc/callcc.ts b/stopify-continuations/src/callcc/callcc.ts
@@ -96,7 +96,7 @@ const visitor: Visitor = {
     path.stop();
 
     let toShift;
-    if (opts.compileFunction) {
+    if (opts.compileFunction === true) {
       if (t.isFunctionDeclaration(path.node.body[0])) {
         toShift = (<t.FunctionDeclaration>path.node.body[0]).body.body
       }

diff --git a/stopify-continuations/src/callcc/delimitTopLevel.ts b/stopify-continuations/src/callcc/delimitTopLevel.ts
@@ -52,7 +52,7 @@ const visitor = {
         // leave intact
       }
       else {
-        if (state.opts.compileFunction && (<any>body[i]).topFunction) {
+        if (state.opts.compileFunction !== false && (<any>body[i]).topFunction) {
         }
         else {
           body[i] = delimitStmt(body[i]);

diff --git a/stopify-continuations/src/types.ts b/stopify-continuations/src/types.ts
@@ -1,8 +1,9 @@
 export type CaptureMethod = 'eager' | 'retval' | 'lazy' | 'original' | 'fudge';
 export type HandleNew = 'direct' | 'wrapper'
+export type CompileFunction = boolean | 'module';
 
 export interface CompilerOpts {
-  compileFunction?: boolean,
+  compileFunction?: CompileFunction,
   getters: boolean,
   debug: boolean,
   captureMethod: CaptureMethod,

diff --git a/stopify-static-website/ts/languages.ts b/stopify-static-website/ts/languages.ts
@@ -10,7 +10,7 @@ export interface Language {
 const compilerBase = 'https://us-central1-arjun-umass.cloudfunctions.net/stopify';
 
 export function runtimeOpts(name: string): stopifyCompiler.Opts {
-  if (name === 'pyjs') {
+  if (name === 'pyjs' || name === 'js') {
     return {
       filename: '',
       estimator: 'reservoir',
@@ -113,16 +113,28 @@ object Runner extends JSApp {
     stepSupported: false,
     aceMode: 'python',
     defaultCode:
-    `def run_forever():
-    i = 0
-    while(True):
-        if i > 10000:
-            i = 0
-        i += 1
-        print i
+    `def fib(n):
+  print "fib(" + str(n) + ")"
+  if n == 0 or n == 1:
+    return 1
+  return fib(n-1) + fib(n-2)
 
-run_forever()
-    `,
+print (fib(15))`,
     compileUrl: `${compilerBase}/pyjs-fast`
+  },
+  JavaScript: {
+    stepSupported: true,
+    aceMode: 'js',
+    defaultCode:
+    `function fib(n) {
+  console.log('fib(' + n + ')');
+  if (n === 0 || n === 1) {
+    return 1;
   }
+  return fib(n-1) + fib(n-2);
 }
+
+fib(15);`,
+    compileUrl: `${compilerBase}/js`
+  },
+};
diff --git a/stopify-static-website/ts/stopify.tsx b/stopify-static-website/ts/stopify.tsx
@@ -40,6 +40,7 @@ class MultilingualStopifyEditor extends React.Component<{}, {language: string}>
             <ul className="dropdown-menu">
             <li><a href="#" onClick={() => this.setState({ language: 'Dart' })}>Dart</a></li>
               <li><a href="#" onClick={() => this.setState({ language: 'Python' })}>Python</a></li>
+              <li><a href="#" onClick={() => this.setState({ language: 'JavaScript' })}>JavaScript</a></li>
               <li><a href="#" onClick={() => this.setState({ language: 'Scala' })}>Scala</a></li>
               <li><a href="#" onClick={() => this.setState({ language: 'OCaml' })}>OCaml</a></li>
               <li><a href="#" onClick={() => this.setState({ language: 'C++' })}>C++</a></li>
@@ -240,8 +241,8 @@ class StopifyEditor extends React.Component<{ language: string }, StopifyEditorS
     else {
       // The "key" in the iframe is unique and forces a full reload.
      rhs = <iframe key={this.state.rhs.url} ref={(frame) => this.iframe = frame}
-                   src={this.state.rhs.url} width='100%' height='100%'
-                   style={{border: 'none', overflow: 'hidden'}}>
+                   src={this.state.rhs.url} width='100%'
+                   style={{border: 'none', overflow: 'hidden', height: '80vh' }}>
            </iframe>;
     }
     return <div className="row display-flex">

diff --git a/stopify/src/stopify/stopifyCallCC.ts b/stopify/src/stopify/stopifyCallCC.ts
@@ -5,18 +5,6 @@ import suspendStop from './suspendStop';
 import suspendStep from './suspendStep';
 import { timeSlow } from '../generic';
 
-const allowed = [
-  "Object",
-  "exports",
-  "require",
-  "console",
-  "global",
-  "window",
-  "document",
-  "setTimeout",
-  "captureCC"
-];
-
 export const visitor: Visitor = {
   Program(path: NodePath<t.Program>, state) {
     const opts: callcc.CompilerOpts = state.opts;
@@ -40,10 +28,6 @@ export const visitor: Visitor = {
 
     callcc.fastFreshId.init(path);
     const plugs: any[] = [];
-    // Cleanup globals when not running in `func` compile mode
-    if (!state.opts.compileFunction) {
-      plugs.push([callcc.cleanupGlobals, { allowed }])
-    }
 
     timeSlow('hygiene, etc.', () =>
       callcc.transformFromAst(path, [
@@ -60,7 +44,7 @@ export const visitor: Visitor = {
 
     callcc.fastFreshId.cleanup()
 
-    if (opts.compileFunction) {
+    if (opts.compileFunction === true || opts.compileFunction === 'module') {
       // Do nothing
     }
     else if (opts.requireRuntime) {
@@ -90,7 +74,7 @@ export const visitor: Visitor = {
                   [t.identifier('$__R')]))]));
     }
 
-    if (!opts.compileFunction) {
+    if (opts.compileFunction === false) {
       path.node.body.push(
         t.expressionStatement(
           t.callExpression(