Chris Boesch
1 year ago
committed by
GitHub
commit
2ed24ab3cf
@ -0,0 +1,25 @@
|
||||
name: CI
|
||||
on:
|
||||
pull_request:
|
||||
branches: [ main ]
|
||||
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
|
||||
jobs:
|
||||
compat:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
zig: [ 0.6.0, 0.7.0, 0.8.0, 0.9.0, 0.10.0 ]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: Setup Zig
|
||||
uses: goto-bus-stop/setup-zig@v2
|
||||
with:
|
||||
version: ${{ matrix.zig }}
|
||||
|
||||
- name: Check compatibility with old Zig compilers
|
||||
run: ci/compat.sh
|
||||
@ -0,0 +1,25 @@
|
||||
#!/bin/bash
|
||||
# This script checks that `zig build` will return an useful error message when
|
||||
# the Zig compiler is not compatible, instead of failing due to a syntax error.
|
||||
#
|
||||
# This script should be run on an UNIX system.
|
||||
|
||||
zig_version=$(zig version)
|
||||
|
||||
zig build -Dn=1 -Dhealed &> /dev/null 2>&1
|
||||
zig_ret=$?
|
||||
|
||||
if [ "$zig_ret" -eq 0 ]; then
|
||||
printf "zig %s unexpectedly succeeded\n" "$zig_version"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
zig_error=$(zig build -Dn=1 -Dhealed 2>&1)
|
||||
|
||||
echo "$zig_error" | grep -q "it looks like your version of zig is too old"
|
||||
zig_ret=$?
|
||||
|
||||
if [ "$zig_ret" -ne 0 ]; then
|
||||
printf "zig %s is not compatible\n" "$zig_version"
|
||||
exit 1
|
||||
fi
|
||||
@ -1,4 +1,4 @@
|
||||
22c22
|
||||
26c26
|
||||
< stdout.print("Hello world!\n", .{});
|
||||
---
|
||||
> try stdout.print("Hello world!\n", .{});
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
35c34
|
||||
35c35
|
||||
< std.debug.print("failed!\n", .{});
|
||||
---
|
||||
> errdefer std.debug.print("failed!\n", .{});
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
24c24
|
||||
26c26
|
||||
< const b: *u8 = &a; // fix this!
|
||||
---
|
||||
> const b: *const u8 = &a; // fix this!
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
24c12
|
||||
24c24
|
||||
< tail: *Elephant = null, // Hmm... tail needs something...
|
||||
---
|
||||
> tail: ?*Elephant = null, // <---- make this optional!
|
||||
54c42
|
||||
54c54
|
||||
< if (e.tail == null) ???;
|
||||
---
|
||||
> if (e.tail == null) break;
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
22,24c22,24
|
||||
< 0o131, // octal
|
||||
< 0o131, // octal
|
||||
< 0b1101000, // binary
|
||||
< 0x66, // hex
|
||||
< 0x66, // hex
|
||||
---
|
||||
> 0o132, // octal
|
||||
> 0o132, // octal
|
||||
> 0b1101001, // binary
|
||||
> 0x67, // hex
|
||||
> 0x67, // hex
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
72c72
|
||||
67c67
|
||||
< const expected_result: u8 = ???;
|
||||
---
|
||||
> const expected_result: u8 = 0b00010010;
|
||||
88c88
|
||||
82c82
|
||||
< const tupni: u8 = @bitReverse(input, tupni);
|
||||
---
|
||||
> const tupni: u8 = @bitReverse(input);
|
||||
|
||||
@ -1,39 +1,20 @@
|
||||
--- exercises/065_builtins2.zig
|
||||
+++ answers/065_builtins2.zig
|
||||
@@ -58,7 +58,7 @@
|
||||
// Oops! We cannot leave the 'me' and 'myself' fields
|
||||
// undefined. Please set them here:
|
||||
narcissus.me = &narcissus;
|
||||
- narcissus.??? = ???;
|
||||
+ narcissus.myself = &narcissus;
|
||||
|
||||
// This determines a "peer type" from three separate
|
||||
// references (they just happen to all be the same object).
|
||||
@@ -70,7 +70,7 @@
|
||||
//
|
||||
// The fix for this is very subtle, but it makes a big
|
||||
// difference!
|
||||
- const Type2 = narcissus.fetchTheMostBeautifulType();
|
||||
+ const Type2 = Narcissus.fetchTheMostBeautifulType();
|
||||
|
||||
// Now we print a pithy statement about Narcissus.
|
||||
print("A {s} loves all {s}es. ", .{
|
||||
@@ -109,15 +109,15 @@
|
||||
// Please complete these 'if' statements so that the field
|
||||
// name will not be printed if the field is of type 'void'
|
||||
// (which is a zero-bit type that takes up no space at all!):
|
||||
- if (fields[0].??? != void) {
|
||||
+ if (fields[0].type != void) {
|
||||
print(" {s}", .{@typeInfo(Narcissus).Struct.fields[0].name});
|
||||
}
|
||||
|
||||
- if (fields[1].??? != void) {
|
||||
+ if (fields[1].type != void) {
|
||||
print(" {s}", .{@typeInfo(Narcissus).Struct.fields[1].name});
|
||||
}
|
||||
|
||||
- if (fields[2].??? != void) {
|
||||
+ if (fields[2].type != void) {
|
||||
print(" {s}", .{@typeInfo(Narcissus).Struct.fields[2].name});
|
||||
}
|
||||
|
||||
61c61
|
||||
< narcissus.??? = ???;
|
||||
---
|
||||
> narcissus.myself = &narcissus;
|
||||
73c73
|
||||
< const Type2 = narcissus.fetchTheMostBeautifulType();
|
||||
---
|
||||
> const Type2 = Narcissus.fetchTheMostBeautifulType();
|
||||
112c112
|
||||
< if (fields[0].??? != void) {
|
||||
---
|
||||
> if (fields[0].type != void) {
|
||||
116c116
|
||||
< if (fields[1].??? != void) {
|
||||
---
|
||||
> if (fields[1].type != void) {
|
||||
120c120
|
||||
< if (fields[2].??? != void) {
|
||||
---
|
||||
> if (fields[2].type != void) {
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
85c84
|
||||
85c85
|
||||
< for (???) |s| {
|
||||
---
|
||||
> for (my_seq) |s| {
|
||||
97c96
|
||||
97c97
|
||||
< while (??? != my_sentinel) {
|
||||
---
|
||||
> while (my_seq[i] != my_sentinel) {
|
||||
|
||||
@ -1,18 +1,8 @@
|
||||
--- exercises/080_anonymous_structs.zig
|
||||
+++ answers/080_anonymous_structs.zig
|
||||
@@ -48,13 +48,13 @@
|
||||
// * circle1 should hold i32 integers
|
||||
// * circle2 should hold f32 floats
|
||||
//
|
||||
- var circle1 = ??? {
|
||||
+ var circle1 = Circle(i32){
|
||||
.center_x = 25,
|
||||
.center_y = 70,
|
||||
.radius = 15,
|
||||
};
|
||||
|
||||
- var circle2 = ??? {
|
||||
+ var circle2 = Circle(f32){
|
||||
.center_x = 25.234,
|
||||
.center_y = 70.999,
|
||||
.radius = 15.714,
|
||||
51c51
|
||||
< var circle1 = ??? {
|
||||
---
|
||||
> var circle1 = Circle(i32){
|
||||
57c57
|
||||
< var circle2 = ??? {
|
||||
---
|
||||
> var circle2 = Circle(f32){
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
23c23
|
||||
< const hello = .{'h', 'e', 'l', 'l', 'o'};
|
||||
< const hello = .{ 'h', 'e', 'l', 'l', 'o' };
|
||||
---
|
||||
> const hello: [5]u8 = .{'h', 'e', 'l', 'l', 'o'};
|
||||
> const hello: [5]u8 = .{ 'h', 'e', 'l', 'l', 'o' };
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
65c65
|
||||
66c66
|
||||
< var avg: []f64 = ???;
|
||||
---
|
||||
> var avg: []f64 = try allocator.alloc(f64, arr.len);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
82c82
|
||||
83c83
|
||||
< ???;
|
||||
---
|
||||
> x ^= y;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
62c62
|
||||
63c63
|
||||
< return bits == 0x..???;
|
||||
---
|
||||
> return bits == 0x3ffffff;
|
||||
|
||||
@ -0,0 +1,97 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
import difflib
|
||||
import io
|
||||
import os
|
||||
import os.path
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
|
||||
IGNORE = subprocess.DEVNULL
|
||||
PIPE = subprocess.PIPE
|
||||
|
||||
EXERCISES_PATH = "exercises"
|
||||
HEALED_PATH = "patches/healed"
|
||||
PATCHES_PATH = "patches/patches"
|
||||
|
||||
|
||||
# Heals all the exercises.
|
||||
def heal():
|
||||
maketree(HEALED_PATH)
|
||||
|
||||
with os.scandir(EXERCISES_PATH) as it:
|
||||
for entry in it:
|
||||
name = entry.name
|
||||
|
||||
original_path = entry.path
|
||||
patch_path = os.path.join(PATCHES_PATH, patch_name(name))
|
||||
output_path = os.path.join(HEALED_PATH, name)
|
||||
|
||||
patch(original_path, patch_path, output_path)
|
||||
|
||||
|
||||
# Yields all the healed exercises that are not correctly formatted.
|
||||
def check_healed():
|
||||
term = subprocess.run(
|
||||
["zig", "fmt", "--check", HEALED_PATH], stdout=PIPE, text=True
|
||||
)
|
||||
if term.stdout == "" and term.returncode != 0:
|
||||
term.check_returncode()
|
||||
|
||||
stream = io.StringIO(term.stdout)
|
||||
for line in stream:
|
||||
yield line.strip()
|
||||
|
||||
|
||||
def main():
|
||||
heal()
|
||||
|
||||
# Show the unified diff between the original example and the correctly
|
||||
# formatted one.
|
||||
for i, original in enumerate(check_healed()):
|
||||
if i > 0:
|
||||
print()
|
||||
|
||||
name = os.path.basename(original)
|
||||
print(f"checking exercise {name}...\n")
|
||||
|
||||
from_file = open(original)
|
||||
to_file = zig_fmt_file(original)
|
||||
|
||||
diff = difflib.unified_diff(
|
||||
from_file.readlines(), to_file.readlines(), name, name + "-fmt"
|
||||
)
|
||||
sys.stderr.writelines(diff)
|
||||
|
||||
|
||||
def maketree(path):
|
||||
return os.makedirs(path, exist_ok=True)
|
||||
|
||||
|
||||
# Returns path with the patch extension.
|
||||
def patch_name(path):
|
||||
name, _ = os.path.splitext(path)
|
||||
|
||||
return name + ".patch"
|
||||
|
||||
|
||||
# Applies patch to original, and write the file to output.
|
||||
def patch(original, patch, output):
|
||||
subprocess.run(
|
||||
["patch", "-i", patch, "-o", output, original], stdout=IGNORE, check=True
|
||||
)
|
||||
|
||||
|
||||
# Formats the Zig file at path, and returns the possibly reformatted file as a
|
||||
# file object.
|
||||
def zig_fmt_file(path):
|
||||
with open(path) as stdin:
|
||||
term = subprocess.run(
|
||||
["zig", "fmt", "--stdin"], stdin=stdin, stdout=PIPE, check=True, text=True
|
||||
)
|
||||
|
||||
return io.StringIO(term.stdout)
|
||||
|
||||
|
||||
main()
|
||||
@ -0,0 +1,68 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
import os
|
||||
import os.path
|
||||
import subprocess
|
||||
|
||||
|
||||
IGNORE = subprocess.DEVNULL
|
||||
|
||||
EXERCISES_PATH = "exercises"
|
||||
ANSWERS_PATH = "answers"
|
||||
PATCHES_PATH = "patches/patches"
|
||||
|
||||
|
||||
# Heals all the exercises.
|
||||
def heal():
|
||||
maketree(ANSWERS_PATH)
|
||||
|
||||
with os.scandir(EXERCISES_PATH) as it:
|
||||
for entry in it:
|
||||
name = entry.name
|
||||
|
||||
original_path = entry.path
|
||||
patch_path = os.path.join(PATCHES_PATH, patch_name(name))
|
||||
output_path = os.path.join(ANSWERS_PATH, name)
|
||||
|
||||
patch(original_path, patch_path, output_path)
|
||||
|
||||
|
||||
def main():
|
||||
heal()
|
||||
|
||||
with os.scandir(EXERCISES_PATH) as it:
|
||||
for entry in it:
|
||||
name = entry.name
|
||||
|
||||
broken_path = entry.path
|
||||
healed_path = os.path.join(ANSWERS_PATH, name)
|
||||
patch_path = os.path.join(PATCHES_PATH, patch_name(name))
|
||||
|
||||
with open(patch_path, "w") as file:
|
||||
term = subprocess.run(
|
||||
["diff", broken_path, healed_path],
|
||||
stdout=file,
|
||||
text=True,
|
||||
)
|
||||
assert term.returncode == 1
|
||||
|
||||
|
||||
def maketree(path):
|
||||
return os.makedirs(path, exist_ok=True)
|
||||
|
||||
|
||||
# Returns path with the patch extension.
|
||||
def patch_name(path):
|
||||
name, _ = os.path.splitext(path)
|
||||
|
||||
return name + ".patch"
|
||||
|
||||
|
||||
# Applies patch to original, and write the file to output.
|
||||
def patch(original, patch, output):
|
||||
subprocess.run(
|
||||
["patch", "-i", patch, "-o", output, original], stdout=IGNORE, check=True
|
||||
)
|
||||
|
||||
|
||||
main()
|
||||
Loading…
Reference in New Issue