1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
|
/*
* MRustC - Rust Compiler
* - By John Hodge (Mutabah/thePowersGang)
*
* expand/format_args.cpp
* - format_args! syntax extension handling
*/
#include <synext_macro.hpp>
#include <synext.hpp> // for Expand_BareExpr
#include "../parse/common.hpp"
#include "../parse/parseerror.hpp"
#include "../parse/tokentree.hpp"
#include "../parse/lex.hpp"
#include "../parse/interpolated_fragment.hpp"
#include <ast/crate.hpp> // for m_load_std
#include <ast/expr.hpp> // for ExprNode_*
namespace {
/// Options for a formatting fragment
struct FmtArgs
{
enum class Align {
Unspec,
Left,
Center,
Right,
};
enum class Sign {
Unspec,
Plus,
Minus,
};
Align align = Align::Unspec;
char align_char = ' ';
Sign sign = Sign::Unspec;
bool alternate = false;
bool zero_pad = false;
bool width_is_arg = false;
unsigned int width = 0;
bool prec_is_arg = false;
unsigned int prec = 0;
bool operator==(const FmtArgs& x) const { return ::std::memcmp(this, &x, sizeof(*this)) == 0; }
bool operator!=(const FmtArgs& x) const {
#define CMP(f) if(f != x.f) return true
CMP(align);
CMP(align_char);
CMP(sign);
CMP(alternate);
CMP(zero_pad);
CMP(width_is_arg);
CMP(width);
CMP(prec_is_arg);
CMP(prec);
return false;
}
friend ::std::ostream& operator<<(::std::ostream& os, const FmtArgs& x) {
os << "Align(";
switch(x.align) {
case Align::Unspec: os << "-"; break;
case Align::Left: os << "<"; break;
case Align::Center: os << "^"; break;
case Align::Right: os << ">"; break;
}
os << "'" << x.align_char << "'";
os << ")";
os << "Sign(";
switch(x.sign) {
case Sign::Unspec: os << " "; break;
case Sign::Plus: os << "+"; break;
case Sign::Minus: os << "-"; break;
}
if(x.alternate) os << "#";
if(x.zero_pad) os << "0";
os << ")";
os << "Width(" << (x.width_is_arg ? "$" : "") << x.width << ")";
os << "Prec(" << (x.prec_is_arg ? "$" : "") << x.prec << ")";
return os;
}
};
/// A single formatting fragment
struct FmtFrag
{
/// Literal text preceding the fragment
::std::string leading_text;
/// Argument index used
unsigned int arg_index;
/// Trait to use for formatting
const char* trait_name;
// TODO: Support case where this hasn't been edited (telling the formatter that it has nothing to apply)
/// Options
FmtArgs args;
};
class string_view {
const char* s;
const char* e;
public:
string_view(const char* s, const char* e):
s(s), e(e)
{}
friend ::std::ostream& operator<<(::std::ostream& os, const string_view& x) {
for(const char* p = x.s; p != x.e; p++)
os << *p;
return os;
}
};
/// Parse a format string into a sequence of fragments.
///
/// Returns a list of fragments, and the remaining free text after the last format sequence
::std::tuple< ::std::vector<FmtFrag>, ::std::string> parse_format_string(
const Span& sp,
const ::std::string& format_string,
const ::std::map< ::std::string,unsigned int>& named,
unsigned int n_free
)
{
unsigned int n_named = named.size();
unsigned int next_free = 0;
::std::vector<FmtFrag> frags;
::std::string cur_literal;
const char* s = format_string.c_str();
for( ; *s; s ++)
{
if( *s != '{' )
{
if( *s == '}' ) {
// Doesn't need escaping
cur_literal += '}';
}
else
{
cur_literal += *s;
}
}
else
{
s ++;
// Escaped '{' as "{{"
if( *s == '{' ) {
cur_literal += '{';
continue ;
}
// Debugging: A view of the formatting fragment
//const char* s2 = s;
//while(*s2 && *s2 != '}')
// s2 ++;
//auto fmt_frag_str = string_view { s, s2 };
unsigned int index = ~0u;
const char* trait_name;
FmtArgs args;
// Formatting parameter
if( *s != ':' && *s != '}' ) {
// Parse either an integer or an identifer
if( isdigit(*s) ) {
unsigned int arg_idx = 0;
do {
arg_idx *= 10;
arg_idx += *s - '0';
s ++;
} while(isdigit(*s));
if( arg_idx >= n_free )
ERROR(sp, E0000, "Positional argument " << arg_idx << " out of range");
index = arg_idx;
}
else {
const char* start = s;
while( isalnum(*s) || *s == '_' || (*s < 0 || *s > 127) ) {
s ++;
}
::std::string ident { start, s };
auto it = named.find(ident);
if( it == named.end() )
ERROR(sp, E0000, "Named argument '"<<ident<<"' not found");
index = n_free + it->second;
}
}
else {
// Leave (for now)
// - If index is ~0u at the end of this block, it's set to the next arg
// - This allows {:.*} to format correctly (taking <prec> then <arg>)
}
// If next character is ':', parse extra information
if( *s == ':' ) {
s ++; // eat ':'
// Alignment
if( s[0] != '\0' && (s[1] == '<' || s[1] == '^' || s[1] == '>') ) {
args.align_char = s[0];
s ++;
}
if( *s == '<' ) {
args.align = FmtArgs::Align::Left;
s ++;
}
else if( *s == '^' ) {
args.align = FmtArgs::Align::Center;
s ++;
}
else if( *s == '>' ) {
args.align = FmtArgs::Align::Right;
s ++;
}
else {
//args.align = FmtArgs::Align::Unspec;
}
// Sign
if( *s == '+' ) {
args.sign = FmtArgs::Sign::Plus;
s ++;
}
else if( *s == '-' ) {
args.sign = FmtArgs::Sign::Minus;
s ++;
}
else {
args.sign = FmtArgs::Sign::Unspec;
}
if( *s == '#' ) {
args.alternate = true;
s ++;
}
else {
//args.alternate = false;
}
if( *s == '0' ) {
args.zero_pad = true;
s ++;
}
else {
//args.zero_pad = false;
}
// Padded width
if( ::std::isdigit(*s) /*|| *s == '*'*/ ) {
unsigned int val = 0;
while( ::std::isdigit(*s) )
{
val *= 10;
val += *s - '0';
s ++;
}
args.width = val;
if( *s == '$' ) {
args.width_is_arg = true;
s ++;
}
else {
//args.width_is_arg = false;
}
}
// Precision
if( *s == '.' ) {
s ++;
// '*' - Use next argument
if( *s == '*' ) {
args.prec_is_arg = true;
if( next_free == n_free ) {
ERROR(sp, E0000, "Not enough arguments passed, expected at least " << n_free+1);
}
args.prec = next_free + n_named;
next_free ++;
}
else {
unsigned int val = 0;
while( ::std::isdigit(*s) )
{
val *= 10;
val += *s - '0';
s ++;
}
args.prec = val;
if( *s == '$' ) {
args.prec_is_arg = true;
s ++;
}
else {
//args.prec_is_arg = false;
}
}
}
// Parse ident?
// - Lazy way is to just handle a single char and ensure that it is just a single char
if( s[0] != '}' && s[0] != '\0' && s[1] != '}' ) {
TODO(sp, "Parse formatting fragment at \"" << s << "\" (long type)");
}
switch(s[0])
{
case '\0':
ERROR(sp, E0000, "Unexpected end of formatting string");
default:
ERROR(sp, E0000, "Unknown formatting type specifier '" << *s << "'");
case '}': trait_name = "Display"; break;
case '?': s++; trait_name = "Debug" ; break;
case 'b': s++; trait_name = "Binary"; break;
case 'o': s++; trait_name = "Octal" ; break;
case 'x': s++; trait_name = "LowerHex"; break;
case 'X': s++; trait_name = "UpperHex"; break;
case 'p': s++; trait_name = "Pointer" ; break;
case 'e': s++; trait_name = "LowerExp"; break;
case 'E': s++; trait_name = "UpperExp"; break;
}
assert(*s == '}');
}
else {
if( *s != '}' )
ERROR(sp, E0000, "Malformed formatting fragment, unexpected " << *s);
// Otherwise, it's just a trivial Display call
trait_name = "Display";
}
// Set index if unspecified
if( index == ~0u )
{
if( next_free == n_free ) {
ERROR(sp, E0000, "Not enough arguments passed, expected at least " << n_free+1);
}
index = next_free + n_named;
next_free ++;
}
frags.push_back( FmtFrag {
mv$(cur_literal),
index, trait_name,
mv$(args)
});
}
}
return ::std::make_tuple( mv$(frags), mv$(cur_literal) );
}
}
namespace {
void push_path(::std::vector<TokenTree>& toks, const AST::Crate& crate, ::std::initializer_list<const char*> il)
{
switch(crate.m_load_std)
{
case ::AST::Crate::LOAD_NONE:
break;
case ::AST::Crate::LOAD_CORE:
toks.push_back( TokenTree(TOK_DOUBLE_COLON) );
toks.push_back( Token(TOK_STRING, "core") );
break;
case ::AST::Crate::LOAD_STD:
toks.push_back( TokenTree(TOK_DOUBLE_COLON) );
toks.push_back( Token(TOK_IDENT, "std") );
break;
}
for(auto ent : il)
{
toks.push_back( TokenTree(TOK_DOUBLE_COLON) );
toks.push_back( Token(TOK_IDENT, ent) );
}
}
}
class CFormatArgsExpander:
public ExpandProcMacro
{
::std::unique_ptr<TokenStream> expand(const Span& sp, const ::AST::Crate& crate, const ::std::string& ident, const TokenTree& tt, AST::Module& mod) override
{
Token tok;
auto lex = TTStream(tt);
if( ident != "" )
ERROR(sp, E0000, "format_args! doesn't take an ident");
auto n = Parse_ExprVal(lex);
ASSERT_BUG(sp, n, "No expression returned");
Expand_BareExpr(crate, mod, n);
auto* format_string_np = dynamic_cast<AST::ExprNode_String*>(&*n);
if( !format_string_np ) {
ERROR(sp, E0000, "format_args! requires a string literal - got " << *n);
}
const auto& format_string = format_string_np->m_value;
::std::map< ::std::string, unsigned int> named_args_index;
::std::vector<TokenTree> named_args;
::std::vector<TokenTree> free_args;
// - Parse the arguments
while( GET_TOK(tok, lex) == TOK_COMMA )
{
if( lex.lookahead(0) == TOK_EOF ) {
GET_TOK(tok, lex);
break;
}
// - Named parameters
if( lex.lookahead(0) == TOK_IDENT && lex.lookahead(1) == TOK_EQUAL )
{
GET_CHECK_TOK(tok, lex, TOK_IDENT);
auto name = mv$(tok.str());
GET_CHECK_TOK(tok, lex, TOK_EQUAL);
auto expr_tt = TokenTree(Token( InterpolatedFragment(InterpolatedFragment::EXPR, Parse_Expr0(lex).release()) ));
auto ins_rv = named_args_index.insert( ::std::make_pair(mv$(name), named_args.size()) );
if( ins_rv.second == false ) {
ERROR(sp, E0000, "Duplicate definition of named argument `" << ins_rv.first->first << "`");
}
named_args.push_back( mv$(expr_tt) );
}
// - Free parameters
else
{
auto expr_tt = TokenTree(Token( InterpolatedFragment(InterpolatedFragment::EXPR, Parse_Expr0(lex).release()) ));
free_args.push_back( mv$(expr_tt) );
}
}
CHECK_TOK(tok, TOK_EOF);
// - Parse the format string
::std::vector< FmtFrag> fragments;
::std::string tail;
::std::tie( fragments, tail ) = parse_format_string(sp, format_string, named_args_index, free_args.size());
bool is_simple = true;
for(unsigned int i = 0; i < fragments.size(); i ++)
{
if( fragments[i].arg_index != i ) {
DEBUG(i << "Ordering mismach");
is_simple = false;
}
if( fragments[i].args != FmtArgs {} ) {
DEBUG(i << " Args changed - " << fragments[i].args << " != " << FmtArgs {});
is_simple = false;
}
}
::std::vector<TokenTree> toks;
// This should expand to a `match (a, b, c) { (ref _0, ref _1, ref _2) => ... }` to ensure that the values live long enough?
// - Also avoids name collisions
toks.push_back( TokenTree(TOK_RWORD_MATCH) );
toks.push_back( TokenTree(TOK_PAREN_OPEN) );
for(auto& arg : free_args)
{
toks.push_back( TokenTree(TOK_AMP) );
toks.push_back( mv$(arg) );
toks.push_back( TokenTree(TOK_COMMA) );
}
for(auto& arg : named_args)
{
toks.push_back( TokenTree(TOK_AMP) );
toks.push_back( mv$(arg) );
toks.push_back( TokenTree(TOK_COMMA) );
}
toks.push_back( TokenTree(TOK_PAREN_CLOSE) );
toks.push_back( TokenTree(TOK_BRACE_OPEN) );
toks.push_back( TokenTree(TOK_PAREN_OPEN) );
for(unsigned int i = 0; i < free_args.size() + named_args.size(); i ++ )
{
toks.push_back( Token(TOK_IDENT, FMT("a" << i)) );
toks.push_back( TokenTree(TOK_COMMA) );
}
toks.push_back( TokenTree(TOK_PAREN_CLOSE) );
toks.push_back( TokenTree(TOK_FATARROW) );
toks.push_back( TokenTree(TOK_BRACE_OPEN) );
// Save fragments into a static
// `static FRAGMENTS: [&'static str; N] = [...];`
// - Contains N+1 entries, where N is the number of fragments
{
toks.push_back( TokenTree(TOK_RWORD_STATIC) );
toks.push_back( Token(TOK_IDENT, "FRAGMENTS") );
toks.push_back( TokenTree(TOK_COLON) );
toks.push_back( TokenTree(TOK_SQUARE_OPEN) );
toks.push_back( Token(TOK_AMP) );
toks.push_back( Token(TOK_LIFETIME, "static") );
toks.push_back( Token(TOK_IDENT, "str") );
toks.push_back( Token(TOK_SEMICOLON) );
toks.push_back( Token(fragments.size() + 1, CORETYPE_UINT) );
toks.push_back( TokenTree(TOK_SQUARE_CLOSE) );
toks.push_back( Token(TOK_EQUAL) );
toks.push_back( TokenTree(TOK_SQUARE_OPEN) );
for(const auto& frag : fragments ) {
toks.push_back( Token(TOK_STRING, frag.leading_text) );
toks.push_back( TokenTree(TOK_COMMA) );
}
toks.push_back( Token(TOK_STRING, tail) );
toks.push_back( TokenTree(TOK_SQUARE_CLOSE) );
toks.push_back( Token(TOK_SEMICOLON) );
}
if( is_simple )
{
// ::fmt::Arguments::new_v1
push_path(toks, crate, {"fmt", "Arguments", "new_v1"});
// (
toks.push_back( TokenTree(TOK_PAREN_OPEN) );
{
toks.push_back( TokenTree(TOK_AMP) );
toks.push_back( Token(TOK_IDENT, "FRAGMENTS") );
toks.push_back( TokenTree(TOK_COMMA) );
toks.push_back( TokenTree(TOK_AMP) );
toks.push_back( TokenTree(TOK_SQUARE_OPEN) );
for(const auto& frag : fragments )
{
push_path(toks, crate, {"fmt", "ArgumentV1", "new"});
toks.push_back( Token(TOK_PAREN_OPEN) );
toks.push_back( Token(TOK_IDENT, FMT("a" << frag.arg_index)) );
toks.push_back( TokenTree(TOK_COMMA) );
push_path(toks, crate, {"fmt", frag.trait_name, "fmt"});
toks.push_back( TokenTree(TOK_PAREN_CLOSE) );
toks.push_back( TokenTree(TOK_COMMA) );
}
toks.push_back( TokenTree(TOK_SQUARE_CLOSE) );
}
// )
toks.push_back( TokenTree(TOK_PAREN_CLOSE) );
}
else // if(is_simple)
{
// Use new_v1_formatted
// - requires creating more entries in the `args` list to cover multiple formatters for one value
//push_path(toks, crate, {"fmt", "Arguments", "new_v1_formatted"});
push_path(toks, crate, {"fmt", "Arguments", "new_v1"});
// (
toks.push_back( TokenTree(TOK_PAREN_OPEN) );
{
toks.push_back( TokenTree(TOK_AMP) );
toks.push_back( Token(TOK_IDENT, "FRAGMENTS") );
toks.push_back( TokenTree(TOK_COMMA) );
// 1. Generate a set of arguments+formatters
// TODO: Fragments to format
// - The format stored by mrustc doesn't quite work with how rustc (and fmt::rt::v1) works
toks.push_back( TokenTree(TOK_AMP) );
toks.push_back( TokenTree(TOK_SQUARE_OPEN) );
//for(const auto& frag : fragments ) {
//}
toks.push_back( TokenTree(TOK_SQUARE_CLOSE) );
}
// )
toks.push_back( TokenTree(TOK_PAREN_CLOSE) );
} // if(is_simple) else
toks.push_back( TokenTree(TOK_BRACE_CLOSE) );
toks.push_back( TokenTree(TOK_BRACE_CLOSE) );
return box$( TTStreamO(TokenTree(mv$(toks))) );
}
};
STATIC_MACRO("format_args", CFormatArgsExpander);
|