Add printString support to legacy C backend

anoma · Jan 4, 2023 · fce2aae · fce2aae
1 parent 64f1265
commit fce2aae
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 10 deletions.
diff --git a/c-runtime/standalone/c-runtime.h b/c-runtime/standalone/c-runtime.h
@@ -156,6 +156,10 @@ prim_io prim_printNat(prim_nat n) {
     exit(1);
 }
 
+prim_io prim_printString(prim_string s) {
+    exit(1);
+}
+
 // Tries to parse str as a positive integer.
 // Returns -1 if parsing fails.
 int parsePositiveInt(char *str) {

diff --git a/c-runtime/wasi-libc/c-runtime.h b/c-runtime/wasi-libc/c-runtime.h
@@ -99,7 +99,11 @@ int debug(const char* str) {
 }
 
 prim_io prim_printNat(prim_nat n) {
-    return putStrLn(intToStr(n));
+    return putStr(intToStr(n));
+}
+
+prim_io prim_printString(prim_string s) {
+    return putStr(s);
 }
 
 #endif // C_RUNTIME_H_
diff --git a/c-runtime/wasi-standalone/c-runtime.h b/c-runtime/wasi-standalone/c-runtime.h
@@ -194,7 +194,11 @@ int debug(const char* str) {
 }
 
 prim_io prim_printNat(prim_nat n) {
-    return putStrLn(intToStr(n));
+    return putStr(intToStr(n));
+}
+
+prim_io prim_printString(prim_string s) {
+    return putStr(s);
 }
 
 // Tries to parse str as a positive integer.

diff --git a/test/BackendC/Positive.hs b/test/BackendC/Positive.hs
@@ -79,6 +79,7 @@ tests =
     PosTest "Mutually recursive function" $(mkRelDir "MutuallyRecursive") (WASI StdlibExclude),
     PosTest "Nested List type" $(mkRelDir "NestedList") (WASI StdlibExclude),
     PosTest "Builtin types and functions" $(mkRelDir "Builtins") (WASI StdlibExclude),
+    PosTest "Builtin types and functions from stdlib" $(mkRelDir "BuiltinsStdlib") (WASI StdlibInclude),
     PosTest "Import from embedded standard library" $(mkRelDir "StdlibImport") (WASI StdlibInclude),
     PosTest "Axiom without a compile block" $(mkRelDir "AxiomNoCompile") (WASI StdlibInclude),
     PosTest "Invoke a function using exported name" $(mkRelDir "ExportName") (WASM (WASMInfo (actualCallExport "fun" []))),

diff --git a/test/Internal/Eval/Positive.hs b/test/Internal/Eval/Positive.hs
@@ -109,6 +109,11 @@ tests =
       $(mkRelDir ".")
       $(mkRelFile "LitString.juvix")
       $(mkRelFile "out/LitString.out"),
+    PosTest
+      "Literal String IO"
+      $(mkRelDir ".")
+      $(mkRelFile "LitStringIO.juvix")
+      $(mkRelFile "out/LitStringIO.out"),
     PosTest
       "Mutually defined functions"
       $(mkRelDir ".")

diff --git a/tests/Internal/positive/LitStringIO b/tests/Internal/positive/LitStringIO
diff --git a/tests/Internal/positive/LitStringIO.juvix b/tests/Internal/positive/LitStringIO.juvix
@@ -0,0 +1,8 @@
+module LitStringIO;
+
+open import Stdlib.Prelude;
+
+main : IO;
+main := printStringLn "hello";
+
+end;
diff --git a/tests/Internal/positive/out/LitStringIO.out b/tests/Internal/positive/out/LitStringIO.out
@@ -0,0 +1 @@
+hello
diff --git a/tests/positive/MiniC/Builtins/Input.juvix b/tests/positive/MiniC/Builtins/Input.juvix
@@ -42,19 +42,24 @@ infix 4 ==;
 == _ _ := false;
 
 builtin IO axiom IO : Type;
+builtin string axiom String : Type;
 
 infixl 1 >>;
 builtin IO-sequence axiom >> : IO → IO → IO;
 builtin nat-print axiom printNat : ℕ → IO;
+builtin string-print axiom printString : String → IO;
+
+printNatLn : ℕ -> IO;
+printNatLn n := printNat n >> printString "\n";
 
 main : IO;
-main := printNat (boolToNat true)
-     >> printNat (boolToNat false)
-     >> printNat (mult 3 (2 + 2))
-     >> printNat 2
-     >> printNat (if (1 == 2) 100 200)
-     >> printNat (if (1 == 1) 300 400)
-     >> if (1 == 2) (printNat 500) (printNat 600)
-     >> if (1 == 1) (printNat 700) (printNat 800);
+main := printNatLn (boolToNat true)
+     >> printNatLn (boolToNat false)
+     >> printNatLn (mult 3 (2 + 2))
+     >> printNatLn 2
+     >> printNatLn (if (1 == 2) 100 200)
+     >> printNatLn (if (1 == 1) 300 400)
+     >> if (1 == 2) (printNatLn 500) (printNatLn 600)
+     >> if (1 == 1) (printNatLn 700) (printNatLn 800);
 
 end;
diff --git a/tests/positive/MiniC/BuiltinsStdlib/Input.juvix b/tests/positive/MiniC/BuiltinsStdlib/Input.juvix
@@ -0,0 +1,24 @@
+module Input;
+
+open import Stdlib.Prelude;
+open import Stdlib.Data.Nat.Ord;
+
+boolToNat : Bool → Nat;
+boolToNat false := zero;
+boolToNat true := suc zero;
+
+mult : Nat → Nat → Nat;
+mult zero _ := zero;
+mult (suc n) m := m + (mult n m);
+
+main : IO;
+main := printNatLn (boolToNat true)
+     >> printNatLn (boolToNat false)
+     >> printNatLn (mult 3 (2 + 2))
+     >> printNatLn 2
+     >> printNatLn (if (1 == 2) 100 200)
+     >> printNatLn (if (1 == 1) 300 400)
+     >> if (1 == 2) (printNatLn 500) (printNatLn 600)
+     >> if (1 == 1) (printNatLn 700) (printNatLn 800);
+
+end;
diff --git a/tests/positive/MiniC/BuiltinsStdlib/expected.golden b/tests/positive/MiniC/BuiltinsStdlib/expected.golden
@@ -0,0 +1,8 @@
+1
+0
+12
+2
+200
+300
+600
+700
diff --git a/tests/positive/MiniC/BuiltinsStdlib/juvix.yaml b/tests/positive/MiniC/BuiltinsStdlib/juvix.yaml