Add very basic support for "J"

JRaspass · JRaspass · commit 00660dff64de · 2018-08-09T00:11:21.000+01:00
Updates #48
diff --git a/assets/hole.css b/assets/hole.css
@@ -147,7 +147,7 @@ h3 {
 #tabs {
     clear: both;
     display: grid;
-    grid-template-columns: repeat(10, 1fr);
+    grid-template-columns: repeat(11, 1fr);
     margin-top: 10px;
     position: relative;
        -moz-user-select: none;
@@ -188,7 +188,7 @@ h3 {
 
 @keyframes spin { 100% { transform: rotate(1turn) } }
 
-@media(max-width: 450px) { #tabs { grid-template-columns: repeat(5, 1fr) } }
+@media(max-width: 450px) { #tabs { grid-template-columns: repeat(6, 1fr) } }
 
 @media(max-width: 970px) {
     #tabs a {
diff --git a/assets/hole.js b/assets/hole.js
@@ -24,8 +24,8 @@ onload = function() {
     let editors = [];
 
     for (let langName of [
-        'Bash', 'Haskell', 'JavaScript', 'Lisp', 'Lua',
-        'Perl', 'Perl 6', 'PHP', 'Python', 'Ruby',
+        'Bash', 'Haskell', 'J', 'JavaScript', 'Lisp',
+        'Lua', 'Perl', 'Perl 6', 'PHP', 'Python', 'Ruby',
     ]) {
         let lang = langName.replace(/ /, '').toLowerCase();
 
@@ -70,7 +70,7 @@ onload = function() {
 
     ( onhashchange = function() {
         // Kick 'em to Perl 6 if we don't know the chosen language.
-        if (!/^#(?:bash|haskell|javascript|lisp|lua|perl6?|php|python|ruby)$/.exec(location.hash))
+        if (!/^#(?:bash|haskell|j|javascript|lisp|lua|perl6?|php|python|ruby)$/.exec(location.hash))
             location.hash = 'perl6';
 
         let lang = location.hash.slice(1);
diff --git a/assets/user.css b/assets/user.css
@@ -102,11 +102,11 @@ tr {
 
 #matrix tr:first-child th:nth-child(2)  { background-image: svg(bash#222)       }
 #matrix tr:first-child th:nth-child(3)  { background-image: svg(haskell#222)    }
-#matrix tr:first-child th:nth-child(4)  { background-image: svg(javascript#222) }
-#matrix tr:first-child th:nth-child(5)  { background-image: svg(lisp#222)       }
-#matrix tr:first-child th:nth-child(6)  { background-image: svg(lua#222)        }
-#matrix tr:first-child th:nth-child(7)  { background-image: svg(perl#222)       }
-#matrix tr:first-child th:nth-child(8)  { background-image: svg(perl6#222)      }
-#matrix tr:first-child th:nth-child(9)  { background-image: svg(php#222)        }
-#matrix tr:first-child th:nth-child(10) { background-image: svg(python#222)     }
-#matrix tr:first-child th:nth-child(11) { background-image: svg(ruby#222)       }
+#matrix tr:first-child th:nth-child(5)  { background-image: svg(javascript#222) }
+#matrix tr:first-child th:nth-child(6)  { background-image: svg(lisp#222)       }
+#matrix tr:first-child th:nth-child(7)  { background-image: svg(lua#222)        }
+#matrix tr:first-child th:nth-child(8)  { background-image: svg(perl#222)       }
+#matrix tr:first-child th:nth-child(9)  { background-image: svg(perl6#222)      }
+#matrix tr:first-child th:nth-child(10) { background-image: svg(php#222)        }
+#matrix tr:first-child th:nth-child(11) { background-image: svg(python#222)     }
+#matrix tr:first-child th:nth-child(12) { background-image: svg(ruby#222)       }
diff --git a/build-langs b/build-langs
@@ -13,7 +13,7 @@ for name in Bash Haskell JavaScript Lisp Lua Perl Perl\ 6 PHP Python Ruby; do
     mkdir $lang/rootfs
 
     # Tag the builder stage so "docker system prune" won't remove it.
-    if [ $lang != haskell ]; then
+    if [ $lang != haskell -a $lang != j ]; then
         docker build --target builder -t code-golf-$lang-builder $lang
     fi
 
diff --git a/containers/j/Dockerfile b/containers/j/Dockerfile
@@ -0,0 +1,31 @@
+FROM alpine:edge
+
+RUN apk add --no-cache bash binutils clang-dev curl fts-dev gcc libedit-dev make musl-dev
+
+RUN curl -L https://github.com/jsoftware/jsource/archive/90adff2.tar.gz | tar xzf -
+
+RUN mkdir -p ~/git ~/jbld/j64/bin                                  \
+ && mv jsource-* ~/git/jsource                                     \
+ && cd ~/git/jsource                                               \
+ && echo '#define jversion "807"'                > jsrc/jversion.h \
+ && echo '#define jplatform "linux"'            >> jsrc/jversion.h \
+ && echo '#define jtype "build"'                >> jsrc/jversion.h \
+ && echo '#define jlicense "GPL3"'              >> jsrc/jversion.h \
+ && echo '#define jbuilder "www.jsoftware.com"' >> jsrc/jversion.h \
+ && . make/jvars.sh                                                \
+ && make/build_jconsole.sh j64                                     \
+ && make/build_libj.sh j64
+
+RUN apk del --no-cache bash binutils clang-dev curl fts-dev gcc make musl-dev
+
+RUN mkdir /j                       \
+ && mv ~/git/jsource/jlibrary/* /j \
+ && mv /root/jbld/j64/bin/* /j/bin
+
+RUN echo -e "#!/bin/sh -e\n\
+\n\
+/bin/cat - > /tmp/code.ijs\n\
+\n\
+exec /j/bin/jconsole /tmp/code.ijs \"\$@\"" > /usr/bin/j && chmod +x /usr/bin/j
+
+ENTRYPOINT ["echo", "807"]
diff --git a/db.sql b/db.sql
@@ -75,6 +75,7 @@ CREATE TYPE public.hole AS ENUM (
 CREATE TYPE public.lang AS ENUM (
     'bash',
     'haskell',
+    'j',
     'javascript',
     'lisp',
     'lua',
diff --git a/routes/solution.go b/routes/solution.go
@@ -133,6 +133,8 @@ func runCode(hole, lang, code string, args []string) (string, string) {
 		cmd.Args = []string{"/usr/bin/bash", "-s", "-"}
 	case "haskell", "javascript", "php":
 		cmd.Args = []string{"/usr/bin/" + lang, "--"}
+	case "j":
+		cmd.Args = []string{"/usr/bin/j"}
 	case "perl6":
 		cmd.Args = []string{
 			"/usr/bin/moar",
diff --git a/routes/types.go b/routes/types.go
@@ -6,6 +6,7 @@ type Hole struct{ ID, Name, Difficulty, Preamble string }
 var langs = []Lang{
 	{"bash", "Bash"},
 	{"haskell", "Haskell"},
+	{"j", "J"},
 	{"javascript", "JavaScript"},
 	{"lisp", "Lisp"},
 	{"lua", "Lua"},
