From 1379c6444db0f78f86bdb9a4f6c1d1c665aad181 Mon Sep 17 00:00:00 2001 From: Mike Lowis Date: Mon, 3 Jun 2024 16:30:54 -0400 Subject: [PATCH] added real filename and line numbers to asserts --- cerise-c.m | 21 ++++++++++++++++++--- cerise-c.rb | 2 +- runtime.h | 1 - 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/cerise-c.m b/cerise-c.m index 1bd5c13..a3e6967 100644 --- a/cerise-c.m +++ b/cerise-c.m @@ -1,4 +1,5 @@ -TestLiterals() { +TestLiterals() +{ assert 42 assert 42.0 assert true @@ -8,7 +9,8 @@ TestLiterals() { return true } -TestBoolOps() { +TestBoolOps() +{ assert true == true assert false == false assert true != false @@ -18,8 +20,21 @@ TestBoolOps() { return true } -init() { +TestIntOps() +{ + return true +} + +TestRealOps() +{ + return false +} + +init() +{ assert TestLiterals() assert TestBoolOps() + assert TestIntOps() + assert TestRealOps() return true } diff --git a/cerise-c.rb b/cerise-c.rb index 775c73a..c70c75c 100755 --- a/cerise-c.rb +++ b/cerise-c.rb @@ -1174,7 +1174,7 @@ module Codegen def self.emit_assert(state, v) temp = emit(state, v.value) - putln state, "Assert(__FILE__, __LINE__, #{temp});" + putln state, "Assert(#{v.loc[0].inspect}, #{v.loc[1]}, #{temp});" end def self.emit_if(state, v) diff --git a/runtime.h b/runtime.h index c32d62d..4a3bdd0 100644 --- a/runtime.h +++ b/runtime.h @@ -276,7 +276,6 @@ static inline Value OpEq(Value left, Value right) { static inline Value OpNeq(Value left, Value right) { Value result; if (IsBool(left)) { - printf("%d != %d\n", ValueAsBool(left), ValueAsBool(right)); result = MakeBool(ValueAsBool(left) != ValueAsBool(right)); } else { result = MakeBool(false); -- 2.52.0