Skip to content

Commit dfcc790

Browse files
committed
refactor: Removed Position from Token, made fields private
Turns out the position was never read from `Token`, it is always picked up from the `RcStringView` with `with_pos()`.
1 parent a40749b commit dfcc790

99 files changed

Lines changed: 376 additions & 376 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

rusty_basic/src/bin/rusty_basic.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ use std::env;
22
use std::fs::File;
33

44
use rusty_basic::instruction_generator::{generate_instructions, unwrap_linter_context};
5-
use rusty_basic::interpreter::{new_default_interpreter, InterpreterTrait};
6-
use rusty_linter::{lint, Context};
7-
use rusty_parser::{parse_main_file, Program};
5+
use rusty_basic::interpreter::{InterpreterTrait, new_default_interpreter};
6+
use rusty_linter::{Context, lint};
7+
use rusty_parser::{Program, parse_main_file};
88

99
fn main() {
1010
let is_running_in_apache = is_running_in_apache();

rusty_basic/src/instruction_generator/instruction_generator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ use rusty_parser::{
55
};
66
use rusty_variant::Variant;
77

8+
use crate::RuntimeError;
89
use crate::instruction_generator::label_resolver::LabelResolver;
910
use crate::instruction_generator::subprogram_info::{
1011
SubprogramInfoCollector, SubprogramInfoRepository
1112
};
12-
use crate::RuntimeError;
1313

1414
pub fn unwrap_linter_context(linter_context: Context) -> (Names, UserDefinedTypes) {
1515
let (pre_linter_result, linter_names) = linter_context.into();

rusty_basic/src/instruction_generator/test_utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use rusty_common::NoPosContainer;
22
use rusty_linter::lint;
3-
use rusty_parser::{parse, UserDefinedTypes};
3+
use rusty_parser::{UserDefinedTypes, parse};
44

55
use crate::instruction_generator::{
6-
generate_instructions, unwrap_linter_context, Instruction, InstructionGeneratorResult, InstructionPos
6+
Instruction, InstructionGeneratorResult, InstructionPos, generate_instructions, unwrap_linter_context
77
};
88

99
pub fn generate_instructions_str_with_types(

rusty_basic/src/interpreter/built_ins/beep.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::interpreter::interpreter_trait::InterpreterTrait;
21
use crate::RuntimeError;
2+
use crate::interpreter::interpreter_trait::InterpreterTrait;
33

44
#[cfg(windows)]
55
pub fn run<S: InterpreterTrait>(_interpreter: &mut S) -> Result<(), RuntimeError> {

rusty_basic/src/interpreter/built_ins/chr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use rusty_linter::QBNumberCast;
22
use rusty_parser::BuiltInFunction;
33

4-
use crate::interpreter::interpreter_trait::InterpreterTrait;
54
use crate::RuntimeError;
5+
use crate::interpreter::interpreter_trait::InterpreterTrait;
66

77
pub fn run<S: InterpreterTrait>(interpreter: &mut S) -> Result<(), RuntimeError> {
88
let i: i32 = interpreter.context()[0].try_cast()?;

rusty_basic/src/interpreter/built_ins/close.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use rusty_parser::FileHandle;
22

3+
use crate::RuntimeError;
34
use crate::interpreter::interpreter_trait::InterpreterTrait;
45
use crate::interpreter::variant_casts::VariantCasts;
5-
use crate::RuntimeError;
66

77
pub fn run<S: InterpreterTrait>(interpreter: &mut S) -> Result<(), RuntimeError> {
88
let file_handles: Vec<FileHandle> = interpreter

rusty_basic/src/interpreter/built_ins/cls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use crate::RuntimeError;
12
use crate::interpreter::interpreter_trait::InterpreterTrait;
23
use crate::interpreter::io::Printer;
3-
use crate::RuntimeError;
44

55
pub fn run<S: InterpreterTrait>(interpreter: &mut S) -> Result<(), RuntimeError> {
66
match interpreter.screen().get_view_print() {

rusty_basic/src/interpreter/built_ins/color.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rusty_linter::QBNumberCast;
22

3-
use crate::interpreter::interpreter_trait::InterpreterTrait;
43
use crate::RuntimeError;
4+
use crate::interpreter::interpreter_trait::InterpreterTrait;
55

66
pub fn run<S: InterpreterTrait>(interpreter: &mut S) -> Result<(), RuntimeError> {
77
let flags: i32 = interpreter.context()[0].try_cast()?;

rusty_basic/src/interpreter/built_ins/cvd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use rusty_parser::BuiltInFunction;
22
use rusty_variant::bytes_to_f64;
33

4+
use crate::RuntimeError;
45
use crate::interpreter::interpreter_trait::InterpreterTrait;
56
use crate::interpreter::string_utils::to_ascii_bytes;
67
use crate::interpreter::variant_casts::VariantCasts;
7-
use crate::RuntimeError;
88

99
pub fn run<S: InterpreterTrait>(interpreter: &mut S) -> Result<(), RuntimeError> {
1010
let s = interpreter.context()[0].to_str_unchecked();

rusty_basic/src/interpreter/built_ins/data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rusty_variant::Variant;
22

3-
use crate::interpreter::interpreter_trait::InterpreterTrait;
43
use crate::RuntimeError;
4+
use crate::interpreter::interpreter_trait::InterpreterTrait;
55

66
pub fn run<S: InterpreterTrait>(interpreter: &mut S) -> Result<(), RuntimeError> {
77
let variables: Vec<Variant> = interpreter

0 commit comments

Comments
 (0)