Update elm implementation, fix keywords and metadata, merge eval

impls/elm/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -9,10 +9,8 @@ MAINTAINER Joel Martin <[email protected]>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
-
-# Some typical implementation and test requirements
-RUN apt-get -y install curl libreadline-dev libedit-dev
+RUN apt-get -y install make python3
+RUN ln -s /usr/bin/python3 /usr/local/bin/python
 
 RUN mkdir -p /mal
 WORKDIR /mal
@@ -21,18 +19,7 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-# For building node modules
-RUN apt-get -y install g++
-
-# Add nodesource apt repo config for 10.x stable
-RUN apt-get -y install gnupg
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
-
-# Install nodejs
-RUN apt-get -y install nodejs
-
-# For pulling elm packages
-RUN apt-get -y install netbase
+RUN apt-get -y install g++ libreadline-dev npm
 
 ENV HOME /mal
 ENV NPM_CONFIG_CACHE /mal/.npm

impls/elm/Makefile

@@ -1,28 +1,24 @@
-SOURCES = step0_repl.elm step1_read_print.elm step2_eval.elm \
- step3_env.elm step4_if_fn_do.elm step5_tco.elm step6_file.elm \
- step7_quote.elm step8_macros.elm step9_try.elm stepA_mal.elm
+SOURCES = src/Step0_repl.elm src/Step1_read_print.elm src/Step2_eval.elm src/\
+ Step3_env.elm src/Step4_if_fn_do.elm src/Step5_tco.elm src/Step6_file.elm src/\
+ Step7_quote.elm src/Step8_macros.elm src/Step9_try.elm src/StepA_mal.elm
 
-BINS = $(SOURCES:%.elm=%.js)
+BINS = $(SOURCES:src/Step%.elm=step%.js)
 
-ELM_MAKE = node_modules/.bin/elm-make
-ELM_PACKAGE = node_modules/.bin/elm-package
+ELM = node_modules/.bin/elm
 
-all: node_modules elm_packages $(BINS)
+all: node_modules $(BINS)
 
 node_modules:
  npm install
 
-elm_packages:
- $(ELM_PACKAGE) install -y
+step%.js: src/Step%.elm node_modules
+ $(ELM) make $< --output $@
 
-%.js: %.elm node_modules elm_packages
- $(ELM_MAKE) $(@:%.js=%.elm) --output $@
-
-STEP0_SOURCES = IO.elm
-STEP1_SOURCES = $(STEP0_SOURCES) Reader.elm Printer.elm Utils.elm Types.elm Env.elm
+STEP0_SOURCES = src/IO.elm
+STEP1_SOURCES = $(STEP0_SOURCES) src/Reader.elm src/Printer.elm src/Utils.elm src/Types.elm src/Env.elm
 STEP2_SOURCES = $(STEP1_SOURCES)
 STEP3_SOURCES = $(STEP2_SOURCES)
-STEP4_SOURCES = $(STEP3_SOURCES) Core.elm Eval.elm
+STEP4_SOURCES = $(STEP3_SOURCES) src/Core.elm src/Eval.elm
 
 step0_repl.js: $(STEP0_SOURCES)
 step1_read_print.js: $(STEP1_SOURCES)

impls/elm/bootstrap.js

@@ -6,8 +6,10 @@ var fs = require('fs');
 var args = process.argv.slice(2);
 var mod = require('./' + args[0]);
 
-var app = mod.Main.worker({
- args: args.slice(1)
+var app = mod.Elm['S' + args[0].slice(1)].init({
+ flags: {
+ args: args.slice(1)
+ }
 });
 
 // Hook up the writeLine and readLine ports of the app.
@@ -22,11 +24,13 @@ app.ports.readLine.subscribe(function(prompt) {
 });
 
 // Read the contents of a file.
-app.ports.readFile.subscribe(function(filename) {
- try {
- var contents = fs.readFileSync(filename, 'utf8');
- app.ports.input.send({"tag": "fileRead", "contents": contents});
- } catch (e) {
- app.ports.input.send({"tag": "exception", "message": e.message});
- }
-});
+if ('readFile' in app.ports) {
+ app.ports.readFile.subscribe(function(filename) {
+ try {
+ var contents = fs.readFileSync(filename, 'utf8');
+ app.ports.input.send({"tag": "fileRead", "contents": contents});
+ } catch (e) {
+ app.ports.input.send({"tag": "exception", "message": e.message});
+ }
+ });
+}

impls/elm/elm.json

@@ -0,0 +1,21 @@
+{
+ "type": "application",
+ "source-directories": [
+ "src"
+ ],
+ "elm-version": "0.19.1",
+ "dependencies": {
+ "direct": {
+ "elm/core": "1.0.5",
+ "elm/json": "1.1.3",
+ "elm/parser": "1.1.0",
+ "elm/regex": "1.0.0",
+ "elm/time": "1.0.0"
+ },
+ "indirect": {}
+ },
+ "test-dependencies": {
+ "direct": {},
+ "indirect": {}
+ }
+}

impls/elm/package.json

@@ -7,7 +7,7 @@
  "ffi-napi": "2.4.x"
  },
  "devDependencies": {
- "elm": "^0.18.0"
+ "elm": "^0.19.1"
  },
  "scripts": {
  "test": "echo \"Error: no test specified\" && exit 1"

impls/elm/run

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 exec node $(dirname $0)/bootstrap.js ${STEP:-stepA_mal} "${@}"