Setup/Loop Entry Point

Juniper/Compiler.fs

@@ -639,18 +639,21 @@ and compileDec module_ theta kappa (dec : Declaration) : string =
 // Program: includes, types, values
 //                              module names   opens                         v incudes           v mod name  v type dec           v mod    v fun/let dec v scc    v theta              v kappa
 and compileProgram (program : string list * ((string * Declaration) list) * Declaration list * ((string * Declaration) list) * (((string * Declaration) list) * Map<string, TyExpr> * Map<string, CapacityExpr>) list) : string =
-    let mutable entryPoint = None
     let executingDir = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location)
     let junCppStdPath = executingDir + "/cppstd/juniper.hpp"
     let junCppStd = System.IO.File.ReadAllText junCppStdPath
     let (moduleNames, opens, includes, typeDecs, valueSccs) = program
+    let mutable setupModule = None
+    let mutable loopModule = None
     (valueSccs |> List.iter (fun scc ->
         match scc with
         | (decs, _, _) ->
             decs |> List.iter (fun (module_, dec) ->
                 match dec with
-                | FunctionDec {name=name} when name = "main" ->
-                    entryPoint <- Some {module_=module_; name=name}
+                | FunctionDec {name=name} when name = "setup" ->
+                    setupModule <- Some module_
+                | FunctionDec {name=name} when name = "loop" ->
+                    loopModule <- Some module_
                 | _ -> ())
         | _ -> ()))
     let compileNamespace theta kappa (module_, dec) =
@@ -681,10 +684,28 @@ and compileProgram (program : string list * ((string * Declaration) list) * Decl
     ) |> String.concat "") +
     (valueSccs |> List.map (fun (decs, theta, kappa) ->
         decs |> List.map (compileNamespace theta kappa) |> String.concat "") |> String.concat "") +
-    (match entryPoint with
-    | None ->
-        failwith "Unable to find program entry point. Please create a function called main."
-    | Some {module_=module_; name=name} ->
-        output "int main() {" + newline() + indentId() + output "init();" + newline() +
-        output module_ + output "::" + output name + output "();" + newline() +
-        output "return 0;" + unindentId() + newline() + "}")
+
+    (*
+        void setup() {
+          Blink::setup();
+        }
+    *)
+    (match setupModule with
+        | None ->
+            failwith "Unable to find program entry point. Please create a function called setup.\n fun setup() = ()"
+        | Some module_ ->
+            output "void setup() {" + newline() + indentId() + output "init();" + newline() +
+            output module_ + output "::" + output "setup();" +
+            output (unindentId() + newline() + "}" + newline()))+
+
+    (*
+        void loop() {
+          Blink::loop();
+        }
+    *)
+    (match loopModule with
+        | None ->
+            failwith "Unable to find program entry point. Please create a function called loop.\n fun loop() = ()."
+        | Some module_ ->
+            output "void loop() {" + indentId() + newline() +
+            output module_ + output "::" + output "loop();" + unindentId() + newline() + "}")

Juniper/examples/Blink.jun

@@ -6,7 +6,7 @@ let boardLed = 13
 let tState = Time:state()
 let ledState = ref low()
 
-fun blink() = (
+fun loop() = (
     let timerSig = Time:every(1000, tState);
     let ledSig =
         Signal:foldP(
@@ -18,11 +18,4 @@ fun blink() = (
 )
 
 fun setup() =
-    Io:setPinMode(boardLed, Io:output())
-
-fun main() = (
-    setup();
-    while true do
-        blink()
-    end
-)
+    Io:setPinMode(boardLed, Io:output())

Juniper/examples/ButtonDebounce.jun

@@ -8,7 +8,7 @@ let bState = Button:state()
 let edgeState = ref Io:low()
 let ledState = ref Io:high()
 
-fun button() = (
+fun loop() = (
     let buttonSig = Io:digIn(buttonPin);
     let debouncedSig = Io:fallingEdge(Button:debounce(buttonSig, bState), edgeState);
     let ledSig =
@@ -24,11 +24,4 @@ fun setup() = (
     Io:setPinMode(ledPin, Io:output());
     Io:setPinMode(buttonPin, Io:input());
     Io:digWrite(ledPin, !ledState)
-)
-
-fun main() = (
-    setup();
-    while true do
-        button()
-    end
-)
+)

Juniper/examples/NeopixelRing.jun

@@ -27,33 +27,30 @@ fun modeToColor(m) =
     | blue() => Neopixel:makeColor(0, 0, 255)
     end
 
+fun loop() = (
+    let buttonSig = Io:digIn(buttonPin);
+    let debouncedSig = Io:risingEdge(
+        Button:debounce(buttonSig, buttonState),
+        edgeState);
+    let changeModeSig =
+        Signal:foldP(
+            fn (u, currMode) ->
+                transitionMode(currMode)
+            end,
+            mode, debouncedSig);
+    Signal:sink(
+        fn (mode) -> (
+            let color = modeToColor(mode);
+            for i in 0 to ringSize - 1 do
+                Neopixel:setPixelColor(i, color, ringStrip)
+            end;
+            Neopixel:show(ringStrip))
+        end,
+        changeModeSig)
+)
+
 fun setup() = (
     Neopixel:begin(ringStrip);
     Io:setPinMode(buttonPin, Io:input());
     Io:setPinMode(buttonPin, Io:inputPullup())
 )
-
-fun main() = (
-    setup();
-    while true do (
-        let buttonSig = Io:digIn(buttonPin);
-        let debouncedSig = Io:risingEdge(
-                                Button:debounce(buttonSig, buttonState),
-                                edgeState);
-        let changeModeSig =
-            Signal:foldP(
-                fn (u, currMode) ->
-                    transitionMode(currMode)
-                end,
-                mode, debouncedSig);
-        Signal:sink(
-            fn (mode) -> (
-                let color = modeToColor(mode);
-                for i in 0 to ringSize - 1 do
-                    Neopixel:setPixelColor(i, color, ringStrip)
-                end;
-                Neopixel:show(ringStrip))
-            end,
-            changeModeSig)
-    ) end
-)