Skip to content

Commit 23da0c6

Browse files
anordalanordal
committed
Syntax: Highlight lvalue, subtler blue for var expansions to distinguish
1 parent d75c377 commit 23da0c6

File tree

5 files changed

+53
-38
lines changed

5 files changed

+53
-38
lines changed

‎src/commonargcmd.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use crate::sitcomment::SitComment;
3636
use crate::sitextent::push_extent;
3737
use crate::sitextent::push_replaceable;
3838
use crate::sitmagic::push_magic;
39-
use crate::sitrvalue::SitRvalue;
39+
use crate::sitrvalue::SitLvalue;
4040
use crate::sitstrdq::SitStrDq;
4141
use crate::sitstrphantom::SitStrPhantom;
4242
use crate::sitstrsqesc::SitStrSqEsc;
@@ -60,7 +60,7 @@ pub fn keyword_or_command(
6060
return flush(i);
6161
}
6262
if found == Tri::Yes {
63-
return push((i + len, 0, None), Box::new(SitRvalue { end_trigger }));
63+
return push((i, 0, None), Box::new(SitLvalue { len, end_trigger }));
6464
}
6565
let len = predlen(is_word, &horizon.input[i..]);
6666
let len = if len != 0 { len } else { prefixlen(&horizon.input[i..], b"((") };
@@ -321,7 +321,6 @@ pub fn find_lvalue(horizon: &[u8]) -> (Tri, usize) {
321321
return (Tri::Maybe, ate);
322322
}
323323
let byte :u8 = horizon[ate];
324-
ate += 1;
325324

326325
// Recursion: There is now an expression_tracker() if needed.
327326
match (state, byte) {
@@ -334,6 +333,7 @@ pub fn find_lvalue(horizon: &[u8]) -> (Tri, usize) {
334333
(Lex::Pluss, _) => return (Tri::No, ate),
335334
(Lex::Brack, _) => {}
336335
}
336+
ate += 1;
337337
}
338338
}
339339

@@ -403,13 +403,13 @@ fn test_find_lvalue() {
403403
assert!(find_lvalue(b"[]") == (Tri::No, 0));
404404
assert!(find_lvalue(b"esa") == (Tri::Maybe, 3));
405405
assert!(find_lvalue(b"esa+") == (Tri::Maybe, 4));
406-
assert!(find_lvalue(b"esa+ ") == (Tri::No, 5));
406+
assert!(find_lvalue(b"esa+ ") == (Tri::No, 4));
407407
assert!(find_lvalue(b"esa[]") == (Tri::Maybe, 5));
408408
assert!(find_lvalue(b"esa[]+") == (Tri::Maybe, 6));
409-
assert!(find_lvalue(b"esa ") == (Tri::No, 4));
410-
assert!(find_lvalue(b"esa]") == (Tri::No, 4));
411-
assert!(find_lvalue(b"esa=") == (Tri::Yes, 4));
412-
assert!(find_lvalue(b"esa+=") == (Tri::Yes, 5));
413-
assert!(find_lvalue(b"esa[]=") == (Tri::Yes, 6));
414-
assert!(find_lvalue(b"esa[]+=") == (Tri::Yes, 7));
409+
assert!(find_lvalue(b"esa ") == (Tri::No, 3));
410+
assert!(find_lvalue(b"esa]") == (Tri::No, 3));
411+
assert!(find_lvalue(b"esa=") == (Tri::Yes, 3));
412+
assert!(find_lvalue(b"esa+=") == (Tri::Yes, 4));
413+
assert!(find_lvalue(b"esa[]=") == (Tri::Yes, 5));
414+
assert!(find_lvalue(b"esa[]+=") == (Tri::Yes, 6));
415415
}

‎src/sitcmd.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ use crate::testhelpers::*;
9797
#[cfg(test)]
9898
use crate::sitmagic::push_magic;
9999
#[cfg(test)]
100-
use crate::sitrvalue::SitRvalue;
100+
use crate::sitrvalue::SitLvalue;
101101
#[cfg(test)]
102102
use crate::sitvec::SitVec;
103103
#[cfg(test)]
@@ -113,7 +113,7 @@ use crate::sitextent::push_extent;
113113

114114
#[cfg(test)]
115115
fn mk_assignment(pre: usize) -> WhatNow {
116-
push((pre, 0, None), Box::new(SitRvalue { end_trigger: 0 }))
116+
push((pre, 0, None), Box::new(SitLvalue { len: 0, end_trigger: 0 }))
117117
}
118118

119119
#[cfg(test)]
@@ -131,17 +131,17 @@ fn test_sit_normal() {
131131
sit_expect!(subj(), b" ", &flush(1));
132132
sit_expect!(subj(), b"\\", &push_extent(COLOR_ESC, 0, 2));
133133
sit_expect!(subj(), b"fo", &flush(0), &mk_cmd(0));
134-
sit_expect!(subj(), b"fo=", &mk_assignment(3));
134+
sit_expect!(subj(), b"fo=", &mk_assignment(0));
135135
sit_expect!(subj(), b"for", &flush(0), &push((0, 3, None), Box::new(SitFor {})));
136-
sit_expect!(subj(), b"for=", &mk_assignment(4));
136+
sit_expect!(subj(), b"for=", &mk_assignment(0));
137137
sit_expect!(subj(), b"fork", &flush(0), &mk_cmd(0));
138-
sit_expect!(subj(), b"fork=", &mk_assignment(5));
138+
sit_expect!(subj(), b"fork=", &mk_assignment(0));
139139
sit_expect!(subj(), b";fo", &flush(1));
140-
sit_expect!(subj(), b";fo=", &mk_assignment(4));
140+
sit_expect!(subj(), b";fo=", &mk_assignment(1));
141141
sit_expect!(subj(), b";for", &flush(1));
142-
sit_expect!(subj(), b";for=", &mk_assignment(5));
142+
sit_expect!(subj(), b";for=", &mk_assignment(1));
143143
sit_expect!(subj(), b";fork", &flush(1));
144-
sit_expect!(subj(), b";fork=", &mk_assignment(6));
144+
sit_expect!(subj(), b";fork=", &mk_assignment(1));
145145
sit_expect!(subj(), b"((", &flush(0), &push_magic(0, 1, b')'));
146146
sit_expect!(subj(), b"[[", &flush(0), &push_magic(0, 1, b']'));
147147
}

‎src/sitfor.rs

+13-18
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@ use crate::situation::pop;
1515
use crate::situation::push;
1616
use crate::situation::COLOR_KWD;
1717
use crate::situation::COLOR_VAR;
18+
use crate::situation::COLOR_LVAL;
1819
use crate::situation::COLOR_NORMAL;
1920

2021
use crate::microparsers::identifierlen;
21-
use crate::microparsers::is_lowercase;
22-
use crate::microparsers::is_identifierhead;
2322
use crate::microparsers::is_identifiertail;
2423
use crate::microparsers::is_whitespace;
2524
use crate::microparsers::predlen;
2625

27-
use crate::sitvarident::SitVarIdent;
26+
use crate::sitextent::push_extent;
2827
use crate::commonargcmd::common_arg;
2928

3029
pub struct SitFor {}
@@ -35,16 +34,16 @@ impl Situation for SitFor {
3534
if is_whitespace(a) && a != b'\n' {
3635
continue;
3736
}
38-
let len = predlen(is_lowercase, &horizon.input[i..]);
37+
let len = identifierlen(&horizon.input[i..]);
3938
if i + len == horizon.input.len() && (i > 0 || horizon.is_lengthenable) {
4039
return flush(i);
4140
}
42-
let word = &horizon.input[i..i+len];
43-
if word == b"in" {
44-
return push_forin(i);
45-
}
46-
if is_identifierhead(a) {
47-
return push_varident(i, 1);
41+
if len > 0 {
42+
let word = &horizon.input[i..i+len];
43+
if word == b"in" {
44+
return push_forin(i);
45+
}
46+
return push_extent(COLOR_LVAL, i, len);
4847
}
4948
return pop(i, 0, None);
5049
}
@@ -122,10 +121,6 @@ fn push_forin(pre: usize) -> WhatNow {
122121
push((pre, 2, None), Box::new(SitForIn {}))
123122
}
124123

125-
fn push_varident(pre: usize, len: usize) -> WhatNow {
126-
push((pre, len, None), Box::new(SitVarIdent { end_insert: None }))
127-
}
128-
129124
fn become_for_in_necessarily_array(pre: usize) -> WhatNow {
130125
WhatNow {
131126
transform: (pre, 1, Some(b"\"${")),
@@ -149,10 +144,10 @@ fn test_sit_for() {
149144
sit_expect!(SitFor{}, b" ", &flush(1));
150145
sit_expect!(SitFor{}, b"\n", &pop(0, 0, None));
151146
sit_expect!(SitFor{}, b";", &pop(0, 0, None));
152-
sit_expect!(SitFor{}, b"_azAZ09\n", &push_varident(0, 1));
153-
sit_expect!(SitFor{}, b"_azAZ09;", &push_varident(0, 1));
154-
sit_expect!(SitFor{}, b"inn\n", &push_varident(0, 1));
155-
sit_expect!(SitFor{}, b"inn;", &push_varident(0, 1));
147+
sit_expect!(SitFor{}, b"_azAZ09\n", &push_extent(COLOR_LVAL, 0, 7));
148+
sit_expect!(SitFor{}, b"_azAZ09;", &push_extent(COLOR_LVAL, 0, 7));
149+
sit_expect!(SitFor{}, b"inn\n", &push_extent(COLOR_LVAL, 0, 3));
150+
sit_expect!(SitFor{}, b"inn;", &push_extent(COLOR_LVAL, 0, 3));
156151
sit_expect!(SitFor{}, b"in\n", &push_forin(0));
157152
sit_expect!(SitFor{}, b"in;", &push_forin(0));
158153
sit_expect!(SitFor{}, b"in ", &push_forin(0));

‎src/sitrvalue.rs

+20-1
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,40 @@
99
use crate::situation::Horizon;
1010
use crate::situation::Situation;
1111
use crate::situation::WhatNow;
12+
use crate::situation::Transition;
1213
use crate::situation::pop;
1314
use crate::situation::push;
1415
use crate::situation::flush;
1516
use crate::situation::flush_or_pop;
1617
use crate::situation::COLOR_NORMAL;
18+
use crate::situation::COLOR_LVAL;
1719

1820
use crate::microparsers::is_whitespace;
1921

2022
use crate::commonargcmd::common_cmd_quoting_unneeded;
2123
use crate::commonargcmd::common_expr;
2224

23-
pub struct SitRvalue {
25+
pub struct SitLvalue {
26+
pub len :usize,
2427
pub end_trigger :u16,
2528
}
2629

30+
impl Situation for SitLvalue {
31+
fn whatnow(&mut self, _: Horizon) -> WhatNow {
32+
WhatNow {
33+
transform: (self.len, 1, None),
34+
transition: Transition::Replace(Box::new(SitRvalue{ end_trigger: self.end_trigger })),
35+
}
36+
}
37+
fn get_color(&self) -> u32 {
38+
COLOR_LVAL
39+
}
40+
}
41+
42+
struct SitRvalue {
43+
end_trigger :u16,
44+
}
45+
2746
impl Situation for SitRvalue {
2847
fn whatnow(&mut self, horizon: Horizon) -> WhatNow {
2948
for (i, &a) in horizon.input.iter().enumerate() {

‎src/situation.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ const COLOR_GOLD : u32 = 0x00_ffcc55;
7777
pub const COLOR_KWD : u32 = COLOR_BOLD;
7878
pub const COLOR_CMD : u32 = 0x00_c00080;
7979
pub const COLOR_MAGIC : u32 = 0x00_c000c0;
80-
pub const COLOR_VAR : u32 = 0x00_007fff;
80+
pub const COLOR_VAR : u32 = 0x00_3f7fcf;
81+
pub const COLOR_LVAL : u32 = 0x00_007fff;
8182
pub const COLOR_HERE : u32 = 0x00_802000;
8283
pub const COLOR_CMT : u32 = 0x00_789060 | COLOR_BOLD | COLOR_ITAL;
8384
pub const COLOR_SQ : u32 = COLOR_GOLD;

0 commit comments

Comments
 (0)