From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 12 Feb 2016 10:31:47 +0000 (+0000)
Subject: Add D, OCaml, PHP, Python3
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=6a9460250aada7d8852ff4edda29c377ce5ad03a;p=plack-app-gruntmaster.git

Add D, OCaml, PHP, Python3
---

diff --git a/js/90-divine-format.js b/js/90-divine-format.js
index 3b0943f..2fdc65f 100644
--- a/js/90-divine-format.js
+++ b/js/90-divine-format.js
@@ -6,6 +6,8 @@ const ext_table = {
 	'cxx' : 'CPP',
 	'C'   : 'CPP',
 
+	'd'   : 'D',
+
 	'go'  : 'GOLANG',
 
 	'gs'  : 'GOLFSCRIPT',
@@ -15,6 +17,8 @@ const ext_table = {
 
 	'm'   : 'OBERON',
 
+	'ml'  : 'OCAML',
+
 	'lisp': 'SBCL',
 	'lsp' : 'SBCL',
 	'cl'  : 'SBCL',
@@ -26,6 +30,8 @@ const ext_table = {
 
 	'pl'  : 'PERL',
 
+	'php' : 'PHP',
+
 	'py'  : 'PYTHON',
 
 	'rb'  : 'RUBY'
diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 8d96842..cda45fc 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -24,16 +24,20 @@ use constant USER_REGEX => qr/^\w{2,20}$/a;
 use constant FORMAT_EXTENSION => {
 	C => 'c',
 	CPP => 'cpp',
+	D => 'd',
 	GCCGO => 'go',
 	GOLANG => 'go',
 	GOLFSCRIPT => 'gs',
 	HASKELL => 'hs',
 	OBERON => 'm',
 	MONO => 'cs',
+	OCAML => 'ml',
 	JAVA => 'java',
 	PASCAL => 'pas',
 	PERL => 'pl',
+	PHP => 'php',
 	PYTHON => 'py',
+	PYTHON3 => 'py',
 	RUBY => 'rb',
 	SBCL => 'l',
 };
diff --git a/tmpl/pb_entry.en b/tmpl/pb_entry.en
index 9ad7d75..a7b2bc0 100644
--- a/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@ -25,15 +25,19 @@
 <div class="form-group"><label for="prog_format">File format:</label><select id="prog_format" name="prog_format" class="form-control" required>
 <option value="C">C11 (gcc 4.9.2)</option>
 <option value="CPP" selected>C++11 (g++ 4.9.2)</option>
+<option value="D">D (gdc 4.9.2)</option>
 <option value="GCCGO">Go (gccgo 4.9.2)</option>
 <option value="GOLANG">Go (gc 1.3.3)</option>
 <!-- <option value="GOLFSCRIPT">Golfscript (golfscript.rb)</option> -->
 <option value="HASKELL">Haskell (ghc 7.6.3)</option>
 <option value="JAVA">Java (openjdk 7u95)</option>
 <option value="OBERON">Oberon (obc 2.9.7)</option>
+<option value="OCAML">OCaml (ocamlopt 4.01.0)</option>
 <option value="PASCAL">Pascal (fpc 2.6.4)</option>
 <option value="PERL">Perl (perl 5.20.2)</option>
+<option value="PHP">PHP (php 5.6.17)</option>
 <option value="PYTHON">Python (python 2.7.9)</option>
+<option value="PYTHON3">Python (python 3.4.2)</option>
 <option value="RUBY">Ruby (ruby 2.1.5)</option>
 <option value="SBCL">Common Lisp (sbcl 1.2.4)</option>
 </select></div>