Add initial Nim support

JRaspass · JRaspass · commit 269ff682ea7e · 2019-05-19T21:13:21.000+01:00
Still needs syntax highlighting and a new version build from source but it works, which is a start :-) Updates #86
diff --git a/assets/common.css b/assets/common.css
@@ -205,6 +205,7 @@ tr.me              { background: #5cf }
 .julia      { background: svg(julia#000)      center right 7px / 26px no-repeat }
 .lisp       { background: svg(lisp#000)       center right 7px / 26px no-repeat }
 .lua        { background: svg(lua#000)        center right 7px / 26px no-repeat }
+.nim        { background: svg(nim#000)        center right 7px / 26px no-repeat }
 .perl       { background: svg(perl#000)       center right 7px / 26px no-repeat }
 .perl6      { background: svg(perl6#000)      center right 7px / 26px no-repeat }
 .php        { background: svg(php#000)        center right 7px / 26px no-repeat }
diff --git a/assets/hole.css b/assets/hole.css
@@ -258,7 +258,7 @@ main nav a:nth-child(3):before {
 #tabs {
     clear: both;
     display: grid;
-    grid-template-columns: repeat(14, 1fr);
+    grid-template-columns: repeat(15, 1fr);
     position: relative;
        -moz-user-select: none;
         -ms-user-select: none;
@@ -295,6 +295,7 @@ main nav a:nth-child(3):before {
 #tabs a[href="#julia"]      { background-image: svg(julia#fff)      }
 #tabs a[href="#lisp"]       { background-image: svg(lisp#fff)       }
 #tabs a[href="#lua"]        { background-image: svg(lua#fff)        }
+#tabs a[href="#nim"]        { background-image: svg(nim#fff)        }
 #tabs a[href="#perl"]       { background-image: svg(perl#fff)       }
 #tabs a[href="#perl6"]      { background-image: svg(perl6#fff)      }
 #tabs a[href="#php"]        { background-image: svg(php#fff)        }
@@ -303,4 +304,4 @@ main nav a:nth-child(3):before {
 
 @keyframes spin { 100% { transform: rotate(1turn) } }
 
-@media(max-width: 450px) { #tabs { grid-template-columns: repeat(7, 1fr) } }
+@media(max-width: 500px) { #tabs { grid-template-columns: repeat(5, 1fr) } }
diff --git a/assets/hole.js b/assets/hole.js
@@ -50,8 +50,8 @@ onload = function() {
     let editors = [];
 
     for (let langName of [
-        'Bash', 'Brainfuck', 'C', 'Haskell', 'J', 'JavaScript', 'Julia', 'Lisp', 'Lua',
-        'Perl', 'Perl 6', 'PHP', 'Python', 'Ruby',
+        'Bash', 'Brainfuck', 'C', 'Haskell', 'J', 'JavaScript', 'Julia',
+        'Lisp', 'Lua', 'Nim', 'Perl', 'Perl 6', 'PHP', 'Python', 'Ruby',
     ]) {
         let lang = langName.replace(/ /, '').toLowerCase();
 
@@ -94,7 +94,7 @@ onload = function() {
 
     ( onhashchange = function() {
         // Kick 'em to Perl 6 if we don't know the chosen language.
-        if (!/^#(?:bash|brainfuck|c|haskell|j|javascript|julia|lisp|lua|perl6?|php|python|ruby)$/.exec(location.hash))
+        if (!/^#(?:bash|brainfuck|c|haskell|j|javascript|julia|lisp|lua|nim|perl6?|php|python|ruby)$/.exec(location.hash))
             location.hash = 'perl6';
 
         let lang = location.hash.slice(1);
diff --git a/assets/includes/nim.svg b/assets/includes/nim.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 89 61"><path d="M44.853 0s-3.41 2.695-6.887 5.372c-3.576-.114-10.59.687-14.392 2.07a85.152 85.152 0 0 1-6.577-4.668s-2.63 4.523-4.283 7.177c-2.452 1.304-4.913 2.77-7.107 4.71A390.72 390.72 0 0 1 0 12.372c3.38 6.818 5.651 13.644 11.831 17.746 9.84-15.54 55.56-14.107 65.603-.088 6.49-3.385 9.014-10.67 11.566-17.392-.28.092-3.753 1.255-6.004 2.113-1.344-1.463-4.512-3.713-6.313-4.8-1.708-3.127-4.194-7.352-4.194-7.352s-2.944 2.19-6.357 4.579c-4.61-.851-10.187-1.885-14.878-1.63C48.062 2.924 44.854 0 44.854 0zM3.494 26.859l8.117 19.656c14.096 18.598 50.092 19.89 65.784.36 3.714-8.368 8.724-20.13 8.724-20.13-4.026 5.965-10.578 10.082-14.613 12.3-2.868 1.57-9.484 2.52-9.484 2.52l-17.37-9.001-17.469 8.82s-6.528-1.048-9.483-2.43C11.735 35.77 7.724 32.01 3.494 26.86" fill="FILL"/></svg>
diff --git a/assets/user.css b/assets/user.css
@@ -109,11 +109,12 @@ tr {
 #matrix tr:first-child th:nth-child(8)  { background-image: svg(julia#222)      }
 #matrix tr:first-child th:nth-child(9)  { background-image: svg(lisp#222)       }
 #matrix tr:first-child th:nth-child(10) { background-image: svg(lua#222)        }
-#matrix tr:first-child th:nth-child(11) { background-image: svg(perl#222)       }
-#matrix tr:first-child th:nth-child(12) { background-image: svg(perl6#222)      }
-#matrix tr:first-child th:nth-child(13) { background-image: svg(php#222)        }
-#matrix tr:first-child th:nth-child(14) { background-image: svg(python#222)     }
-#matrix tr:first-child th:nth-child(15) { background-image: svg(ruby#222)       }
+#matrix tr:first-child th:nth-child(11) { background-image: svg(nim#222)        }
+#matrix tr:first-child th:nth-child(12) { background-image: svg(perl#222)       }
+#matrix tr:first-child th:nth-child(13) { background-image: svg(perl6#222)      }
+#matrix tr:first-child th:nth-child(14) { background-image: svg(php#222)        }
+#matrix tr:first-child th:nth-child(15) { background-image: svg(python#222)     }
+#matrix tr:first-child th:nth-child(16) { background-image: svg(ruby#222)       }
 
 #matrix,
 #trophies {
diff --git a/build-langs b/build-langs
@@ -10,6 +10,7 @@ declare -A urls=(
     ["julia"]="//julialang.org"
     ["lisp"]="//clisp.sourceforge.io"
     ["lua"]="//www.lua.org"
+    ["nim"]="//nim-lang.org"
     ["perl"]="//www.perl.org"
     ["perl6"]="//perl6.org"
     ["php"]="//secure.php.net"
@@ -21,7 +22,7 @@ docker pull alpine:edge
 
 cd langs
 
-for name in Bash Brainfuck C Haskell J JavaScript Julia Lisp Lua Perl Perl\ 6 PHP Python Ruby; do
+for name in Bash Brainfuck C Haskell J JavaScript Julia Lisp Lua Nim Perl Perl\ 6 PHP Python Ruby; do
     lang=${name,,}      # lowercase
     lang=${lang// /}    # trim space
 
@@ -30,14 +31,16 @@ for name in Bash Brainfuck C Haskell J JavaScript Julia Lisp Lua Perl Perl\ 6 PH
     mkdir $lang/rootfs
 
     # Tag the builder stage so "docker system prune" won't remove it.
-    if [ $lang != haskell ]; then
+    if [ $lang != haskell -a $lang != nim ]; then
         docker build --target builder -t quay.io/jraspass/$lang-builder $lang
     fi
 
     docker build -t code-golf-$lang $lang
 
     if [ $lang = j ]; then
         ver=`echo echo JLIB | docker run --rm --tmpfs /tmp -i code-golf-j`
+    elif [ $lang = nim ]; then
+        ver=`echo echo NimVersion | docker run --rm --tmpfs /tmp -i code-golf-nim`
     else
         ver=`docker run --rm code-golf-$lang`
     fi
diff --git a/db.sql b/db.sql
@@ -72,6 +72,7 @@ CREATE TYPE public.lang AS ENUM (
     'julia',
     'lisp',
     'lua',
+    'nim',
     'perl',
     'perl6',
     'php',
diff --git a/langs/nim/Dockerfile b/langs/nim/Dockerfile
@@ -0,0 +1,6 @@
+FROM alpine:edge
+
+RUN apk add -X http://dl-cdn.alpinelinux.org/alpine/edge/testing --no-cache \
+    musl-dev nim tcc
+
+ENTRYPOINT ["/usr/bin/nim", "--cc:tcc", "--verbosity:0", "-r", "c", "-"]
diff --git a/routes/solution.go b/routes/solution.go
@@ -222,6 +222,11 @@ func runCode(hole, lang, code string, args []string, userID int) (string, string
 		cmd.Args = []string{"/usr/bin/j", "/tmp/code.ijs"}
 	case "julia":
 		cmd.Args = []string{"/usr/bin/run-julia", "/tmp/code.jl"}
+	case "nim":
+		cmd.Args = []string{
+			"/usr/bin/nim", "--cc:tcc", "--hint[Processing]:off",
+			"--nimcache:/tmp", "--verbosity:0", "-o:/tmp/code", "-r", "c", "-",
+		}
 	case "perl6":
 		cmd.Args = []string{
 			"/usr/bin/moar",
diff --git a/routes/types.go b/routes/types.go
@@ -21,6 +21,7 @@ var langs = []Lang{
 	{"julia", "Julia"},
 	{"lisp", "Lisp"},
 	{"lua", "Lua"},
+	{"nim", "Nim"},
 	{"perl", "Perl"},
 	{"perl6", "Perl 6"},
 	{"php", "PHP"},
diff --git a/routes/versions.go b/routes/versions.go
@@ -10,6 +10,7 @@ const versionTable = "" +
 	"<tr><th class=julia>Julia<td>1.1.1<td><a href=//julialang.org></a>" +
 	"<tr><th class=lisp>Lisp<td>GNU CLISP 2.49.92<td><a href=//clisp.sourceforge.io></a>" +
 	"<tr><th class=lua>Lua<td>5.3.5<td><a href=//www.lua.org></a>" +
+	"<tr><th class=nim>Nim<td>0.17.2<td><a href=//nim-lang.org></a>" +
 	"<tr><th class=perl>Perl<td>5.28.2<td><a href=//www.perl.org></a>" +
 	"<tr><th class=perl6>Perl 6<td>Rakudo 2019.03 on MoarVM 2019.03 implementing Perl 6.d<td><a href=//perl6.org></a>" +
 	"<tr><th class=php>PHP<td>7.3.5<td><a href=//secure.php.net></a>" +
