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 5a1a7d69c6440efea73f9b0d37114dd53c228e1a..cb9b6ab8f13baa7ef292aa52e2b8dc3ed4d4c46d 100644 (file)
--- 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 425dc313779369d8d69fddc2f06117687d4055c4..c590bc9e2309977edb92554854dd0e66c8605e8b 100644 (file)
--- 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 0837cb7ed73d94415dc8100f410cbca45e9c9483..ab2333f11ee52c6d5b7da1c26f6c34db188fa789 100644 (file)
--- 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">