added real filename and line numbers to asserts

diff --git a/cerise-c.m b/cerise-c.m
index 1bd5c13311c230652325bae16cb94e2147862df9..a3e6967f3961592173e6cb2bb776c415e38bdaa5 100644 (file)
--- 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 775c73a8ee213ce078da923173027105a9615c73..c70c75cd0e2696b13b2e373ee36023989b276dde 100755 (executable)
--- 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 c32d62dd68c8c73af2e2be8a89d793bb3d8d35f8..4a3bdd0ea1169d740cfdf6d40a8f780a76037ce8 100644 (file)
--- 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);