remove mutability/publicability
i may implement those in a better way, which isn't V's
This commit is contained in:
parent
c7920246a5
commit
9869cca2ae
3 changed files with 8 additions and 111 deletions
|
@ -29,7 +29,6 @@ pub const ParamDecl = struct {
|
||||||
pub const MethodData = struct {
|
pub const MethodData = struct {
|
||||||
variable: Token,
|
variable: Token,
|
||||||
typ: Token,
|
typ: Token,
|
||||||
mutable: bool,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
pub const FnDecl = struct {
|
pub const FnDecl = struct {
|
||||||
|
@ -288,10 +287,6 @@ pub const FieldList = std.ArrayList(StructField);
|
||||||
pub const StructField = struct {
|
pub const StructField = struct {
|
||||||
name: Token,
|
name: Token,
|
||||||
typ: Token,
|
typ: Token,
|
||||||
|
|
||||||
mutable: bool = false,
|
|
||||||
public: bool = false,
|
|
||||||
mutable_outside: bool = false,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
pub const Struct = struct {
|
pub const Struct = struct {
|
||||||
|
|
|
@ -48,11 +48,7 @@ pub fn printNode(node: *const Node, ident: usize) void {
|
||||||
const vari = method.variable.lexeme;
|
const vari = method.variable.lexeme;
|
||||||
const typ = method.typ.lexeme;
|
const typ = method.typ.lexeme;
|
||||||
|
|
||||||
if (method.mutable) {
|
warn("(method {} {} {} {} (", vari, typ, name, ret_type);
|
||||||
warn("(method mut {} {} {} {} (", vari, typ, name, ret_type);
|
|
||||||
} else {
|
|
||||||
warn("(method {} {} {} {} (", vari, typ, name, ret_type);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
warn("(fn {} {} (", name, ret_type);
|
warn("(fn {} {} (", name, ret_type);
|
||||||
}
|
}
|
||||||
|
@ -112,22 +108,7 @@ pub fn printNode(node: *const Node, ident: usize) void {
|
||||||
.Struct => |struc| {
|
.Struct => |struc| {
|
||||||
print(ident, "(struct {} (\n", struc.name.lexeme);
|
print(ident, "(struct {} (\n", struc.name.lexeme);
|
||||||
for (struc.fields.toSlice()) |field| {
|
for (struc.fields.toSlice()) |field| {
|
||||||
printIdent(ident + 1);
|
print(ident + 1, "({} {})\n", field.name.lexeme, field.typ.lexeme);
|
||||||
if (field.mutable) {
|
|
||||||
std.debug.warn("(mut ");
|
|
||||||
} else {
|
|
||||||
std.debug.warn("(");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (field.public) {
|
|
||||||
std.debug.warn("pub ");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (field.mutable_outside) {
|
|
||||||
std.debug.warn("MUT_OUT ");
|
|
||||||
}
|
|
||||||
|
|
||||||
std.debug.warn("{} {})\n", field.name.lexeme, field.typ.lexeme);
|
|
||||||
}
|
}
|
||||||
print(ident, "))\n");
|
print(ident, "))\n");
|
||||||
},
|
},
|
||||||
|
|
|
@ -23,12 +23,6 @@ const Stmt = ast.Stmt;
|
||||||
|
|
||||||
const TokenList = std.ArrayList(Token);
|
const TokenList = std.ArrayList(Token);
|
||||||
|
|
||||||
const FieldState = struct {
|
|
||||||
public: bool = false,
|
|
||||||
mutable: bool = false,
|
|
||||||
mutable_outside: bool = false,
|
|
||||||
};
|
|
||||||
|
|
||||||
const operator_tokens = [_][]const u8{
|
const operator_tokens = [_][]const u8{
|
||||||
"+", "-", "*", "/", "%", ">", ">=", "<", "<=", "==",
|
"+", "-", "*", "/", "%", ">", ">=", "<", "<=", "==",
|
||||||
};
|
};
|
||||||
|
@ -511,19 +505,12 @@ pub const Parser = struct {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// parse the (v [mut] T) part of the method (defined here
|
/// parse the (v T) part of the method (defined here
|
||||||
/// as a premethod)
|
/// as a premethod)
|
||||||
fn parsePreMethod(self: *@This()) !?*ast.MethodData {
|
fn parsePreMethod(self: *@This()) !?*ast.MethodData {
|
||||||
_ = try self.consumeSingle(.LeftParen);
|
_ = try self.consumeSingle(.LeftParen);
|
||||||
|
|
||||||
var mutable_ref: bool = false;
|
|
||||||
const variable = try self.consumeSingle(.Identifier);
|
const variable = try self.consumeSingle(.Identifier);
|
||||||
|
|
||||||
if (self.check(.Mut)) {
|
|
||||||
_ = try self.consumeSingle(.Mut);
|
|
||||||
mutable_ref = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
const typ = try self.consumeSingle(.Identifier);
|
const typ = try self.consumeSingle(.Identifier);
|
||||||
|
|
||||||
_ = try self.consumeSingle(.RightParen);
|
_ = try self.consumeSingle(.RightParen);
|
||||||
|
@ -533,7 +520,6 @@ pub const Parser = struct {
|
||||||
method.* = ast.MethodData{
|
method.* = ast.MethodData{
|
||||||
.variable = variable,
|
.variable = variable,
|
||||||
.typ = typ,
|
.typ = typ,
|
||||||
.mutable = mutable_ref,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
return method;
|
return method;
|
||||||
|
@ -581,27 +567,14 @@ pub const Parser = struct {
|
||||||
|
|
||||||
_ = try self.consumeSingle(.LeftBrace);
|
_ = try self.consumeSingle(.LeftBrace);
|
||||||
|
|
||||||
var field_state = FieldState{};
|
|
||||||
|
|
||||||
while (!self.check(.RightBrace)) {
|
while (!self.check(.RightBrace)) {
|
||||||
try self.parseFieldModifiers(&field_state);
|
|
||||||
|
|
||||||
const field_name = try self.consumeSingle(.Identifier);
|
const field_name = try self.consumeSingle(.Identifier);
|
||||||
self.setErrContext("struct {} field {}", name, field_name);
|
self.setErrContext("struct {} field {}", name, field_name);
|
||||||
|
|
||||||
const field_type = try self.consumeSingle(.Identifier);
|
const field_type = try self.consumeSingle(.Identifier);
|
||||||
|
|
||||||
// we could create a FieldState on the heap and copy our current
|
|
||||||
// field state into a StructField.state, but copying via this makes
|
|
||||||
// things so much nicer.
|
|
||||||
|
|
||||||
try fields.append(ast.StructField{
|
try fields.append(ast.StructField{
|
||||||
.name = field_name,
|
.name = field_name,
|
||||||
.typ = field_type,
|
.typ = field_type,
|
||||||
|
|
||||||
.mutable = field_state.mutable,
|
|
||||||
.public = field_state.public,
|
|
||||||
.mutable_outside = field_state.mutable_outside,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -610,51 +583,6 @@ pub const Parser = struct {
|
||||||
return Node.mkStructDecl(self.allocator, name, fields);
|
return Node.mkStructDecl(self.allocator, name, fields);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn parseFieldModifiers(self: *@This(), field_state: *FieldState) !void {
|
|
||||||
|
|
||||||
// there are five access modifiers:
|
|
||||||
// - none (private immutable)
|
|
||||||
// - mut (private mutable)
|
|
||||||
// - pub (public immutable)
|
|
||||||
// - pub mut (public mutable only in module)
|
|
||||||
// - pub mut mut (public mutable everywhere)
|
|
||||||
|
|
||||||
// this function takes care of that by changing the current FieldState
|
|
||||||
// to what the modifiers dictate.
|
|
||||||
switch (self.peek().typ) {
|
|
||||||
.Mut => {
|
|
||||||
// There are no oher modifiers that start with mut, so we
|
|
||||||
// can just go the way of marking it as mutable
|
|
||||||
_ = try self.consumeSingle(.Mut);
|
|
||||||
_ = try self.consumeSingle(.Colon);
|
|
||||||
|
|
||||||
field_state.mutable = true;
|
|
||||||
},
|
|
||||||
|
|
||||||
// 'pub', 'pub mut', and 'pub mut mut' are all handled here
|
|
||||||
.Pub => {
|
|
||||||
_ = try self.consumeSingle(.Pub);
|
|
||||||
field_state.public = true;
|
|
||||||
|
|
||||||
if (self.check(.Mut)) {
|
|
||||||
_ = try self.consumeSingle(.Mut);
|
|
||||||
|
|
||||||
field_state.mutable = true;
|
|
||||||
if (self.check(.Mut)) {
|
|
||||||
_ = try self.consumeSingle(.Mut);
|
|
||||||
field_state.mutable_outside = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_ = try self.consumeSingle(.Colon);
|
|
||||||
},
|
|
||||||
|
|
||||||
// if it isn't mut or pub we're likely in an identifier, just
|
|
||||||
// ignore it.
|
|
||||||
else => return,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parseEnumDecl(self: *@This()) !*Node {
|
fn parseEnumDecl(self: *@This()) !*Node {
|
||||||
var fields = ast.TokenList.init(self.allocator);
|
var fields = ast.TokenList.init(self.allocator);
|
||||||
errdefer fields.deinit();
|
errdefer fields.deinit();
|
||||||
|
@ -848,29 +776,22 @@ pub const Parser = struct {
|
||||||
// there can be two assignments coming out of this function:
|
// there can be two assignments coming out of this function:
|
||||||
// - an assignment to a variable with =
|
// - an assignment to a variable with =
|
||||||
// - an update to a variable with +=, -=
|
// - an update to a variable with +=, -=
|
||||||
|
|
||||||
// one is a statement, other is an expression. since the normal result
|
|
||||||
// of this is an Expr, we wrap variable assignments in an Expr as well.
|
|
||||||
var mutable: bool = false;
|
|
||||||
|
|
||||||
if (self.check(.Mut)) {
|
|
||||||
_ = try self.consumeSingle(.Mut);
|
|
||||||
mutable = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
var expr = try self.parseOr();
|
var expr = try self.parseOr();
|
||||||
|
|
||||||
if (self.compareAnyOf(&[_]TokenType{
|
if (self.compareAnyOf(&[_]TokenType{
|
||||||
.Equal, .PlusEqual, .MinusEqual, .StarEqual,
|
.Equal, .PlusEqual, .MinusEqual, .StarEqual,
|
||||||
.SlashEqual,
|
.SlashEqual,
|
||||||
})) {
|
})) {
|
||||||
return try self.finishAssignment(expr, mutable);
|
return try self.finishAssignment(expr);
|
||||||
}
|
}
|
||||||
|
|
||||||
return expr;
|
return expr;
|
||||||
}
|
}
|
||||||
|
|
||||||
fn finishAssignment(self: *@This(), expr: *Expr, mutable: bool) !*Expr {
|
fn finishAssignment(
|
||||||
|
self: *@This(),
|
||||||
|
expr: *Expr,
|
||||||
|
) !*Expr {
|
||||||
var op_tok = self.peek();
|
var op_tok = self.peek();
|
||||||
_ = try self.nextToken();
|
_ = try self.nextToken();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue