Rework codegen to put all definitions in #main

.color_coded

@@ -1,5 +1,2 @@
 -std=c++1y
--Itest/include
--Iinclude
--Ilib/jtl/include
--Ilib/jest/include
+-Ibackend/c++/include

bin/jank

@@ -10,8 +10,9 @@ lein run $@ > $tmp/jank-generated.hpp 2>&1
 ret=$?
 if [ $ret -eq 0 ];
 then
+  set -e
   g++ -std=c++14 -I$here/../backend/c++/include -I$tmp $here/../backend/c++/src/main.cpp
-  ret=$?
+  set +e
 else
   cat $tmp/jank-generated.hpp
 fi

src/jank/codegen/c++.clj

@@ -33,13 +33,10 @@
        "}"))
 
 (defmethod codegen-impl :binding-definition [current]
-  ; Special case for function definitions
-  (if (= (first (nth current 2)) :lambda-definition)
-    (codegen-impl (update-in current [0] (fn [x] :function-definition)))
-    (str "auto "
-         (codegen-impl (second current))
-         "="
-         (codegen-impl (nth current 2)))))
+  (str "auto "
+       (codegen-impl (second current))
+       "="
+       (codegen-impl (nth current 2))))
 
 (defmethod codegen-impl :function-call [current]
   (str (codegen-impl (second current)) ; Name
@@ -110,18 +107,12 @@
   (codegen-assert false (str "no codegen for '" current "'")))
 
 (defn codegen [ast]
-  (let [[definitions expressions] (util/partition-definitions (:cells ast))]
-    ; Generate all top-level definitions
-    (doseq [current definitions]
-      (util/print-statement (util/end-statement (codegen-impl current))))
-
-    ; Build the main function
-    (util/print-statement
-      (codegen-impl
-        [:binding-definition
-         [:identifier "#main"]
-         (apply (partial vector
-                         :lambda-definition
-                         [:argument-list]
-                         [:return-list])
-                expressions)]))))
+  (util/print-statement
+    (codegen-impl
+      [:function-definition
+       [:identifier "#main"]
+       (apply (partial vector
+                       :lambda-definition
+                       [:argument-list]
+                       [:return-list])
+              (:cells ast))])))