Load 'Debug.carp' by default.

carp-lang · Mar 13, 2018 · a9fd73a · a9fd73a
1 parent 832212d
commit a9fd73a
Show file tree

Hide file tree

Showing 14 changed files with 5 additions and 14 deletions.
diff --git a/bench/array_resizing.carp b/bench/array_resizing.carp
@@ -1,6 +1,5 @@
 (load "Bench.carp")
 (use Bench)
-(load "Debug.carp")
 (Debug.sanitize-addresses)
 
 (def n 10000)

diff --git a/bench/array_subarray.carp b/bench/array_subarray.carp
@@ -1,6 +1,5 @@
 (load "Bench.carp")
 (use Bench)
-(load "Debug.carp")
 (Debug.sanitize-addresses)
 (use Array)
 

diff --git a/bench/array_swap.carp b/bench/array_swap.carp
@@ -1,6 +1,5 @@
 (load "Bench.carp")
 (use Bench)
-(load "Debug.carp")
 (Debug.sanitize-addresses)
 
 (def a [0])

diff --git a/bench/array_update.carp b/bench/array_update.carp
@@ -1,6 +1,5 @@
 (load "Bench.carp")
 (use Bench)
-(load "Debug.carp")
 (Debug.sanitize-addresses)
 (use Array)
 

diff --git a/core/Debug.carp b/core/Debug.carp
@@ -40,6 +40,6 @@
         ()
         (list 'do
               (list 'IO.println (list 'ref
-                                      (list 'String.append (list 'String.copy "Assertion failed ")
+                                      (list 'String.append (list 'String.copy "Assertion failed at ")
                                             (list 'String.copy (source-location)))))
               '(System.exit 1))))
diff --git a/examples/ant.carp b/examples/ant.carp
@@ -4,7 +4,6 @@
 
 (load "sdl.carp")
 (load "sdl_image.carp")
-(load "Debug.carp")
 
 (Debug.sanitize-addresses)
 

diff --git a/examples/bugs.carp b/examples/bugs.carp
@@ -1,6 +1,5 @@
 ;; This file contains examples of unsolved bugs
 
-(load "Debug.carp")
 (Debug.sanitize-addresses)
 (Project.config "print-ast" true)
 

diff --git a/examples/generic_structs.carp b/examples/generic_structs.carp
@@ -1,4 +1,3 @@
-(load "Debug.carp")
 (Debug.sanitize-addresses)
 (use Array)
 

diff --git a/examples/globals.carp b/examples/globals.carp
@@ -1,4 +1,3 @@
-(load "Debug.carp")
 (Project.config "print-ast" true)
 (Debug.sanitize-addresses)
 

diff --git a/examples/temp.carp b/examples/temp.carp
@@ -1,4 +1,6 @@
 ;;(Project.config "echo-compiler-cmd" true)
-;; (load "Debug.carp")
 ;; (Debug.sanitize-addresses)
 ;; (Project.config "print-ast" true)
+
+(defn main []
+  (assert false))
diff --git a/src/StartingEnv.hs b/src/StartingEnv.hs
@@ -29,6 +29,7 @@ coreModules carpDir = map (\s -> carpDir ++ "/core/" ++ s ++ ".carp") [ "Interfa
                                                                       , "IO"
                                                                       , "System"
                                                                       , "Pattern"
+                                                                      , "Debug"
                                                                       ]
 
 -- | The array module contains functions for working with the Array type.

diff --git a/test/init_global.carp b/test/init_global.carp
@@ -2,8 +2,6 @@
 ;; It initializes a global with a something that needs to allocate memory and call functions,
 ;; then checks that the memory balance is correct after the init step.
 
-(load "Debug.carp")
-
 (def g (copy (Array.nth &[@"A" @"B" @"C"] 1)))
 
 ;; The one allocation left after 'carp_init_globals' should be 'g' itself:

diff --git a/test/memory.carp b/test/memory.carp
@@ -1,4 +1,3 @@
-(load "Debug.carp")
 (load "Test.carp")
 
 (use IO)

diff --git a/test/vectorn.carp b/test/vectorn.carp
@@ -1,4 +1,3 @@
-(load "Debug.carp")
 (Debug.sanitize-addresses)
 
 (load "Test.carp")