Finally enable Assembly

JRaspass · JRaspass · commit babc6cb7b510 · 2021-05-30T00:09:41.000+01:00
There's more tweaks needed, especially around the UI but it seems to mostly work so make it live. Fixes #126
diff --git a/hole/play.go b/hole/play.go
@@ -6,6 +6,8 @@ import (
 	"context"
 	"embed"
 	"errors"
+	"fmt"
+	"os"
 	"os/exec"
 	"strings"
 	"syscall"
@@ -19,12 +21,12 @@ const timeout = 7 * time.Second
 var answers embed.FS
 
 type Scorecard struct {
-	Answer         string
-	Args           []string
-	ExitCode       int
-	Pass, Timeout  bool
-	Stderr, Stdout []byte
-	Took           time.Duration
+	ASMBytes, ExitCode int
+	Answer             string
+	Args               []string
+	Pass, Timeout      bool
+	Stderr, Stdout     []byte
+	Took               time.Duration
 }
 
 func getAnswer(holeID, code string) (args []string, answer string) {
@@ -93,6 +95,7 @@ func Play(ctx context.Context, holeID, langID, code string) (score Scorecard) {
 	score.Args, score.Answer = getAnswer(holeID, code)
 
 	var stderr, stdout bytes.Buffer
+	var asmBytesRead, asmBytesWrite *os.File
 
 	ctx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
@@ -109,7 +112,13 @@ func Play(ctx context.Context, holeID, langID, code string) (score Scorecard) {
 	// Interpreter
 	switch langID {
 	case "assembly":
-		cmd.Args = []string{"/usr/bin/defasm", "-r"}
+		var err error
+		if asmBytesRead, asmBytesWrite, err = os.Pipe(); err != nil {
+			panic(err)
+		}
+
+		cmd.Args = []string{"/usr/bin/defasm", "--size-out=3", "-r"}
+		cmd.ExtraFiles = []*os.File{asmBytesWrite}
 	case "bash":
 		cmd.Args = []string{"/usr/bin/bash", "-s", "-"}
 	case "brainfuck":
@@ -194,6 +203,14 @@ func Play(ctx context.Context, holeID, langID, code string) (score Scorecard) {
 		}
 	}
 
+	// Actual byte count is printed by the assembler.
+	if langID == "assembly" {
+		if _, err := fmt.Fscanf(asmBytesRead, "%d", &score.ASMBytes); err != nil {
+			panic(err)
+		}
+		asmBytesRead.Close()
+	}
+
 	const maxLength = 128 * 1024 // 128 KiB
 
 	// Trim trailing whitespace.
diff --git a/routes/recent.go b/routes/recent.go
@@ -8,6 +8,7 @@ import (
 	"github.com/code-golf/code-golf/hole"
 	"github.com/code-golf/code-golf/lang"
 	"github.com/code-golf/code-golf/session"
+	"gopkg.in/guregu/null.v4"
 )
 
 // Recent serves GET /recent/{lang}
@@ -82,11 +83,12 @@ func Recent(w http.ResponseWriter, r *http.Request) {
 	defer rows.Close()
 
 	type recent struct {
-		Hole                                  hole.Hole
-		Lang                                  lang.Lang
-		Login, Scoring                        string
-		Bytes, Chars, Strokes, Rank, TieCount int
-		Submitted                             time.Time
+		Hole                           hole.Hole
+		Lang                           lang.Lang
+		Login, Scoring                 string
+		Bytes, Strokes, Rank, TieCount int
+		Chars                          null.Int
+		Submitted                      time.Time
 	}
 
 	var recents []recent
diff --git a/routes/solution.go b/routes/solution.go
@@ -91,7 +91,7 @@ func Solution(w http.ResponseWriter, r *http.Request) {
 		ToFile:   "Out",
 	})
 
-	if out.Pass && golfer != nil && !experimental && in.Lang != "assembly" {
+	if out.Pass && golfer != nil && !experimental {
 		if err := db.QueryRowContext(
 			r.Context(),
 			`SELECT earned,
@@ -102,14 +102,20 @@ func Solution(w http.ResponseWriter, r *http.Request) {
 			        new_chars_joint, new_chars_rank, new_chars,
 			        beat_chars
 			   FROM save_solution(
-			            bytes   := octet_length($1),
-			            chars   :=  char_length($1),
+			            bytes   := CASE WHEN $3 = 'assembly'::lang
+			                            THEN $5
+			                            ELSE octet_length($1)
+			                            END,
+			            chars   := CASE WHEN $3 = 'assembly'::lang
+			                            THEN NULL
+			                            ELSE char_length($1)
+			                            END,
 			            code    := $1,
 			            hole    := $2,
 			            lang    := $3,
 			            user_id := $4
 			        )`,
-			in.Code, in.Hole, in.Lang, golfer.ID,
+			in.Code, in.Hole, in.Lang, golfer.ID, score.ASMBytes,
 		).Scan(
 			pq.Array(&out.Cheevos),
 			&out.RankUpdates[0].From.Joint,
diff --git a/t/solution.t b/t/solution.t
@@ -77,12 +77,12 @@ constant $code = Q:c:to/ASM/;
     text: .string "{ $answer.lines.join: ｢\n｣ }"; textEnd:
     ASM
 
-ok post-solution( :$session :$code :lang<assembly> )<Pass>, 'Passes';
+    ok post-solution( :$session :$code :lang<assembly> )<Pass>, 'Passes';
 
     is-deeply db, (
         { :code($code-short),       :lang<raku>,     :scoring<bytes> },
         { :code($code-short-chars), :lang<raku>,     :scoring<chars> },
-        # TODO { :$code,            :lang<assembly>, :scoring<bytes> },
+        { :$code,                   :lang<assembly>, :scoring<bytes> },
     ), 'Inserts only bytes';
 };
 
diff --git a/views/js/hole.js b/views/js/hole.js
@@ -117,6 +117,10 @@ onload = () => {
         if (!langs.find(l => l.id == lang))
             lang = 'python';
 
+        // Assembly only has bytes.
+        if (lang == 'assembly')
+            setSolution(solution = 0);
+
         localStorage.setItem('lang', lang);
 
         history.replaceState(null, '', '#' + lang);
