comparison: src/format.cpp
src/format.cpp
- changeset 134
- eca2fc0acaa2
- parent 133
- dbbdb870c835
- child 137
- 73d057b030d0
equal
deleted
inserted
replaced
| 133:dbbdb870c835 | 134:eca2fc0acaa2 |
|---|---|
| 68 | 68 |
| 69 int ofs = 1; | 69 int ofs = 1; |
| 70 char mod = '\0'; | 70 char mod = '\0'; |
| 71 | 71 |
| 72 // handle modifiers | 72 // handle modifiers |
| 73 if (fmt[pos + ofs] == 's' || fmt[pos + ofs] == 'x' || fmt[pos + ofs] == 'd') | 73 if (fmt[pos + ofs] == 's' or fmt[pos + ofs] == 'x' or fmt[pos + ofs] == 'd') |
| 74 { | 74 { |
| 75 mod = fmt[pos + ofs]; | 75 mod = fmt[pos + ofs]; |
| 76 ofs++; | 76 ofs++; |
| 77 } | 77 } |
| 78 | 78 |
| 109 void error (const String& msg) | 109 void error (const String& msg) |
| 110 { | 110 { |
| 111 Lexer* lx = Lexer::getCurrentLexer(); | 111 Lexer* lx = Lexer::getCurrentLexer(); |
| 112 String fileinfo; | 112 String fileinfo; |
| 113 | 113 |
| 114 if (lx != null && lx->hasValidToken()) | 114 if (lx != null and lx->hasValidToken()) |
| 115 { | 115 { |
| 116 Lexer::TokenInfo* tk = lx->token(); | 116 Lexer::TokenInfo* tk = lx->token(); |
| 117 fileinfo = format ("%1:%2:%3: ", tk->file, tk->line, tk->column); | 117 fileinfo = format ("%1:%2:%3: ", tk->file, tk->line, tk->column); |
| 118 } | 118 } |
| 119 | 119 |
