From 7baee29b2642aabb77a24745dc8be86440c30a4f Mon Sep 17 00:00:00 2001
From: Sergiu <srg.pscs@gmail.com>
Date: Wed, 20 Jan 2016 21:29:25 +0200
Subject: [PATCH] Add Rust, Julia, Brainfuck, PHP, OCaml and D

---
 js/90-divine-format.js       | 14 +++++++++++++-
 lib/Plack/App/Gruntmaster.pm |  8 +++++++-
 tmpl/pb_entry.en             |  6 ++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/js/90-divine-format.js b/js/90-divine-format.js
index a842de1..f8bd6a9 100644
--- a/js/90-divine-format.js
+++ b/js/90-divine-format.js
@@ -1,6 +1,10 @@
 const ext_table = {
+	'bf'  : 'BRAINFUCK',
+
 	'c'   : 'C',
 
+	'd'   : 'D',
+
 	'cc'  : 'CPP',
 	'cpp' : 'CPP',
 	'cxx' : 'CPP',
@@ -20,13 +24,21 @@ const ext_table = {
 
 	'java': 'JAVA',
 
+	'jl'  : 'JULIA',
+
+	'ml'  : 'OCAML',
+
 	'pas' : 'PASCAL',
 
 	'pl'  : 'PERL',
 
+	'php' : 'PHP',
+
 	'py'  : 'PYTHON',
 
-	'rb'  : 'RUBY'
+	'rb'  : 'RUBY',
+
+	'rs'  : 'RUST'
 }
 
 function divine_format() {
diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index c941578..31ea346 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -23,18 +23,24 @@ no warnings 'illegalproto';
 use constant USER_REGEX => qr/^\w{2,20}$/a;
 
 use constant FORMAT_EXTENSION => {
+	BRAINFUCK => 'bf',
 	C => 'c',
 	CPP => 'cpp',
+	D => 'd',
 	GCCGO => 'go',
 	GOLANG => 'go',
 	GOLFSCRIPT => 'gs',
 	HASKELL => 'hs',
-	MONO => 'cs',
 	JAVA => 'java',
+	JULIA => 'jl',
+	MONO => 'cs',
+	OCAML => 'ml',
 	PASCAL => 'pas',
 	PERL => 'pl',
+	PHP => 'php',
 	PYTHON => 'py',
 	RUBY => 'rb',
+	RUST => 'rs',
 	SBCL => 'l',
 };
 
diff --git a/tmpl/pb_entry.en b/tmpl/pb_entry.en
index f2709e3..fe6697f 100644
--- a/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@ -23,17 +23,23 @@
 <div class="form-group"><label for="prog">File:</label><input id="prog" name="prog" type="file"></div>
 <div class="form-group"><label for="source_code">Source code:</label> <textarea class="form-control" id="source_code" name="source_code"></textarea></div>
 <div class="form-group"><label for="prog_format">File format:</label><select id="prog_format" name="prog_format" class="form-control" required>
+<option value="BRAINFUCK">Brainfuck (bfc)</option>
 <option value="C">C (gcc)</option>
 <option value="CPP" selected>C++ (g++)</option>
+<option value="D">D (dmd)</option>
 <option value="GCCGO">Go (gccgo)</option>
 <option value="GOLANG">Go (gc)</option>
 <option value="GOLFSCRIPT">Golfscript (golfscript.rb)</option>
 <option value="HASKELL">Haskell (ghc)</option>
 <option value="JAVA">Java (javac)</option>
+<option value="JULIA">Julia (julia)</option>
+<option value="OCAML">OCaml (ocamlc)</option>
 <option value="PASCAL">Pascal (fpc)</option>
 <option value="PERL">Perl (perl)</option>
+<option value="PHP">PHP (php)</option>
 <option value="PYTHON">Python (python)</option>
 <option value="RUBY">Ruby (ruby)</option>
+<option value="RUST">Rust (rustc)</option>
 <option value="SBCL">Common Lisp (sbcl)</option>
 </select></div>
 
-- 
2.30.2