feat: Namespace

- A script exporting at least one symbol, must specify its namespace at the start of the script - When importing, the namespace can be changed with `as` - A `_` import namespace will erase the imported symbols namespace closes #271
buzz-language · Mar 11, 2024 · 9f4356d · 9f4356d
1 parent cccdf0f
commit 9f4356d
Show file tree

Hide file tree

Showing 114 changed files with 772 additions and 720 deletions.
diff --git a/build.zig b/build.zig
@@ -442,7 +442,7 @@ pub fn build(b: *Build) !void {
             .{ .name = "http", .path = "src/lib/buzz_http.zig", .wasm_compatible = false },
             .{ .name = "ffi", .path = "src/lib/buzz_ffi.zig", .wasm_compatible = false },
             .{ .name = "serialize", .path = "src/lib/buzz_serialize.zig" },
-            .{ .name = "test", .path = null },
+            .{ .name = "testing", .path = null },
             .{ .name = "errors", .path = null },
         };
 

diff --git a/examples/game-of-life.buzz b/examples/game-of-life.buzz
@@ -1,8 +1,8 @@
 import "std";
-import "io" as io;
+import "io";
 import "os";
 import "debug";
-import "examples/sdl-wrapped";
+import "examples/sdl-wrapped" as _;
 
 | buzz -L/path/to/SDL2.dylib/so/dll examples/game-of-life.buzz
 object World {
@@ -18,7 +18,7 @@ object World {
         };
 
         for (int i = 0; i < width * height; i = i + 1) {
-            world.cells.append(random(max: 5) == 1);
+            world.cells.append(std.random(max: 5) == 1);
         }
 
         return world;
@@ -156,8 +156,8 @@ fun main([str] args) > void !> SDLError {
         height: 600,
     );
 
-    int? width = if (args.len() > 0) parseInt(args[0]) else null;
-    int? height = if (args.len() > 1) parseInt(args[1]) else null;
+    int? width = if (args.len() > 0) std.parseInt(args[0]) else null;
+    int? height = if (args.len() > 1) std.parseInt(args[1]) else null;
 
     var world = World.init(
         width: width ?? 10,

diff --git a/examples/sdl-wrapped.buzz b/examples/sdl-wrapped.buzz
@@ -1,3 +1,5 @@
+namespace sdl;
+
 import "std";
 import "ffi";
 
@@ -212,7 +214,7 @@ export object SDL {
             flags = flags \ subsystem.value;
         }
 
-        if (SDL_Init(toFloat(flags)) != 0) {
+        if (SDL_Init(std.toFloat(flags)) != 0) {
             throw SDLError{
                 message = "SDL_Init error: {SDL_GetError()}",
             };
@@ -293,7 +295,7 @@ export object Renderer {
     ) > Texture !> SDLError {
         const SDL_Texture? texture = SDL_CreateTexture(
             this.renderer,
-            format: toFloat(format.value),
+            format: std.toFloat(format.value),
             access: access.value,
             w: width,
             h: height,
@@ -415,12 +417,12 @@ export object Window {
         }
 
         const SDL_Window? window = SDL_CreateWindow(
-            cstr(name),
+            ffi.cstr(name),
             x,
             y,
             w: width,
             h: height,
-            flags: toFloat(windowFlags),
+            flags: std.toFloat(windowFlags),
         );
 
         if (window -> unwrapped) {
@@ -446,7 +448,7 @@ export object Window {
         const SDL_Renderer? renderer = SDL_CreateRenderer(
             this.window,
             index: index,
-            flags: toFloat(rendererFlags),
+            flags: std.toFloat(rendererFlags),
         );
 
         if (renderer -> unwrapped) {

diff --git a/examples/sdl.buzz b/examples/sdl.buzz
@@ -1,5 +1,5 @@
 import "std";
-import "examples/sdl-wrapped";
+import "examples/sdl-wrapped" as _;
 
 | buzz -L/path/to/SDL2.dylib/so/dll examples/sdl.buzz
 fun main([str] args) > int !> SDLError {

diff --git a/examples/sqlite.buzz b/examples/sqlite.buzz
@@ -1,8 +1,9 @@
+namespace sqlite;
+
 import "ffi";
 import "std";
-import "buffer";
-import "serialize";
-import "log";
+import "buffer" as _;
+import "serialize" as _;
 
 zdef("sqlite3", `
     fn sqlite3_initialize() c_int;
@@ -152,7 +153,7 @@ export object Statement {
     ud stmt,
 
     fun execute() > [[Boxed]] *> [Boxed]? !> SQLiteError {
-        Logger.instance?.debug("Executing query `{this.query}`", namespace: "SQL");
+        std.print("Executing query `{this.query}`");
         ResultCode code = ResultCode.Ok;
 
         [[Boxed]] rows = [<[Boxed]>];
@@ -198,28 +199,22 @@ export object Statement {
             const [Boxed] boxedRow = (Boxed.init(row) catch void).listValue();
             rows.append(boxedRow);
 
-            yield boxedRow;
+            _ = yield boxedRow;
         }
 
         return rows;
     }
 
     fun collect() > void {
-        sqlite3_finalize(this.stmt);
+        _ = sqlite3_finalize(this.stmt);
     }
 }
 
 export object Database {
     ud db,
 
     fun collect() > void {
-        const ResultCode code = ResultCode(sqlite3_close_v2(this.db)) ?? ResultCode.Error;
-        if (code != ResultCode.Ok) {
-            throw SQLiteError{
-                code = code,
-                message = "Could not close database: {code} {sqlite3_errmsg(this.db)}"
-            };
-        }
+        _ = ResultCode(sqlite3_close_v2(this.db)) ?? ResultCode.Error;
     }
 
     fun prepare(Query query) > Statement !> SQLiteError {
@@ -228,12 +223,12 @@ export object Database {
 
     fun prepareRaw(str query) > Statement !> SQLiteError {
         Buffer buffer = Buffer.init();
-        buffer.writeUserData(toUd(0)) catch void;
+        buffer.writeUserData(std.toUd(0)) catch void;
 
         const ResultCode code = ResultCode(
             sqlite3_prepare_v2(
                 db: this.db,
-                zSql: cstr(query),
+                zSql: ffi.cstr(query),
                 nBytes: -1,
                 ppStmt: buffer.ptr(),
                 pzTail: null,
@@ -268,11 +263,11 @@ export object SQLite {
     }
 
     static fun escape(str string) > str {
-        return sqlite3_mprintf(cstr(string)) ?? "";
+        return sqlite3_mprintf(ffi.cstr(string)) ?? "";
     } 
 
     fun collect() > void {
-        sqlite3_shutdown();
+        _ = sqlite3_shutdown();
     }
 
     fun open(str filename, [OpenFlag] flags) > Database !> SQLiteError {
@@ -282,11 +277,11 @@ export object SQLite {
         }
 
         Buffer buffer = Buffer.init();
-        buffer.writeUserData(toUd(0)) catch void;
+        buffer.writeUserData(std.toUd(0)) catch void;
 
         const ResultCode code = ResultCode(
             sqlite3_open_v2(
-                filename: cstr(filename),
+                filename: ffi.cstr(filename),
                 ppDb: buffer.ptr(),
                 flags: cFlags,
                 zVfs: null
@@ -300,7 +295,7 @@ export object SQLite {
             };
         }
 
-        Logger.instance?.info("Database `{filename}` opened", namespace: "SQL");
+        std.print("Database `{filename}` opened");
 
         return Database {
             db = buffer.readUserData()!,
@@ -319,10 +314,10 @@ test "Testing sqlite" {
         )
     `);
 
-    statement.execute();
+    _ =  statement.execute();
 
     foreach (str name in ["john", "joe", "janet", "joline"]) {
-        Query{}
+        _ = Query{}
             .insertInto("test", columns: [ "name" ])
             .values([ "'{name}'" ])
             .execute(database);
@@ -334,6 +329,6 @@ test "Testing sqlite" {
         .prepare(database);
 
     foreach ([Boxed] row in &select.execute()) {
-        print("{row[0].integerValue()}: {row[1].stringValue()}");
+        std.print("{row[0].integerValue()}: {row[1].stringValue()}");
     }
 }
diff --git a/src/Ast.zig b/src/Ast.zig
@@ -109,6 +109,7 @@ pub const Node = struct {
         ListType,
         Map,
         MapType,
+        Namespace,
         NamedVariable,
         Null,
         ObjectDeclaration,
@@ -174,6 +175,7 @@ pub const Node = struct {
         ListType: ListType,
         Map: Map,
         MapType: MapType,
+        Namespace: TokenIndex,
         NamedVariable: NamedVariable,
         Null: void,
         ObjectDeclaration: ObjectDeclaration,
@@ -562,6 +564,7 @@ pub fn isConstant(self: Self, node: Node.Index) bool {
         .StringLiteral,
         .TypeExpression,
         .Void,
+        .Namespace,
         => true,
         .AsyncCall,
         .Block,

diff --git a/src/Codegen.zig b/src/Codegen.zig
@@ -58,7 +58,7 @@ jit: ?*JIT,
 reporter: Reporter,
 
 const generators = [_]NodeGen{
-    &noGen, // AnonymousObjectType,
+    noGen, // AnonymousObjectType,
     generateAs, // As,
     generateAsyncCall, // AsyncCall,
     generateBinary, // Binary,
@@ -93,6 +93,7 @@ const generators = [_]NodeGen{
     noGen, // ListType,
     generateMap, // Map,
     noGen, // MapType,
+    noGen, // Namespace,
     generateNamedVariable, // NamedVariable,
     generateNull, // Null,
     generateObjectDeclaration, // ObjectDeclaration,