Merge branch 'Spu7Nix:master' into master

Spu7Nix · Aug 1, 2021 · 45585f1 · 45585f1
2 parents 70056f6 + 3a6da29
commit 45585f1
Show file tree

Hide file tree

Showing 16 changed files with 430 additions and 283 deletions.
diff --git a/spwn-lang/Cargo.lock b/spwn-lang/Cargo.lock
diff --git a/spwn-lang/Cargo.toml b/spwn-lang/Cargo.toml
@@ -18,6 +18,8 @@ smallvec = "1.4.2"
 text_io = "0.1.8"
 regex = "1.5.4"
 
+internment = "0.5.4"
+
 ariadne = "0.1.3" # errors
 
 aes = "0.6.0"

diff --git a/spwn-lang/src/ast.rs b/spwn-lang/src/ast.rs
@@ -77,11 +77,11 @@ pub enum ValueBody {
 }
 
 impl ValueBody {
-    pub fn to_variable(&self) -> Variable {
+    pub fn to_variable(&self, pos: FileRange) -> Variable {
         Variable {
             value: ValueLiteral { body: self.clone() },
             operator: None,
-            pos: (0, 0),
+            pos,
             //comment: (None, None),
             path: Vec::new(),
             tag: Attribute::new(),
@@ -354,7 +354,7 @@ impl Expression {
         Variable {
             operator: None,
             value: ValueLiteral::new(ValueBody::Expression(self.clone())),
-            pos: (0, 0),
+            pos: self.get_pos(),
             path: Vec::new(),
             //comment: (None, None),
             tag: Attribute::new(),

diff --git a/spwn-lang/src/builtin.rs b/spwn-lang/src/builtin.rs
@@ -289,7 +289,7 @@ macro_rules! typed_argument_check {
         #[allow(unused_variables)]
         #[allow(unused_mut)]
         #[allow(unused_parens)]
-        let ( $($arg_name),*) = clone_and_get_value($arguments[$arg_index], $globals.get_lifetime($arguments[$arg_index]), $globals, $context.start_group, true, $info.position.clone());
+        let ( $($arg_name),*) = clone_and_get_value($arguments[$arg_index], $globals.get_lifetime($arguments[$arg_index]), $globals, $context.start_group, true);
     };
 
     (($globals:ident, $arg_index:ident, $arguments:ident, $info:ident, $context:ident) mut ($($arg_name:ident),*)) => {
@@ -304,7 +304,7 @@ macro_rules! typed_argument_check {
         #[allow(unused_mut)]
         #[allow(unused_parens)]
 
-        let  ( $($arg_name),*) = match clone_and_get_value($arguments[$arg_index], $globals.get_lifetime($arguments[$arg_index]), $globals, $context.start_group, true, $info.position.clone()) {
+        let  ( $($arg_name),*) = match clone_and_get_value($arguments[$arg_index], $globals.get_lifetime($arguments[$arg_index]), $globals, $context.start_group, true) {
             Value::$arg_type($($arg_name),*) => ($($arg_name),*),
 
             a => {