flakes and fixed some tests

This commit is contained in:
Robin Bärtschi 2025-02-13 11:12:36 +01:00
parent 855bcff9b4
commit d1c1d8a287
5 changed files with 104 additions and 6 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
result

View File

@ -147,7 +147,7 @@ var basicTest string
func TestCodegen(t *testing.T) {
program := &ttir.Program{
Functions: []ttir.Function{
Functions: []*ttir.Function{
{
Name: "main",
HasReturnValue: true,
@ -193,7 +193,7 @@ var binaryTest string
func TestBinary(t *testing.T) {
program := &ttir.Program{
Functions: []ttir.Function{
Functions: []*ttir.Function{
{
Name: "main",
Instructions: []ttir.Instruction{
@ -222,7 +222,7 @@ var equalityTest string
// There was once a bug with how the cmp instructions were generated, this check should fail if it happens again
func TestEqualityOperators(t *testing.T) {
program := ttir.Program{
Functions: []ttir.Function{
Functions: []*ttir.Function{
{
Name: "main",
HasReturnValue: false,

26
flake.lock generated Normal file
View File

@ -0,0 +1,26 @@
{
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1739214665,
"narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

71
flake.nix Normal file
View File

@ -0,0 +1,71 @@
{
description = "A simple Go package";
# Nixpkgs / NixOS version to use.
inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
outputs = { self, nixpkgs }:
let
# to work with older version of flakes
lastModifiedDate = self.lastModifiedDate or self.lastModified or "19700101";
# Generate a user-friendly version number.
version = builtins.substring 0 8 lastModifiedDate;
# System types to support.
supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
# Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
# Nixpkgs instantiated for supported system types.
nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
in
{
# Provide some binary packages for selected system types.
packages = forAllSystems (system:
let
pkgs = nixpkgsFor.${system};
in
{
tt = pkgs.buildGoModule {
pname = "tt";
inherit version;
# In 'nix develop', we don't need a copy of the source tree
# in the Nix store.
src = ./.;
# This hash locks the dependencies of this package. It is
# necessary because of how Go requires network access to resolve
# VCS. See https://www.tweag.io/blog/2021-03-04-gomod2nix/ for
# details. Normally one can build with a fake hash and rely on native Go
# mechanisms to tell you what the hash should be or determine what
# it should be "out-of-band" with other tooling (eg. gomod2nix).
# To begin with it is recommended to set this, but one must
# remember to bump this hash when your dependencies change.
# vendorHash = pkgs.lib.fakeHash;
vendorHash = "sha256-cpjMZr+kP+XyXRxK4YI/lGHl97IROFVVz8DrID0vi6E=";
};
});
# Add dependencies that are only needed for development
devShells = forAllSystems (system:
let
pkgs = nixpkgsFor.${system};
in
{
default = pkgs.mkShell {
buildInputs = with pkgs; [ go gopls gotools go-tools ];
};
});
# The default package for 'nix build'. This makes sense if the
# flake provides only one package or there is a clear "main"
# package.
defaultPackage = forAllSystems (system: self.packages.${system}.tt);
};
}

View File

@ -58,7 +58,7 @@ func expectProgram(t *testing.T, expected *Program, actual *Program) {
}
}
func expectFunction(t *testing.T, expected Function, actual Function) {
func expectFunction(t *testing.T, expected *Function, actual *Function) {
t.Helper()
if expected.Name != actual.Name {
@ -133,7 +133,7 @@ func TestBasicFunction(t *testing.T) {
runTTIREmitterTest(t, ttirEmitterTest{
input: "fn main() = 0;",
expected: Program{
Functions: []Function{
Functions: []*Function{
{
Name: "main",
Instructions: []Instruction{
@ -151,7 +151,7 @@ func TestBinaryExpression(t *testing.T) {
runTTIREmitterTest(t, ttirEmitterTest{
input: "fn main() = 3 + 3 + 3;",
expected: Program{
Functions: []Function{
Functions: []*Function{
{Name: "main", Instructions: []Instruction{
&Binary{Operator: ast.Add, Lhs: &Constant{Value: 3}, Rhs: &Constant{Value: 3}, Dst: &Var{Value: "temp.1"}},
&Binary{Operator: ast.Add, Lhs: &Var{Value: "temp.1"}, Rhs: &Constant{Value: 3}, Dst: &Var{Value: "temp.2"}},