Merge pull request #1063 from andrew-johnson-4/param-print

Param print

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lambda_mountain"
-version = "1.20.1"
+version = "1.20.2"
 authors = ["Andrew <andrew@subarctic.org>"]
 license = "MIT"
 description = "Typed Macro Assembler (backed by Coq proofs-of-correctness)"

Makefile

@@ -1,6 +1,6 @@
 
 dev: install-production
-	lm EXAMPLES/phi-types.lsts
+	lm tests/regress/eprint.lsts
 	cc -O3 tmp.c
 	./a.out
 

PLATFORM/C/LIB/default.lm

@@ -30,3 +30,4 @@ import PLATFORM/C/LIB/array.lm;
 import PLATFORM/C/LIB/io.lm;
 import PLATFORM/C/LIB/regex.lm;
 import PLATFORM/C/LIB/cmp.lsts;
+import PLATFORM/C/LIB/print.lsts;

PLATFORM/C/LIB/io.lm

@@ -5,9 +5,14 @@ import string.h;
 import unistd.h;
 import sys/wait.h;
 
+stdin := λ: Blob(). (: (:expression stdin_l) IO::File);
+stdout := λ: Blob(). (: (:expression stdout_l) IO::File);
+stderr := λ: Blob(). (: (:expression stderr_l) IO::File);
+
 strcmp := λ: FFI(: l U8[])(: r U8[]). (: () I32);
 memcmp := λ: FFI(: l ?[])(: r ?[])(: len U64). (: () U32);
 printf := λ: FFI(: format String)(: arg Any). (: () U32);
+fprintf := λ: FFI(: io IO::File)(: format String)(: arg Any). (: () U32);
 putchar := λ: FFI(: x U32). (: () U32);
 exit := λ: FFI(: x U32). (: () Nil);
 malloc := λ: FFI(: sz U64). (: () ?[]);

PLATFORM/C/LIB/print.lsts

@@ -0,0 +1,8 @@
+
+let print(e: x): Nil = (
+   print( stdout(), e );
+);
+
+let eprint(e: x): Nil = (
+   print( stderr(), e );
+);

PLATFORM/C/LIB/u64.lm

@@ -25,8 +25,8 @@ fragment type U64; size U64 8; atom suffix U64 _u64;
 
 (declare-unop( into-branch-conditional U64 BranchConditional ( x ) ));
 
-print := λ(: x U64). (: (
-   (printf( '%lu_s x )) ()
+print := λ(: io IO::File)(: x U64). (: (
+   (fprintf( io '%lu_s x )) ()
 ) Nil);
 
 max := λ(: x U64)(: y U64). (: (

PLUGINS/BACKEND/C/mangle-c-type.lm

@@ -29,6 +29,7 @@ mangle-c-type-internal := λ(: tt Type). (: (
       ( (TGround( 'F64_s _ )) (set r (SAtom 'double_s)) )
       ( (TGround( 'String_s _ )) (set r (SAtom 'char*_s)) )
       ( (TGround( 'File_s _ )) (set r (SAtom 'FILE_s)) )
+      ( (TGround( 'IO::File_s _ )) (set r (SAtom 'FILE*_s)) )
       ( (TGround( 'PID_s _ )) (set r (SAtom 'pid_t_s)) )
       ( (TGround( 'Regex_s _ )) (set r (SAtom 'regex_t_s)) )
       ( (TGround( 'Array_s (LCons( _ (LCons( array-base _ )) )) )) (set r (+( (mangle-c-type array-base) (SAtom '*_s) ))) )

tests/regress/eprint.lsts

@@ -0,0 +1,7 @@
+
+import LIB/default.lm;
+
+let main(): Nil = (
+   print(1);
+   eprint(2);
+);

tests/regress/eprint.lsts.out

@@ -0,0 +1 @@
+1