Thu, 19 Oct 2023 15:10:12 -0500
Add whitespace and comment stripping
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
1 | // The main documentation is in the README. |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
2 | #![doc = include_str!("../README.md")] |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
3 | |
0 | 4 | use std::io; |
5 | use std::io::BufWriter; | |
6 | use std::io::Write; | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
7 | use clap::Parser; |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
8 | |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
9 | /// Command line parameters |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
10 | #[derive(Parser, Debug)] |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
11 | #[clap( |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
12 | about = env!("CARGO_PKG_DESCRIPTION"), |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
13 | author = env!("CARGO_PKG_AUTHORS"), |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
14 | version = env!("CARGO_PKG_VERSION"), |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
15 | )] |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
16 | struct CommandLineArgs { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
17 | #[arg(long, short = 'c')] |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
18 | /// Strip comments |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
19 | strip_comments : bool, |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
20 | |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
21 | #[arg(long, short = 'w')] |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
22 | /// Strip unnecessary whitespace |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
23 | strip_whitespace : bool, |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
24 | } |
0 | 25 | |
26 | #[derive(Clone, Copy, Debug, PartialEq, Eq)] | |
27 | enum Element { | |
28 | Added, | |
29 | Deleted, | |
30 | Replaced, | |
31 | Other, | |
32 | Comment, | |
33 | } | |
34 | ||
35 | #[derive(Clone, Copy, Debug, PartialEq, Eq)] | |
36 | enum Status { | |
37 | Output(Element), | |
38 | Ignore(Element), | |
39 | Scan(Element, bool), | |
40 | } | |
41 | ||
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
42 | use Status::*; |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
43 | use Element::*; |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
44 | |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
45 | struct Out<W : Write> { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
46 | only_whitespace : bool, |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
47 | stored_whitespace : String, |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
48 | output : W, |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
49 | stack : Vec<Status>, |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
50 | whitespace_satisfied : bool, |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
51 | par_satisfied : bool, |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
52 | } |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
53 | |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
54 | impl<W : Write> Out<W> { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
55 | fn current(&self) -> Status { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
56 | self.stack.last().map_or(Output(Other), |s| *s) |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
57 | } |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
58 | |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
59 | fn raw_out(&mut self, c : char) { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
60 | write!(self.output, "{}", c).unwrap(); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
61 | } |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
62 | |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
63 | pub fn out(&mut self, c : char) { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
64 | self.only_whitespace = false; |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
65 | write!(self.output, "{}{}", self.stored_whitespace, c).unwrap(); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
66 | self.stored_whitespace.clear(); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
67 | self.whitespace_satisfied = false; |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
68 | self.par_satisfied = false; |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
69 | } |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
70 | |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
71 | pub fn whitespace(&mut self, c : char) { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
72 | self.stored_whitespace.push(c); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
73 | } |
0 | 74 | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
75 | pub fn line_end(&mut self, strip_ws : bool, input_only_ws : bool) { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
76 | let cur = self.current(); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
77 | let skip_linefeed = if input_only_ws { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
78 | // Need a paragraph break |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
79 | strip_ws && self.par_satisfied |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
80 | } else if strip_ws { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
81 | self.only_whitespace && self.whitespace_satisfied |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
82 | } else if let Ignore(Comment) = cur { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
83 | // Skip comment-only lines if the comment is ignored |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
84 | self.only_whitespace |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
85 | } else if let Ignore(_) = cur { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
86 | // Skip line feeds in ignored bits |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
87 | true |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
88 | } else { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
89 | false |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
90 | }; |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
91 | |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
92 | if !skip_linefeed { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
93 | if !strip_ws { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
94 | write!(self.output, "{}", self.stored_whitespace).unwrap(); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
95 | } |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
96 | self.raw_out('\n'); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
97 | self.whitespace_satisfied = true; |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
98 | self.par_satisfied = self.only_whitespace; |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
99 | } |
0 | 100 | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
101 | if let Ignore(Comment) | Output(Comment) = cur { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
102 | self.stack.pop(); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
103 | } |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
104 | |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
105 | self.stored_whitespace.clear(); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
106 | self.only_whitespace = true; |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
107 | } |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
108 | |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
109 | pub fn flush(&mut self) { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
110 | self.output.flush().unwrap(); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
111 | } |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
112 | } |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
113 | |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
114 | fn main() { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
115 | let cli = CommandLineArgs::parse(); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
116 | let input = io::stdin(); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
117 | |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
118 | let mut o = Out { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
119 | only_whitespace : true, |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
120 | stored_whitespace : String::new(), |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
121 | output : BufWriter::new(io::stdout()), |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
122 | stack : Vec::new(), |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
123 | whitespace_satisfied : true, |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
124 | par_satisfied : true, |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
125 | }; |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
126 | |
0 | 127 | let mut lineno = 0; |
128 | ||
129 | for l in input.lines().map(|l| l.unwrap()) { | |
130 | lineno += 1; | |
131 | let mut chars = l.chars(); | |
132 | let mut maybe_next_char = None; | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
133 | let mut input_only_ws = true; |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
134 | |
0 | 135 | 'process_line: loop { |
136 | let next_char = match maybe_next_char { | |
137 | None => chars.next(), | |
138 | Some(c) => { | |
139 | maybe_next_char = None; | |
140 | Some(c) | |
141 | } | |
142 | }; | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
143 | input_only_ws = input_only_ws && next_char.map_or(true, |c| c.is_whitespace()); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
144 | match(o.current(), next_char) { |
0 | 145 | (_, None) => { |
146 | break 'process_line; | |
147 | }, | |
148 | (st @ (Output(e) | Ignore(e)), Some('\\')) if e != Comment => { | |
149 | let mut command = String::new(); | |
150 | let mut first = true; | |
151 | maybe_next_char = 'scan_command: loop { | |
152 | match chars.next() { | |
153 | Some(c) if first && (c=='{' || c=='}' || c=='\\') => { | |
154 | command.push(c); | |
155 | break 'scan_command None; | |
156 | }, | |
157 | Some(c) if c.is_alphanumeric() => { | |
158 | command.push(c); | |
159 | }, | |
160 | maybe_c => { | |
161 | break 'scan_command maybe_c; | |
162 | } | |
163 | } | |
164 | first = false; | |
165 | }; | |
166 | let output_guard = if let Ignore(_) = st { false } else { true }; | |
167 | match command.as_str() { | |
168 | "added" => { | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
169 | o.stack.push(Scan(Added, true && output_guard)); |
0 | 170 | }, |
171 | "replaced" => { | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
172 | o.stack.push(Scan(Replaced, true && output_guard)); |
0 | 173 | }, |
174 | "deleted" => { | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
175 | o.stack.push(Scan(Deleted, false)); |
0 | 176 | }, |
177 | _ => { | |
178 | if output_guard { | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
179 | o.out('\\'); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
180 | command.chars().for_each(|c| o.out(c.clone())); |
0 | 181 | } |
182 | } | |
183 | }; | |
184 | }, | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
185 | (Scan(next, out), Some(c)) => { |
0 | 186 | match c { |
187 | '{' => { | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
188 | o.stack.pop(); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
189 | o.stack.push(if out { Output(next) } else { Ignore(next) }); |
0 | 190 | }, |
191 | ' ' => { | |
192 | }, | |
193 | _ => panic!("Non-whitespace character ({c}) separating arguments on\ | |
194 | line {lineno}"), | |
195 | } | |
196 | }, | |
197 | (Output(e), Some('{')) if e != Comment => { | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
198 | o.out('{'); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
199 | o.stack.push(Output(Other)); |
0 | 200 | }, |
201 | (Ignore(e), Some('{')) if e != Comment => { | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
202 | o.stack.push(Ignore(Other)); |
0 | 203 | }, |
204 | (Output(Added) | Ignore(Added) | Output(Deleted) | Ignore(Deleted), Some('}')) => { | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
205 | o.stack.pop(); |
0 | 206 | }, |
207 | (Output(Replaced) | Ignore(Replaced), Some('}')) => { | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
208 | o.stack.pop(); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
209 | o.stack.push(Scan(Deleted, false)); |
0 | 210 | }, |
211 | (Output(Other), Some('}')) => { | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
212 | o.out('}'); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
213 | o.stack.pop(); |
0 | 214 | }, |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
215 | (Ignore(e), Some('}')) if e != Comment => { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
216 | o.stack.pop(); |
0 | 217 | }, |
218 | (Output(e), Some('%')) if e != Comment=> { | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
219 | if cli.strip_comments { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
220 | if o.stored_whitespace.is_empty() && !o.only_whitespace { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
221 | // Output comment marker if it is required to maintain |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
222 | // lack of whitespace. |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
223 | o.out('%'); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
224 | } |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
225 | o.stack.push(Ignore(Comment)); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
226 | } else { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
227 | o.out('%'); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
228 | o.stack.push(Output(Comment)); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
229 | } |
0 | 230 | }, |
231 | (Ignore(e), Some('%')) if e != Comment => { | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
232 | o.stack.push(Ignore(Comment)); |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
233 | }, |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
234 | (Output(_), Some(c)) if c.is_whitespace() => { |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
235 | o.whitespace(c); |
0 | 236 | }, |
237 | (Output(_), Some(c)) => { | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
238 | o.out(c); |
0 | 239 | }, |
240 | (Ignore(_), Some(_)) => { | |
241 | }, | |
242 | }; | |
243 | } | |
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
244 | |
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
245 | o.line_end(cli.strip_whitespace, input_only_ws); |
0 | 246 | } |
247 | ||
2
254e1e4bd795
Add whitespace and comment stripping
Tuomo Valkonen <tuomov@iki.fi>
parents:
0
diff
changeset
|
248 | o.flush(); |
0 | 249 | } |