From b3b5887d8b64d6b56d04ad5180a58d3c5a4c7809 Mon Sep 17 00:00:00 2001 From: Andrew Morris Date: Fri, 23 Jun 2023 09:23:48 +1000 Subject: [PATCH] methods -> prototype --- valuescript_compiler/src/asm.rs | 6 +++--- valuescript_compiler/src/assembler.rs | 2 +- valuescript_compiler/src/assembly_parser.rs | 2 +- valuescript_compiler/src/link_module.rs | 2 +- valuescript_compiler/src/module_compiler.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/valuescript_compiler/src/asm.rs b/valuescript_compiler/src/asm.rs index 9bbceb9..46cc811 100644 --- a/valuescript_compiler/src/asm.rs +++ b/valuescript_compiler/src/asm.rs @@ -138,14 +138,14 @@ impl std::fmt::Display for Function { #[derive(Debug, Clone)] pub struct Class { pub constructor: Value, - pub methods: Value, + pub prototype: Value, } impl std::fmt::Display for Class { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { write!(f, "class({}, ", self.constructor)?; - match &self.methods { + match &self.prototype { Value::Object(object) => { write!(f, "{{\n")?; for (name, method) in &object.properties { @@ -154,7 +154,7 @@ impl std::fmt::Display for Class { write!(f, "}})")?; } _ => { - write!(f, "{})", self.methods)?; + write!(f, "{})", self.prototype)?; } } diff --git a/valuescript_compiler/src/assembler.rs b/valuescript_compiler/src/assembler.rs index df96059..0e73048 100644 --- a/valuescript_compiler/src/assembler.rs +++ b/valuescript_compiler/src/assembler.rs @@ -146,7 +146,7 @@ impl Assembler { fn class(&mut self, class: &Class) { self.output.push(ValueType::Class as u8); self.value(&class.constructor); - self.value(&class.methods); + self.value(&class.prototype); } fn label(&mut self, label: &Label) { diff --git a/valuescript_compiler/src/assembly_parser.rs b/valuescript_compiler/src/assembly_parser.rs index df025cd..5382e6b 100644 --- a/valuescript_compiler/src/assembly_parser.rs +++ b/valuescript_compiler/src/assembly_parser.rs @@ -530,7 +530,7 @@ impl<'a> AssemblyParser<'a> { Class { constructor, - methods, + prototype: methods, } } diff --git a/valuescript_compiler/src/link_module.rs b/valuescript_compiler/src/link_module.rs index bc91a59..5ed2dbd 100644 --- a/valuescript_compiler/src/link_module.rs +++ b/valuescript_compiler/src/link_module.rs @@ -185,7 +185,7 @@ where } DefinitionContent::Class(class) => { self.value(Some(&definition.pointer), &mut class.constructor); - self.value(Some(&definition.pointer), &mut class.methods); + self.value(Some(&definition.pointer), &mut class.prototype); } DefinitionContent::Value(value) => { self.value(Some(&definition.pointer), value); diff --git a/valuescript_compiler/src/module_compiler.rs b/valuescript_compiler/src/module_compiler.rs index 0afc3be..291f1e1 100644 --- a/valuescript_compiler/src/module_compiler.rs +++ b/valuescript_compiler/src/module_compiler.rs @@ -847,7 +847,7 @@ impl ModuleCompiler { pointer: defn_name.clone(), content: DefinitionContent::Class(Class { constructor, - methods: Value::Object(Box::new(methods)), + prototype: Value::Object(Box::new(methods)), }), });