jonas/lispers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(tokenizer): allow negative numbers

Browse Source
This commit is contained in:
Jonas Röger
2026-03-31 04:32:08 +02:00
parent 3c73077837
commit d4281d3538
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lispers-core/src/parser/tokenizer.rs
View File

@@ -294,7 +294,9 @@ where
let mut buf = String::new(); let mut buf = String::new();
while let Some(c) = reader.next() { while let Some(c) = reader.next() {
if c.is_ascii_digit() { if buf.is_empty() && c == '-' {
buf.push(c);
} else if c.is_ascii_digit() {
buf.push(c); buf.push(c);
} else { } else {
reader.step_back(1); reader.step_back(1);
@@ -317,7 +319,9 @@ where
let mut has_dot = false; let mut has_dot = false;
while let Some(c) = reader.next() { while let Some(c) = reader.next() {
if c.is_ascii_digit() { if buf.is_empty() && c == '-' {
buf.push(c);
} else if c.is_ascii_digit() {
buf.push(c); buf.push(c);
} else if c == '.' && !has_dot { } else if c == '.' && !has_dot {
buf.push(c); buf.push(c);
@@ -337,11 +341,12 @@ where
#[test] #[test]
fn test_tokenize() { fn test_tokenize() {
let test_str = "(\"abcdefg( )123\" )(\n\t 'nil true \"true\")00987463 123.125 . 0+-*/go="; let test_str =
"(\"abcdefg( )123\" )(\n\t 'nil true \"true\")00987463 123.125 -20 -3.14 . 0+-*/go=";
let result: Vec<_> = tokenize(&mut test_str.chars()).collect(); let result: Vec<_> = tokenize(&mut test_str.chars()).collect();
assert_eq!(result.len(), 13); assert_eq!(result.len(), 15);
assert_eq!(result[0].clone().unwrap(), Token::ParOpen); assert_eq!(result[0].clone().unwrap(), Token::ParOpen);
assert_eq!( assert_eq!(
result[1].clone().unwrap(), result[1].clone().unwrap(),
@@ -359,9 +364,11 @@ fn test_tokenize() {
assert_eq!(result[8].clone().unwrap(), Token::ParClose); assert_eq!(result[8].clone().unwrap(), Token::ParClose);
assert_eq!(result[9].clone().unwrap(), Token::IntLiteral(987463)); assert_eq!(result[9].clone().unwrap(), Token::IntLiteral(987463));
assert_eq!(result[10].clone().unwrap(), Token::FloatLiteral(123.125)); assert_eq!(result[10].clone().unwrap(), Token::FloatLiteral(123.125));
assert_eq!(result[11].clone().unwrap(), Token::Dot); assert_eq!(result[11].clone().unwrap(), Token::IntLiteral(-20));
assert_eq!(result[12].clone().unwrap(), Token::FloatLiteral(-3.14));
assert_eq!(result[13].clone().unwrap(), Token::Dot);
assert_eq!( assert_eq!(
result[12].clone().unwrap(), result[14].clone().unwrap(),
Token::Symbol("0+-*/go=".to_string()) Token::Symbol("0+-*/go=".to_string())
); );
} }

4
scenes/demo-2.lisp
View File

@@ -80,12 +80,12 @@
(defun cam-fn (t c) (defun cam-fn (t c)
(let '((pos . (point 0 4 8)) (let '((pos . (point 0 4 8))
(cnt . (point 0 0 0)) (cnt . (point 0 0 0))
(to . (point 1 1 1)) (to . (point -3 3 -8))
(up . (vector 0 1 0)) (up . (vector 0 1 0))
(fovy . 40) (fovy . 40)
(pct . (/ t 300.0))) (pct . (/ t 300.0)))
(let '((tpos . (vadd pos (vmul (vsub to pos) pct))) (let '((tpos . (vadd pos (vmul (vsub to pos) pct)))
(tfovy . (+ fovy (* 10 pct))) (tfovy . (+ fovy (* 40 pct)))
) )
(camera-reposition c tpos cnt up fovy) (camera-reposition c tpos cnt up fovy)
) )