From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 14 Feb 2015 16:29:46 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=d4ca2412db2c1c6e021809e9b72d3410abc476c2;hp=00c887ce06707532ce45ad863139f79455480d24;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc

Conflicts:
	tmpl/pb_entry.en
---

diff --git a/js/90-divine-format.js b/js/90-divine-format.js
index 5a1a7d6..cb9b6ab 100644
--- a/js/90-divine-format.js
+++ b/js/90-divine-format.js
@@ -23,6 +23,12 @@
 		case 'lhs':
 			format = 'HASKELL';
 			break;
+		case 'lisp':
+		case 'lsp':
+		case 'cl':
+		case 'l':
+			format = 'SBCL';
+			break;
 		case 'java':
 			format = 'JAVA';
 			break;
diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 425dc31..c590bc9 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -47,6 +47,7 @@ use constant FORMAT_EXTENSION => {
 	PASCAL => 'pas',
 	PERL => 'pl',
 	PYTHON => 'py',
+	SBCL => 'l',
 };
 
 use constant NOT_FOUND => [404, ['Content-Type' => 'text/plain'], ['Not found']];
diff --git a/tmpl/pb_entry.en b/tmpl/pb_entry.en
index 0837cb7..ab2333f 100644
--- a/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@ -40,6 +40,7 @@ To submit solutions to this problem, please visit the problem <a href="/pb/id">o
 <option value="PASCAL">Pascal (fpc 2.6.0)</option>
 <option value="PERL">Perl (perl 5.14.2)</option>
 <option value="PYTHON">Python (python 2.7.3)</option>
+<option value="SBCL">Common Lisp (sbcl)</option>
 </select></div>
 
 <input type="submit" value="Submit job" class="btn btn-primary">