refactor(stdlib): move stdlib into defaultImports

LindonAliu · LindonAliu · commit 218c967363da · 2025-10-30T15:56:23.000+01:00
diff --git a/lib/Sema/GlobalScopeVisitor.cpp b/lib/Sema/GlobalScopeVisitor.cpp
@@ -233,12 +233,12 @@ class GlobalScopeVisitor
     void visitImportDecl(ast::ImportDecl *node)
     {
         assert(_importManager && "ImportManager must be provided for imports");
-        if (_skipPrivateImports && node->isPrivate()) {
-            _importManager->addSkippedImport(
-                node->getLocation(), node->getImportPath()
-            );
-            return;
-        }
+        // if (_skipPrivateImports && node->isPrivate()) {
+        //     _importManager->addSkippedImport(
+        //         node->getLocation(), node->getImportPath()
+        //     );
+        //     return;
+        // }
         if (!_importManager->handleImport(
                 node->getLocation(), node->getImportPath(), _scopeTable,
                 node->getVisibility()
diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt
@@ -20,7 +20,16 @@ function(glu_compile_module module_name)
 endfunction()
 
 # List of stdlib modules (without extension)
-set(stdlib_modules defaultImports/stringType defaultImports/operators defaultImports/defaultImports glucinfo allocation string io file)
+set(stdlib_modules
+    glucinfo
+    allocation
+    defaultImports/stringType
+    defaultImports/operators
+    defaultImports/std
+    defaultImports/defaultImports
+    defaultImports/string
+    defaultImports/io
+    defaultImports/file)
 
 # Copy explicit .glu files from stdlib to build/tools/lib/glu
 set(stdlib_src_files)
diff --git a/stdlib/defaultImports/defaultImports.glu b/stdlib/defaultImports/defaultImports.glu
@@ -1,2 +1,3 @@
 public import operators::*;
 public import stringType::*;
+public import std;
diff --git a/stdlib/defaultImports/file.glu b/stdlib/defaultImports/file.glu
diff --git a/stdlib/defaultImports/io.glu b/stdlib/defaultImports/io.glu
@@ -0,0 +1,35 @@
+import stringType::*;
+
+@no_mangling
+public func getchar() -> Char;
+
+@no_mangling @c_variadic
+public func printf(s: *Char) -> Int;
+
+public func printout(c: Char) -> Void {
+    printf("%c", c);
+}
+
+public func printout(s: String) -> Void {
+    printf("%s", s.data);
+}
+
+public func printout(i: Int) -> Void {
+    printf("%d", i);
+}
+
+public func printout(b: Bool) -> Void {
+    printf(b ? "true" : "false");
+}
+
+#define PRINT(Type) public func print(variable: Type) -> Void { \
+    printout(variable); \
+    printf("\n"); \
+}
+
+PRINT(String)
+PRINT(Char)
+PRINT(Int)
+PRINT(Bool)
+
+#undef PRINT
diff --git a/stdlib/defaultImports/std.glu b/stdlib/defaultImports/std.glu
@@ -0,0 +1 @@
+public import io::*;
diff --git a/stdlib/defaultImports/string.glu b/stdlib/defaultImports/string.glu
@@ -1,4 +1,6 @@
 import allocation::allocate;
+import stringType::*;
+import operators::*;
 
 @no_mangling func strlen(s: *Char) -> Int;
 @no_mangling func strcat(destination: *Char, source: *Char) -> *Char;
diff --git a/stdlib/io.glu b/stdlib/io.glu
diff --git a/test/functional/ASTPrinter/unicode_test.glu b/test/functional/ASTPrinter/unicode_test.glu
@@ -2,8 +2,6 @@
 // RUN: gluc --print-ast %s | FileCheck -v %s
 //
 
-import io;
-
 func main() -> Int {
     // CHECK: Name: capital_a
     // CHECK: Type: Char
diff --git a/test/functional/Sema/invalid_char_lit.glu b/test/functional/Sema/invalid_char_lit.glu
@@ -2,12 +2,14 @@
 // RUN: not gluc -c %s -o %t.o 2>&1 | FileCheck -v %s
 //
 
-import io::printCharacter;
+func printCharacter(c: Char) {
+    std::print(c);
+}
 
 func main() -> Int {
-    // CHECK: invalid_char_lit.glu:9:20: error: Character literal must be a single character
-    printCharacter("abc");
     // CHECK: invalid_char_lit.glu:11:20: error: Character literal must be a single character
+    printCharacter("abc");
+    // CHECK: invalid_char_lit.glu:13:20: error: Character literal must be a single character
     printCharacter("");
     return 0;
 }
diff --git a/test/functional/run/global_let.glu b/test/functional/run/global_let.glu
@@ -2,17 +2,15 @@
 // RUN: gluc %s -o %t && %t | FileCheck -v %s
 //
 
-import io::printLine;
-
 let globalFlag: Bool = true;
 let globalName: String = "global";
 
 // CHECK: global
 func main() -> Int {
     if globalFlag {
-        printLine(globalName);
+        std::print(globalName);
     } else {
-        printLine("no!");
+        std::print("no!");
     }
     return 0;
 }
diff --git a/test/functional/run/global_var_side_effects.glu b/test/functional/run/global_var_side_effects.glu
@@ -2,38 +2,36 @@
 // RUN: gluc %s -o %t && %t | FileCheck -v %s
 //
 
-import io::printLine;
-
 let globalFlag: Bool = getGlobalFlag();
 var globalName: String = getGlobalName();
 
 func getGlobalFlag() -> Bool {
-    printLine("Initializing globalFlag");
+    std::print("Initializing globalFlag");
     return true;
 }
 
 func getGlobalName() -> String {
-    printLine("Initializing globalName");
+    std::print("Initializing globalName");
     return "pizza";
 }
 
 func main() -> Int {
     // CHECK: In main
-    printLine("In main");
+    std::print("In main");
     // CHECK-NEXT: Initializing globalFlag
     if globalFlag {
         // CHECK-NEXT: true
-        printLine("true");
+        std::print("true");
     } else {
-        printLine("false");
+        std::print("false");
     }
     if globalFlag {
         // CHECK-NEXT: Initializing globalName
         // CHECK-NEXT: pizza
-        printLine(globalName);
+        std::print(globalName);
     }
     globalName = "Done";
     // CHECK-NEXT: Done
-    printLine(globalName);
+    std::print(globalName);
     return 0;
 }
diff --git a/test/functional/run/multiple_overloads.glu b/test/functional/run/multiple_overloads.glu
@@ -2,26 +2,24 @@
 // RUN: gluc %s -o %t && %t | FileCheck -v %s
 //
 
-import io::{printLine};
-
 func +(a: Int8, b: Int) -> String {
     return "troll";
 }
 
 func main() -> Int {
     // CHECK: troll
-    printLine(8 as Int8 + 42 as Int);
+    std::print(8 as Int8 + 42 as Int);
     // CHECK: OK1
     if 1 + 2 == 3 as Int {
-        printLine("OK1");
+        std::print("OK1");
     }
     // CHECK: OK2
     if 1 as UInt8 + 2 == 3 {
-        printLine("OK2");
+        std::print("OK2");
     }
     // CHECK: OK3
     if 1 as Double + 1 == 2.0 {
-        printLine("OK3");
+        std::print("OK3");
     }
     return 0;
 }
diff --git a/test/functional/run/nested-var.glu b/test/functional/run/nested-var.glu
@@ -2,18 +2,16 @@
 // RUN: gluc %s -o %t && %t | FileCheck -v %s
 //
 
-import io::{printCharacter, printLine};
-
 func testWhile() -> Void {
     var outer = 1;
 
     while outer < 5 {
         var inner = outer * 2;
         while inner > 0 {
-            printCharacter(".");
+            std::printout(".");
             inner = inner - 1;
         }
-        printLine("");
+        std::print("");
         outer = outer + 1;
     }
 }
diff --git a/test/functional/run/operators.glu b/test/functional/run/operators.glu
diff --git a/test/functional/run/shortcircuiting_operators.glu b/test/functional/run/shortcircuiting_operators.glu
diff --git a/test/functional/run/string_concat.glu b/test/functional/run/string_concat.glu
diff --git a/test/functional/run/string_test.glu b/test/functional/run/string_test.glu

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`public import operators::*;`
`2`	`2`	`public import stringType::*;`
	`3`	`+public import std;`