use <carp-dir>/out for all build artifacts

.gitignore

@@ -1,7 +1,9 @@
-.DS_Store
-/bin/carp-repl
 *.dSYM
+a.out
+.DS_Store
+
 /gl-constants/gl_constants.o
+
 /out/*.c
 /out/*.so
 /out/*.h
@@ -11,9 +13,12 @@
 /out/*.pdb
 /out/*.ilk
 /out/*.obj
-/src/*.o
 /out/exe
-a.out
-/bin/Debug/
+
+/src/*.o
+
+/bin/carp-repl
 /bin/Release/
+/bin/Debug/
+
 /build/

README.md

@@ -78,8 +78,8 @@ If 'libffi' is installed with Brew, you can find the include files at "/usr/loca
 Note: 'rlwrap' is not strictly needed but makes the REPL experience much nicer, modify the '/bin/carp' script if you don't want to use it.
 
 ### Compiler Variables
-* ```out-dir``` A string with the name of the folder where build artifacts should be put. Standard value is "".
 * ```carp-dir``` The root folder of the Carp compiler, should be the same folder as the on where this README.md file resides.
+* ```out-dir``` A string with the name of the folder where build artifacts should be put. Standard value is the 'out' folder in the carp directory.
 * ```echo-signature-after-bake``` If this is true the type signature of freshly baked functions will be printed in the REPL.
 * ```prompt``` The prompt displayed in the repl
 

TODO.md

@@ -44,11 +44,14 @@
 
 # Dynamic Runtime Big Features
   - Macro splicing
+  - Be able to start carp with a file as argument
   - Use array for macro parameter list
   - Proper bool type
   - Modules 
   - Get inferior lisp to work
   - Remove globals to enable several instances of the runner in parallel
+  - Add more numeric types (double, unsigned long?)
+  - A Set-type with reader syntax #{}
 
 # Dynamic Runtime Small Features
   - Want to be able to send Obj-arrays to ffi functions
@@ -58,6 +61,7 @@
   - Better error handling and input validation for primops, clean up the C error/assertion macros
   - ONLY allow [] in parameter list for function definitions
   - Use modules to solve problem of using same name for members in different structs
+  - Use size_t where approperiate
   
 # Dynamic Runtime Optimization
 
@@ -78,6 +82,7 @@
   
   
 # Lisp Core Libs
+  - 'import' function that searches paths for carp files
   - assert-eq shows wrong result when the assertion fails? (in ffi situations, the wrong type is produced and compared to something else)
   - -> and ->>
   - 'case'/'cond' macro

lisp/compiler.carp

@@ -159,7 +159,7 @@
     ""
     "-framework OpenGL -framework Cocoa -framework IOKit"))
 
-(def out-dir "./")
+(def out-dir (str carp-dir "out/"))
 (def echo-signature-after-bake false)
 
 (defn remove-non-user-defined-deps (func-deps)

out/dont-remove-this-file

@@ -0,0 +1 @@
+This file makes sure the 'out' directory is version controlled.

out/project.carp

@@ -1,31 +0,0 @@
-(reset! echo-signature-after-bake true)
-(reset! log-unloading-of-dylibs true)
-
-;;(when (not carp-dev) (load-lisp (str carp-dir "lisp/examples.carp")))
-;;(load-gl)
-;;(defn tricky-let [] ((id id) 2))
-
-;; (defn h [a b]
-;;   (+ (strlen a)
-;;      (strlen b)))
-
-;; (defn f []
-;;   (h 3 "b"))
-
-;; (defn g []
-;;   (let [s (string-copy &"hej")]
-;;     (f s)))
-
-;;(bake g)
-
-;; ^doc "Hej på dig"
-;; ^ann '(:fn () :void)
-
-;; (defn f [] "yeah")
-
-
-(defn f []
-  (let [a (fn [] (nth "erik"))
-        b (fn [] (a))]
-    (b)))
-