From b9d10fae035643cc798221318e21e2cebe9b498c Mon Sep 17 00:00:00 2001
From: Erin <erin@erindesu.cz>
Date: Sun, 6 Jun 2021 23:13:48 +0200
Subject: [PATCH] AST revamp - Unified terminology of span in error.rs

---
 src/ast.rs   | 18 ++++++++++++++++--
 src/error.rs |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/ast.rs b/src/ast.rs
index 434a246a..a8643171 100644
--- a/src/ast.rs
+++ b/src/ast.rs
@@ -1,9 +1,22 @@
+//! AbleScript's Abstract Syntax tree
+//!
+//! Statements are the type which is AST made of, as they
+//! express an effect.
+//!
+//! Expressions are just operations and they cannot be
+//! used as statements. Functions in AbleScript are in fact
+//! just plain subroutines and they do not return any value, 
+//! so their calls are statements.
+
 use crate::variables::Value;
 
 type Span = std::ops::Range<usize>;
 
 #[derive(Debug)]
-pub struct Iden(String);
+pub struct Iden {
+    pub iden: String,
+    pub span: Span,
+}
 
 #[derive(Debug)]
 pub struct Block {
@@ -64,13 +77,14 @@ pub struct Expr {
 
 #[derive(Debug)]
 pub enum ExprKind {
-    Binary {
+    BinOp {
         lhs: Box<Expr>,
         rhs: Box<Expr>,
         kind: BinOpKind,
     },
     Not(Box<Expr>),
     Literal(Value),
+    Variable(String),
 }
 
 impl Expr {
diff --git a/src/error.rs b/src/error.rs
index 2d2a3541..bd150013 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -5,7 +5,7 @@ use crate::brian::InterpretError;
 #[derive(Debug, Clone)]
 pub struct Error {
     pub kind: ErrorKind,
-    pub position: Range<usize>,
+    pub span: Range<usize>,
 }
 
 #[derive(Debug, Clone)]