cass.cityboundforest.com
A Quadrilateral Cowboy clone intended to help me learn Game Dev
Added lexing terminal input into tokens
+6
-3
src/level.rs
+6
-3
src/level.rs
···
1
1
use std::mem;
2
2
3
3
use bevy::{asset::RenderAssetUsages, camera::RenderTarget, input::keyboard::{Key, KeyboardInput}, math::Affine2, prelude::*, render::render_resource::{Extent3d, TextureDimension, TextureFormat, TextureUsages}};
4
-
use crate::game::{GameAssets, GameState};
4
+
use crate::{game::{GameAssets, GameState}, terminal};
5
5
6
6
pub fn plugin(app: &mut App) {
7
7
app.add_systems(OnEnter(GameState::Loading), check_levels)
···
179
179
Camera3d::default(),
180
180
Transform::from_xyz(0.5, -1.0, 3.5).looking_at(Vec3::new(0.0, -1.0, 0.0), Vec3::Y)
181
181
));
182
+
183
+
commands.spawn(terminal::TerminalSystem);
182
184
}
183
185
184
-
fn check_input(mut keyboard_input_reader: MessageReader<KeyboardInput>, mut query: Query<(&mut CurrentInput, &Terminal, &mut ConsoleHistory)>, mut terminal_query: Query<(&mut Text, &TerminalText)>) {
186
+
fn check_input(mut keyboard_input_reader: MessageReader<KeyboardInput>, mut query: Query<(&mut CurrentInput, &Terminal, &mut ConsoleHistory)>, mut terminal_query: Query<(&mut Text, &TerminalText)>, mut terminal_system: Query<&mut terminal::TerminalSystem>) {
185
187
let mut current_input = query.single_mut().unwrap();
186
188
let mut current_terminal_text = terminal_query.single_mut().unwrap();
189
+
let mut terminal = terminal_system.single_mut().unwrap();
187
190
188
191
for keyboard_input in keyboard_input_reader.read() {
189
192
if !keyboard_input.state.is_pressed() {
···
199
202
}
200
203
201
204
current_input.2.0.push(ConsoleEntry::Command(current_input.0.0.to_owned()));
205
+
terminal.parse(current_input.0.0.clone());
202
206
current_input.0.0.clear();
203
-
// TODO: Process input
204
207
},
205
208
(Key::Backspace, _) => {
206
209
current_input.0.0.pop();
+1
src/main.rs
+1
src/main.rs
+94
src/terminal.rs
+94
src/terminal.rs
···
1
+
use bevy::prelude::*;
2
+
3
+
#[derive(Component)]
4
+
pub struct TerminalSystem;
5
+
6
+
enum Token {
7
+
Identifier(String),
8
+
Integer(i32),
9
+
Period,
10
+
Semicolon,
11
+
LParen,
12
+
RParen
13
+
}
14
+
15
+
impl TerminalSystem {
16
+
pub fn parse(&mut self, input: String) {
17
+
let tokens = self.lex(input);
18
+
self.parse_tokens(tokens);
19
+
}
20
+
21
+
fn lex(&mut self, input: String) -> Vec<Token> {
22
+
let mut tokens = Vec::new();
23
+
let mut buffer = String::new();
24
+
let mut in_id = false;
25
+
let mut in_int = false;
26
+
27
+
let mut iter = 0;
28
+
29
+
while iter < input.len() {
30
+
let chr = input.chars().skip(iter).take(1).collect::<String>();
31
+
32
+
if in_id {
33
+
if chr.chars().any(|c| matches!(c, 'a'..='z')) || "0123456789".contains(&chr) {
34
+
buffer += &chr;
35
+
iter += 1;
36
+
continue;
37
+
} else {
38
+
tokens.push(Token::Identifier(buffer.clone()));
39
+
in_id = false;
40
+
continue;
41
+
}
42
+
} else if in_int {
43
+
if "0123456789".contains(&chr) {
44
+
buffer += &chr;
45
+
iter += 1;
46
+
continue;
47
+
} else {
48
+
tokens.push(Token::Integer(buffer.parse::<i32>().unwrap()));
49
+
in_int = false;
50
+
continue;
51
+
}
52
+
} else if chr == ";" {
53
+
tokens.push(Token::Semicolon);
54
+
iter += 1;
55
+
continue;
56
+
} else if chr == "." {
57
+
tokens.push(Token::Period);
58
+
iter += 1;
59
+
continue;
60
+
} else if chr == "(" {
61
+
tokens.push(Token::LParen);
62
+
iter += 1;
63
+
continue;
64
+
} else if chr == ")" {
65
+
tokens.push(Token::RParen);
66
+
iter += 1;
67
+
continue;
68
+
} else if chr == " " {
69
+
iter += 1;
70
+
continue;
71
+
} else if chr.is_ascii() {
72
+
in_id = true;
73
+
buffer = chr.clone();
74
+
iter += 1;
75
+
continue;
76
+
} else if "0123456789".contains(&chr) {
77
+
if !in_int {
78
+
in_int = true;
79
+
buffer = chr.clone();
80
+
iter += 1;
81
+
continue;
82
+
}
83
+
} else {
84
+
panic!("Need to figure out how to throw errors");
85
+
}
86
+
}
87
+
88
+
tokens
89
+
}
90
+
91
+
fn parse_tokens(&mut self, tokens: Vec<Token>) {
92
+
93
+
}
94
+
}