Update examples

examples/error.sp

@@ -1,5 +1,5 @@
 const { exit } from @'core/os';
 
-let @main in {
+let @main : i32 in {
     exit(1);
 }

examples/file.sp

@@ -1,7 +1,7 @@
 const io from @'core/io';
 const { open } from @'core/fs';
 
-let @main in {
+let @main : i32 in {
     io.out('What is your name? ');
     let name = io.in();
     let file = open('name.txt');

examples/float128.sp

@@ -2,7 +2,7 @@ const io from @'core/io';
 const { concat } from @'core/string';
 const { toString } from @'core/float_utils';
 
-let @main in {
+let @main : i32 in {
     let float1 : f128 = 234.6;
     f128 float2 : f128 = 2934748348291930404.5;
     io.outln(concat('Result is: ',toString(float1 + float2)));

examples/hello-world.sp

@@ -1,5 +1,5 @@
 const io from @'core/io';
 
-let @main in {
+let @main : i32 in {
     io.outln('Hello world!');
 }

examples/input.sp

@@ -1,6 +1,6 @@
 const io from @'core/io';
 
-let @main in {
+let @main : i32 in {
     io.out('What\'s your name? ');
     let name = io.in();
     io.out('Hello, ');

examples/new-syntax.sp

@@ -2,7 +2,7 @@ const { io } from @'core/io';
 
 const good_food : String = 'watermelon';
 
-let @main in {
+let @main : i32 in {
 
     io.outln('Hello world!');
 

examples/variables.sp

@@ -1,6 +1,6 @@
 const io from @'core/io';
 
-let @main in {
+let @main : i32 in {
     let age : i32 = 64;
     io.out('I am ');
     io.out(age);

src/AST/FunctionNode.cpp

@@ -40,6 +40,30 @@ void FunctionNode::codegen(IRBuilder* builder, llvm::Module* module)
 
     if (llvm::Value* retVal = body->codegen(builder))
     {
+        if (retVal->getType() != prototype.returnType)
+        {
+            if (retVal->getType()->isIntegerTy() && prototype.returnType->isIntegerTy())
+            {
+                retVal = builder->getBuilder()->CreateIntCast(retVal, prototype.returnType, true);
+            }
+            else if (retVal->getType()->isFloatingPointTy() && prototype.returnType->isFloatingPointTy())
+            {
+                retVal = builder->getBuilder()->CreateFPCast(retVal, prototype.returnType);
+            }
+            else if (retVal->getType()->isIntegerTy() && prototype.returnType->isFloatingPointTy())
+            {
+                retVal = builder->getBuilder()->CreateCast(llvm::Instruction::SIToFP, retVal, prototype.returnType);
+            }
+            else if (retVal->getType()->isFloatingPointTy() && prototype.returnType->isIntegerTy())
+            {
+                retVal = builder->getBuilder()->CreateCast(llvm::Instruction::FPToSI, retVal, prototype.returnType);
+            }
+            else
+            {
+                Error::throw_error_without_location(
+                    format_string("The %s function's body type does not match its return type", prototype.name));
+            }
+        }
         builder->getBuilder()->CreateRet(retVal);
 
         if (llvm::verifyFunction(*Function))

src/IRBuilder.cpp

@@ -37,6 +37,11 @@ void IRBuilder::create_program(std::shared_ptr<ProgramNode> program)
         {
             Error::throw_error_without_location(format_string("Missing entry point: %s", Arguments::values["entry"]));
         }
+        if (module->getFunction(Arguments::values["entry"])->empty())
+        {
+            Error::throw_error_without_location(
+                format_string("Entry point %s has no body", Arguments::values["entry"]));
+        }
     }
 }
 

src/Parser.cpp

@@ -10,7 +10,8 @@ Parser::Parser(const TokenStream& tokens) : tokens(tokens)
 {
     m_type_map = {{"void", llvm::Type::getVoidTy(*globalContext)}, {"bool", llvm::Type::getInt1Ty(*globalContext)},
                   {"i8", llvm::Type::getInt8Ty(*globalContext)},   {"i16", llvm::Type::getInt16Ty(*globalContext)},
-                  {"i32", llvm::Type::getInt32Ty(*globalContext)}, {"i64", llvm::Type::getInt64Ty(*globalContext)}};
+                  {"i32", llvm::Type::getInt32Ty(*globalContext)}, {"i64", llvm::Type::getInt64Ty(*globalContext)},
+                  {"f32", llvm::Type::getFloatTy(*globalContext)}, {"f64", llvm::Type::getDoubleTy(*globalContext)}};
 }
 
 std::shared_ptr<Parser> Parser::new_parser(const TokenStream& tokens)

tests/declare-main.json

@@ -2,8 +2,8 @@
     "file": "declare-main.sp",
     "compile": {
         "flags": [],
-        "exit-code": 0,
+        "exit-code": 1,
         "stdout": "",
-        "stderr": ""
+        "stderr": "\u001b[1;1m\u001b[31;49merror: \u001b[0;0mEntry point main has no body\n"
     }
 }

tests/float-expr.json

@@ -2,8 +2,13 @@
     "file": "float-expr.sp",
     "compile": {
         "flags": [],
-        "exit-code": 1,
+        "exit-code": 0,
         "stdout": "",
-        "stderr": "\u001b[1;1m\u001b[31;49merror: \u001b[0;0mInvalid function main\n"
+        "stderr": ""
+    },
+    "run": {
+        "exit-code": 3,
+        "stdout": "",
+        "stderr": ""
     }
 }

tests/top-level-math.json

@@ -0,0 +1,9 @@
+{
+    "file": "top-level-math.sp",
+    "compile": {
+        "flags": [],
+        "exit-code": 1,
+        "stdout": "",
+        "stderr": "\u001b[1;1mtests/top-level-math.sp:1:1: \u001b[31;49merror: \u001b[0;0mExpected let\n1    \n     \u001b[31;49m^\u001b[0;0m\n"
+    }
+}

tests/top-level-math.sp

@@ -0,0 +1 @@
+4 + 5 - 6

tests/unmatched-integer-type.json

@@ -0,0 +1,14 @@
+{
+    "file": "unmatched-integer-type.sp",
+    "compile": {
+        "flags": [],
+        "exit-code": 0,
+        "stdout": "",
+        "stderr": ""
+    },
+    "run": {
+        "exit-code": 0,
+        "stdout": "",
+        "stderr": ""
+    }
+}

tests/unmatched-integer-type.sp

@@ -0,0 +1,3 @@
+let @main : i64 in {
+    0
+}

tests/unmatched-type.json

@@ -4,6 +4,6 @@
         "flags": [],
         "exit-code": 1,
         "stdout": "",
-        "stderr": "\u001b[1;1m\u001b[31;49merror: \u001b[0;0mInvalid function main\n"
+        "stderr": "\u001b[1;1m\u001b[31;49merror: \u001b[0;0mThe main function's body type does not match its return type\n"
     }
 }

tools/generateASTNode.sh

@@ -5,6 +5,14 @@ if [ "$1" == "" ]; then
 exit 1
 fi
 
+if [ -f $1.cpp ]; then
+exit 0
+fi
+
+if [ -f $1.h ]; then
+exit 0
+fi
+
 touch $1.cpp
 touch $1.h