diff --git a/README.md b/README.md index 95aa47f..3f2d823 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,16 @@ -# spoodle +# vig -a vlang parser in zig +a [v] parser in zig + +[v]: https://vlang.io + +(will likely be done as a full compiler, who knows, leave a like and subscribe +for more epic adventures) ## why -because i can +because i want to learn parsers and what best to do it with a language i'm +negatively charged towards ## variations @@ -17,7 +23,7 @@ because i can ## how ``` -git clone https://gitdab.com/luna/spoodle.git -cd spoodle +git clone https://gitdab.com/luna/vig.git +cd vig zig build install --prefix ~/.local/ ``` diff --git a/build.zig b/build.zig index 39685c8..a3468ef 100644 --- a/build.zig +++ b/build.zig @@ -2,7 +2,7 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { const mode = b.standardReleaseOptions(); - const exe = b.addExecutable("spoodle", "src/main.zig"); + const exe = b.addExecutable("vig", "src/main.zig"); exe.setBuildMode(mode); const run_cmd = exe.run(); diff --git a/examples/hello.v b/examples/hello.v index af539b5..9c1f047 100644 --- a/examples/hello.v +++ b/examples/hello.v @@ -5,6 +5,11 @@ const ( Businesses = 4 ) +struct Point { + x int + y int +} + fn main(a int) int { 1 + 2 + 3 + 4 1 + 1 * 1 @@ -41,10 +46,7 @@ fn main(a int) int { y: 20 } - //println(p.x) -} + p.x = 69 -struct Point { - x int - y int -} + println(egg.scramble(3).with(cheddar)) +} diff --git a/src/ast.zig b/src/ast.zig index c031733..c872fd2 100644 --- a/src/ast.zig +++ b/src/ast.zig @@ -80,6 +80,8 @@ pub const ExprType = enum { Struct, Grouping, + Get, + Set, }; pub const VarDecl = struct { @@ -105,6 +107,17 @@ pub const StructExpr = struct { inits: StructInitList, }; +pub const GetExpr = struct { + struc: *Expr, + name: Token, +}; + +pub const SetExpr = struct { + struc: *Expr, + field: Token, + value: *Expr, +}; + pub const Expr = union(ExprType) { Assign: AssignExpr, VarDecl: VarDecl, @@ -118,6 +131,9 @@ pub const Expr = union(ExprType) { Variable: Token, Grouping: *Expr, Call: CallExpr, + + Get: GetExpr, + Set: SetExpr, }; pub const Block = std.ArrayList(*Stmt); diff --git a/src/ast_printer.zig b/src/ast_printer.zig index a44aa33..668e687 100644 --- a/src/ast_printer.zig +++ b/src/ast_printer.zig @@ -4,6 +4,8 @@ const Token = tokens.Token; usingnamespace @import("ast.zig"); +const warn = std.debug.warn; + fn printIdent(ident: usize) void { var i: usize = 0; while (i < ident) : (i += 1) { @@ -177,6 +179,20 @@ pub fn printExpr(expr: *Expr) void { std.debug.warn("))"); }, + .Get => |get| { + warn("("); + printExpr(get.struc); + warn(".{})", get.name.lexeme); + }, + + .Set => |set| { + warn("(set "); + printExpr(set.struc); + warn(" {} ", set.field.lexeme); + printExpr(set.value); + warn(")"); + }, + else => std.debug.warn("UnknownExpr-{}", @tagName(expr.*)), } } diff --git a/src/parser.zig b/src/parser.zig index f300ddc..d3fa8bf 100644 --- a/src/parser.zig +++ b/src/parser.zig @@ -89,7 +89,11 @@ pub const Parser = struct { } fn consume(self: *Parser, ttype: TokenType, comptime msg: []const u8) !Token { - if (self.check(ttype)) return try self.nextToken(); + if (self.check(ttype)) { + var tok = self.peek(); + _ = try self.nextToken(); + return tok; + } try self.tokenError(self.peek(), msg); return Result.CompileError; @@ -271,6 +275,31 @@ pub const Parser = struct { return expr; } + fn mkGet(self: *@This(), struc: *Expr, name: Token) !*Expr { + var expr = try self.allocator.create(Expr); + expr.* = Expr{ + .Get = ast.GetExpr{ + .struc = struc, + .name = name, + }, + }; + + return expr; + } + + fn mkSet(self: *@This(), struc: *Expr, field: Token, value: *Expr) !*Expr { + var expr = try self.allocator.create(Expr); + expr.* = Expr{ + .Set = ast.SetExpr{ + .struc = struc, + .field = field, + .value = value, + }, + }; + + return expr; + } + fn mkBool(self: *Parser, val: bool) !*ast.Expr { var expr = try self.allocator.create(Expr); expr.* = Expr{ @@ -582,15 +611,28 @@ pub const Parser = struct { _ = try self.nextToken(); value = try self.parseAssignment(); - if (ast.ExprType(expr.*) != .Variable) { - self.doError("Invalid assignment target"); - return Result.CompileError; - } + switch (expr.*) { + .Variable => { + switch (op.ttype) { + .ColonEqual => return try self.mkVarDecl(expr.Variable, value, mutable), + .Equal => return try self.mkAssign(expr.Variable, value), + else => unreachable, + } + }, - switch (op.ttype) { - .ColonEqual => return try self.mkVarDecl(expr.Variable, value, mutable), - .Equal => return try self.mkAssign(expr.Variable, value), - else => unreachable, + .Get => |get| { + if (op.ttype == .ColonEqual) { + self.doError("can not initialize struct field"); + return Result.CompileError; + } + + return try self.mkSet(get.struc, get.name, value); + }, + + else => |expr_typ| { + self.doError("Invalid assignment target {}", expr_typ); + return Result.CompileError; + }, } } @@ -715,17 +757,18 @@ pub const Parser = struct { printer.printExpr(expr); if (self.check(.LeftParen)) { - if (ast.ExprType(expr.*) != .Variable) { - self.doError("cannot call non-variable {}", ast.ExprType(expr.*)); - return Result.CompileError; - } - _ = try self.consumeSingle(.LeftParen); expr = try self.finishCall(expr); } else if (self.check(.Dot)) { _ = try self.consumeSingle(.Dot); - _ = try self.consumeSingle(.LeftBrace); - expr = try self.finishStructVal(expr); + + if (self.check(.LeftBrace)) { + _ = try self.consumeSingle(.LeftBrace); + expr = try self.finishStructVal(expr); + } else { + var name = try self.consume(.Identifier, "Expect property name after '.'"); + expr = try self.mkGet(expr, name); + } } else { break; } @@ -752,6 +795,7 @@ pub const Parser = struct { } } + // TODO shouldnt consume() return the current token, not nextToken? var paren = try self.consume(.RightParen, "Expected ')' after arguments"); return self.mkCall(callee, paren, args);