aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdvard Thörnros <edvard.thornros@gmail.com>2021-02-10 23:01:35 +0100
committerEdvard Thörnros <edvard.thornros@gmail.com>2021-02-10 23:01:35 +0100
commit651865f41eea7a64093724ad664646eb76100ab1 (patch)
tree5876c211d4512f01997ac0aaf314861d9af9f6bc
parentbe4559ed0af1d12401365b5ffeae99885842314f (diff)
downloadsylt-651865f41eea7a64093724ad664646eb76100ab1.tar.gz
add constants
-rw-r--r--src/compiler.rs47
1 files changed, 47 insertions, 0 deletions
diff --git a/src/compiler.rs b/src/compiler.rs
index 7f0d32d..d18d9c6 100644
--- a/src/compiler.rs
+++ b/src/compiler.rs
@@ -126,6 +126,7 @@ struct Variable {
active: bool,
upvalue: bool,
captured: bool,
+ mutable: bool,
}
struct Frame {
@@ -759,6 +760,32 @@ impl Compiler {
scope,
active: false,
upvalue: false,
+ mutable: true,
+ });
+ Ok(slot)
+ }
+
+ fn define_constant(&mut self, name: &str, typ: Type, _block: &mut Block) -> Result<usize, ()> {
+ if let Some(var) = self.find_variable(&name) {
+ if var.scope == self.frame().scope {
+ error!(self, format!("Multiple definitions of {} in this block.", name));
+ return Err(());
+ }
+ }
+
+ let slot = self.stack().len();
+ let scope = self.frame().scope;
+ self.stack_mut().push(Variable {
+ name: String::from(name),
+ captured: false,
+ outer_upvalue: false,
+ outer_slot: 0,
+ slot,
+ typ,
+ scope,
+ active: false,
+ upvalue: false,
+ mutable: false,
});
Ok(slot)
}
@@ -774,6 +801,15 @@ impl Compiler {
}
}
+ fn constant_statement(&mut self, name: &str, typ: Type, block: &mut Block) {
+ let slot = self.define_constant(name, typ.clone(), block);
+ self.expression(block);
+
+ if let Ok(slot) = slot {
+ self.stack_mut()[slot].active = true;
+ }
+ }
+
fn assign(&mut self, block: &mut Block) {
let name = match self.eat() {
Token::Identifier(name) => name,
@@ -798,6 +834,10 @@ impl Compiler {
};
if let Some(var) = self.find_variable(&name) {
+ if !var.mutable {
+ // TODO(ed): Maybe a better error than "SyntaxError".
+ error!(self, format!("Cannot assign to constant '{}'", var.name));
+ }
if let Some(op) = op {
add_op(self, block, Op::Copy);
self.expression(block);
@@ -1123,6 +1163,12 @@ impl Compiler {
self.definition_statement(&name, Type::Unknown, block);
}
+ (Token::Identifier(name), Token::ColonColon, ..) => {
+ self.eat();
+ self.eat();
+ self.constant_statement(&name, Type::Unknown, block);
+ }
+
(Token::Blob, Token::Identifier(_), ..) => {
self.blob_statement(block);
}
@@ -1177,6 +1223,7 @@ impl Compiler {
active: false,
captured: false,
upvalue: false,
+ mutable: true,
});
let mut block = Block::new(name, file, 0);