Merge branch 'feature/graal-main'

.github/workflows/deploy.yml

@@ -1,5 +1,7 @@
 name: deploy
 
+env:
+  GRAAL_VERSION: "20.0.0.java11"
 # on:
 #   push:
 #     tags:
@@ -159,7 +161,7 @@ jobs:
       - uses: actions/cache@v1
         with:
           path: /Users/runner/hostedtoolcache/GraalVM
-          key: ${{ runner.os }}-graal-19.2.1
+          key: ${{ runner.os }}-graal-${{ env.GRAAL_VERSION }}
           restore-keys: |
             ${{ runner.os }}-graal-
 
@@ -184,9 +186,9 @@ jobs:
           path: .
 
       - name: Prepare GraalVM
-        uses: DeLaGuardo/setup-graalvm@1.0
+        uses: DeLaGuardo/setup-graalvm@3
         with:
-          graalvm-version: "19.2.1"
+          graalvm-version: ${{ env.GRAAL_VERSION }}
 
       - name: Install native-image
         run: gu install native-image
@@ -234,7 +236,7 @@ jobs:
       - uses: actions/cache@v1
         with:
           path: /opt/hostedtoolcache/GraalVM
-          key: ${{ runner.os }}-graal-19.2.1
+          key: ${{ runner.os }}-graal-${{ env.GRAAL_VERSION }}
           restore-keys: |
             ${{ runner.os }}-graal-
 
@@ -259,9 +261,9 @@ jobs:
           path: .
 
       - name: Prepare GraalVM
-        uses: DeLaGuardo/setup-graalvm@1.0
+        uses: DeLaGuardo/setup-graalvm@3
         with:
-          graalvm-version: "19.2.1"
+          graalvm-version: ${{ env.GRAAL_VERSION }}
 
       - name: Install native-image
         run: gu install native-image

boot.properties

@@ -1,7 +1,7 @@
 #http://boot-clj.com
 #Wed Aug 22 17:16:41 CEST 2018
 BOOT_CLOJURE_NAME=org.clojure/clojure
-BOOT_CLOJURE_VERSION=1.10.1
+BOOT_CLOJURE_VERSION=1.10.2-alpha1
 BOOT_VERSION=2.8.1
 
 # https://github.com/boot-clj/boot/wiki/JVM-Options#dont-swallow-stacktraces

build.boot

@@ -3,7 +3,7 @@
 (set-env!
   :resource-paths #{"resources"}
   :dependencies
-  '[[org.clojure/clojure "1.10.1"]
+  '[[org.clojure/clojure "1.10.2-alpha1"]
     [seancorfield/boot-tools-deps "0.4.6" #_:scope #_"provided"]])
 
 (require '[boot-tools-deps.core :refer [deps]])

deps.edn

@@ -1,5 +1,5 @@
 {:deps
- {org.clojure/clojure {:mvn/version "1.10.1"}
+ {org.clojure/clojure {:mvn/version "1.10.2-alpha1"}
   org.clojure/tools.reader {:mvn/version "1.3.2"}
   org.clojure/data.json {:mvn/version "0.2.6"}
   com.cemerick/pomegranate {:mvn/version "1.1.0"}

project.clj

@@ -3,14 +3,15 @@
      #=(slurp "resources/CLOSH_VERSION"))
   :description "Closh with SCI"
   :source-paths ["src/jvm" "src/closh-sci" "src/common" "resources"]
-  :dependencies [[org.clojure/clojure "1.10.1"]
+  :dependencies [[org.clojure/clojure "1.10.2-alpha1"]
                  [borkdude/sci "0.0.11"]
-                 [borkdude/edamame "0.0.9"]
+                 [borkdude/edamame "0.0.10"]
                  [org.clojure/tools.reader "1.3.2"]
                  [squarepeg "0.6.1"]
                  [org.clojure/java.jdbc "0.7.9"]
                  [com.bhauman/rebel-readline "0.1.4"]
-                 [org.jline/jline-reader "3.5.1"]]
+                 [org.jline/jline-reader "3.5.1"]
+                 [fipp "0.6.22"]]
   :global-vars {*warn-on-reflection* true}
   :main closh.zero.frontend.sci
   :profiles {:uberjar {:global-vars {*assert* false}

scripts/compile

@@ -15,21 +15,6 @@ if [ -z "$NATIVE_IMAGE" ]; then
   NATIVE_IMAGE="$GRAALVM_HOME/bin/native-image"
 fi
 
-#CLOSH_VERSION=$(jq ".version" package.json)
-
-# We also need to AOT sci, else something didn't work in the Mac build on CircleCI
-# See https://github.com/oracle/graal/issues/1613
-( cd /tmp;  git clone https://github.com/borkdude/sci 2> /dev/null || true )
-mkdir -p src/sci
-cp -R /tmp/sci/src/* src
-
-
-# npm run uberjar-sci
-
-# "-H:IncludeResources=CLOSH_VERSION" \
-# "-H:IncludeResources=SCI_VERSION" \
-# --initialize-at-build-time=clojure,clojure.spec.gen.alpha,clojure.test.check,clojure.test.check.generators,clojure.test.check.properties \
-
 export __CLOSH_USE_SCI_EVAL__=true
 
 use_lein=false # set to true to build uberjar with project.clj instead of boot

src/closh-sci/closh/zero/platform/clojure_compiler.clj

@@ -1,9 +1,8 @@
 (ns closh.zero.platform.clojure-compiler
-  (:refer-clojure :exclude [load load-file eval])
+  (:refer-clojure :exclude [load load-file])
   (:require [closh.zero.reader :as reader]
             [closh.zero.parser]
             [closh.zero.compiler]
-            #_[closh.zero.platform.eval :as eval]
             [clojure.tools.reader.reader-types :as r])
   (:import (clojure.lang Compiler RT LineNumberingPushbackReader LispReader$ReaderException Compiler$CompilerException)
            (java.io File FileInputStream InputStreamReader StringReader PipedWriter PipedReader PushbackReader BufferedReader)))

src/closh-sci/closh/zero/platform/clojure_platform.clj

@@ -0,0 +1,54 @@
+(ns closh.zero.platform.clojure-platform
+  (:refer-clojure :exclude [eval read load-reader read+string])
+  (:require [closh.zero.reader :as reader]
+            [closh.zero.parser]
+            [closh.zero.compiler]
+            [closh.zero.platform.eval :as eval]
+            [closh.zero.platform.clojure-compiler :as compiler])
+  (:import (clojure.lang LineNumberingPushbackReader)))
+
+(def read reader/read)
+
+(defn eval [form]
+  (eval/eval
+   (closh.zero.compiler/compile-interactive
+    (closh.zero.parser/parse form))))
+
+;; Copied from clojure/core
+(defn read+string
+  "Like read, and taking the same args. stream must be a LineNumberingPushbackReader.
+  Returns a vector containing the object read and the (whitespace-trimmed) string read."
+  {:added "1.10"}
+  ([] (read+string *in*))
+  ([stream] (read+string stream true nil))
+  ([stream eof-error? eof-value] (read+string stream eof-error? eof-value false))
+  ([^clojure.lang.LineNumberingPushbackReader stream eof-error? eof-value recursive?]
+   (try
+     (.captureString stream)
+     (let [o (read stream eof-error? eof-value recursive?)
+           s (.trim (.getString stream))]
+       [o s])
+     (catch Throwable ex
+       (.getString stream)
+       (throw ex))))
+  ([opts ^clojure.lang.LineNumberingPushbackReader stream]
+   (try
+     (.captureString stream)
+     (let [o (read opts stream)
+           s (.trim (.getString stream))]
+       [o s])
+     (catch Throwable ex
+       (.getString stream)
+       (throw ex)))))
+
+(defn load-reader [rdr]
+  (compiler/load rdr eval))
+
+(defn compiler-load-file [path]
+  (compiler/load-file path eval))
+
+;; TODO: Does it make sense to reimplement this?
+(defn rt-load-resource-script [path]
+  (binding [*out* *err*]
+    (println "rt-load-resource-script not implemented:" path))
+  (System/exit 1))