Add templates for input-output tasks

combefis · combefis · commit 5bc166a8c89a · 2020-01-22T09:32:48.000+01:00
- Added templates for Ada, Algol68, C++, Go, Lua, Prolog, Rust, Tcl
- Updated templates for Java, Python, Rexx
diff --git a/handler/handlers.go b/handler/handlers.go
@@ -1,4 +1,4 @@
-// Copyright 2019 The Pythia Authors.
+// Copyright 2019-2020 The Pythia Authors.
 // This file is part of Pythia.
 //
 // Pythia is free software: you can redistribute it and/or modify
@@ -321,22 +321,42 @@ func CreateTask(w http.ResponseWriter, r *http.Request) {
 		_ = copyFile(templateDir+"/scripts/pythia-iot", taskDir+"/scripts/pythia-iot", 0755)
 
 		switch request.Environment {
-		case "python":
-			_ = copyFile(templateDir+"/skeleton/program.py", taskDir+"/skeleton/program.py", 0755)
-		case "php7":
-			_ = copyFile(templateDir+"/skeleton/program.php", taskDir+"/skeleton/program.php", 0755)
-		case "nodejs":
-			_ = copyFile(templateDir+"/skeleton/program.js", taskDir+"/skeleton/program.js", 0755)
-		case "java":
+		case "ada":
 			_ = copyFile(templateDir+"/scripts/execute.sh", taskDir+"/scripts/execute.sh", 0755)
-			_ = copyFile(templateDir+"/skeleton/Program.java", taskDir+"/skeleton/Program.java", 0755)
+			_ = copyFile(templateDir+"/skeleton/program.adb", taskDir+"/skeleton/program.adb", 0755)
+		case "algol68":
+			_ = copyFile(templateDir+"/skeleton/program.alg", taskDir+"/skeleton/program.alg", 0755)
 		case "bash":
 			_ = copyFile(templateDir+"/skeleton/program.sh", taskDir+"/skeleton/program.sh", 0755)
-		case "rexx":
-			_ = copyFile(templateDir+"/skeleton/program.rexx", taskDir+"/skeleton/program.rexx", 0755)
 		case "c":
 			_ = copyFile(templateDir+"/scripts/execute.sh", taskDir+"/scripts/execute.sh", 0755)
 			_ = copyFile(templateDir+"/skeleton/program.c", taskDir+"/skeleton/program.c", 0755)
+		case "cpp":
+			_ = copyFile(templateDir+"/scripts/execute.sh", taskDir+"/scripts/execute.sh", 0755)
+			_ = copyFile(templateDir+"/skeleton/program.cpp", taskDir+"/skeleton/program.cpp", 0755)
+		case "golang":
+			_ = copyFile(templateDir+"/scripts/execute.sh", taskDir+"/scripts/execute.sh", 0755)
+			_ = copyFile(templateDir+"/skeleton/program.go", taskDir+"/skeleton/program.go", 0755)
+		case "java":
+			_ = copyFile(templateDir+"/scripts/execute.sh", taskDir+"/scripts/execute.sh", 0755)
+			_ = copyFile(templateDir+"/skeleton/Program.java", taskDir+"/skeleton/Program.java", 0755)
+		case "lua":
+			_ = copyFile(templateDir+"/skeleton/program.lua", taskDir+"/skeleton/program.lua", 0755)
+		case "nodejs":
+			_ = copyFile(templateDir+"/skeleton/program.js", taskDir+"/skeleton/program.js", 0755)
+		case "php7":
+			_ = copyFile(templateDir+"/skeleton/program.php", taskDir+"/skeleton/program.php", 0755)
+		case "prolog":
+			_ = copyFile(templateDir+"/skeleton/program.pl", taskDir+"/skeleton/program.pl", 0755)
+		case "python":
+			_ = copyFile(templateDir+"/skeleton/program.py", taskDir+"/skeleton/program.py", 0755)
+		case "rexx":
+			_ = copyFile(templateDir+"/skeleton/program.rexx", taskDir+"/skeleton/program.rexx", 0755)
+		case "rust":
+			_ = copyFile(templateDir+"/scripts/execute.sh", taskDir+"/scripts/execute.sh", 0755)
+			_ = copyFile(templateDir+"/skeleton/program.rs", taskDir+"/skeleton/program.rs", 0755)
+		case "tcl":
+			_ = copyFile(templateDir+"/skeleton/program.tcl", taskDir+"/skeleton/program.tcl", 0755)
 		}
 
 		// Save the configuration
diff --git a/templates/input-output/ada/control b/templates/input-output/ada/control
@@ -0,0 +1,3 @@
+/task/scripts/pythia-iot preprocess
+!/task/scripts/pythia-iot execute /task/scripts/execute.sh
+/task/scripts/pythia-iot feedback
diff --git a/templates/input-output/ada/scripts/execute.sh b/templates/input-output/ada/scripts/execute.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Move to working directory.
+cd /tmp/work/student
+
+# Compile the code if not already compiled.
+if [ ! -f program ]
+then
+	gnatmake program.adb -o program 2> /tmp/work/output/out.err
+	if [ -s /tmp/work/output/out.err ]
+	then
+		cat /tmp/work/output/out.err
+		exit 1
+	else
+		rm /tmp/work/output/out.err
+	fi
+fi
+
+# Execute the code.
+./program
diff --git a/templates/input-output/ada/scripts/pythia-iot b/templates/input-output/ada/scripts/pythia-iot
diff --git a/templates/input-output/ada/skeleton/program.adb b/templates/input-output/ada/skeleton/program.adb
@@ -0,0 +1,7 @@
+@@header@@
+
+procedure Program is
+@  @footer@@
+begin
+@  @body@@
+end Program;
diff --git a/templates/input-output/algol68/control b/templates/input-output/algol68/control
@@ -0,0 +1,3 @@
+/task/scripts/pythia-iot preprocess
+!/task/scripts/pythia-iot execute a68g /tmp/work/student/program.alg
+/task/scripts/pythia-iot feedback
diff --git a/templates/input-output/algol68/scripts/pythia-iot b/templates/input-output/algol68/scripts/pythia-iot
diff --git a/templates/input-output/algol68/skeleton/program.alg b/templates/input-output/algol68/skeleton/program.alg
@@ -0,0 +1,7 @@
+@@header@@
+
+@@footer@@
+
+main: (
+@	@body@@
+)
diff --git a/templates/input-output/cpp/control b/templates/input-output/cpp/control
@@ -0,0 +1,3 @@
+/task/scripts/pythia-iot preprocess
+!/task/scripts/pythia-iot execute /task/scripts/execute.sh
+/task/scripts/pythia-iot feedback
diff --git a/templates/input-output/cpp/scripts/execute.sh b/templates/input-output/cpp/scripts/execute.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Move to working directory.
+cd /tmp/work/student
+
+# Compile the code if not already compiled.
+if [ ! -f program ]
+then
+	/usr/bin/g++ program.cpp -o program 2> /tmp/work/output/out.err
+	if [ -s /tmp/work/output/out.err ]
+	then
+		cat /tmp/work/output/out.err
+		exit 1
+	else
+		rm /tmp/work/output/out.err
+	fi
+fi
+
+# Execute the code.
+./program
diff --git a/templates/input-output/cpp/scripts/pythia-iot b/templates/input-output/cpp/scripts/pythia-iot
diff --git a/templates/input-output/cpp/skeleton/program.cpp b/templates/input-output/cpp/skeleton/program.cpp
@@ -0,0 +1,7 @@
+@@header@@
+
+int main() {
+@	@body@@
+}
+
+@@footer@@
diff --git a/templates/input-output/golang/control b/templates/input-output/golang/control
@@ -0,0 +1,3 @@
+/task/scripts/pythia-iot preprocess
+!/task/scripts/pythia-iot execute /task/scripts/execute.sh
+/task/scripts/pythia-iot feedback
diff --git a/templates/input-output/golang/scripts/execute.sh b/templates/input-output/golang/scripts/execute.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Move to working directory.
+cd /tmp/work/student
+
+# Compile the code if not already compiled.
+if [ ! -f program ]
+then
+	go build -o program program.go 2> /tmp/work/output/out.err
+	if [ -s /tmp/work/output/out.err ]
+	then
+		cat /tmp/work/output/out.err
+		exit 1
+	else
+		rm /tmp/work/output/out.err
+	fi
+fi
+
+# Execute the code.
+./program
diff --git a/templates/input-output/golang/scripts/pythia-iot b/templates/input-output/golang/scripts/pythia-iot
diff --git a/templates/input-output/golang/skeleton/program.go b/templates/input-output/golang/skeleton/program.go
@@ -0,0 +1,7 @@
+@@header@@
+
+func main() {
+@	@body@@
+}
+
+@@footer@@
diff --git a/templates/input-output/java/scripts/execute.sh b/templates/input-output/java/scripts/execute.sh
@@ -7,7 +7,7 @@ PATH=/usr/lib/jvm/java-8-openjdk-i386/bin:$PATH
 cd /tmp/work/student
 
 # Compile the code if not already compiled.
-if [ ! -f /tmp/work/student/Program.class ]
+if [ ! -f Program.class ]
 then
 	javac Program.java 2> /tmp/work/output/out.err
 	if [ -s /tmp/work/output/out.err ]
diff --git a/templates/input-output/lua/control b/templates/input-output/lua/control
@@ -0,0 +1,3 @@
+/task/scripts/pythia-iot preprocess
+!/task/scripts/pythia-iot execute /usr/bin/lua5.3 /tmp/work/student/program.lua
+/task/scripts/pythia-iot feedback
diff --git a/templates/input-output/lua/scripts/pythia-iot b/templates/input-output/lua/scripts/pythia-iot
diff --git a/templates/input-output/lua/skeleton/program.lua b/templates/input-output/lua/skeleton/program.lua
@@ -0,0 +1,5 @@
+@@header@@
+
+@@body@@
+
+@@footer@@
diff --git a/templates/input-output/prolog/control b/templates/input-output/prolog/control
@@ -0,0 +1,3 @@
+/task/scripts/pythia-iot preprocess
+!/task/scripts/pythia-iot execute swipl /tmp/work/student/program.pl
+/task/scripts/pythia-iot feedback
diff --git a/templates/input-output/prolog/scripts/pythia-iot b/templates/input-output/prolog/scripts/pythia-iot
diff --git a/templates/input-output/prolog/skeleton/program.pl b/templates/input-output/prolog/skeleton/program.pl
@@ -0,0 +1,7 @@
+@@header@@
+:- initialization(main).
+
+main :-
+@  @body@@
+
+@@footer@@
diff --git a/templates/input-output/python/skeleton/program.py b/templates/input-output/python/skeleton/program.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 @@header@@
 
 @@footer@@
diff --git a/templates/input-output/rexx/skeleton/program.rexx b/templates/input-output/rexx/skeleton/program.rexx
@@ -1,3 +1,5 @@
 @@header@@
 
-@@code@@
+@@body@@
+
+@@footer@@
diff --git a/templates/input-output/rust/control b/templates/input-output/rust/control
@@ -0,0 +1,3 @@
+/task/scripts/pythia-iot preprocess
+!/task/scripts/pythia-iot execute /task/scripts/execute.sh
+/task/scripts/pythia-iot feedback
diff --git a/templates/input-output/rust/scripts/execute.sh b/templates/input-output/rust/scripts/execute.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Move to working directory.
+cd /tmp/work/student
+
+# Compile the code if not already compiled.
+if [ ! -f program ]
+then
+	rustc -C linker=gcc -o program program.rs 2> /tmp/work/output/out.err
+	if [ -s /tmp/work/output/out.err ]
+	then
+		cat /tmp/work/output/out.err
+		exit 1
+	else
+		rm /tmp/work/output/out.err
+	fi
+fi
+
+# Execute the code.
+./program
diff --git a/templates/input-output/rust/scripts/pythia-iot b/templates/input-output/rust/scripts/pythia-iot
diff --git a/templates/input-output/rust/skeleton/program.rs b/templates/input-output/rust/skeleton/program.rs
@@ -0,0 +1,7 @@
+@@header@@
+
+fn main() {
+@    @body@@
+}
+
+@@footer@@
diff --git a/templates/input-output/tcl/control b/templates/input-output/tcl/control
@@ -0,0 +1,3 @@
+/task/scripts/pythia-iot preprocess
+!/task/scripts/pythia-iot execute /usr/bin/tclsh8.6 /tmp/work/student/program.tcl
+/task/scripts/pythia-iot feedback
diff --git a/templates/input-output/tcl/scripts/pythia-iot b/templates/input-output/tcl/scripts/pythia-iot
diff --git a/templates/input-output/tcl/skeleton/program.tcl b/templates/input-output/tcl/skeleton/program.tcl
@@ -0,0 +1,5 @@
+@@header@@
+
+@@body@@
+
+@@footer@@

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/task/scripts/pythia-iot preprocess`
	`2`	`+!/task/scripts/pythia-iot execute /task/scripts/execute.sh`
	`3`	`+/task/scripts/pythia-iot feedback`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/task/scripts/pythia-iot preprocess`
	`2`	`+!/task/scripts/pythia-iot execute a68g /tmp/work/student/program.alg`
	`3`	`+/task/scripts/pythia-iot feedback`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +@@header@@
++
 +@@footer@@
++
 +main: (
 +@	@body@@
 +)