@@ -174,55 +174,53 @@ fn gen_words(
174174 eprintln ! ( "code2text: Scanner error" ) ;
175175 break ;
176176 }
177- ScanResult :: Ok ( val1) => {
178- match val1 {
179- Some ( i) => {
180- if i. get_type ( ) == TokenType :: Identifier {
181- let mut v = data. lock ( ) . unwrap ( ) ;
182- let mut map = map_data. lock ( ) . unwrap ( ) ;
183- let s = i. get_string ( ) ;
184- if s. len ( ) > num_len {
185- if map. contains_key ( & s. to_string ( ) ) {
177+ ScanResult :: Ok ( val1) => match val1 {
178+ Some ( i) => {
179+ if i. get_type ( ) == TokenType :: Identifier {
180+ let mut v = data. lock ( ) . unwrap ( ) ;
181+ let mut map = map_data. lock ( ) . unwrap ( ) ;
182+ let s = i. get_string ( ) ;
183+ if s. len ( ) > num_len {
184+ if map. contains_key ( & s. to_string ( ) ) {
185+ continue ;
186+ } else {
187+ map. insert ( s. to_string ( ) , true ) ;
188+ if !under {
189+ v. push ( s. to_string ( ) ) ;
190+ if stop && v. len ( ) > num {
191+ break ;
192+ }
193+ if max_t != 0 && v. len ( ) > max_t {
194+ break ;
195+ }
186196 continue ;
187- } else {
188- map. insert ( s. to_string ( ) , true ) ;
189- if !under {
190- v. push ( s. to_string ( ) ) ;
191- if stop && v. len ( ) > num {
192- break ;
193- }
194- if max_t != 0 && v. len ( ) > max_t {
195- break ;
196- }
197- continue ;
197+ }
198+ let f = s. find ( '_' ) ;
199+ if f != None {
200+ let value2 = & s[ ..f. unwrap ( ) ] ;
201+ v. push ( value2. to_string ( ) ) ;
202+ if stop && v. len ( ) > num {
203+ break ;
198204 }
199- let f = s. find ( '_' ) ;
200- if f != None {
201- let value2 = & s[ ..f. unwrap ( ) ] ;
202- v. push ( value2. to_string ( ) ) ;
203- if stop && v. len ( ) > num {
204- break ;
205- }
206- if max_t != 0 && v. len ( ) > max_t {
207- break ;
208- }
209- continue ;
205+ if max_t != 0 && v. len ( ) > max_t {
206+ break ;
210207 }
208+ continue ;
211209 }
212210 }
213211 }
214212 }
215- None => {
216- break ;
217- }
218213 }
219- }
214+ None => {
215+ break ;
216+ }
217+ } ,
220218 }
221219 }
222220 } ) ;
223221
224222 let mut v = data. lock ( ) . unwrap ( ) ;
225-
223+
226224 println ! (
227225 "code2text: scanning finished gathered {} tokens for pool out of {} lines, generating words..." ,
228226 v. len( ) ,
0 commit comments