Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita264017

Browse files
committed
Minor lexer simplifications.
1 parentb50f0be commita264017

File tree

1 file changed

+42
-60
lines changed

1 file changed

+42
-60
lines changed

‎parser/src/lexer.rs‎

Lines changed: 42 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -719,16 +719,13 @@ where
719719
Some('+') =>{
720720
let tok_start =self.get_pos();
721721
self.next_char();
722-
matchself.chr0{
723-
Some('=') =>{
724-
self.next_char();
725-
let tok_end =self.get_pos();
726-
returnSome(Ok((tok_start,Tok::PlusEqual, tok_end)));
727-
}
728-
_ =>{
729-
let tok_end =self.get_pos();
730-
returnSome(Ok((tok_start,Tok::Plus, tok_end)));
731-
}
722+
ifletSome('=') =self.chr0{
723+
self.next_char();
724+
let tok_end =self.get_pos();
725+
returnSome(Ok((tok_start,Tok::PlusEqual, tok_end)));
726+
}else{
727+
let tok_end =self.get_pos();
728+
returnSome(Ok((tok_start,Tok::Plus, tok_end)));
732729
}
733730
}
734731
Some('*') =>{
@@ -792,61 +789,49 @@ where
792789
Some('%') =>{
793790
let tok_start =self.get_pos();
794791
self.next_char();
795-
matchself.chr0{
796-
Some('=') =>{
797-
self.next_char();
798-
let tok_end =self.get_pos();
799-
returnSome(Ok((tok_start,Tok::PercentEqual, tok_end)));
800-
}
801-
_ =>{
802-
let tok_end =self.get_pos();
803-
returnSome(Ok((tok_start,Tok::Percent, tok_end)));
804-
}
792+
ifletSome('=') =self.chr0{
793+
self.next_char();
794+
let tok_end =self.get_pos();
795+
returnSome(Ok((tok_start,Tok::PercentEqual, tok_end)));
796+
}else{
797+
let tok_end =self.get_pos();
798+
returnSome(Ok((tok_start,Tok::Percent, tok_end)));
805799
}
806800
}
807801
Some('|') =>{
808802
let tok_start =self.get_pos();
809803
self.next_char();
810-
matchself.chr0{
811-
Some('=') =>{
812-
self.next_char();
813-
let tok_end =self.get_pos();
814-
returnSome(Ok((tok_start,Tok::VbarEqual, tok_end)));
815-
}
816-
_ =>{
817-
let tok_end =self.get_pos();
818-
returnSome(Ok((tok_start,Tok::Vbar, tok_end)));
819-
}
804+
ifletSome('=') =self.chr0{
805+
self.next_char();
806+
let tok_end =self.get_pos();
807+
returnSome(Ok((tok_start,Tok::VbarEqual, tok_end)));
808+
}else{
809+
let tok_end =self.get_pos();
810+
returnSome(Ok((tok_start,Tok::Vbar, tok_end)));
820811
}
821812
}
822813
Some('^') =>{
823814
let tok_start =self.get_pos();
824815
self.next_char();
825-
matchself.chr0{
826-
Some('=') =>{
827-
self.next_char();
828-
let tok_end =self.get_pos();
829-
returnSome(Ok((tok_start,Tok::CircumflexEqual, tok_end)));
830-
}
831-
_ =>{
832-
let tok_end =self.get_pos();
833-
returnSome(Ok((tok_start,Tok::CircumFlex, tok_end)));
834-
}
816+
ifletSome('=') =self.chr0{
817+
self.next_char();
818+
let tok_end =self.get_pos();
819+
returnSome(Ok((tok_start,Tok::CircumflexEqual, tok_end)));
820+
}else{
821+
let tok_end =self.get_pos();
822+
returnSome(Ok((tok_start,Tok::CircumFlex, tok_end)));
835823
}
836824
}
837825
Some('&') =>{
838826
let tok_start =self.get_pos();
839827
self.next_char();
840-
matchself.chr0{
841-
Some('=') =>{
842-
self.next_char();
843-
let tok_end =self.get_pos();
844-
returnSome(Ok((tok_start,Tok::AmperEqual, tok_end)));
845-
}
846-
_ =>{
847-
let tok_end =self.get_pos();
848-
returnSome(Ok((tok_start,Tok::Amper, tok_end)));
849-
}
828+
ifletSome('=') =self.chr0{
829+
self.next_char();
830+
let tok_end =self.get_pos();
831+
returnSome(Ok((tok_start,Tok::AmperEqual, tok_end)));
832+
}else{
833+
let tok_end =self.get_pos();
834+
returnSome(Ok((tok_start,Tok::Amper, tok_end)));
850835
}
851836
}
852837
Some('-') =>{
@@ -872,16 +857,13 @@ where
872857
Some('@') =>{
873858
let tok_start =self.get_pos();
874859
self.next_char();
875-
matchself.chr0{
876-
Some('=') =>{
877-
self.next_char();
878-
let tok_end =self.get_pos();
879-
returnSome(Ok((tok_start,Tok::AtEqual, tok_end)));
880-
}
881-
_ =>{
882-
let tok_end =self.get_pos();
883-
returnSome(Ok((tok_start,Tok::At, tok_end)));
884-
}
860+
ifletSome('=') =self.chr0{
861+
self.next_char();
862+
let tok_end =self.get_pos();
863+
returnSome(Ok((tok_start,Tok::AtEqual, tok_end)));
864+
}else{
865+
let tok_end =self.get_pos();
866+
returnSome(Ok((tok_start,Tok::At, tok_end)));
885867
}
886868
}
887869
Some('!') =>{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp