Skip to content

Commit

Permalink
frontend: Warn about old class definition usages
Browse files Browse the repository at this point in the history
  • Loading branch information
@dinfuehr
dinfuehr committed Nov 5, 2024
1 parent 40d32be commit 2258c35
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 32 deletions.
4 changes: 4 additions & 0 deletions dora-frontend/src/error/msg.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ pub enum ErrorMessage {
SuperfluousArgument,
MissingArguments(usize, usize),
FieldShouldBeUnnamed,
OldClassDefinition,
}

impl ErrorMessage {
Expand Down Expand Up @@ -725,6 +726,9 @@ impl ErrorMessage {
ErrorMessage::FieldShouldBeUnnamed => {
format!("Field access should be unnamed.")
}
ErrorMessage::OldClassDefinition => {
format!("Switch code to new class definition syntax.")
}
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions dora-frontend/src/program_parser.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,11 @@ impl<'x> visit::Visitor for TopLevelDeclaration<'x> {
for field in &node.fields {
check_modifiers(self.sa, self.file_id, &field.modifiers, &[Annotation::Pub]);
}

if node.field_name_style.is_old() {
self.sa
.warn(self.file_id, node.span, ErrorMessage::OldClassDefinition);
}
}

fn visit_struct(&mut self, node: &Arc<ast::Struct>) {
Expand Down
56 changes: 28 additions & 28 deletions dora-frontend/src/typeck/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@ fn type_method_len() {

#[test]
fn type_object_field() {
ok("class Foo(a:Int32) fn f(x: Foo): Int32 { return x.a; }");
ok("class Foo(a:String) fn f(x: Foo): String { return x.a; }");
ok("class Foo{a:Int32} fn f(x: Foo): Int32 { return x.a; }");
ok("class Foo{a:String} fn f(x: Foo): String { return x.a; }");
err(
"class Foo(a:Int32) fn f(x: Foo): Bool { return x.a; }",
"class Foo{a:Int32} fn f(x: Foo): Bool { return x.a; }",
(1, 41),
ErrorMessage::ReturnType("Bool".into(), "Int32".into()),
);
err(
"class Foo(a:Int32) fn f(x: Foo): Int32 { return x.b; }",
"class Foo{a:Int32} fn f(x: Foo): Int32 { return x.b; }",
(1, 51),
ErrorMessage::UnknownField("b".into(), "Foo".into()),
);
}

#[test]
fn type_object_set_field() {
ok("class Foo(a: Int32) fn f(x: Foo) { x.a = 1; }");
ok("class Foo{a: Int32} fn f(x: Foo) { x.a = 1; }");
err(
"class Foo(a: Int32) fn f(x: Foo) { x.a = false; }",
"class Foo{a: Int32} fn f(x: Foo) { x.a = false; }",
(1, 36),
ErrorMessage::AssignField("a".into(), "Foo".into(), "Int32".into(), "Bool".into()),
);
Expand All @@ -39,12 +39,12 @@ fn type_object_set_field() {
#[test]
fn type_object_field_without_self() {
err(
"class Foo(a: Int32) impl Foo { fn f(): Int32 { return a; } }",
"class Foo{a: Int32} impl Foo { fn f(): Int32 { return a; } }",
(1, 55),
ErrorMessage::UnknownIdentifier("a".into()),
);
err(
"class Foo(a: Int32) impl Foo { fn set(x: Int32) { a = x; } }",
"class Foo{a: Int32} impl Foo { fn set(x: Int32) { a = x; } }",
(1, 51),
ErrorMessage::UnknownIdentifier("a".into()),
);
Expand Down Expand Up @@ -139,12 +139,12 @@ fn type_self() {
ErrorMessage::ThisUnavailable,
);

ok("class Foo(a: Int32, b: Int32)
ok("class Foo{a: Int32, b: Int32}
impl Foo {
fn bar(): Int32 { return self.a + self.b; }
}");

ok("class Foo(a: Int32)
ok("class Foo{a: Int32}
impl Foo {
fn setA(a: Int32) { self.a = a; }
}");
Expand Down Expand Up @@ -185,7 +185,7 @@ fn type_unknown_method() {
#[test]
fn type_ctor() {
ok("class Foo fn f(): Foo { return Foo(); }");
ok("class Foo(a: Int32) fn f(): Foo { return Foo(1i32); }");
ok("class Foo&(Int32) fn f(): Foo { return Foo(1i32); }");
err(
"class Foo fn f(): Foo { return 1i32; }",
(1, 25),
Expand Down Expand Up @@ -497,7 +497,7 @@ fn type_array_assign() {
#[test]
fn type_array_field() {
ok("
class Foo(x: Array[Int32])
class Foo { x: Array[Int32] }
fn f(a: Foo): Int32 { return a.x(1i64); }
");
}
Expand Down Expand Up @@ -533,7 +533,7 @@ fn reassign_param() {

#[test]
fn reassign_field() {
ok("class Foo(x: Int32) fn foo(f: Foo) { f.x = 1; }");
ok("class Foo {x: Int32} fn foo(f: Foo) { f.x = 1; }");
}

#[test]
Expand Down Expand Up @@ -2205,7 +2205,7 @@ fn zero_trait_err() {
#[test]
fn extension_method_call() {
ok("
class Foo(value: Int32)
class Foo { value: Int32 }
impl Foo { fn foo(): Int32 { self.value } }
fn bar(x: Foo): Int32 { x.foo() }
");
Expand Down Expand Up @@ -2866,7 +2866,7 @@ fn mod_class_field() {
err(
"
fn f(x: foo::Foo) { let a = x.bar; }
mod foo { pub class Foo(bar: Int32) }
mod foo { pub class Foo { bar: Int32 } }
",
(2, 39),
ErrorMessage::NotAccessible,
Expand All @@ -2875,7 +2875,7 @@ fn mod_class_field() {
err(
"
fn f(x: foo::Foo) { let a = x.bar(10i64); }
mod foo { pub class Foo(bar: Array[Int32]) }
mod foo { pub class Foo { bar: Array[Int32] } }
",
(2, 37),
ErrorMessage::NotAccessible,
Expand All @@ -2884,15 +2884,15 @@ fn mod_class_field() {
err(
"
fn f(x: foo::Foo) { x.bar(10i64) = 10i32; }
mod foo { pub class Foo(bar: Array[Int32]) }
mod foo { pub class Foo { bar: Array[Int32] } }
",
(2, 31),
ErrorMessage::NotAccessible,
);

ok("
fn f(x: foo::Foo) { let a = x.bar; }
mod foo { pub class Foo(pub bar: Int32) }
mod foo { pub class Foo { pub bar: Int32 } }
");
}

Expand Down Expand Up @@ -3063,7 +3063,7 @@ fn mod_impl() {
fn mod_class() {
ok("
mod foo {
class Foo(x: Bar)
class Foo&(Bar)
impl Foo {
fn foo(x: Bar) {}
}
Expand All @@ -3076,7 +3076,7 @@ fn mod_class() {
fn mod_class_new() {
ok("
mod foo {
class Foo(x: Bar)
class Foo&(Bar)
class Bar
}
");
Expand All @@ -3085,7 +3085,7 @@ fn mod_class_new() {
"
fn f() { foo::Foo(1i32); }
mod foo {
class Foo(f: Int32)
class Foo&(Int32)
}
",
(2, 18),
Expand All @@ -3096,7 +3096,7 @@ fn mod_class_new() {
"
fn f() { foo::Foo(1i32); }
mod foo {
class Foo(pub f: Int32)
class Foo&(pub Int32)
}
",
(2, 18),
Expand All @@ -3107,7 +3107,7 @@ fn mod_class_new() {
"
fn f() { foo::Foo(1i32); }
mod foo {
pub class Foo(f: Int32)
pub class Foo&(Int32)
}
",
(2, 18),
Expand Down Expand Up @@ -4342,7 +4342,7 @@ fn pattern_in_expression() {
#[test]
fn pattern_class_with_args() {
ok("
class Foo(a: Int64, b: String)
class Foo&(Int64, String)
fn f(x: Foo): Int64 {
let Foo(a, b) = x;
a
Expand All @@ -4351,8 +4351,8 @@ fn pattern_class_with_args() {

err(
"
class Foo(a: Int64, b: String)
class Bar(a: Int64, b: String)
class Foo&(Int64, String)
class Bar&(Int64, String)
fn f(x: Foo): Int64 {
let Bar(a, b) = x;
b
Expand All @@ -4364,7 +4364,7 @@ fn pattern_class_with_args() {

err(
"
class Foo(a: Int64)
class Foo&(Int64)
fn f(x: Foo): Int64 {
let Foo(a, b) = x;
b
Expand Down Expand Up @@ -4475,7 +4475,7 @@ fn pattern_class_private_ctor() {
err(
"
mod n {
pub class Foo(pub a: Int64, b: String)
pub class Foo&(pub Int64, String)
}
fn f(x: n::Foo): Int64 {
let n::Foo(a, b) = x;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/boots/bytecode/builder.dora
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ impl BytecodeBuilder {
}
}

class BytecodeLabel(off: Int32)
class BytecodeLabel &(Int32)

impl BytecodeLabel {
static fn new(): BytecodeLabel {
Expand All @@ -446,7 +446,7 @@ impl BytecodeLabel {

fn bindTo(offset: Int32): BytecodeLabel {
assert(offset >= 0i32);
self.off = offset;
self.0 = offset;
self
}

Expand Down
8 changes: 6 additions & 2 deletions pkgs/std/thread.dora
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ impl Thread {

@internal pub fn spawn(action: (): ()): Thread;

pub class AtomicInt32(value: Int32)
pub class AtomicInt32 {
value: Int32
}

impl AtomicInt32 {
pub static fn new(value: Int32): AtomicInt32 {
Expand All @@ -29,7 +31,9 @@ impl AtomicInt32 {
pub @internal fn fetchAdd(value: Int32): Int32;
}

pub class AtomicInt64(value: Int64)
pub class AtomicInt64 {
value: Int64
}

impl AtomicInt64 {
pub static fn new(value: Int64): AtomicInt64 {
Expand Down

0 comments on commit 2258c35

Please sign in to comment.