diff --git a/README.md b/README.md index 504180f4..26e19362 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,13 @@ ### Local Configuration -1. Install [Node.js](https://nodejs.org/en/) -2. Clone/download the repository -3. Run `npm i` to install dependencies -4. Run `node index dev` to run on port 8080 -5. Visit http://localhost:8080 in your browser +1. Download/install [Rust](https://www.rust-lang.org/) +2. Download/install [Node.js](https://nodejs.org/en/) +3. Download/install [Emscripten SDK](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html) +4. Run `rustup target add wasm32-unknown-emscripten` to install the Emscripten compile target +5. Run `npm i` to install dependencies +6. Run `node index dev` to run on port 8080 +7. Visit http://localhost:8080 in your browser ### Current Features - Pretty-printing bundled Fungi code/traces diff --git a/nodemon.json b/nodemon.json index c711cbe5..cc14952c 100644 --- a/nodemon.json +++ b/nodemon.json @@ -1,3 +1,3 @@ { - "ignore": ["www/**/*", "dist/**/*"] + "ignore": ["src/www/**/*", "dist/**/*"] } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 7c539522..02e4826d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "iodyn-web", + "name": "fungi-vis", "version": "0.1.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index 4d218b65..d378b5af 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Fungi Visualization Tool", "main": "index.js", "repository": "https://github.com/Adapton/fungi-vis.git", - "author": "Adapton Project (http://adapton.org)", + "author": "Adapton Project", "scripts": { "start": "node index" }, diff --git a/sorc.config.js b/sorc.config.js index daaf3ce9..ce7ace0c 100644 --- a/sorc.config.js +++ b/sorc.config.js @@ -1,15 +1,15 @@ module.exports = { - basePath: __dirname, + basePath: __dirname + '/src', verbose: 'dev', packages: [{ - path: '/src/app', + path: '/server/app', env: ['dev', 'prod'], eager: true, }, { - path: '/src/lib', + path: '/server/lib', }, { env: 'dev', - path: '/src/dev', + path: '/server/dev', eager: true, }], }; \ No newline at end of file diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock new file mode 100644 index 00000000..a8856e6e --- /dev/null +++ b/src/rust/Cargo.lock @@ -0,0 +1,106 @@ +[[package]] +name = "adapton" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "bitflags" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "fungi-lang" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "adapton 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", + "iodyn 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "fungi-vis" +version = "0.1.0" +dependencies = [ + "fungi-lang 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "iodyn" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "adapton 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "libc" +version = "0.2.36" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "rand" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "winapi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[metadata] +"checksum adapton 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)" = "68890c580905a3fd9b5e27ff61303e5e0dcce42d7eeade4e52723155e4e11317" +"checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf" +"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +"checksum fungi-lang 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "10eefe127e52f9bfe0cc63c8e720980d1462b70a637ae4dfb41ceb300b1ba6be" +"checksum iodyn 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3086ada83a69ac5af810ca68a24ae2808fbc593f9ac8906e3da99da2adbdc85d" +"checksum libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "1e5d97d6708edaa407429faa671b942dc0f2727222fb6b6539bf1db936e4b121" +"checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1" +"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5" +"checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3" +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml new file mode 100644 index 00000000..2813f4d8 --- /dev/null +++ b/src/rust/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "fungi-vis" +version = "0.1.0" +authors = ["Adapton Project"] + +[dependencies] +fungi-lang = "^0.1.20" \ No newline at end of file diff --git a/src/rust/src/main.rs b/src/rust/src/main.rs new file mode 100644 index 00000000..0fa10479 --- /dev/null +++ b/src/rust/src/main.rs @@ -0,0 +1,13 @@ +// #[macro_use] +// extern crate fungi_lang; + +// use fungi_lang::vis; + +fn main() { + println!("Hello Rust!"); +} + +#[no_mangle] +pub fn test(input: &str) { + println!("~~ {} ~~", input); +} \ No newline at end of file diff --git a/src/app/App.js b/src/server/app/App.js similarity index 87% rename from src/app/App.js rename to src/server/app/App.js index bdf9744c..01ef8a73 100644 --- a/src/app/App.js +++ b/src/server/app/App.js @@ -8,7 +8,7 @@ module.exports = function() { var app = express(); - app.set('views', 'view'); + app.set('views', this.config.basePath + '/www/view'); app.set('view engine', 'ejs'); app.use(compression()); diff --git a/src/app/Config.js b/src/server/app/Config.js similarity index 100% rename from src/app/Config.js rename to src/server/app/Config.js diff --git a/src/app/Server.js b/src/server/app/Server.js similarity index 100% rename from src/app/Server.js rename to src/server/app/Server.js diff --git a/src/app/Site.js b/src/server/app/Site.js similarity index 91% rename from src/app/Site.js rename to src/server/app/Site.js index bb5f3d6c..9a58f2aa 100644 --- a/src/app/Site.js +++ b/src/server/app/Site.js @@ -12,7 +12,7 @@ module.exports = function(App, Config, log) var webpack = require('webpack'); var devMiddleware = require('webpack-dev-middleware'); - var compiler = webpack(require(this.config.basePath + '/webpack.config')); + var compiler = webpack(require(this.config.basePath + '/../webpack.config')); App.use(require('webpack-hot-middleware')(compiler, {log})); App.use(devMiddleware(compiler, { stats: {colors: true}, diff --git a/src/app/util/log.js b/src/server/app/util/log.js similarity index 100% rename from src/app/util/log.js rename to src/server/app/util/log.js diff --git a/src/dev/Config.js b/src/server/dev/Config.js similarity index 100% rename from src/dev/Config.js rename to src/server/dev/Config.js diff --git a/www/app/component/app/app.component.js b/src/www/app/component/app/app.component.js similarity index 100% rename from www/app/component/app/app.component.js rename to src/www/app/component/app/app.component.js diff --git a/www/app/component/app/app.html b/src/www/app/component/app/app.html similarity index 100% rename from www/app/component/app/app.html rename to src/www/app/component/app/app.html diff --git a/www/app/component/ast/ast.component.js b/src/www/app/component/ast/ast.component.js similarity index 100% rename from www/app/component/ast/ast.component.js rename to src/www/app/component/ast/ast.component.js diff --git a/www/app/component/ast/ast.html b/src/www/app/component/ast/ast.html similarity index 100% rename from www/app/component/ast/ast.html rename to src/www/app/component/ast/ast.html diff --git a/www/app/component/pretty/enclose/enclose-block.component.js b/src/www/app/component/pretty/enclose/enclose-block.component.js similarity index 100% rename from www/app/component/pretty/enclose/enclose-block.component.js rename to src/www/app/component/pretty/enclose/enclose-block.component.js diff --git a/www/app/component/pretty/enclose/enclose-paren.component.js b/src/www/app/component/pretty/enclose/enclose-paren.component.js similarity index 100% rename from www/app/component/pretty/enclose/enclose-paren.component.js rename to src/www/app/component/pretty/enclose/enclose-paren.component.js diff --git a/www/app/component/pretty/enclose/enclose-square.component.js b/src/www/app/component/pretty/enclose/enclose-square.component.js similarity index 100% rename from www/app/component/pretty/enclose/enclose-square.component.js rename to src/www/app/component/pretty/enclose/enclose-square.component.js diff --git a/www/app/component/pretty/enclose/schema.js b/src/www/app/component/pretty/enclose/schema.js similarity index 100% rename from www/app/component/pretty/enclose/schema.js rename to src/www/app/component/pretty/enclose/schema.js diff --git a/www/app/component/pretty/indent/indent.component.js b/src/www/app/component/pretty/indent/indent.component.js similarity index 100% rename from www/app/component/pretty/indent/indent.component.js rename to src/www/app/component/pretty/indent/indent.component.js diff --git a/www/app/component/pretty/node/p-ceffect.component.js b/src/www/app/component/pretty/node/p-ceffect.component.js similarity index 100% rename from www/app/component/pretty/node/p-ceffect.component.js rename to src/www/app/component/pretty/node/p-ceffect.component.js diff --git a/www/app/component/pretty/node/p-context.component.js b/src/www/app/component/pretty/node/p-context.component.js similarity index 100% rename from www/app/component/pretty/node/p-context.component.js rename to src/www/app/component/pretty/node/p-context.component.js diff --git a/www/app/component/pretty/node/p-ctype.component.js b/src/www/app/component/pretty/node/p-ctype.component.js similarity index 100% rename from www/app/component/pretty/node/p-ctype.component.js rename to src/www/app/component/pretty/node/p-ctype.component.js diff --git a/www/app/component/pretty/node/p-effect.component.js b/src/www/app/component/pretty/node/p-effect.component.js similarity index 100% rename from www/app/component/pretty/node/p-effect.component.js rename to src/www/app/component/pretty/node/p-effect.component.js diff --git a/www/app/component/pretty/node/p-exp.component.js b/src/www/app/component/pretty/node/p-exp.component.js similarity index 100% rename from www/app/component/pretty/node/p-exp.component.js rename to src/www/app/component/pretty/node/p-exp.component.js diff --git a/www/app/component/pretty/node/p-index.component.js b/src/www/app/component/pretty/node/p-index.component.js similarity index 100% rename from www/app/component/pretty/node/p-index.component.js rename to src/www/app/component/pretty/node/p-index.component.js diff --git a/www/app/component/pretty/node/p-kind.component.js b/src/www/app/component/pretty/node/p-kind.component.js similarity index 100% rename from www/app/component/pretty/node/p-kind.component.js rename to src/www/app/component/pretty/node/p-kind.component.js diff --git a/www/app/component/pretty/node/p-name.component.js b/src/www/app/component/pretty/node/p-name.component.js similarity index 100% rename from www/app/component/pretty/node/p-name.component.js rename to src/www/app/component/pretty/node/p-name.component.js diff --git a/www/app/component/pretty/node/p-nametm.component.js b/src/www/app/component/pretty/node/p-nametm.component.js similarity index 100% rename from www/app/component/pretty/node/p-nametm.component.js rename to src/www/app/component/pretty/node/p-nametm.component.js diff --git a/www/app/component/pretty/node/p-primapp.component.js b/src/www/app/component/pretty/node/p-primapp.component.js similarity index 100% rename from www/app/component/pretty/node/p-primapp.component.js rename to src/www/app/component/pretty/node/p-primapp.component.js diff --git a/www/app/component/pretty/node/p-prop.component.js b/src/www/app/component/pretty/node/p-prop.component.js similarity index 100% rename from www/app/component/pretty/node/p-prop.component.js rename to src/www/app/component/pretty/node/p-prop.component.js diff --git a/www/app/component/pretty/node/p-sort.component.js b/src/www/app/component/pretty/node/p-sort.component.js similarity index 100% rename from www/app/component/pretty/node/p-sort.component.js rename to src/www/app/component/pretty/node/p-sort.component.js diff --git a/www/app/component/pretty/node/p-tcons.component.js b/src/www/app/component/pretty/node/p-tcons.component.js similarity index 100% rename from www/app/component/pretty/node/p-tcons.component.js rename to src/www/app/component/pretty/node/p-tcons.component.js diff --git a/www/app/component/pretty/node/p-td.component.js b/src/www/app/component/pretty/node/p-td.component.js similarity index 100% rename from www/app/component/pretty/node/p-td.component.js rename to src/www/app/component/pretty/node/p-td.component.js diff --git a/www/app/component/pretty/node/p-term.component.js b/src/www/app/component/pretty/node/p-term.component.js similarity index 100% rename from www/app/component/pretty/node/p-term.component.js rename to src/www/app/component/pretty/node/p-term.component.js diff --git a/www/app/component/pretty/node/p-type.component.js b/src/www/app/component/pretty/node/p-type.component.js similarity index 100% rename from www/app/component/pretty/node/p-type.component.js rename to src/www/app/component/pretty/node/p-type.component.js diff --git a/www/app/component/pretty/node/p-val.component.js b/src/www/app/component/pretty/node/p-val.component.js similarity index 100% rename from www/app/component/pretty/node/p-val.component.js rename to src/www/app/component/pretty/node/p-val.component.js diff --git a/www/app/component/pretty/node/schema.js b/src/www/app/component/pretty/node/schema.js similarity index 100% rename from www/app/component/pretty/node/schema.js rename to src/www/app/component/pretty/node/schema.js diff --git a/www/app/component/pretty/term/id-name.component.js b/src/www/app/component/pretty/term/id-name.component.js similarity index 100% rename from www/app/component/pretty/term/id-name.component.js rename to src/www/app/component/pretty/term/id-name.component.js diff --git a/www/app/component/pretty/term/id-type.component.js b/src/www/app/component/pretty/term/id-type.component.js similarity index 100% rename from www/app/component/pretty/term/id-type.component.js rename to src/www/app/component/pretty/term/id-type.component.js diff --git a/www/app/component/pretty/term/id-var.component.js b/src/www/app/component/pretty/term/id-var.component.js similarity index 100% rename from www/app/component/pretty/term/id-var.component.js rename to src/www/app/component/pretty/term/id-var.component.js diff --git a/www/app/component/pretty/term/keyword.component.js b/src/www/app/component/pretty/term/keyword.component.js similarity index 100% rename from www/app/component/pretty/term/keyword.component.js rename to src/www/app/component/pretty/term/keyword.component.js diff --git a/www/app/component/pretty/term/literal.component.js b/src/www/app/component/pretty/term/literal.component.js similarity index 100% rename from www/app/component/pretty/term/literal.component.js rename to src/www/app/component/pretty/term/literal.component.js diff --git a/www/app/component/pretty/term/operator.component.js b/src/www/app/component/pretty/term/operator.component.js similarity index 100% rename from www/app/component/pretty/term/operator.component.js rename to src/www/app/component/pretty/term/operator.component.js diff --git a/www/app/component/trace/trace.component.js b/src/www/app/component/trace/trace.component.js similarity index 100% rename from www/app/component/trace/trace.component.js rename to src/www/app/component/trace/trace.component.js diff --git a/www/app/component/trace/trace.html b/src/www/app/component/trace/trace.html similarity index 100% rename from www/app/component/trace/trace.html rename to src/www/app/component/trace/trace.html diff --git a/www/app/config/animation.config.js b/src/www/app/config/animation.config.js similarity index 100% rename from www/app/config/animation.config.js rename to src/www/app/config/animation.config.js diff --git a/www/app/config/app.config.js b/src/www/app/config/app.config.js similarity index 100% rename from www/app/config/app.config.js rename to src/www/app/config/app.config.js diff --git a/www/app/config/promise.run.js b/src/www/app/config/promise.run.js similarity index 100% rename from www/app/config/promise.run.js rename to src/www/app/config/promise.run.js diff --git a/www/app/directive/ace-editor.directive.js b/src/www/app/directive/ace-editor.directive.js similarity index 100% rename from www/app/directive/ace-editor.directive.js rename to src/www/app/directive/ace-editor.directive.js diff --git a/www/app/directive/p-handle/fallback.html b/src/www/app/directive/p-handle/fallback.html similarity index 100% rename from www/app/directive/p-handle/fallback.html rename to src/www/app/directive/p-handle/fallback.html diff --git a/www/app/directive/p-handle/p-handle.directive.js b/src/www/app/directive/p-handle/p-handle.directive.js similarity index 100% rename from www/app/directive/p-handle/p-handle.directive.js rename to src/www/app/directive/p-handle/p-handle.directive.js diff --git a/www/app/directive/p-handle/template/ceffect/Cons.html b/src/www/app/directive/p-handle/template/ceffect/Cons.html similarity index 100% rename from www/app/directive/p-handle/template/ceffect/Cons.html rename to src/www/app/directive/p-handle/template/ceffect/Cons.html diff --git a/www/app/directive/p-handle/template/ceffect/ForallIdx.html b/src/www/app/directive/p-handle/template/ceffect/ForallIdx.html similarity index 100% rename from www/app/directive/p-handle/template/ceffect/ForallIdx.html rename to src/www/app/directive/p-handle/template/ceffect/ForallIdx.html diff --git a/www/app/directive/p-handle/template/ceffect/ForallType.html b/src/www/app/directive/p-handle/template/ceffect/ForallType.html similarity index 100% rename from www/app/directive/p-handle/template/ceffect/ForallType.html rename to src/www/app/directive/p-handle/template/ceffect/ForallType.html diff --git a/www/app/directive/p-handle/template/context/Def.html b/src/www/app/directive/p-handle/template/context/Def.html similarity index 100% rename from www/app/directive/p-handle/template/context/Def.html rename to src/www/app/directive/p-handle/template/context/Def.html diff --git a/www/app/directive/p-handle/template/context/Empty.html b/src/www/app/directive/p-handle/template/context/Empty.html similarity index 100% rename from www/app/directive/p-handle/template/context/Empty.html rename to src/www/app/directive/p-handle/template/context/Empty.html diff --git a/www/app/directive/p-handle/template/context/IVar.html b/src/www/app/directive/p-handle/template/context/IVar.html similarity index 100% rename from www/app/directive/p-handle/template/context/IVar.html rename to src/www/app/directive/p-handle/template/context/IVar.html diff --git a/www/app/directive/p-handle/template/context/TCons.html b/src/www/app/directive/p-handle/template/context/TCons.html similarity index 100% rename from www/app/directive/p-handle/template/context/TCons.html rename to src/www/app/directive/p-handle/template/context/TCons.html diff --git a/www/app/directive/p-handle/template/context/TVar.html b/src/www/app/directive/p-handle/template/context/TVar.html similarity index 100% rename from www/app/directive/p-handle/template/context/TVar.html rename to src/www/app/directive/p-handle/template/context/TVar.html diff --git a/www/app/directive/p-handle/template/context/Var.html b/src/www/app/directive/p-handle/template/context/Var.html similarity index 100% rename from www/app/directive/p-handle/template/context/Var.html rename to src/www/app/directive/p-handle/template/context/Var.html diff --git a/www/app/directive/p-handle/template/ctype/Arrow.html b/src/www/app/directive/p-handle/template/ctype/Arrow.html similarity index 100% rename from www/app/directive/p-handle/template/ctype/Arrow.html rename to src/www/app/directive/p-handle/template/ctype/Arrow.html diff --git a/www/app/directive/p-handle/template/ctype/Lift.html b/src/www/app/directive/p-handle/template/ctype/Lift.html similarity index 100% rename from www/app/directive/p-handle/template/ctype/Lift.html rename to src/www/app/directive/p-handle/template/ctype/Lift.html diff --git a/www/app/directive/p-handle/template/effect/WR.html b/src/www/app/directive/p-handle/template/effect/WR.html similarity index 100% rename from www/app/directive/p-handle/template/effect/WR.html rename to src/www/app/directive/p-handle/template/effect/WR.html diff --git a/www/app/directive/p-handle/template/exp/AnnoC.html b/src/www/app/directive/p-handle/template/exp/AnnoC.html similarity index 100% rename from www/app/directive/p-handle/template/exp/AnnoC.html rename to src/www/app/directive/p-handle/template/exp/AnnoC.html diff --git a/www/app/directive/p-handle/template/exp/AnnoE.html b/src/www/app/directive/p-handle/template/exp/AnnoE.html similarity index 100% rename from www/app/directive/p-handle/template/exp/AnnoE.html rename to src/www/app/directive/p-handle/template/exp/AnnoE.html diff --git a/www/app/directive/p-handle/template/exp/App.html b/src/www/app/directive/p-handle/template/exp/App.html similarity index 100% rename from www/app/directive/p-handle/template/exp/App.html rename to src/www/app/directive/p-handle/template/exp/App.html diff --git a/www/app/directive/p-handle/template/exp/Case.html b/src/www/app/directive/p-handle/template/exp/Case.html similarity index 100% rename from www/app/directive/p-handle/template/exp/Case.html rename to src/www/app/directive/p-handle/template/exp/Case.html diff --git a/www/app/directive/p-handle/template/exp/DefType.html b/src/www/app/directive/p-handle/template/exp/DefType.html similarity index 100% rename from www/app/directive/p-handle/template/exp/DefType.html rename to src/www/app/directive/p-handle/template/exp/DefType.html diff --git a/www/app/directive/p-handle/template/exp/Fix.html b/src/www/app/directive/p-handle/template/exp/Fix.html similarity index 100% rename from www/app/directive/p-handle/template/exp/Fix.html rename to src/www/app/directive/p-handle/template/exp/Fix.html diff --git a/www/app/directive/p-handle/template/exp/Force.html b/src/www/app/directive/p-handle/template/exp/Force.html similarity index 100% rename from www/app/directive/p-handle/template/exp/Force.html rename to src/www/app/directive/p-handle/template/exp/Force.html diff --git a/www/app/directive/p-handle/template/exp/Get.html b/src/www/app/directive/p-handle/template/exp/Get.html similarity index 100% rename from www/app/directive/p-handle/template/exp/Get.html rename to src/www/app/directive/p-handle/template/exp/Get.html diff --git a/www/app/directive/p-handle/template/exp/IfThenElse.html b/src/www/app/directive/p-handle/template/exp/IfThenElse.html similarity index 100% rename from www/app/directive/p-handle/template/exp/IfThenElse.html rename to src/www/app/directive/p-handle/template/exp/IfThenElse.html diff --git a/www/app/directive/p-handle/template/exp/Lam.html b/src/www/app/directive/p-handle/template/exp/Lam.html similarity index 100% rename from www/app/directive/p-handle/template/exp/Lam.html rename to src/www/app/directive/p-handle/template/exp/Lam.html diff --git a/www/app/directive/p-handle/template/exp/Let.html b/src/www/app/directive/p-handle/template/exp/Let.html similarity index 100% rename from www/app/directive/p-handle/template/exp/Let.html rename to src/www/app/directive/p-handle/template/exp/Let.html diff --git a/www/app/directive/p-handle/template/exp/NameFnApp.html b/src/www/app/directive/p-handle/template/exp/NameFnApp.html similarity index 100% rename from www/app/directive/p-handle/template/exp/NameFnApp.html rename to src/www/app/directive/p-handle/template/exp/NameFnApp.html diff --git a/www/app/directive/p-handle/template/exp/PrimApp.html b/src/www/app/directive/p-handle/template/exp/PrimApp.html similarity index 100% rename from www/app/directive/p-handle/template/exp/PrimApp.html rename to src/www/app/directive/p-handle/template/exp/PrimApp.html diff --git a/www/app/directive/p-handle/template/exp/Ret.html b/src/www/app/directive/p-handle/template/exp/Ret.html similarity index 100% rename from www/app/directive/p-handle/template/exp/Ret.html rename to src/www/app/directive/p-handle/template/exp/Ret.html diff --git a/www/app/directive/p-handle/template/exp/Split.html b/src/www/app/directive/p-handle/template/exp/Split.html similarity index 100% rename from www/app/directive/p-handle/template/exp/Split.html rename to src/www/app/directive/p-handle/template/exp/Split.html diff --git a/www/app/directive/p-handle/template/exp/Thunk.html b/src/www/app/directive/p-handle/template/exp/Thunk.html similarity index 100% rename from www/app/directive/p-handle/template/exp/Thunk.html rename to src/www/app/directive/p-handle/template/exp/Thunk.html diff --git a/www/app/directive/p-handle/template/exp/Unimp.html b/src/www/app/directive/p-handle/template/exp/Unimp.html similarity index 100% rename from www/app/directive/p-handle/template/exp/Unimp.html rename to src/www/app/directive/p-handle/template/exp/Unimp.html diff --git a/www/app/directive/p-handle/template/exp/Unpack.html b/src/www/app/directive/p-handle/template/exp/Unpack.html similarity index 100% rename from www/app/directive/p-handle/template/exp/Unpack.html rename to src/www/app/directive/p-handle/template/exp/Unpack.html diff --git a/www/app/directive/p-handle/template/exp/Unroll.html b/src/www/app/directive/p-handle/template/exp/Unroll.html similarity index 100% rename from www/app/directive/p-handle/template/exp/Unroll.html rename to src/www/app/directive/p-handle/template/exp/Unroll.html diff --git a/www/app/directive/p-handle/template/exp/__DebugLabel.html b/src/www/app/directive/p-handle/template/exp/__DebugLabel.html similarity index 100% rename from www/app/directive/p-handle/template/exp/__DebugLabel.html rename to src/www/app/directive/p-handle/template/exp/__DebugLabel.html diff --git a/www/app/directive/p-handle/template/index/Disj.html b/src/www/app/directive/p-handle/template/index/Disj.html similarity index 100% rename from www/app/directive/p-handle/template/index/Disj.html rename to src/www/app/directive/p-handle/template/index/Disj.html diff --git a/www/app/directive/p-handle/template/index/Empty.html b/src/www/app/directive/p-handle/template/index/Empty.html similarity index 100% rename from www/app/directive/p-handle/template/index/Empty.html rename to src/www/app/directive/p-handle/template/index/Empty.html diff --git a/www/app/directive/p-handle/template/index/FlatMap.html b/src/www/app/directive/p-handle/template/index/FlatMap.html similarity index 100% rename from www/app/directive/p-handle/template/index/FlatMap.html rename to src/www/app/directive/p-handle/template/index/FlatMap.html diff --git a/www/app/directive/p-handle/template/index/Lam.html b/src/www/app/directive/p-handle/template/index/Lam.html similarity index 100% rename from www/app/directive/p-handle/template/index/Lam.html rename to src/www/app/directive/p-handle/template/index/Lam.html diff --git a/www/app/directive/p-handle/template/index/Sing.html b/src/www/app/directive/p-handle/template/index/Sing.html similarity index 100% rename from www/app/directive/p-handle/template/index/Sing.html rename to src/www/app/directive/p-handle/template/index/Sing.html diff --git a/www/app/directive/p-handle/template/index/Var.html b/src/www/app/directive/p-handle/template/index/Var.html similarity index 100% rename from www/app/directive/p-handle/template/index/Var.html rename to src/www/app/directive/p-handle/template/index/Var.html diff --git a/www/app/directive/p-handle/template/kind/Type.html b/src/www/app/directive/p-handle/template/kind/Type.html similarity index 100% rename from www/app/directive/p-handle/template/kind/Type.html rename to src/www/app/directive/p-handle/template/kind/Type.html diff --git a/www/app/directive/p-handle/template/name/Num.html b/src/www/app/directive/p-handle/template/name/Num.html similarity index 100% rename from www/app/directive/p-handle/template/name/Num.html rename to src/www/app/directive/p-handle/template/name/Num.html diff --git a/www/app/directive/p-handle/template/nametm/Bin.html b/src/www/app/directive/p-handle/template/nametm/Bin.html similarity index 100% rename from www/app/directive/p-handle/template/nametm/Bin.html rename to src/www/app/directive/p-handle/template/nametm/Bin.html diff --git a/www/app/directive/p-handle/template/nametm/Lam.html b/src/www/app/directive/p-handle/template/nametm/Lam.html similarity index 100% rename from www/app/directive/p-handle/template/nametm/Lam.html rename to src/www/app/directive/p-handle/template/nametm/Lam.html diff --git a/www/app/directive/p-handle/template/nametm/Name.html b/src/www/app/directive/p-handle/template/nametm/Name.html similarity index 100% rename from www/app/directive/p-handle/template/nametm/Name.html rename to src/www/app/directive/p-handle/template/nametm/Name.html diff --git a/www/app/directive/p-handle/template/nametm/Var.html b/src/www/app/directive/p-handle/template/nametm/Var.html similarity index 100% rename from www/app/directive/p-handle/template/nametm/Var.html rename to src/www/app/directive/p-handle/template/nametm/Var.html diff --git a/www/app/directive/p-handle/template/primapp/NameBin.html b/src/www/app/directive/p-handle/template/primapp/NameBin.html similarity index 100% rename from www/app/directive/p-handle/template/primapp/NameBin.html rename to src/www/app/directive/p-handle/template/primapp/NameBin.html diff --git a/www/app/directive/p-handle/template/primapp/NatLt.html b/src/www/app/directive/p-handle/template/primapp/NatLt.html similarity index 100% rename from www/app/directive/p-handle/template/primapp/NatLt.html rename to src/www/app/directive/p-handle/template/primapp/NatLt.html diff --git a/www/app/directive/p-handle/template/primapp/RefThunk.html b/src/www/app/directive/p-handle/template/primapp/RefThunk.html similarity index 100% rename from www/app/directive/p-handle/template/primapp/RefThunk.html rename to src/www/app/directive/p-handle/template/primapp/RefThunk.html diff --git a/www/app/directive/p-handle/template/prop/Tt.html b/src/www/app/directive/p-handle/template/prop/Tt.html similarity index 100% rename from www/app/directive/p-handle/template/prop/Tt.html rename to src/www/app/directive/p-handle/template/prop/Tt.html diff --git a/www/app/directive/p-handle/template/sort/Nm.html b/src/www/app/directive/p-handle/template/sort/Nm.html similarity index 100% rename from www/app/directive/p-handle/template/sort/Nm.html rename to src/www/app/directive/p-handle/template/sort/Nm.html diff --git a/www/app/directive/p-handle/template/sort/NmArrow.html b/src/www/app/directive/p-handle/template/sort/NmArrow.html similarity index 100% rename from www/app/directive/p-handle/template/sort/NmArrow.html rename to src/www/app/directive/p-handle/template/sort/NmArrow.html diff --git a/www/app/directive/p-handle/template/sort/NmSet.html b/src/www/app/directive/p-handle/template/sort/NmSet.html similarity index 100% rename from www/app/directive/p-handle/template/sort/NmSet.html rename to src/www/app/directive/p-handle/template/sort/NmSet.html diff --git a/www/app/directive/p-handle/template/tcons/Bool.html b/src/www/app/directive/p-handle/template/tcons/Bool.html similarity index 100% rename from www/app/directive/p-handle/template/tcons/Bool.html rename to src/www/app/directive/p-handle/template/tcons/Bool.html diff --git a/www/app/directive/p-handle/template/tcons/D.html b/src/www/app/directive/p-handle/template/tcons/D.html similarity index 100% rename from www/app/directive/p-handle/template/tcons/D.html rename to src/www/app/directive/p-handle/template/tcons/D.html diff --git a/www/app/directive/p-handle/template/tcons/Nat.html b/src/www/app/directive/p-handle/template/tcons/Nat.html similarity index 100% rename from www/app/directive/p-handle/template/tcons/Nat.html rename to src/www/app/directive/p-handle/template/tcons/Nat.html diff --git a/www/app/directive/p-handle/template/tcons/Seq.html b/src/www/app/directive/p-handle/template/tcons/Seq.html similarity index 100% rename from www/app/directive/p-handle/template/tcons/Seq.html rename to src/www/app/directive/p-handle/template/tcons/Seq.html diff --git a/www/app/directive/p-handle/template/tcons/String.html b/src/www/app/directive/p-handle/template/tcons/String.html similarity index 100% rename from www/app/directive/p-handle/template/tcons/String.html rename to src/www/app/directive/p-handle/template/tcons/String.html diff --git a/www/app/directive/p-handle/template/tcons/User.html b/src/www/app/directive/p-handle/template/tcons/User.html similarity index 100% rename from www/app/directive/p-handle/template/tcons/User.html rename to src/www/app/directive/p-handle/template/tcons/User.html diff --git a/www/app/directive/p-handle/template/term/IdxTm.html b/src/www/app/directive/p-handle/template/term/IdxTm.html similarity index 100% rename from www/app/directive/p-handle/template/term/IdxTm.html rename to src/www/app/directive/p-handle/template/term/IdxTm.html diff --git a/www/app/directive/p-handle/template/term/NameTm.html b/src/www/app/directive/p-handle/template/term/NameTm.html similarity index 100% rename from www/app/directive/p-handle/template/term/NameTm.html rename to src/www/app/directive/p-handle/template/term/NameTm.html diff --git a/www/app/directive/p-handle/template/term/Type.html b/src/www/app/directive/p-handle/template/term/Type.html similarity index 100% rename from www/app/directive/p-handle/template/term/Type.html rename to src/www/app/directive/p-handle/template/term/Type.html diff --git a/www/app/directive/p-handle/template/type/Cons.html b/src/www/app/directive/p-handle/template/type/Cons.html similarity index 100% rename from www/app/directive/p-handle/template/type/Cons.html rename to src/www/app/directive/p-handle/template/type/Cons.html diff --git a/www/app/directive/p-handle/template/type/Exists.html b/src/www/app/directive/p-handle/template/type/Exists.html similarity index 100% rename from www/app/directive/p-handle/template/type/Exists.html rename to src/www/app/directive/p-handle/template/type/Exists.html diff --git a/www/app/directive/p-handle/template/type/Ident.html b/src/www/app/directive/p-handle/template/type/Ident.html similarity index 100% rename from www/app/directive/p-handle/template/type/Ident.html rename to src/www/app/directive/p-handle/template/type/Ident.html diff --git a/www/app/directive/p-handle/template/type/IdxApp.html b/src/www/app/directive/p-handle/template/type/IdxApp.html similarity index 100% rename from www/app/directive/p-handle/template/type/IdxApp.html rename to src/www/app/directive/p-handle/template/type/IdxApp.html diff --git a/www/app/directive/p-handle/template/type/IdxFn.html b/src/www/app/directive/p-handle/template/type/IdxFn.html similarity index 100% rename from www/app/directive/p-handle/template/type/IdxFn.html rename to src/www/app/directive/p-handle/template/type/IdxFn.html diff --git a/www/app/directive/p-handle/template/type/Nm.html b/src/www/app/directive/p-handle/template/type/Nm.html similarity index 100% rename from www/app/directive/p-handle/template/type/Nm.html rename to src/www/app/directive/p-handle/template/type/Nm.html diff --git a/www/app/directive/p-handle/template/type/Prod.html b/src/www/app/directive/p-handle/template/type/Prod.html similarity index 100% rename from www/app/directive/p-handle/template/type/Prod.html rename to src/www/app/directive/p-handle/template/type/Prod.html diff --git a/www/app/directive/p-handle/template/type/Rec.html b/src/www/app/directive/p-handle/template/type/Rec.html similarity index 100% rename from www/app/directive/p-handle/template/type/Rec.html rename to src/www/app/directive/p-handle/template/type/Rec.html diff --git a/www/app/directive/p-handle/template/type/Ref.html b/src/www/app/directive/p-handle/template/type/Ref.html similarity index 100% rename from www/app/directive/p-handle/template/type/Ref.html rename to src/www/app/directive/p-handle/template/type/Ref.html diff --git a/www/app/directive/p-handle/template/type/Sum.html b/src/www/app/directive/p-handle/template/type/Sum.html similarity index 100% rename from www/app/directive/p-handle/template/type/Sum.html rename to src/www/app/directive/p-handle/template/type/Sum.html diff --git a/www/app/directive/p-handle/template/type/Thk.html b/src/www/app/directive/p-handle/template/type/Thk.html similarity index 100% rename from www/app/directive/p-handle/template/type/Thk.html rename to src/www/app/directive/p-handle/template/type/Thk.html diff --git a/www/app/directive/p-handle/template/type/TypeApp.html b/src/www/app/directive/p-handle/template/type/TypeApp.html similarity index 100% rename from www/app/directive/p-handle/template/type/TypeApp.html rename to src/www/app/directive/p-handle/template/type/TypeApp.html diff --git a/www/app/directive/p-handle/template/type/TypeFn.html b/src/www/app/directive/p-handle/template/type/TypeFn.html similarity index 100% rename from www/app/directive/p-handle/template/type/TypeFn.html rename to src/www/app/directive/p-handle/template/type/TypeFn.html diff --git a/www/app/directive/p-handle/template/type/Unit.html b/src/www/app/directive/p-handle/template/type/Unit.html similarity index 100% rename from www/app/directive/p-handle/template/type/Unit.html rename to src/www/app/directive/p-handle/template/type/Unit.html diff --git a/www/app/directive/p-handle/template/type/Var.html b/src/www/app/directive/p-handle/template/type/Var.html similarity index 100% rename from www/app/directive/p-handle/template/type/Var.html rename to src/www/app/directive/p-handle/template/type/Var.html diff --git a/www/app/directive/p-handle/template/val/Bool.html b/src/www/app/directive/p-handle/template/val/Bool.html similarity index 100% rename from www/app/directive/p-handle/template/val/Bool.html rename to src/www/app/directive/p-handle/template/val/Bool.html diff --git a/www/app/directive/p-handle/template/val/Inj1.html b/src/www/app/directive/p-handle/template/val/Inj1.html similarity index 100% rename from www/app/directive/p-handle/template/val/Inj1.html rename to src/www/app/directive/p-handle/template/val/Inj1.html diff --git a/www/app/directive/p-handle/template/val/Inj2.html b/src/www/app/directive/p-handle/template/val/Inj2.html similarity index 100% rename from www/app/directive/p-handle/template/val/Inj2.html rename to src/www/app/directive/p-handle/template/val/Inj2.html diff --git a/www/app/directive/p-handle/template/val/Name.html b/src/www/app/directive/p-handle/template/val/Name.html similarity index 100% rename from www/app/directive/p-handle/template/val/Name.html rename to src/www/app/directive/p-handle/template/val/Name.html diff --git a/www/app/directive/p-handle/template/val/NameFn.html b/src/www/app/directive/p-handle/template/val/NameFn.html similarity index 100% rename from www/app/directive/p-handle/template/val/NameFn.html rename to src/www/app/directive/p-handle/template/val/NameFn.html diff --git a/www/app/directive/p-handle/template/val/Nat.html b/src/www/app/directive/p-handle/template/val/Nat.html similarity index 100% rename from www/app/directive/p-handle/template/val/Nat.html rename to src/www/app/directive/p-handle/template/val/Nat.html diff --git a/www/app/directive/p-handle/template/val/Pack.html b/src/www/app/directive/p-handle/template/val/Pack.html similarity index 100% rename from www/app/directive/p-handle/template/val/Pack.html rename to src/www/app/directive/p-handle/template/val/Pack.html diff --git a/www/app/directive/p-handle/template/val/Pair.html b/src/www/app/directive/p-handle/template/val/Pair.html similarity index 100% rename from www/app/directive/p-handle/template/val/Pair.html rename to src/www/app/directive/p-handle/template/val/Pair.html diff --git a/www/app/directive/p-handle/template/val/Roll.html b/src/www/app/directive/p-handle/template/val/Roll.html similarity index 100% rename from www/app/directive/p-handle/template/val/Roll.html rename to src/www/app/directive/p-handle/template/val/Roll.html diff --git a/www/app/directive/p-handle/template/val/ThunkAnon.html b/src/www/app/directive/p-handle/template/val/ThunkAnon.html similarity index 100% rename from www/app/directive/p-handle/template/val/ThunkAnon.html rename to src/www/app/directive/p-handle/template/val/ThunkAnon.html diff --git a/www/app/directive/p-handle/template/val/Unit.html b/src/www/app/directive/p-handle/template/val/Unit.html similarity index 100% rename from www/app/directive/p-handle/template/val/Unit.html rename to src/www/app/directive/p-handle/template/val/Unit.html diff --git a/www/app/directive/p-handle/template/val/Var.html b/src/www/app/directive/p-handle/template/val/Var.html similarity index 100% rename from www/app/directive/p-handle/template/val/Var.html rename to src/www/app/directive/p-handle/template/val/Var.html diff --git a/www/app/directive/refresh.directive.js b/src/www/app/directive/refresh.directive.js similarity index 100% rename from www/app/directive/refresh.directive.js rename to src/www/app/directive/refresh.directive.js diff --git a/www/app/factory/api.factory.js b/src/www/app/factory/api.factory.js similarity index 100% rename from www/app/factory/api.factory.js rename to src/www/app/factory/api.factory.js diff --git a/www/app/factory/cursor.factory.js b/src/www/app/factory/cursor.factory.js similarity index 100% rename from www/app/factory/cursor.factory.js rename to src/www/app/factory/cursor.factory.js diff --git a/www/app/main.js b/src/www/app/main.js similarity index 100% rename from www/app/main.js rename to src/www/app/main.js diff --git a/www/app/module.js b/src/www/app/module.js similarity index 100% rename from www/app/module.js rename to src/www/app/module.js diff --git a/www/app/service/parse.service.js b/src/www/app/service/parse.service.js similarity index 100% rename from www/app/service/parse.service.js rename to src/www/app/service/parse.service.js diff --git a/www/app/service/parser.js b/src/www/app/service/parser.js similarity index 100% rename from www/app/service/parser.js rename to src/www/app/service/parser.js diff --git a/src/www/app/service/rust.service.js b/src/www/app/service/rust.service.js new file mode 100644 index 00000000..8bdec88c --- /dev/null +++ b/src/www/app/service/rust.service.js @@ -0,0 +1,12 @@ +var wasm = require('../../../rust/src/main.rs'); + +module.exports = function RustService() +{ + wasm.initialize({noExitRuntime: true}) + .then(module => + { + var test = module.cwrap('test', 'number', ['string']); + + + }); +} \ No newline at end of file diff --git a/www/app/service/storage.service.js b/src/www/app/service/storage.service.js similarity index 100% rename from www/app/service/storage.service.js rename to src/www/app/service/storage.service.js diff --git a/www/style/components.css b/src/www/style/components.css similarity index 100% rename from www/style/components.css rename to src/www/style/components.css diff --git a/www/style/main.css b/src/www/style/main.css similarity index 100% rename from www/style/main.css rename to src/www/style/main.css diff --git a/www/style/terms.css b/src/www/style/terms.css similarity index 100% rename from www/style/terms.css rename to src/www/style/terms.css diff --git a/view/common/head.ejs b/src/www/view/common/head.ejs similarity index 100% rename from view/common/head.ejs rename to src/www/view/common/head.ejs diff --git a/view/error.ejs b/src/www/view/error.ejs similarity index 100% rename from view/error.ejs rename to src/www/view/error.ejs diff --git a/view/index.ejs b/src/www/view/index.ejs similarity index 100% rename from view/index.ejs rename to src/www/view/index.ejs diff --git a/webpack.config.js b/webpack.config.js index 113fd3da..fb9b757c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,20 +1,19 @@ var webpack = require('webpack'); -// var HtmlWebpackPlugin = require('html-webpack-plugin'); var ExtractTextPlugin = require('extract-text-webpack-plugin'); var CopyPlugin = require('copy-webpack-plugin'); var ENV = process.env.npm_lifecycle_event; var isBuild = ENV === 'build'; -var srcPath = __dirname + '/www'; +var wwwPath = __dirname + '/src/www'; +var rustPath = __dirname + '/src/rust'; var destPath = __dirname + '/dist'; -// var rustPath = __dirname + '/lib'; var config = { entry: { - app: srcPath + '/app/main.js', - module: srcPath + '/app/module.js', + app: wwwPath + '/app/main.js', + module: wwwPath + '/app/module.js', }, output: { path: destPath, @@ -38,7 +37,7 @@ var config = { }, { test: /\.(png|jpg|ico)$/, loader: 'file-loader', - }/*, { + }, { test: /\.rs$/, use: { loader: 'rust-wasm-loader', @@ -46,7 +45,7 @@ var config = { path: rustPath, } } - }*/], + }], }, plugins: [ new webpack.HotModuleReplacementPlugin(), @@ -54,18 +53,13 @@ var config = { // new webpack.optimize.UglifyJsPlugin({ // sourceMap: true, // }), - // new HtmlWebpackPlugin({ - // // chunks: ['app'], - // template: srcPath + '/../view/webapp.ejs', - // inject: 'head', - // }), new ExtractTextPlugin('bundle/[name].css'), ], }; if(isBuild) { - config.plugins.push(new CopyPlugin([{from: srcPath}])); + config.plugins.push(new CopyPlugin([{from: wwwPath}])); } module.exports = config; \ No newline at end of file diff --git a/www/app/service/engine.service.js b/www/app/service/engine.service.js deleted file mode 100644 index bda7cde5..00000000 --- a/www/app/service/engine.service.js +++ /dev/null @@ -1,6 +0,0 @@ -// var tgt_ast = require('../../../lib/iodyn-lang.rust/src/tgt_ast.rs'); - -module.exports = function EngineService() -{ - -} \ No newline at end of file