@@ -136,18 +136,18 @@ impl fmt::Show for Nonterminal {
136
136
}
137
137
}
138
138
139
- pub fn binop_to_str ( o : BinOp ) -> String {
139
+ pub fn binop_to_str ( o : BinOp ) -> & ' static str {
140
140
match o {
141
- PLUS => "+" . to_string ( ) ,
142
- MINUS => "-" . to_string ( ) ,
143
- STAR => "*" . to_string ( ) ,
144
- SLASH => "/" . to_string ( ) ,
145
- PERCENT => "%" . to_string ( ) ,
146
- CARET => "^" . to_string ( ) ,
147
- AND => "&" . to_string ( ) ,
148
- OR => "|" . to_string ( ) ,
149
- SHL => "<<" . to_string ( ) ,
150
- SHR => ">>" . to_string ( )
141
+ PLUS => "+" ,
142
+ MINUS => "-" ,
143
+ STAR => "*" ,
144
+ SLASH => "/" ,
145
+ PERCENT => "%" ,
146
+ CARET => "^" ,
147
+ AND => "&" ,
148
+ OR => "|" ,
149
+ SHL => "<<" ,
150
+ SHR => ">>"
151
151
}
152
152
}
153
153
@@ -164,9 +164,9 @@ pub fn to_str(t: &Token) -> String {
164
164
TILDE => "~" . to_string ( ) ,
165
165
OROR => "||" . to_string ( ) ,
166
166
ANDAND => "&&" . to_string ( ) ,
167
- BINOP ( op) => binop_to_str ( op) ,
167
+ BINOP ( op) => binop_to_str ( op) . to_string ( ) ,
168
168
BINOPEQ ( op) => {
169
- let mut s = binop_to_str ( op) ;
169
+ let mut s = binop_to_str ( op) . to_strbuf ( ) ;
170
170
s. push_str ( "=" ) ;
171
171
s
172
172
}
0 commit comments