grain-lang · ospencer · Jun 21, 2018 · Dec 9, 2017 · Dec 9, 2017 · Jan 16, 2018
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 main
-grainc
-grain.install
+*.install
 output/*.o
 output/*.run
 output/*.s
@@ -17,10 +16,13 @@ notes.org
 **/node_modules/**/*
 *.wasm
 *.wasm.wast
+*.wasm.modsig
 .tern-port
 setup.data
 setup.ml
 myocamlbuild.ml
 .merlin
 runtime/dist
 script/public/javascripts/grain-runtime.js
+script/public/javascripts/grain-runtime-browser.js
+/*.gr
diff --git a/Makefile b/Makefile
@@ -1,20 +1,20 @@
-JBUILDER := $(shell command -v jbuilder &> /dev/null)
+JBUILDER := $(shell command -v jbuilder 2> /dev/null)
+
+default: check-libs
+	jbuilder build

 ifndef JBUILDER
 	$(error "jbuilder not found on your PATH. Please install jbuilder before building: opam install jbuilder")
 endif

-default: check-libs
-	jbuilder build
-
 tests:
 	jbuilder runtest

 install:
 	jbuilder install

 check-libs:
-	jbuilder external-lib-deps --missing @install
+	./tools/get-deps.sh

 clean:
 	jbuilder clean
diff --git a/cli/bin/compile.js b/cli/bin/compile.js
@@ -0,0 +1,11 @@
+const { execSync } = require('child_process');
+
+module.exports = (file) => {
+  try {
+    execSync(`grainc -I _build/install/default/lib/grain/stdlib ${file}`);
+    return file.replace(/\.gr$/, '.wasm')
+  } catch (e) {
+    console.log(e.stdout.toString());
+    process.exit(-1);
+  }
+}
diff --git a/cli/bin/grain.js b/cli/bin/grain.js
@@ -0,0 +1,31 @@
+#!node --harmony
+
+let program = require('commander');
+let compile = require('./compile.js');
+let run = require('./run.js');
+
+let file;
+
+program
+  .version('Grain compiler 0.0.0\nGrain cli 0.0.0', '-v, --version')
+  .arguments('<file>')
+  .action((givenFile) => {
+    file = givenFile || '';
+  });
+
+program.on('--help', () => {
+  console.log('\n\n  File can be either a Grain (.gr) or WebAssembly (.wasm) file.\n');
+});
+  
+program.parse(process.argv);
+
+let wasmFile;
+if (file.endsWith('gr')) {
+  wasmFile = compile(file);
+} else if (file.endsWith('wasm')) {
+  wasmFile = file;
+} else {
+  program.help();
+}
+
+run(wasmFile);
diff --git a/cli/bin/run.js b/cli/bin/run.js
@@ -0,0 +1,8 @@
+let runtime = require('../../runtime/dist/grain-runtime.js');
+let locator = runtime.defaultFileLocator('_build/install/default/lib/grain/stdlib');
+let GrainRunner = runtime.buildGrainRunner(locator);
+
+module.exports = async function run(path) {
+    let res = await GrainRunner.runFile(path);
+    //console.log(`result: ${res}`);
+}
diff --git a/cli/package-lock.json b/cli/package-lock.json
diff --git a/cli/package.json b/cli/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "@grain/cli",
+  "version": "0.0.0",
+  "description": "A command line tool for the Grain language.",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "bin": {
+    "grain": "bin/grain.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/grain-lang/grain.git"
+  },
+  "keywords": [
+    "grain",
+    "cli"
+  ],
+  "author": "Oscar Spencer",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/grain-lang/grain/issues"
+  },
+  "homepage": "https://github.com/grain-lang/grain#readme",
+  "dependencies": {
+    "commander": "^2.14.1"
+  }
+}
diff --git a/dune-project b/dune-project
@@ -0,0 +1,3 @@
+(lang dune 0.1)
+(name grain)
+(version 0.0.1)
diff --git a/grain.opam b/grain.opam
@@ -12,14 +12,23 @@ build: [
 ]
 build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
 depends: [
-  "ocamlfind" {build}
-  "ocamlbuild" {build}
-  "jbuilder" {build}
-  "ounit"
-  "extlib"
-  "batteries"
-  "cmdliner"
-  "ocamlgraph"
-  "wasm"
-  "stdint"
+  "ocamlfind" {build & >= "1.7.3" }
+  "ocamlbuild" {build & >= "0.12.0" }
+  "jbuilder" {build & >= "1.0+beta20" }
+  "ppx_deriving"
+  "ppx_sexp_conv"
+  "sexplib"
+  "dypgen"
+  "ounit" { >= "2.0.0" }
+  "extlib" { >= "1.7.2" }
+  "batteries" { >= "2.8.0" }
+  "cmdliner" { >= "1.0.2" }
+  "ocamlgraph" {>= "1.8.8" }
+  "wasm" { = "1.0" }
+  "stdint" { >= "0.5.0" }
+  "grain_utils"
+  "grain_parsing"
+  "grain_typed"
+  "grain_middle_end"
+  "grain_codegen"
 ]
diff --git a/grain_codegen.opam b/grain_codegen.opam
@@ -0,0 +1,31 @@
+opam-version: "1.2"
+maintainer: "philip@pblair.org"
+authors: ["Philip Blair"  "Oscar Spencer"]
+license: "MIT"
+homepage: "https://github.com/grain-lang/grain"
+dev-repo: "git+https://github.com/grain-lang/grain.git"
+bug-reports: "https://github.com/grain-lang/grain/issues"
+doc: "Experimental language targeting WebAssembly"
+build: [
+  [ "jbuilder" "subst" ] {pinned}
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+depends: [
+  "ocamlfind" {build & >= "1.7.3" }
+  "ocamlbuild" {build & >= "0.12.0" }
+  "jbuilder" {build & >= "1.0+beta20" }
+  "ppx_deriving"
+  "ppx_sexp_conv"
+  "sexplib"
+  "dypgen"
+  "ounit" { >= "2.0.0" }
+  "extlib" { >= "1.7.2" }
+  "batteries" { >= "2.8.0" }
+  "cmdliner" { >= "1.0.2" }
+  "ocamlgraph" {>= "1.8.8" }
+  "wasm" { = "1.0" }
+  "stdint" { >= "0.5.0" }
+  "grain_utils"
+  "grain_middle_end"
+]
diff --git a/grain_middle_end.opam b/grain_middle_end.opam
@@ -0,0 +1,32 @@
+opam-version: "1.2"
+maintainer: "philip@pblair.org"
+authors: ["Philip Blair"  "Oscar Spencer"]
+license: "MIT"
+homepage: "https://github.com/grain-lang/grain"
+dev-repo: "git+https://github.com/grain-lang/grain.git"
+bug-reports: "https://github.com/grain-lang/grain/issues"
+doc: "Experimental language targeting WebAssembly"
+build: [
+  [ "jbuilder" "subst" ] {pinned}
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+depends: [
+  "ocamlfind" {build & >= "1.7.3" }
+  "ocamlbuild" {build & >= "0.12.0" }
+  "jbuilder" {build & >= "1.0+beta20" }
+  "ppx_deriving"
+  "ppx_sexp_conv"
+  "sexplib"
+  "dypgen"
+  "ounit" { >= "2.0.0" }
+  "extlib" { >= "1.7.2" }
+  "batteries" { >= "2.8.0" }
+  "cmdliner" { >= "1.0.2" }
+  "ocamlgraph" {>= "1.8.8" }
+  "wasm" { = "1.0" }
+  "stdint" { >= "0.5.0" }
+  "grain_utils"
+  "grain_parsing"
+  "grain_typed"
+]
diff --git a/grain_parsing.opam b/grain_parsing.opam
@@ -0,0 +1,30 @@
+opam-version: "1.2"
+maintainer: "philip@pblair.org"
+authors: ["Philip Blair"  "Oscar Spencer"]
+license: "MIT"
+homepage: "https://github.com/grain-lang/grain"
+dev-repo: "git+https://github.com/grain-lang/grain.git"
+bug-reports: "https://github.com/grain-lang/grain/issues"
+doc: "Experimental language targeting WebAssembly"
+build: [
+  [ "jbuilder" "subst" ] {pinned}
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+depends: [
+  "ocamlfind" {build & >= "1.7.3" }
+  "ocamlbuild" {build & >= "0.12.0" }
+  "jbuilder" {build & >= "1.0+beta20" }
+  "ppx_deriving"
+  "ppx_sexp_conv"
+  "sexplib"
+  "dypgen"
+  "ounit" { >= "2.0.0" }
+  "extlib" { >= "1.7.2" }
+  "batteries" { >= "2.8.0" }
+  "cmdliner" { >= "1.0.2" }
+  "ocamlgraph" {>= "1.8.8" }
+  "wasm" { = "1.0" }
+  "stdint" { >= "0.5.0" }
+  "grain_utils"
+]
diff --git a/grain_typed.opam b/grain_typed.opam
@@ -0,0 +1,31 @@
+opam-version: "1.2"
+maintainer: "philip@pblair.org"
+authors: ["Philip Blair"  "Oscar Spencer"]
+license: "MIT"
+homepage: "https://github.com/grain-lang/grain"
+dev-repo: "git+https://github.com/grain-lang/grain.git"
+bug-reports: "https://github.com/grain-lang/grain/issues"
+doc: "Experimental language targeting WebAssembly"
+build: [
+  [ "jbuilder" "subst" ] {pinned}
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+depends: [
+  "ocamlfind" {build & >= "1.7.3" }
+  "ocamlbuild" {build & >= "0.12.0" }
+  "jbuilder" {build & >= "1.0+beta20" }
+  "ppx_deriving"
+  "ppx_sexp_conv"
+  "sexplib"
+  "dypgen"
+  "ounit" { >= "2.0.0" }
+  "extlib" { >= "1.7.2" }
+  "batteries" { >= "2.8.0" }
+  "cmdliner" { >= "1.0.2" }
+  "ocamlgraph" {>= "1.8.8" }
+  "wasm" { = "1.0" }
+  "stdint" { >= "0.5.0" }
+  "grain_utils"
+  "grain_parsing"
+]
diff --git a/grain_utils.opam b/grain_utils.opam
@@ -0,0 +1,29 @@
+opam-version: "1.2"
+maintainer: "philip@pblair.org"
+authors: ["Philip Blair"  "Oscar Spencer"]
+license: "MIT"
+homepage: "https://github.com/grain-lang/grain"
+dev-repo: "git+https://github.com/grain-lang/grain.git"
+bug-reports: "https://github.com/grain-lang/grain/issues"
+doc: "Experimental language targeting WebAssembly"
+build: [
+  [ "jbuilder" "subst" ] {pinned}
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+depends: [
+  "ocamlfind" {build & >= "1.7.3" }
+  "ocamlbuild" {build & >= "0.12.0" }
+  "jbuilder" {build & >= "1.0+beta20" }
+  "ppx_deriving"
+  "ppx_sexp_conv"
+  "sexplib"
+  "dypgen"
+  "ounit" { >= "2.0.0" }
+  "extlib" { >= "1.7.2" }
+  "batteries" { >= "2.8.0" }
+  "cmdliner" { >= "1.0.2" }
+  "ocamlgraph" {>= "1.8.8" }
+  "wasm" { = "1.0" }
+  "stdint" { >= "0.5.0" }
+]
diff --git a/grainc.opam b/grainc.opam
@@ -0,0 +1,30 @@
+opam-version: "1.2"
+maintainer: "philip@pblair.org"
+authors: ["Philip Blair"  "Oscar Spencer"]
+license: "MIT"
+homepage: "https://github.com/grain-lang/grain"
+dev-repo: "git+https://github.com/grain-lang/grain.git"
+bug-reports: "https://github.com/grain-lang/grain/issues"
+doc: "Experimental language targeting WebAssembly"
+build: [
+  [ "jbuilder" "subst" ] {pinned}
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+depends: [
+  "ocamlfind" {build & >= "1.7.3" }
+  "ocamlbuild" {build & >= "0.12.0" }
+  "jbuilder" {build & >= "1.0+beta20" }
+  "ppx_deriving"
+  "ppx_sexp_conv"
+  "sexplib"
+  "dypgen"
+  "ounit" { >= "2.0.0" }
+  "extlib" { >= "1.7.2" }
+  "batteries" { >= "2.8.0" }
+  "cmdliner" { >= "1.0.2" }
+  "ocamlgraph" {>= "1.8.8" }
+  "wasm" { = "1.0" }
+  "stdint" { >= "0.5.0" }
+  "grain"
+]