From bc2b55e22a83eeac7dd52c21ec079f7a8b415f9d Mon Sep 17 00:00:00 2001
From: Natapat Samutpong <natapat.samutpong@gmail.com>
Date: Fri, 25 Feb 2022 04:37:43 +0700
Subject: [PATCH] puts to lower write instead

---
 a.out              | Bin 0 -> 16120 bytes
 ex.c               |  16 ++++++++++++++++
 example/ex.hyc     |   3 ++-
 src/back/c.rs      |  36 ++++++++++++++++++++++++++----------
 src/front/parse.rs |   1 +
 src/main.rs        |   1 +
 6 files changed, 46 insertions(+), 11 deletions(-)
 create mode 100755 a.out
 create mode 100644 ex.c

diff --git a/a.out b/a.out
new file mode 100755
index 0000000000000000000000000000000000000000..c25abd26cc81ddbd6742669d3e8d9be3c8c6f747
GIT binary patch
literal 16120
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

literal 0
HcmV?d00001

diff --git a/ex.c b/ex.c
new file mode 100644
index 0000000..e233928
--- /dev/null
+++ b/ex.c
@@ -0,0 +1,16 @@
+#include <hycron/stdbool.h>
+#include <string.h>
+#include <unistd.h>
+int foo = 1;
+char *bar = "str";
+bool baz = true;
+int USER_DEFINED_qux(int lhs, int rhs)
+{
+    return lhs + rhs;
+}
+int main(int ARGC, char **ARGV)
+{
+    char *msg = "Hello, World!";
+    write(1, msg, strlen(msg));
+    return 0;
+}
diff --git a/example/ex.hyc b/example/ex.hyc
index b19f784..c800236 100644
--- a/example/ex.hyc
+++ b/example/ex.hyc
@@ -4,6 +4,7 @@ let baz: bool = true;
 
 fun qux (lhs: int rhs: int) -> int = lhs + rhs;
 fun main () -> int = do
-    puts("Hello, World");
+    let msg: string = "Hello, World!";
+    write(msg);
     0;
 end;
\ No newline at end of file
diff --git a/src/back/c.rs b/src/back/c.rs
index 29c39f4..7297bb9 100644
--- a/src/back/c.rs
+++ b/src/back/c.rs
@@ -8,7 +8,7 @@ pub struct Codegen {
 }
 
 const HEADER_INCLUDES: [&str; 3] = [
-    "<stdio.h>",
+    "<unistd.h>",
     "<string.h>",
     "<hycron/stdbool.h>",
 ];
@@ -43,10 +43,22 @@ impl Codegen {
                 self.emit(";\n");
             },
             IR::Fun { name, return_type_hint, args, body } => {
-                let args = args.iter().map(|(name, type_hint)| {
+                let args_str = args.iter().map(|(name, type_hint)| {
                     format!("{} {}", type_hint, name)
                 }).collect::<Vec<_>>().join(", ");
-                self.emit(format!("{} {}({}) {{", return_type_hint, name, args));
+                self.emit(format!(
+                    "{} {}({}) {{",
+                    return_type_hint,
+                    match name.as_str() {
+                        "main" => "main".to_string(),
+                        _ => format!("USER_DEFINED_{}", name),
+                    },
+                    match name.as_str() {
+                        "main" => format!("{}{}{}", "int ARGC, char **ARGV", if args.len() == 0 { "" } else { "," }, args_str.as_str()),
+                        _ => args_str,
+                    }
+                ));
+
                 match &**body {
                     IR::Value { value } => {
                         self.emit("return ");
@@ -57,9 +69,11 @@ impl Codegen {
                         for (i, node) in body.iter().enumerate() {
                             if i == body.len() - 1 {
                                 self.emit("return ");
-                            };
-                            self.gen_ir(node);
-                            self.emit(";");
+                                self.gen_ir(node);
+                                self.emit(";");
+                            } else {
+                                self.gen_ir(node);
+                            }
                         }
                     },
                     IR::Binary { op, left, right } => {
@@ -75,13 +89,15 @@ impl Codegen {
             },
             IR::Call { name, args } => {
                 match name.as_str() {
-                    "puts" => {
-                        self.emit("printf(");
+                    "write" => {
+                        self.emit("write(1, ");
                         self.gen_ir(&args[0]);
-                        self.emit(")");
+                        self.emit(", strlen(");
+                        self.gen_ir(&args[0]);
+                        self.emit("));");
                     },
                     _ => {
-                        self.emit(format!("{}(", name));
+                        self.emit(format!("USER_DEFINED_{}(", name));
                         for (i, arg) in args.iter().enumerate() {
                             if i != 0 {
                                 self.emit(", ");
diff --git a/src/front/parse.rs b/src/front/parse.rs
index 6f1c29e..77b4a2d 100644
--- a/src/front/parse.rs
+++ b/src/front/parse.rs
@@ -237,6 +237,7 @@ fn expr_parser() -> impl Parser<Token, Expr, Error = Simple<Token>> + Clone {
         let do_block = just(Token::Do)
             .ignore_then(
                 expr.clone()
+                .or(decl.clone())
                     .then_ignore(just(Token::Semicolon))
                     .repeated())
             .then_ignore(just(Token::End))
diff --git a/src/main.rs b/src/main.rs
index e180fb9..a7d854f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -61,6 +61,7 @@ fn main() {
                             log(0, "Running clang-format...");
                             let mut clang_format_status = Command::new("clang-format")
                                 .arg("-i")
+                                .arg("-style=Microsoft")
                                 .arg(&out_file_name)
                                 .spawn()
                                 .expect("Failed to run clang-format, make sure you have it installed");