Skip to content

Commit ece2bb7

Browse files
committed
Replace uuid with incrementing counter
fix wasm build
1 parent b554298 commit ece2bb7

File tree

3 files changed

+8
-82
lines changed

3 files changed

+8
-82
lines changed

Cargo.lock

Lines changed: 0 additions & 71 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,9 @@ exclude = ["myscheme-wasm"]
88
[dependencies]
99
num = "0.4"
1010
regex = "1.11.1"
11-
getrandom = { version = "0.3", features = ["wasm_js"] }
1211
const_format = "0.2.34"
1312
itertools = "0.14.0"
1413

15-
[dependencies.uuid]
16-
version = "1.16.0"
17-
features = ["v4", "fast-rng", "macro-diagnostics"]
18-
1914
[dev-dependencies]
2015
assert_fs = "1.1.3"
2116

src/parser/mod.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,27 @@ mod quasiquote;
33
pub mod syn_env;
44

55
use std::cell::RefCell;
6-
use std::collections::{hash_map::Entry, HashMap, HashSet};
6+
use std::collections::{HashMap, HashSet, hash_map::Entry};
77
use std::error::Error;
88
use std::fmt;
99
use std::rc::Rc;
10+
use std::sync::atomic::{AtomicUsize, Ordering};
1011

1112
use crate::datum::*;
1213
use crate::expr::*;
1314
use crate::interner::Symbol;
1415

1516
use itertools::Itertools;
16-
use uuid::Uuid;
1717

1818
use self::syn_env::{EnvBinding, SynEnv};
1919

20+
static NEXT_TEMP: AtomicUsize = AtomicUsize::new(0);
21+
2022
fn gen_temp_name() -> Symbol {
2123
if cfg!(test) {
2224
"#temp_var".into()
2325
} else {
24-
format!("#{}", Uuid::new_v4().simple()).into()
26+
format!("#{}", NEXT_TEMP.fetch_add(1, Ordering::Relaxed)).into()
2527
}
2628
}
2729

@@ -33,7 +35,7 @@ fn freshen_name(name: Symbol) -> Symbol {
3335
let fresh = if cfg!(test) {
3436
format!("{name}#fresh").into()
3537
} else {
36-
format!("{name}#{}", Uuid::new_v4().simple()).into()
38+
format!("{name}#{}", NEXT_TEMP.fetch_add(1, Ordering::Relaxed)).into()
3739
};
3840
INV_FRESH.with_borrow_mut(|inv| inv.insert(fresh, name));
3941
fresh
@@ -72,7 +74,7 @@ where
7274
Entry::Occupied(_) => {
7375
return Err(ParserError {
7476
kind: ParserErrorKind::DuplicateArgument(*arg),
75-
})
77+
});
7678
}
7779
Entry::Vacant(e) => {
7880
*arg = freshen_name(*arg);
@@ -337,7 +339,7 @@ fn process_body<I: Iterator<Item = Datum>>(
337339
ExprOrDef::MixedBegin(_) => {
338340
return Err(ParserError {
339341
kind: ParserErrorKind::IllegalDefine,
340-
})
342+
});
341343
}
342344
}
343345
eods.push(eod);

0 commit comments

Comments
 (0)